From 03be3258de6d228f09dfcbfea64184c7c0d17f97 Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Thu, 9 Oct 2014 10:05:42 +0100
Subject: [PATCH] Re #8911. Fixing the builds.
---
.../MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp | 6 +++---
Code/Mantid/QtPropertyBrowser/CMakeLists.txt | 1 -
Code/Mantid/QtPropertyBrowser/src/ButtonEditorFactory.h | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit.cpp
index 7996786f508..21da7fba4bd 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 de00cf75336..7c29f5f3e66 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 d79eb576c3b..238cf7c2192 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;
}
};
--
GitLab