diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp index 7996786f508952edaaba9b05bf8393673ebcffb4..21da7fba4bd418819ad5e973fe3edf1423522701 100644 --- a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp +++ b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp @@ -149,7 +149,7 @@ public: void show(QwtPlot *plot); void hide(); private: - void setData(QwtPlotCurve *curve, const Mantid::API::MatrixWorkspace *ws, int wsIndex, const Mantid::API::MatrixWorkspace *outputWS); + void setData(const Mantid::API::MatrixWorkspace *ws, int wsIndex, const Mantid::API::MatrixWorkspace *outputWS); QwtPlotCurve *m_dataCurve; QwtPlotCurve *m_calcCurve; QwtPlotCurve *m_diffCurve; @@ -176,7 +176,7 @@ DatasetPlotData::DatasetPlotData(const QString& wsName, int wsIndex, const QStri throw std::runtime_error( mess.toStdString() ); } // check that the index is in range - if ( wsIndex >= ws->getNumberHistograms() ) + if ( static_cast<size_t>(wsIndex) >= ws->getNumberHistograms() ) { QString mess = QString("Spectrum %1 doesn't exist in workspace %2").arg(wsIndex).arg(wsName); throw std::runtime_error( mess.toStdString() ); @@ -215,7 +215,7 @@ DatasetPlotData::~DatasetPlotData() } } -void DatasetPlotData::setData(QwtPlotCurve *curve, const Mantid::API::MatrixWorkspace *ws, int wsIndex, const Mantid::API::MatrixWorkspace *outputWS) +void DatasetPlotData::setData(const Mantid::API::MatrixWorkspace *ws, int wsIndex, const Mantid::API::MatrixWorkspace *outputWS) { std::vector<double> xValues = ws->readX(wsIndex); if ( ws->isHistogramData() ) diff --git a/Code/Mantid/QtPropertyBrowser/CMakeLists.txt b/Code/Mantid/QtPropertyBrowser/CMakeLists.txt index de00cf753364c1bf0d254f6ca0817380350b1451..7c29f5f3e662163dae3b50d1fda730ecd743bc92 100644 --- a/Code/Mantid/QtPropertyBrowser/CMakeLists.txt +++ b/Code/Mantid/QtPropertyBrowser/CMakeLists.txt @@ -104,7 +104,6 @@ set ( qt4_wrap_cpp ( EXTRA_MOCS src/DoubleEditorFactory.h src/ButtonEditorFactory.h - src/CompositeEditorFactory.h src/ParameterPropertyManager.h ) diff --git a/Code/Mantid/QtPropertyBrowser/src/ButtonEditorFactory.h b/Code/Mantid/QtPropertyBrowser/src/ButtonEditorFactory.h index d79eb576c3b674467a77fc4d09fca7ff75f640b5..238cf7c21928002bd0690d57a2da56733c551e5a 100644 --- a/Code/Mantid/QtPropertyBrowser/src/ButtonEditorFactory.h +++ b/Code/Mantid/QtPropertyBrowser/src/ButtonEditorFactory.h @@ -52,7 +52,7 @@ protected: { (void) manager; // Unused auto button = new ButtonEditor(property, parent); - connect(button,SIGNAL(buttonClicked(QtProperty *)),this,SIGNAL(buttonClicked(QtProperty *))); + this->connect(button,SIGNAL(buttonClicked(QtProperty *)),this,SIGNAL(buttonClicked(QtProperty *))); return button; } };