From 13cdcd07eb677476c4b512e17a65671ee8e7de3e Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Fri, 20 Nov 2015 16:14:03 -0500
Subject: [PATCH] Start Fixing cpp-check 1.71 warnings.
---
Framework/API/src/Algorithm.cpp | 5 +++--
Framework/API/src/IFunction.cpp | 4 ++--
Framework/API/src/NumericAxis.cpp | 2 +-
Framework/API/src/ParamFunction.cpp | 2 +-
Framework/Algorithms/src/AlignDetectors.cpp | 4 ++--
Framework/Algorithms/src/FilterByLogValue.cpp | 2 +-
Framework/Algorithms/src/GetEi2.cpp | 4 ++--
.../Algorithms/src/PerformIndexOperations.cpp | 5 +++--
Framework/Algorithms/src/RebinByTimeBase.cpp | 2 +-
Framework/Algorithms/src/Segfault.cpp | 1 +
Framework/Crystal/src/CompositeCluster.cpp | 2 +-
Framework/CurveFitting/src/Functions/Abragam.cpp | 2 +-
Framework/DataHandling/src/LoadEventNexus.cpp | 3 +--
Framework/DataHandling/src/LoadISISNexus2.cpp | 7 ++-----
.../DataHandling/src/LoadNexusProcessed.cpp | 2 +-
Framework/DataHandling/src/LoadRaw/isisraw.h | 2 +-
.../DataHandling/src/SaveGSASInstrumentFile.cpp | 2 +-
Framework/DataObjects/src/EventList.cpp | 5 ++---
Framework/DataObjects/src/PeaksWorkspace.cpp | 2 +-
.../Geometry/src/Crystal/ReflectionGenerator.cpp | 2 +-
.../src/MDGeometry/MDGeometryXMLBuilder.cpp | 2 +-
.../src/MDGeometry/MDGeometryXMLParser.cpp | 2 +-
Framework/Geometry/src/Math/ConvexPolygon.cpp | 9 ++++-----
.../Geometry/src/Surfaces/SurfaceFactory.cpp | 2 +-
Framework/ICat/src/CatalogDownloadDataFiles.cpp | 4 +---
Framework/Kernel/src/BinFinder.cpp | 2 +-
Framework/Kernel/src/ConfigService.cpp | 2 +-
Framework/Kernel/src/DllOpen.cpp | 2 +-
Framework/Kernel/src/Math/ChebyshevPolyFit.cpp | 2 +-
.../Distributions/BoseEinsteinDistribution.cpp | 2 +-
.../MDAlgorithms/src/CompareMDWorkspaces.cpp | 3 ++-
Framework/MDAlgorithms/src/Integrate3DEvents.cpp | 3 +--
.../mantid/api/src/Exports/IAlgorithm.cpp | 2 +-
MantidPlot/src/ApplicationWindow.cpp | 10 +++++-----
MantidPlot/src/ApplicationWindow.h | 2 +-
MantidPlot/src/Bar.h | 2 +-
MantidPlot/src/CanvasPicker.h | 4 ++--
MantidPlot/src/CustomActionDialog.h | 2 +-
MantidPlot/src/DockedWindow.h | 2 +-
MantidPlot/src/FitModelHandler.h | 2 +-
MantidPlot/src/FunctionCurve.h | 2 +-
MantidPlot/src/Graph.cpp | 16 +++++-----------
MantidPlot/src/ImageMarker.h | 4 ++--
MantidPlot/src/LabelTool.h | 4 ++--
MantidPlot/src/LegendWidget.h | 4 ++--
MantidPlot/src/Mantid/AlgorithmHistoryWindow.h | 8 ++++----
MantidPlot/src/Mantid/AlgorithmMonitor.h | 2 +-
MantidPlot/src/Mantid/ErrorBarSettings.h | 2 +-
MantidPlot/src/Mantid/FirstTimeSetup.h | 2 +-
MantidPlot/src/Mantid/FitParameterTie.h | 3 ++-
.../src/Mantid/InstrumentWidget/BinDialog.h | 2 +-
.../Mantid/InstrumentWidget/CollapsiblePanel.h | 2 +-
.../src/Mantid/InstrumentWidget/GLActorVisitor.h | 2 +-
.../Mantid/InstrumentWidget/InstrumentActor.h | 8 +++++---
.../InstrumentWidget/InstrumentTreeWidget.h | 2 +-
.../InstrumentWidget/InstrumentWindowMaskTab.cpp | 2 +-
.../InstrumentWidget/InstrumentWindowMaskTab.h | 2 +-
.../InstrumentWidget/InstrumentWindowPickTab.h | 2 +-
.../InstrumentWidget/InstrumentWindowRenderTab.h | 2 +-
.../InstrumentWidget/InstrumentWindowTreeTab.h | 2 +-
.../src/Mantid/InstrumentWidget/MantidGLWidget.h | 2 +-
.../src/Mantid/InstrumentWidget/OneCurvePlot.h | 2 +-
.../Mantid/InstrumentWidget/PanelsSurface.cpp | 2 +-
.../src/Mantid/InstrumentWidget/PanelsSurface.h | 2 +-
.../Mantid/InstrumentWidget/ProjectionSurface.h | 2 +-
MantidPlot/src/Mantid/InstrumentWidget/RectF.h | 2 +-
MantidPlot/src/Mantid/InstrumentWidget/Shape2D.h | 2 +-
.../InstrumentWidget/Shape2DCollection.cpp | 4 ++--
.../src/Mantid/InstrumentWidget/SimpleWidget.h | 2 +-
.../Mantid/InstrumentWidget/UnwrappedSurface.h | 3 +--
.../InstrumentWidget/XIntegrationControl.h | 4 ++--
MantidPlot/src/Mantid/LoadDAEDlg.h | 4 ++--
MantidPlot/src/Mantid/ManageCustomMenus.h | 3 ++-
.../src/Mantid/ManageInterfaceCategories.h | 5 +++--
MantidPlot/src/Mantid/MantidAbout.h | 4 ++--
MantidPlot/src/Mantid/MantidCurve.h | 2 +-
MantidPlot/src/Mantid/MantidDock.h | 2 +-
MantidPlot/src/Mantid/MantidMatrixFunction.h | 5 ++---
MantidPlot/src/Mantid/MantidUI.h | 2 +-
MantidPlot/src/Mantid/MantidWSIndexDialog.h | 10 +++++-----
MantidPlot/src/Mantid/RemoveErrorsDialog.h | 2 +-
MantidPlot/src/Mantid/UserFitFunctionDialog.h | 2 +-
MantidPlot/src/Matrix.cpp | 6 +++---
MantidPlot/src/MatrixModel.cpp | 10 +++++-----
MantidPlot/src/MatrixModel.h | 2 +-
MantidPlot/src/Plot.h | 2 +-
MantidPlot/src/PlotCurve.cpp | 2 +-
MantidPlot/src/PlotCurve.h | 2 +-
MantidPlot/src/PlotToolInterface.h | 4 ++--
MantidPlot/src/PythonScript.cpp | 5 ++---
MantidPlot/src/PythonScript.h | 4 +---
MantidPlot/src/PythonScripting.h | 2 +-
MantidPlot/src/QwtHistogram.h | 4 ++--
MantidPlot/src/ScaleDraw.cpp | 10 ++++------
MantidPlot/src/ScalePicker.h | 4 ++--
MantidPlot/src/Script.h | 2 +-
MantidPlot/src/ScriptCode.h | 4 ++--
MantidPlot/src/ScriptFileInterpreter.cpp | 2 +-
MantidPlot/src/ScriptOutputDisplay.h | 2 +-
MantidPlot/src/Scripted.h | 3 ++-
MantidPlot/src/SelectionMoveResizer.h | 16 ++++++++--------
MantidPlot/src/Spectrogram.h | 10 ++++------
MantidPlot/src/TSVSerialiser.h | 2 +-
MantidPlot/src/Table.cpp | 12 ++++++------
MantidPlot/src/TextEditor.h | 2 +-
MantidPlot/src/TextFileIO.h | 2 +-
MantidPlot/src/TiledWindow.cpp | 2 +-
MantidPlot/src/TiledWindow.h | 2 +-
MantidPlot/src/TitlePicker.h | 2 +-
MantidPlot/src/UserFunction.h | 2 +-
.../3rdparty/qtcolorpicker/src/qtcolorpicker.cpp | 2 +-
MantidPlot/src/muParserScripting.h | 5 ++++-
MantidPlot/src/plot2D/ImageSymbol.h | 2 +-
MantidQt/CustomInterfaces/src/StepScan.cpp | 3 +--
.../MantidWidgets/src/SelectWorkspacesDialog.cpp | 7 ++-----
.../SliceViewer/src/CompositePeaksPresenter.cpp | 4 ++--
MantidQt/SpectrumViewer/src/ColorMaps.cpp | 4 ++--
117 files changed, 198 insertions(+), 213 deletions(-)
diff --git a/Framework/API/src/Algorithm.cpp b/Framework/API/src/Algorithm.cpp
index 7b678fb3edb..34248e78d0f 100644
--- a/Framework/API/src/Algorithm.cpp
+++ b/Framework/API/src/Algorithm.cpp
@@ -41,7 +41,8 @@ const std::string WORKSPACE_TYPES_SEPARATOR = ";";
class WorkspacePropertyValueIs {
public:
- WorkspacePropertyValueIs(const std::string &value) : m_value(value){};
+ explicit WorkspacePropertyValueIs(const std::string &value)
+ : m_value(value){};
bool operator()(IWorkspaceProperty *property) {
Property *prop = dynamic_cast<Property *>(property);
if (!prop)
@@ -1427,7 +1428,7 @@ struct AsyncFlagHolder {
/** Constructor
* @param A :: reference to the running flag
*/
- AsyncFlagHolder(bool &running_flag) : m_running_flag(running_flag) {
+ explicit AsyncFlagHolder(bool &running_flag) : m_running_flag(running_flag) {
m_running_flag = true;
}
/// Destructor
diff --git a/Framework/API/src/IFunction.cpp b/Framework/API/src/IFunction.cpp
index 91f4f47621d..e48cfb6babf 100644
--- a/Framework/API/src/IFunction.cpp
+++ b/Framework/API/src/IFunction.cpp
@@ -308,7 +308,7 @@ namespace {
*/
class AttValue : public IFunction::ConstAttributeVisitor<std::string> {
public:
- AttValue(bool quoteString = false)
+ explicit AttValue(bool quoteString = false)
: IFunction::ConstAttributeVisitor<std::string>(),
m_quoteString(quoteString) {}
@@ -539,7 +539,7 @@ public:
* Constructor
* @param value :: The value to set
*/
- SetValue(const std::string &value) : m_value(value) {}
+ explicit SetValue(const std::string &value) : m_value(value) {}
protected:
/// Apply if string
diff --git a/Framework/API/src/NumericAxis.cpp b/Framework/API/src/NumericAxis.cpp
index d609325a239..c5fa1673f89 100644
--- a/Framework/API/src/NumericAxis.cpp
+++ b/Framework/API/src/NumericAxis.cpp
@@ -14,7 +14,7 @@ Mantid::Kernel::Logger g_log("NumericAxis");
class EqualWithinTolerance {
public:
- EqualWithinTolerance(double tolerance) : m_tolerance(tolerance){};
+ explicit EqualWithinTolerance(double tolerance) : m_tolerance(tolerance){};
bool operator()(double a, double b) {
if (boost::math::isnan(a) && boost::math::isnan(b))
return true;
diff --git a/Framework/API/src/ParamFunction.cpp b/Framework/API/src/ParamFunction.cpp
index 2d43466f5d7..758bad29275 100644
--- a/Framework/API/src/ParamFunction.cpp
+++ b/Framework/API/src/ParamFunction.cpp
@@ -333,7 +333,7 @@ class ReferenceEqual {
public:
/** Constructor
*/
- ReferenceEqual(size_t i) : m_i(i) {}
+ explicit ReferenceEqual(size_t i) : m_i(i) {}
/**Bracket operator
* @param p :: the parameter you are looking for
* @return True if found
diff --git a/Framework/Algorithms/src/AlignDetectors.cpp b/Framework/Algorithms/src/AlignDetectors.cpp
index 84488701952..3b4211711b9 100644
--- a/Framework/Algorithms/src/AlignDetectors.cpp
+++ b/Framework/Algorithms/src/AlignDetectors.cpp
@@ -30,7 +30,7 @@ namespace { // anonymous namespace
/// Applies the equation d=(TOF-tzero)/difc
struct func_difc_only {
- func_difc_only(const double difc) : factor(1. / difc) {}
+ explicit func_difc_only(const double difc) : factor(1. / difc) {}
double operator()(const double tof) const { return factor * tof; }
@@ -77,7 +77,7 @@ struct func_difa {
class ConversionFactors {
public:
- ConversionFactors(ITableWorkspace_const_sptr table) {
+ explicit ConversionFactors(ITableWorkspace_const_sptr table) {
m_difcCol = table->getColumn("difc");
m_difaCol = table->getColumn("difa");
m_tzeroCol = table->getColumn("tzero");
diff --git a/Framework/Algorithms/src/FilterByLogValue.cpp b/Framework/Algorithms/src/FilterByLogValue.cpp
index 2b4c4596de2..8d9c7f05d45 100644
--- a/Framework/Algorithms/src/FilterByLogValue.cpp
+++ b/Framework/Algorithms/src/FilterByLogValue.cpp
@@ -134,7 +134,7 @@ void FilterByLogValue::exec() {
// Find the start and stop times of the run, but handle it if they are not
// found.
DateAndTime run_start(0), run_stop("2100-01-01T00:00:00");
- double handle_edge_values = false;
+ bool handle_edge_values = false;
try {
run_start = inputWS->getFirstPulseTime() - tolerance;
run_stop = inputWS->getLastPulseTime() + tolerance;
diff --git a/Framework/Algorithms/src/GetEi2.cpp b/Framework/Algorithms/src/GetEi2.cpp
index e01d556106a..f431d950392 100644
--- a/Framework/Algorithms/src/GetEi2.cpp
+++ b/Framework/Algorithms/src/GetEi2.cpp
@@ -532,11 +532,11 @@ double GetEi2::calculatePeakWidthAtHalfHeight(
int64_t ipk_int = static_cast<int64_t>(iPeak) -
im; // ! peak position in internal array
double hby2 = 0.5 * peak_y[ipk_int];
- int64_t ip1(0), ip2(0);
double xp_hh(0);
int64_t nyvals = static_cast<int64_t>(peak_y.size());
if (peak_y[nyvals - 1] < hby2) {
+ int64_t ip1(0), ip2(0);
for (int64_t i = ipk_int; i < nyvals; ++i) {
if (peak_y[i] < hby2) {
// after this point the intensity starts to go below half-height
@@ -569,9 +569,9 @@ double GetEi2::calculatePeakWidthAtHalfHeight(
xp_hh = peak_x[nyvals - 1];
}
- int64_t im1(0), im2(0);
double xm_hh(0);
if (peak_y[0] < hby2) {
+ int64_t im1(0), im2(0);
for (int64_t i = ipk_int; i >= 0; --i) {
if (peak_y[i] < hby2) {
im1 = i + 1; // ! after this point the intensity starts to go below
diff --git a/Framework/Algorithms/src/PerformIndexOperations.cpp b/Framework/Algorithms/src/PerformIndexOperations.cpp
index 31ddff057b6..b8bdb32c058 100644
--- a/Framework/Algorithms/src/PerformIndexOperations.cpp
+++ b/Framework/Algorithms/src/PerformIndexOperations.cpp
@@ -67,7 +67,8 @@ private:
std::vector<int> m_indexes;
public:
- AdditionCommand(const std::vector<int> &indexes) : m_indexes(indexes) {}
+ explicit AdditionCommand(const std::vector<int> &indexes)
+ : m_indexes(indexes) {}
virtual MatrixWorkspace_sptr execute(MatrixWorkspace_sptr inputWS) const {
MatrixWorkspace_sptr outWS;
@@ -97,7 +98,7 @@ private:
std::vector<int> m_indexes;
public:
- CropCommand(const std::vector<int> &indexes) : m_indexes(indexes) {}
+ explicit CropCommand(const std::vector<int> &indexes) : m_indexes(indexes) {}
MatrixWorkspace_sptr execute(MatrixWorkspace_sptr inputWS) const {
diff --git a/Framework/Algorithms/src/RebinByTimeBase.cpp b/Framework/Algorithms/src/RebinByTimeBase.cpp
index 02933f6b4cb..84fe544d906 100644
--- a/Framework/Algorithms/src/RebinByTimeBase.cpp
+++ b/Framework/Algorithms/src/RebinByTimeBase.cpp
@@ -24,7 +24,7 @@ private:
double m_offSet;
public:
- ConvertToRelativeTime(const DateAndTime &offSet)
+ explicit ConvertToRelativeTime(const DateAndTime &offSet)
: m_offSet(static_cast<double>(offSet.totalNanoseconds()) * 1e-9) {}
MantidVec::value_type operator()(const MantidVec::value_type &absTNanoSec) {
return (absTNanoSec * 1e-9) - m_offSet;
diff --git a/Framework/Algorithms/src/Segfault.cpp b/Framework/Algorithms/src/Segfault.cpp
index 2479120f24d..f5e3b158c68 100644
--- a/Framework/Algorithms/src/Segfault.cpp
+++ b/Framework/Algorithms/src/Segfault.cpp
@@ -50,6 +50,7 @@ void Segfault::exec() {
if (!dryrun) {
// NULL pointer dereference
int *ptr = NULL;
+ // cppcheck-suppress nullPointer
*ptr = 1;
}
}
diff --git a/Framework/Crystal/src/CompositeCluster.cpp b/Framework/Crystal/src/CompositeCluster.cpp
index b89ae2a5454..7b58c7adb0a 100644
--- a/Framework/Crystal/src/CompositeCluster.cpp
+++ b/Framework/Crystal/src/CompositeCluster.cpp
@@ -10,7 +10,7 @@ private:
size_t m_label;
public:
- Comparitor(const size_t &label) : m_label(label) {}
+ explicit Comparitor(const size_t &label) : m_label(label) {}
bool operator()(
const boost::shared_ptr<Mantid::Crystal::ICluster> &pCluster) const {
return pCluster->containsLabel(m_label);
diff --git a/Framework/CurveFitting/src/Functions/Abragam.cpp b/Framework/CurveFitting/src/Functions/Abragam.cpp
index 40ff74e9b61..35b0dc131b5 100644
--- a/Framework/CurveFitting/src/Functions/Abragam.cpp
+++ b/Framework/CurveFitting/src/Functions/Abragam.cpp
@@ -36,7 +36,7 @@ void Abragam::function1D(double *out, const double *xValues,
for (size_t i = 0; i < nData; i++) {
double A1 = A * cos(w * xValues[i] + phi);
double A2 =
- -(sig * sig * t * t) * (exp(-xValues[i] / t) - 1 + (xValues[i] / t));
+ -(sig * sig * t * t) * (expm1(-xValues[i] / t) + (xValues[i] / t));
double A3 = exp(A2);
out[i] = A1 * A3;
diff --git a/Framework/DataHandling/src/LoadEventNexus.cpp b/Framework/DataHandling/src/LoadEventNexus.cpp
index 854fb6eadae..f1004eaff85 100644
--- a/Framework/DataHandling/src/LoadEventNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -677,9 +677,8 @@ public:
file.closeData();
// determine the range of pixel ids
- uint32_t temp;
for (auto i = 0; i < m_loadSize[0]; ++i) {
- temp = m_event_id[i];
+ uint32_t temp = m_event_id[i];
if (temp < m_min_id)
m_min_id = temp;
if (temp > m_max_id)
diff --git a/Framework/DataHandling/src/LoadISISNexus2.cpp b/Framework/DataHandling/src/LoadISISNexus2.cpp
index c1506d13fcc..7b369bcaf03 100644
--- a/Framework/DataHandling/src/LoadISISNexus2.cpp
+++ b/Framework/DataHandling/src/LoadISISNexus2.cpp
@@ -457,11 +457,8 @@ void LoadISISNexus2::checkOptionalProperties(
m_load_selected_spectra = true;
}
- int64_t spec_min(0);
- int64_t spec_max(EMPTY_INT());
- //
- spec_min = getProperty("SpectrumMin");
- spec_max = getProperty("SpectrumMax");
+ int64_t spec_min = getProperty("SpectrumMin");
+ int64_t spec_max = getProperty("SpectrumMax");
// default spectra ID-s would not work if spectraID_min!=1
if (m_loadBlockInfo.spectraID_min != 1) {
diff --git a/Framework/DataHandling/src/LoadNexusProcessed.cpp b/Framework/DataHandling/src/LoadNexusProcessed.cpp
index b24e56a65c0..c59b6fb24f4 100644
--- a/Framework/DataHandling/src/LoadNexusProcessed.cpp
+++ b/Framework/DataHandling/src/LoadNexusProcessed.cpp
@@ -1044,7 +1044,6 @@ API::Workspace_sptr LoadNexusProcessed::loadPeaksEntry(NXEntry &entry) {
// Coordinates - Older versions did not have the separate field but used a log
// value
- uint32_t loadCoord(0);
const std::string peaksWSName = "peaks_workspace";
try {
m_cppFile->openGroup(peaksWSName, "NXentry");
@@ -1055,6 +1054,7 @@ API::Workspace_sptr LoadNexusProcessed::loadPeaksEntry(NXEntry &entry) {
peaksWSName + ". Lower level error description: " + re.what());
}
try {
+ uint32_t loadCoord(0);
m_cppFile->readData("coordinate_system", loadCoord);
peakWS->setCoordinateSystem(
static_cast<Kernel::SpecialCoordinateSystem>(loadCoord));
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw.h b/Framework/DataHandling/src/LoadRaw/isisraw.h
index 84d82a06fe2..21bddafbbc2 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw.h
+++ b/Framework/DataHandling/src/LoadRaw/isisraw.h
@@ -343,7 +343,7 @@ public:
int size_check();
ISISRAW();
virtual ~ISISRAW();
- ISISRAW(ISISCRPT_STRUCT *crpt);
+ explicit ISISRAW(ISISCRPT_STRUCT *crpt);
ISISRAW(ISISCRPT_STRUCT *crpt, bool doUpdateFromCRPT);
int updateFromCRPT();
diff --git a/Framework/DataHandling/src/SaveGSASInstrumentFile.cpp b/Framework/DataHandling/src/SaveGSASInstrumentFile.cpp
index 42f12ef2d1a..d533f02cb58 100644
--- a/Framework/DataHandling/src/SaveGSASInstrumentFile.cpp
+++ b/Framework/DataHandling/src/SaveGSASInstrumentFile.cpp
@@ -22,7 +22,7 @@ DECLARE_ALGORITHM(SaveGSASInstrumentFile)
class ChopperConfiguration {
public:
- ChopperConfiguration(vector<int> bankids);
+ explicit ChopperConfiguration(vector<int> bankids);
ChopperConfiguration(const int freq, const std::string &bankidstr,
const std::string &cwlstr, const std::string &mndspstr,
const std::string &mxdspstr,
diff --git a/Framework/DataObjects/src/EventList.cpp b/Framework/DataObjects/src/EventList.cpp
index 8dfbd6d9421..ba0b7472432 100644
--- a/Framework/DataObjects/src/EventList.cpp
+++ b/Framework/DataObjects/src/EventList.cpp
@@ -4051,7 +4051,6 @@ void EventList::splitByFullTimeHelper(Kernel::TimeSplitterType &splitter,
// 1. Prepare to Iterate through the splitter at the same time
Kernel::TimeSplitterType::iterator itspl = splitter.begin();
Kernel::TimeSplitterType::iterator itspl_end = splitter.end();
- int64_t start, stop;
// 2. Prepare to Iterate through all events (sorted by tof)
typename std::vector<T>::iterator itev = events.begin();
@@ -4060,8 +4059,8 @@ void EventList::splitByFullTimeHelper(Kernel::TimeSplitterType &splitter,
// 3. This is the time of the first section. Anything before is thrown out.
while (itspl != itspl_end) {
// Get the splitting interval times and destination
- start = itspl->start().totalNanoseconds();
- stop = itspl->stop().totalNanoseconds();
+ int64_t start = itspl->start().totalNanoseconds();
+ int64_t stop = itspl->stop().totalNanoseconds();
const int index = itspl->index();
// a) Skip the events before the start of the time
diff --git a/Framework/DataObjects/src/PeaksWorkspace.cpp b/Framework/DataObjects/src/PeaksWorkspace.cpp
index f75ca8b4064..5f60d4dd27b 100644
--- a/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -72,7 +72,7 @@ public:
* @param criteria : a vector with a list of pairs: column name, bool;
* where bool = true for ascending, false for descending sort.
*/
- PeakComparator(std::vector<std::pair<std::string, bool>> &criteria)
+ explicit PeakComparator(std::vector<std::pair<std::string, bool>> &criteria)
: criteria(criteria) {}
/** Compare two peaks using the stored criteria */
diff --git a/Framework/Geometry/src/Crystal/ReflectionGenerator.cpp b/Framework/Geometry/src/Crystal/ReflectionGenerator.cpp
index 59fd597ef21..6a35f3c6093 100644
--- a/Framework/Geometry/src/Crystal/ReflectionGenerator.cpp
+++ b/Framework/Geometry/src/Crystal/ReflectionGenerator.cpp
@@ -11,7 +11,7 @@ using namespace Kernel;
/// Small helper functor to calculate d-Values from a unit cell.
class LatticeSpacingCalculator {
public:
- LatticeSpacingCalculator(const UnitCell &cell) : m_cell(cell) {}
+ explicit LatticeSpacingCalculator(const UnitCell &cell) : m_cell(cell) {}
double operator()(const V3D &hkl) { return m_cell.d(hkl); }
diff --git a/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp b/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
index 1def9b2ece0..05f056be280 100644
--- a/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
+++ b/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
@@ -29,7 +29,7 @@ private:
IMDDimension_const_sptr _a;
public:
- CompareIMDDimension_const_sptr(IMDDimension_const_sptr a) : _a(a) {}
+ explicit CompareIMDDimension_const_sptr(IMDDimension_const_sptr a) : _a(a) {}
bool operator()(IMDDimension_const_sptr b) {
return _a->getDimensionId() == b->getDimensionId();
}
diff --git a/Framework/Geometry/src/MDGeometry/MDGeometryXMLParser.cpp b/Framework/Geometry/src/MDGeometry/MDGeometryXMLParser.cpp
index 48ab61092f0..341df4504d9 100644
--- a/Framework/Geometry/src/MDGeometry/MDGeometryXMLParser.cpp
+++ b/Framework/Geometry/src/MDGeometry/MDGeometryXMLParser.cpp
@@ -16,7 +16,7 @@ namespace Geometry {
struct findID
: public std::unary_function<Mantid::Geometry::IMDDimension_sptr, bool> {
const std::string m_id;
- findID(const std::string &id) : m_id(id) {}
+ explicit findID(const std::string &id) : m_id(id) {}
bool operator()(const Mantid::Geometry::IMDDimension_sptr obj) const {
return m_id == obj->getDimensionId();
diff --git a/Framework/Geometry/src/Math/ConvexPolygon.cpp b/Framework/Geometry/src/Math/ConvexPolygon.cpp
index 7015fa07deb..4c6240577b2 100644
--- a/Framework/Geometry/src/Math/ConvexPolygon.cpp
+++ b/Framework/Geometry/src/Math/ConvexPolygon.cpp
@@ -177,13 +177,12 @@ double ConvexPolygon::determinant() const {
// that calling next() on the vertex takes us clockwise within
// the polygon.
double lhs(0.0), rhs(0.0);
- const V2D *v_i(NULL), *v_ip1(NULL);
for (size_t i = 0; i < npoints(); ++i) {
- v_i = &(m_vertices[i]);
- v_ip1 = &(m_vertices[(i + 1) % npoints()]);
+ const V2D &v_i = m_vertices[i];
+ const V2D &v_ip1 = m_vertices[(i + 1) % npoints()];
- lhs += v_ip1->X() * v_i->Y();
- rhs += v_i->X() * v_ip1->Y();
+ lhs += v_ip1.X() * v_i.Y();
+ rhs += v_i.X() * v_ip1.Y();
}
return lhs - rhs;
}
diff --git a/Framework/Geometry/src/Surfaces/SurfaceFactory.cpp b/Framework/Geometry/src/Surfaces/SurfaceFactory.cpp
index 7917ec7666f..6b5fa1f79d9 100644
--- a/Framework/Geometry/src/Surfaces/SurfaceFactory.cpp
+++ b/Framework/Geometry/src/Surfaces/SurfaceFactory.cpp
@@ -91,7 +91,7 @@ void SurfaceFactory::registerSurface()
namespace {
class KeyEquals {
public:
- KeyEquals(std::string key) : m_key(std::move(key)) {}
+ explicit KeyEquals(std::string key) : m_key(std::move(key)) {}
bool
operator()(const std::pair<std::string, std::unique_ptr<Surface>> &element) {
return m_key == element.first;
diff --git a/Framework/ICat/src/CatalogDownloadDataFiles.cpp b/Framework/ICat/src/CatalogDownloadDataFiles.cpp
index eabdf518384..c2f9ba5b2fb 100644
--- a/Framework/ICat/src/CatalogDownloadDataFiles.cpp
+++ b/Framework/ICat/src/CatalogDownloadDataFiles.cpp
@@ -147,13 +147,11 @@ std::string CatalogDownloadDataFiles::doDownloadandSavetoLocalDrive(
const std::string &URL, const std::string &fileName) {
std::string pathToDownloadedDatafile;
- clock_t start;
-
try {
Poco::URI uri(URL);
std::string path(uri.getPathAndQuery());
- start = clock();
+ clock_t start = clock();
Poco::SharedPtr<Poco::Net::InvalidCertificateHandler> certificateHandler =
new Poco::Net::AcceptCertificateHandler(true);
diff --git a/Framework/Kernel/src/BinFinder.cpp b/Framework/Kernel/src/BinFinder.cpp
index 157fb7b3ff2..ab927579bb3 100644
--- a/Framework/Kernel/src/BinFinder.cpp
+++ b/Framework/Kernel/src/BinFinder.cpp
@@ -47,7 +47,7 @@ BinFinder::BinFinder(const std::vector<double> &binParams) {
// Pre-do some calculations for log binning.
if (step < 0) {
- double log_step = log(1.0 + fabs(step));
+ double log_step = log1p(fabs(step));
logSteps.push_back(log_step);
if (i == 0)
logBoundaries.push_back(log(min));
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 9b3107e78d6..cb7b0e1b59f 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -107,7 +107,7 @@ public:
/** Constructor with a class to wrap
* @param F :: The object to wrap
*/
- template <typename Field> WrappedObject(Field &F) : T(F) {
+ template <typename Field> explicit WrappedObject(Field &F) : T(F) {
m_pPtr = static_cast<T *>(this);
}
diff --git a/Framework/Kernel/src/DllOpen.cpp b/Framework/Kernel/src/DllOpen.cpp
index c702c1b41de..5d0966c9999 100644
--- a/Framework/Kernel/src/DllOpen.cpp
+++ b/Framework/Kernel/src/DllOpen.cpp
@@ -78,7 +78,7 @@ const std::string DllOpen::ConvertToLibName(const std::string &fileName) {
// take a copy of the input string
std::string retVal = fileName;
- if ((retVal.find(LIB_PREFIX) == 0) &&
+ if ((retVal.compare(LIB_PREFIX) == 0) &&
(retVal.find(PATH_SEPERATOR) == std::string::npos)) {
// found
retVal =
diff --git a/Framework/Kernel/src/Math/ChebyshevPolyFit.cpp b/Framework/Kernel/src/Math/ChebyshevPolyFit.cpp
index c31141147e0..ba05e3550b0 100644
--- a/Framework/Kernel/src/Math/ChebyshevPolyFit.cpp
+++ b/Framework/Kernel/src/Math/ChebyshevPolyFit.cpp
@@ -15,7 +15,7 @@ namespace Kernel {
///@cond
class ChebyshevPolyFitImpl {
public:
- ChebyshevPolyFitImpl(const size_t order) : m_order(order) {}
+ explicit ChebyshevPolyFitImpl(const size_t order) : m_order(order) {}
std::vector<double> fit(const std::vector<double> &xs,
const std::vector<double> &ys,
diff --git a/Framework/Kernel/src/Math/Distributions/BoseEinsteinDistribution.cpp b/Framework/Kernel/src/Math/Distributions/BoseEinsteinDistribution.cpp
index d4b6dca905f..01423942589 100644
--- a/Framework/Kernel/src/Math/Distributions/BoseEinsteinDistribution.cpp
+++ b/Framework/Kernel/src/Math/Distributions/BoseEinsteinDistribution.cpp
@@ -40,7 +40,7 @@ double BoseEinsteinDistribution::n(const double energy,
"function not well-behaved",
beta);
- return 1.0 / (std::exp(beta) - 1.0);
+ return 1.0 / std::expm1(beta);
}
/**
diff --git a/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp b/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
index acd3bc4ae87..20a7d9c86aa 100644
--- a/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
+++ b/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
@@ -18,7 +18,8 @@ using namespace Mantid::Geometry;
*/
class CompareFailsException : public std::runtime_error {
public:
- CompareFailsException(const std::string &msg) : std::runtime_error(msg) {}
+ explicit CompareFailsException(const std::string &msg)
+ : std::runtime_error(msg) {}
~CompareFailsException() throw() {}
std::string getMessage() const { return this->what(); }
};
diff --git a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
index 372e9b1ad95..65fc845b427 100644
--- a/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
+++ b/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
@@ -38,9 +38,8 @@ Integrate3DEvents::Integrate3DEvents(
m_UBinv = UBinv;
m_radius = radius;
- int64_t hkl_key;
for (size_t it = 0; it != peak_q_list.size(); ++it) {
- hkl_key = getHklKey(peak_q_list[it].second);
+ int64_t hkl_key = getHklKey(peak_q_list[it].second);
if (hkl_key != 0) // only save if hkl != (0,0,0)
m_peak_qs[hkl_key] = peak_q_list[it].second;
}
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
index 009ca30fb11..fe017452e91 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
@@ -206,7 +206,7 @@ std::string createDocString(IAlgorithm &self) {
* detailed explanation
*/
struct AllowCThreads {
- AllowCThreads(const object &algm)
+ explicit AllowCThreads(const object &algm)
: m_tracefunc(NULL), m_tracearg(NULL), m_saved(NULL), m_tracking(false) {
PyThreadState *curThreadState = PyThreadState_GET();
m_tracefunc = curThreadState->c_tracefunc;
diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp
index 3fa69dd633f..fb8cb9c9f33 100644
--- a/MantidPlot/src/ApplicationWindow.cpp
+++ b/MantidPlot/src/ApplicationWindow.cpp
@@ -7314,7 +7314,7 @@ void ApplicationWindow::showAxisDialog() {
QDialog *gd = showScaleDialog();
if (gd && plot->isA("MultiLayer")) {
MultiLayer *ml = dynamic_cast<MultiLayer *>(plot);
- if (!ml || (ml && !ml->layers()))
+ if (!ml || !ml->layers())
return;
auto ad = dynamic_cast<AxesDialog *>(gd);
@@ -15854,7 +15854,7 @@ void ApplicationWindow::executeScriptFile(
runner->redirectStdOut(false);
scriptingEnv()->redirectStdOut(false);
if (execMode == Script::Asynchronous) {
- QFuture<bool> job = runner->executeAsync(code);
+ QFuture<bool> job = runner->executeAsync(ScriptCode(code));
while (job.isRunning()) {
QCoreApplication::processEvents();
}
@@ -15862,7 +15862,7 @@ void ApplicationWindow::executeScriptFile(
QCoreApplication::processEvents();
QCoreApplication::processEvents();
} else {
- runner->execute(code);
+ runner->execute(ScriptCode(code));
}
delete runner;
}
@@ -15932,7 +15932,7 @@ bool ApplicationWindow::runPythonScript(const QString &code, bool async,
}
bool success(false);
if (async) {
- QFuture<bool> job = m_iface_script->executeAsync(code);
+ QFuture<bool> job = m_iface_script->executeAsync(ScriptCode(code));
while (job.isRunning()) {
QCoreApplication::instance()->processEvents();
}
@@ -15940,7 +15940,7 @@ bool ApplicationWindow::runPythonScript(const QString &code, bool async,
QCoreApplication::instance()->processEvents();
success = job.result();
} else {
- success = m_iface_script->execute(code);
+ success = m_iface_script->execute(ScriptCode(code));
}
if (redirect) {
m_iface_script->redirectStdOut(false);
diff --git a/MantidPlot/src/ApplicationWindow.h b/MantidPlot/src/ApplicationWindow.h
index 7f37e7f6868..cc952f8f99a 100644
--- a/MantidPlot/src/ApplicationWindow.h
+++ b/MantidPlot/src/ApplicationWindow.h
@@ -129,7 +129,7 @@ class ApplicationWindow: public QMainWindow, public Scripted
Q_OBJECT
public:
ApplicationWindow(bool factorySettings, const QStringList& args);
- ApplicationWindow(bool factorySettings=false);
+ explicit ApplicationWindow(bool factorySettings = false);
~ApplicationWindow();
enum ShowWindowsPolicy{HideAll, ActiveFolder, SubFolders};
diff --git a/MantidPlot/src/Bar.h b/MantidPlot/src/Bar.h
index 511d85a9516..fd3e5bb5be9 100644
--- a/MantidPlot/src/Bar.h
+++ b/MantidPlot/src/Bar.h
@@ -36,7 +36,7 @@ class Bar : public Qwt3D::VertexEnrichment
{
public:
Bar();
- Bar(double rad);
+ explicit Bar(double rad);
Qwt3D::Enrichment* clone() const {return new Bar(*this);}
diff --git a/MantidPlot/src/CanvasPicker.h b/MantidPlot/src/CanvasPicker.h
index f8144fb01de..eb12e9c433f 100644
--- a/MantidPlot/src/CanvasPicker.h
+++ b/MantidPlot/src/CanvasPicker.h
@@ -42,8 +42,8 @@ class CanvasPicker: public QObject
{
Q_OBJECT
public:
- CanvasPicker(Graph *plot);
- virtual bool eventFilter(QObject *, QEvent *);
+ explicit CanvasPicker(Graph *plot);
+ virtual bool eventFilter(QObject *, QEvent *);
void selectPoints(int n);
void selectPeak(const QPoint& p);
diff --git a/MantidPlot/src/CustomActionDialog.h b/MantidPlot/src/CustomActionDialog.h
index 8711b841331..4aead660099 100644
--- a/MantidPlot/src/CustomActionDialog.h
+++ b/MantidPlot/src/CustomActionDialog.h
@@ -85,7 +85,7 @@ private:
class CustomActionHandler : public QXmlDefaultHandler
{
public:
- CustomActionHandler(QAction *action);
+ explicit CustomActionHandler(QAction *action);
bool startElement(const QString &namespaceURI, const QString &localName,
const QString &qName, const QXmlAttributes &attributes);
diff --git a/MantidPlot/src/DockedWindow.h b/MantidPlot/src/DockedWindow.h
index e6439b8b4ea..7fde73088ed 100644
--- a/MantidPlot/src/DockedWindow.h
+++ b/MantidPlot/src/DockedWindow.h
@@ -15,7 +15,7 @@ class DockedWindow: public QMdiSubWindow
{
Q_OBJECT
public:
- DockedWindow(ApplicationWindow* appWindow);
+ explicit DockedWindow(ApplicationWindow *appWindow);
MdiSubWindow* mdiSubWindow() const;
void setMdiSubWindow(MdiSubWindow* sw);
diff --git a/MantidPlot/src/FitModelHandler.h b/MantidPlot/src/FitModelHandler.h
index 4f971edbee0..ae88a7b7696 100644
--- a/MantidPlot/src/FitModelHandler.h
+++ b/MantidPlot/src/FitModelHandler.h
@@ -37,7 +37,7 @@ class Fit;
class FitModelHandler : public QXmlDefaultHandler
{
public:
- FitModelHandler(Fit *fit);
+ explicit FitModelHandler(Fit *fit);
bool startElement(const QString &namespaceURI, const QString &localName,
const QString &qName, const QXmlAttributes &attributes);
diff --git a/MantidPlot/src/FunctionCurve.h b/MantidPlot/src/FunctionCurve.h
index f79d4b51259..e9c71d5be59 100644
--- a/MantidPlot/src/FunctionCurve.h
+++ b/MantidPlot/src/FunctionCurve.h
@@ -49,7 +49,7 @@ public:
enum FunctionType{Normal = 0, Parametric = 1, Polar = 2};
FunctionCurve(const FunctionType& t, const QString& name = QString());
- FunctionCurve(const QString& name = QString());
+ explicit FunctionCurve(const QString &name = QString());
FunctionCurve(const Mantid::API::IFunction* fun,
const QString& wsName, int wsIndex = 0, const QString& name = QString());
FunctionCurve(const FunctionCurve& c);
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index 2fbfe1977b7..0fb52787a59 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -6448,18 +6448,16 @@ void Graph::loadFromProject(const std::string& lines, ApplicationWindow* app, co
int lastCurveID = -1;
for(auto lineIt = lineVec.begin(); lineIt != lineVec.end(); ++lineIt)
{
- const std::string line = *lineIt;
+ const std::string &line = *lineIt;
- if(line.find("MantidMatrixCurve") == 0)
- {
+ if (line.compare("MantidMatrixCurve") == 0) {
//Moving onto the next MantidMatrixCurve.
lastCurveID++;
continue;
}
//Handle sections as appropriate.
- if(line.find("<SkipPoints>") == 0)
- {
+ if (line.compare("<SkipPoints>") == 0) {
PlotCurve* c = dynamic_cast<PlotCurve*>(curve(lastCurveID));
if(!c)
continue;
@@ -6470,9 +6468,7 @@ void Graph::loadFromProject(const std::string& lines, ApplicationWindow* app, co
int value = 0;
Mantid::Kernel::Strings::convert<int>(contents, value);
c->setSkipSymbolsCount(value);
- }
- else if(line.find("<CurveLabels>") == 0)
- {
+ } else if (line.compare("<CurveLabels>") == 0) {
//Start reading from next line
lineIt++;
if(lineIt == lineVec.end())
@@ -6489,9 +6485,7 @@ void Graph::loadFromProject(const std::string& lines, ApplicationWindow* app, co
//We now have StringList of the lines we want.
restoreCurveLabels(lastCurveID, lst);
- }
- else if(line.find("<MantidYErrors>") == 0)
- {
+ } else if (line.compare("<MantidYErrors>") == 0) {
MantidCurve *c = dynamic_cast<MantidCurve*>(curve(lastCurveID));
if(!c)
continue;
diff --git a/MantidPlot/src/ImageMarker.h b/MantidPlot/src/ImageMarker.h
index fd71b54d590..757a99ef52d 100644
--- a/MantidPlot/src/ImageMarker.h
+++ b/MantidPlot/src/ImageMarker.h
@@ -64,9 +64,9 @@ class ImageMarker : public QwtPlotMarker
{
public:
//! Construct an image marker from a file name.
- ImageMarker(const QString& fn);
+ explicit ImageMarker(const QString &fn);
- //! Return bounding rectangle in paint coordinates.
+ //! Return bounding rectangle in paint coordinates.
QRect rect() const;
//! Set value (position) and #d_size, giving everything in paint coordinates.
void setRect(int x, int y, int w, int h);
diff --git a/MantidPlot/src/LabelTool.h b/MantidPlot/src/LabelTool.h
index 8ec5d79532d..7b5f6710641 100644
--- a/MantidPlot/src/LabelTool.h
+++ b/MantidPlot/src/LabelTool.h
@@ -46,8 +46,8 @@ class QMenu;
class LabelTool : public QObject, public QVector<QPoint>, public PlotToolInterface
{
Q_OBJECT
-public:
- LabelTool(Graph *graph);
+public:
+ explicit LabelTool(Graph *graph);
virtual ~LabelTool();
virtual int rtti() const {return PlotToolInterface::Rtti_LabelTool;};
diff --git a/MantidPlot/src/LegendWidget.h b/MantidPlot/src/LegendWidget.h
index b40d0b3b0a1..d0e8c8952c4 100644
--- a/MantidPlot/src/LegendWidget.h
+++ b/MantidPlot/src/LegendWidget.h
@@ -41,8 +41,8 @@ class LegendWidget: public QWidget
Q_OBJECT
public:
- LegendWidget(Plot *);
- ~LegendWidget();
+ explicit LegendWidget(Plot *);
+ ~LegendWidget();
void clone(LegendWidget* t);
QwtPlot *plot(){return d_plot;};
diff --git a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.h b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.h
index e172a33e64e..afcd9826827 100644
--- a/MantidPlot/src/Mantid/AlgorithmHistoryWindow.h
+++ b/MantidPlot/src/Mantid/AlgorithmHistoryWindow.h
@@ -57,8 +57,8 @@ signals:
public:
/// Constructor
- AlgHistoryTreeWidget(QWidget *w):QTreeWidget(w),m_algName(""),m_nVersion(0)
- {
+ explicit AlgHistoryTreeWidget(QWidget *w)
+ : QTreeWidget(w), m_algName(""), m_nVersion(0) {
connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)),SLOT(onItemChanged(QTreeWidgetItem*,int)));
}
void populateAlgHistoryTreeWidget(const Mantid::API::WorkspaceHistory& wsHist);
@@ -88,7 +88,7 @@ class AlgExecSummaryGrpBox: public QGroupBox
{
Q_OBJECT
public:
- AlgExecSummaryGrpBox(QWidget*w);
+ explicit AlgExecSummaryGrpBox(QWidget *w);
AlgExecSummaryGrpBox(QString,QWidget*w);
~AlgExecSummaryGrpBox();
void setData(const double execDuration,const Mantid::Kernel::DateAndTime execDate);
@@ -109,7 +109,7 @@ class AlgEnvHistoryGrpBox: public QGroupBox
{
Q_OBJECT
public:
- AlgEnvHistoryGrpBox(QWidget*w);
+ explicit AlgEnvHistoryGrpBox(QWidget *w);
AlgEnvHistoryGrpBox(QString,QWidget*w);
~AlgEnvHistoryGrpBox();
diff --git a/MantidPlot/src/Mantid/AlgorithmMonitor.h b/MantidPlot/src/Mantid/AlgorithmMonitor.h
index 4f3f39708dc..1c6a3aed3c8 100644
--- a/MantidPlot/src/Mantid/AlgorithmMonitor.h
+++ b/MantidPlot/src/Mantid/AlgorithmMonitor.h
@@ -27,7 +27,7 @@ class AlgorithmMonitor: public QThread
public:
/// Constructor
- AlgorithmMonitor(MantidUI *m);
+ explicit AlgorithmMonitor(MantidUI *m);
/// Destructor
~AlgorithmMonitor();
/// Add algorithm to monitor
diff --git a/MantidPlot/src/Mantid/ErrorBarSettings.h b/MantidPlot/src/Mantid/ErrorBarSettings.h
index a50f6465567..42fb38e0fff 100644
--- a/MantidPlot/src/Mantid/ErrorBarSettings.h
+++ b/MantidPlot/src/Mantid/ErrorBarSettings.h
@@ -28,7 +28,7 @@ class ErrorBarSettings : public QObject
{
Q_OBJECT
public:
- ErrorBarSettings(QObject * parent = 0);
+ explicit ErrorBarSettings(QObject *parent = 0);
int capLength() const;
void setCapLength(int t);
diff --git a/MantidPlot/src/Mantid/FirstTimeSetup.h b/MantidPlot/src/Mantid/FirstTimeSetup.h
index 04f2f50b7a9..348ccdf6c98 100644
--- a/MantidPlot/src/Mantid/FirstTimeSetup.h
+++ b/MantidPlot/src/Mantid/FirstTimeSetup.h
@@ -14,7 +14,7 @@ class FirstTimeSetup : public QDialog
Q_OBJECT
public:
- FirstTimeSetup(QWidget *parent=0);
+ explicit FirstTimeSetup(QWidget *parent = 0);
~FirstTimeSetup();
private:
diff --git a/MantidPlot/src/Mantid/FitParameterTie.h b/MantidPlot/src/Mantid/FitParameterTie.h
index a598a11c266..8ad449c1a49 100644
--- a/MantidPlot/src/Mantid/FitParameterTie.h
+++ b/MantidPlot/src/Mantid/FitParameterTie.h
@@ -22,7 +22,8 @@ class FitParameterTie
{
public:
/// Constructor
- FitParameterTie(boost::shared_ptr<Mantid::API::CompositeFunction> cf);
+ explicit FitParameterTie(
+ boost::shared_ptr<Mantid::API::CompositeFunction> cf);
/// Destructor
~FitParameterTie();
/// Set the tying expression, e.g. "f1.Sigma = 2*f0.Sigma + 1"
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/BinDialog.h b/MantidPlot/src/Mantid/InstrumentWidget/BinDialog.h
index e847f4d70e9..8348919ca0d 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/BinDialog.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/BinDialog.h
@@ -44,7 +44,7 @@ class BinDialog: public QDialog
Q_OBJECT
public:
- BinDialog(QWidget *parent = 0);
+ explicit BinDialog(QWidget *parent = 0);
~BinDialog();
void setIntegralMinMax(double,double,bool);
signals:
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.h b/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.h
index bc90efa36b0..62f717841f7 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/CollapsiblePanel.h
@@ -51,7 +51,7 @@ class CollapsibleStack: public QWidget
{
Q_OBJECT
public:
- CollapsibleStack(QWidget* parent);
+ explicit CollapsibleStack(QWidget *parent);
CollapsiblePanel* addPanel(const QString& caption,QWidget* widget);
private slots:
void updateStretch();
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/GLActorVisitor.h b/MantidPlot/src/Mantid/InstrumentWidget/GLActorVisitor.h
index 49ad8d52abd..18c130f6092 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/GLActorVisitor.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/GLActorVisitor.h
@@ -64,7 +64,7 @@ class SetVisibilityVisitor: public GLActorVisitor
class SetAllVisibleVisitor: public SetVisibilityVisitor
{
public:
- SetAllVisibleVisitor(bool showNonDet):m_showNonDet(showNonDet){}
+ explicit SetAllVisibleVisitor(bool showNonDet) : m_showNonDet(showNonDet) {}
using GLActorVisitor::visit;
bool visit(GLActor*);
bool visit(ComponentActor *actor);
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentActor.h b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentActor.h
index aa1fc4019b9..659a83a7b51 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentActor.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentActor.h
@@ -270,7 +270,8 @@ private:
class SetVisibleComponentVisitor: public SetVisibilityVisitor
{
public:
- SetVisibleComponentVisitor(const Mantid::Geometry::ComponentID id):m_id(id){}
+ explicit SetVisibleComponentVisitor(const Mantid::Geometry::ComponentID id)
+ : m_id(id) {}
bool visit(GLActor*);
bool visit(GLActorCollection*);
bool visit(ComponentActor* actor);
@@ -292,7 +293,7 @@ class SetVisibleNonDetectorVisitor: public SetVisibilityVisitor
public:
/// Constructor
/// @param on :: If true then all non-detectors will be made visible or invisible if false.
- SetVisibleNonDetectorVisitor(bool on):m_on(on){}
+ explicit SetVisibleNonDetectorVisitor(bool on) : m_on(on) {}
using GLActorVisitor::visit;
bool visit(GLActor*);
private:
@@ -305,7 +306,8 @@ private:
class FindComponentVisitor: public GLActorVisitor
{
public:
- FindComponentVisitor(const Mantid::Geometry::ComponentID id):m_id(id),m_actor(NULL){}
+ explicit FindComponentVisitor(const Mantid::Geometry::ComponentID id)
+ : m_id(id), m_actor(NULL) {}
using GLActorVisitor::visit;
bool visit(GLActor*);
ComponentActor* getActor()const{return m_actor;}
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.h b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.h
index e208c66b633..563bf44774b 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeWidget.h
@@ -20,7 +20,7 @@ class InstrumentTreeWidget:public QTreeView
{
Q_OBJECT
public:
- InstrumentTreeWidget(QWidget *w);
+ explicit InstrumentTreeWidget(QWidget *w);
void setInstrumentActor(InstrumentActor* instrActor);
void getSelectedBoundingBox(const QModelIndex& index,double &xmax, double &ymax, double &zmax, double &xmin, double &ymin, double &zmin);
//Mantid::Kernel::V3D getSamplePos()const;
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp
index cea3acca3ce..694cdda13db 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp
@@ -562,7 +562,7 @@ void InstrumentWindowMaskTab::doubleChanged(QtProperty* prop)
{
QRectF rect(QPointF(m_doubleManager->value(m_left),m_doubleManager->value(m_top)),
QPointF(m_doubleManager->value(m_right),m_doubleManager->value(m_bottom)));
- m_instrWindow->getSurface()->setCurrentBoundingRect(rect);
+ m_instrWindow->getSurface()->setCurrentBoundingRect(RectF(rect));
}
else
{
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.h b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.h
index 49e4e88ef38..eb805e3cffd 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.h
@@ -56,7 +56,7 @@ public:
enum Mode {Mask, Group, ROI};
enum Activity {Move,Select,DrawEllipse,DrawRectangle,DrawEllipticalRing,DrawRectangularRing,DrawFree};
- InstrumentWindowMaskTab(InstrumentWindow* instrWindow);
+ explicit InstrumentWindowMaskTab(InstrumentWindow *instrWindow);
void initSurface();
void setMode(Mode mode);
void selectTool(Activity tool);
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowPickTab.h b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowPickTab.h
index 5bcdf5c420f..2f48d292714 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowPickTab.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowPickTab.h
@@ -49,7 +49,7 @@ public:
enum SelectionType {Single=0,AddPeak,ErasePeak,SingleDetectorSelection,Tube, Draw};
enum ToolType {Zoom,PixelSelect,TubeSelect,PeakSelect,PeakErase, DrawEllipse, DrawRectangle, DrawFree, EditShape};
- InstrumentWindowPickTab(InstrumentWindow* instrWindow);
+ explicit InstrumentWindowPickTab(InstrumentWindow *instrWindow);
bool canUpdateTouchedDetector()const;
void initSurface();
void saveSettings(QSettings& settings) const;
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowRenderTab.h b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowRenderTab.h
index 95bb0dd94b5..13b84166bbf 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowRenderTab.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowRenderTab.h
@@ -26,7 +26,7 @@ class InstrumentWindowRenderTab: public InstrumentWindowTab
Q_OBJECT
public:
- InstrumentWindowRenderTab(InstrumentWindow* instrWindow);
+ explicit InstrumentWindowRenderTab(InstrumentWindow *instrWindow);
~InstrumentWindowRenderTab();
void initSurface();
void saveSettings(QSettings&)const;
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowTreeTab.h b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowTreeTab.h
index d2466e81d47..3697fd182f9 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowTreeTab.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowTreeTab.h
@@ -14,7 +14,7 @@ class InstrumentWindowTreeTab: public InstrumentWindowTab
{
Q_OBJECT
public:
- InstrumentWindowTreeTab(InstrumentWindow* instrWindow);
+ explicit InstrumentWindowTreeTab(InstrumentWindow *instrWindow);
void initSurface();
public slots:
void selectComponentByName(const QString& name);
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.h b/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.h
index 2ebd983f158..efa59ffdb60 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/MantidGLWidget.h
@@ -19,7 +19,7 @@ class MantidGLWidget : public QGLWidget
{
Q_OBJECT
public:
- MantidGLWidget(QWidget* parent=0); ///< Constructor
+ explicit MantidGLWidget(QWidget *parent = 0); ///< Constructor
virtual ~MantidGLWidget(); ///< Destructor
void setSurface(boost::shared_ptr<ProjectionSurface> surface);
boost::shared_ptr<ProjectionSurface> getSurface(){return m_surface;}
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.h b/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.h
index 885180845c1..bfccc552094 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/OneCurvePlot.h
@@ -19,7 +19,7 @@ class OneCurvePlot: public QwtPlot
{
Q_OBJECT
public:
- OneCurvePlot(QWidget* parent);
+ explicit OneCurvePlot(QWidget *parent);
~OneCurvePlot();
void setData(const double* x,const double* y,int dataSize,const std::string& xUnits = "");
void setLabel(const QString& label);
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/PanelsSurface.cpp b/MantidPlot/src/Mantid/InstrumentWidget/PanelsSurface.cpp
index a2eeb6012f7..5c6ba2c0fef 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/PanelsSurface.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/PanelsSurface.cpp
@@ -170,7 +170,7 @@ class FlatBankFinder: public GLActorConstVisitor
{
PanelsSurface &m_surface;
public:
- FlatBankFinder(PanelsSurface &surface):m_surface(surface){}
+ explicit FlatBankFinder(PanelsSurface &surface) : m_surface(surface) {}
bool visit(const GLActor*){return false;}
bool visit(const GLActorCollection*){return false;}
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/PanelsSurface.h b/MantidPlot/src/Mantid/InstrumentWidget/PanelsSurface.h
index 2b359f356ec..772c61cd268 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/PanelsSurface.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/PanelsSurface.h
@@ -10,7 +10,7 @@ class PanelsSurface;
struct FlatBankInfo
{
- FlatBankInfo(PanelsSurface *s);
+ explicit FlatBankInfo(PanelsSurface *s);
/// Component id of the bank
Mantid::Geometry::ComponentID id;
/// Bank's rotation
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h b/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h
index 161484368e8..e607afcf193 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/ProjectionSurface.h
@@ -67,7 +67,7 @@ public:
InteractionModeSize
};
/// Constructor
- ProjectionSurface(const InstrumentActor* rootActor);
+ explicit ProjectionSurface(const InstrumentActor *rootActor);
/// Destructor
virtual ~ProjectionSurface();
/// Resets the instrument actor.
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/RectF.h b/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
index 570edc68c82..a3f2da0c2cf 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/RectF.h
@@ -29,7 +29,7 @@ public:
RectF(const QPointF &origin, const QSizeF &size);
/// Explicitly set the two points
RectF(const QPointF &point0, const QPointF &point1);
- RectF(const QRectF &rect);
+ explicit RectF(const QRectF &rect);
/// Copy constructor
RectF(const RectF &rect) {*this = rect;}
/// Copy assignment operator
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.h b/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.h
index d1db694c15d..19c637419dc 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Shape2D.h
@@ -244,7 +244,7 @@ protected:
class Shape2DFree: public Shape2D
{
public:
- Shape2DFree(const QPointF& p);
+ explicit Shape2DFree(const QPointF &p);
virtual Shape2D* clone()const{return new Shape2DFree(*this);}
virtual bool selectAt(const QPointF& p)const;
virtual bool contains(const QPointF& p)const;
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp b/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
index f2c38011600..2f6e2f5ed68 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
+++ b/MantidPlot/src/Mantid/InstrumentWidget/Shape2DCollection.cpp
@@ -400,7 +400,7 @@ void Shape2DCollection::deselectAtXY(int x, int y)
*/
bool Shape2DCollection::selectIn(const QRect& rect)
{
- RectF untransformedRect = QRectF(rect);
+ RectF untransformedRect = RectF(QRectF(rect));
RectF r( m_transform.inverted().mapRect( QRectF(rect) ) );
bool selected = false;
deselectAll();
@@ -724,7 +724,7 @@ void Shape2DCollection::getMaskedPixels(QList<QPoint>& pixels)const
void Shape2DCollection::setCurrentBoundingRectReal(const QRectF& rect)
{
if (!m_currentShape) return;
- m_currentShape->setBoundingRect(rect);
+ m_currentShape->setBoundingRect(RectF(rect));
}
/**
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/SimpleWidget.h b/MantidPlot/src/Mantid/InstrumentWidget/SimpleWidget.h
index 11e94f60461..2fcf05d211f 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/SimpleWidget.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/SimpleWidget.h
@@ -14,7 +14,7 @@ class SimpleWidget : public QWidget
{
public:
/// Constructor
- SimpleWidget(QWidget* parent);
+ explicit SimpleWidget(QWidget *parent);
~SimpleWidget();
/// Assign a surface to draw on
void setSurface(boost::shared_ptr<ProjectionSurface> surface);
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/UnwrappedSurface.h b/MantidPlot/src/Mantid/InstrumentWidget/UnwrappedSurface.h
index f23524a0809..6a1a1f113a8 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/UnwrappedSurface.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/UnwrappedSurface.h
@@ -80,8 +80,7 @@ class UnwrappedSurface: public ProjectionSurface
{
Q_OBJECT
public:
-
- UnwrappedSurface(const InstrumentActor* rootActor);
+ explicit UnwrappedSurface(const InstrumentActor *rootActor);
/** @name Implemented public virtual methods */
//@{
diff --git a/MantidPlot/src/Mantid/InstrumentWidget/XIntegrationControl.h b/MantidPlot/src/Mantid/InstrumentWidget/XIntegrationControl.h
index 7891c5a2e78..5c71bda1e53 100644
--- a/MantidPlot/src/Mantid/InstrumentWidget/XIntegrationControl.h
+++ b/MantidPlot/src/Mantid/InstrumentWidget/XIntegrationControl.h
@@ -17,7 +17,7 @@ class XIntegrationScrollBar: public QFrame
{
Q_OBJECT
public:
- XIntegrationScrollBar(QWidget* parent);
+ explicit XIntegrationScrollBar(QWidget *parent);
double getMinimum()const;
double getMaximum()const;
double getWidth()const;
@@ -50,7 +50,7 @@ class XIntegrationControl: public QFrame
{
Q_OBJECT
public:
- XIntegrationControl(InstrumentWindow* instrWindow);
+ explicit XIntegrationControl(InstrumentWindow *instrWindow);
void setTotalRange(double minimum,double maximum);
void setUnits(const QString& units);
void setRange(double minimum,double maximum);
diff --git a/MantidPlot/src/Mantid/LoadDAEDlg.h b/MantidPlot/src/Mantid/LoadDAEDlg.h
index 6fbbbf8e6e6..28d291ecd56 100644
--- a/MantidPlot/src/Mantid/LoadDAEDlg.h
+++ b/MantidPlot/src/Mantid/LoadDAEDlg.h
@@ -16,8 +16,8 @@ class loadDAEDlg : public QDialog
Q_OBJECT
public:
- loadDAEDlg(QWidget *parent = 0);
- ~loadDAEDlg();
+ explicit loadDAEDlg(QWidget *parent = 0);
+ ~loadDAEDlg();
const QString& getHostName() { return m_hostName; }
const QString& getWorkspaceName() { return m_workspaceName; }
diff --git a/MantidPlot/src/Mantid/ManageCustomMenus.h b/MantidPlot/src/Mantid/ManageCustomMenus.h
index f3c7aacbc70..332bf1f111f 100644
--- a/MantidPlot/src/Mantid/ManageCustomMenus.h
+++ b/MantidPlot/src/Mantid/ManageCustomMenus.h
@@ -36,7 +36,8 @@ class ManageCustomMenus : public QDialog
{
Q_OBJECT
public:
- ManageCustomMenus(QWidget *parent = 0);
+ explicit ManageCustomMenus(QWidget *parent = 0);
+
private:
void initLayout();
void populateMenuTree();
diff --git a/MantidPlot/src/Mantid/ManageInterfaceCategories.h b/MantidPlot/src/Mantid/ManageInterfaceCategories.h
index e0797cca6f3..6313d4b8694 100644
--- a/MantidPlot/src/Mantid/ManageInterfaceCategories.h
+++ b/MantidPlot/src/Mantid/ManageInterfaceCategories.h
@@ -47,7 +47,8 @@ class InterfaceCategoryModel : public QAbstractListModel
public:
/// Constructor.
- InterfaceCategoryModel(const QSet<QString> & allCategories = QSet<QString>());
+ explicit InterfaceCategoryModel(
+ const QSet<QString> &allCategories = QSet<QString>());
/// Required overloaded methods for an editable Qt data model:
@@ -87,7 +88,7 @@ class ManageInterfaceCategories : public QDialog
public:
/// Only constructor. We insist on seeing the ApplicationWindow.
- ManageInterfaceCategories(ApplicationWindow * parent);
+ explicit ManageInterfaceCategories(ApplicationWindow *parent);
private slots:
/// Slot to open the help web page.
diff --git a/MantidPlot/src/Mantid/MantidAbout.h b/MantidPlot/src/Mantid/MantidAbout.h
index 745bd90eaf3..6dc9d73ed09 100644
--- a/MantidPlot/src/Mantid/MantidAbout.h
+++ b/MantidPlot/src/Mantid/MantidAbout.h
@@ -41,8 +41,8 @@ class MantidAbout : public MantidQt::API::MantidDialog
public:
/// constructor
- MantidAbout(QWidget* parent = 0);
- ///destructor
+ explicit MantidAbout(QWidget *parent = 0);
+ ///destructor
~MantidAbout() {}
private:
/// form generated by QT Designer
diff --git a/MantidPlot/src/Mantid/MantidCurve.h b/MantidPlot/src/Mantid/MantidCurve.h
index c379748316f..bc72cc343f9 100644
--- a/MantidPlot/src/Mantid/MantidCurve.h
+++ b/MantidPlot/src/Mantid/MantidCurve.h
@@ -39,7 +39,7 @@ public:
/// Constructor
MantidCurve(const QString& wsName, bool error, bool allerror = false);
/// Default constructor
- MantidCurve(bool err);
+ explicit MantidCurve(bool err);
/// Destructor
virtual ~MantidCurve();
/// Clone
diff --git a/MantidPlot/src/Mantid/MantidDock.h b/MantidPlot/src/Mantid/MantidDock.h
index 120e7a8790d..54c3491d025 100644
--- a/MantidPlot/src/Mantid/MantidDock.h
+++ b/MantidPlot/src/Mantid/MantidDock.h
@@ -195,7 +195,7 @@ private:
class MantidTreeWidgetItem : public QTreeWidgetItem
{
public:
- MantidTreeWidgetItem(MantidTreeWidget*);
+ explicit MantidTreeWidgetItem(MantidTreeWidget *);
MantidTreeWidgetItem(QStringList, MantidTreeWidget*);
void disableIfNode(bool);
void setSortPos(int o) {m_sortPos = o;}
diff --git a/MantidPlot/src/Mantid/MantidMatrixFunction.h b/MantidPlot/src/Mantid/MantidMatrixFunction.h
index d617faaa1c0..ea8bc2221d2 100644
--- a/MantidPlot/src/Mantid/MantidMatrixFunction.h
+++ b/MantidPlot/src/Mantid/MantidMatrixFunction.h
@@ -21,8 +21,7 @@ class MantidMatrixFunctionWorkspaceObserver: public QObject, public MantidQt::AP
{
Q_OBJECT
public:
-
- MantidMatrixFunctionWorkspaceObserver(MantidMatrixFunction *);
+ explicit MantidMatrixFunctionWorkspaceObserver(MantidMatrixFunction *);
signals:
void requestRedraw();
@@ -44,7 +43,7 @@ private:
class MantidMatrixFunction: public Function2D
{
public:
- MantidMatrixFunction(MantidMatrix &matrix);
+ explicit MantidMatrixFunction(MantidMatrix &matrix);
~MantidMatrixFunction();
/* Base class virtual methods */
diff --git a/MantidPlot/src/Mantid/MantidUI.h b/MantidPlot/src/Mantid/MantidUI.h
index 4edc755bd5b..fa810ef0fb7 100644
--- a/MantidPlot/src/Mantid/MantidUI.h
+++ b/MantidPlot/src/Mantid/MantidUI.h
@@ -111,7 +111,7 @@ class MantidUI:public QObject
public:
// Constructor
- MantidUI(ApplicationWindow *aw);
+ explicit MantidUI(ApplicationWindow *aw);
// Destructor
~MantidUI();
diff --git a/MantidPlot/src/Mantid/MantidWSIndexDialog.h b/MantidPlot/src/Mantid/MantidWSIndexDialog.h
index 9ab943480a4..e24cd8daea7 100644
--- a/MantidPlot/src/Mantid/MantidWSIndexDialog.h
+++ b/MantidPlot/src/Mantid/MantidWSIndexDialog.h
@@ -71,11 +71,11 @@ class Interval
{
public:
/// Constructor - starting and ending at single.
- Interval(int single);
+ explicit Interval(int single);
/// Constructor - starting at start and ending at end.
Interval(int start, int end);
/// Constructor - attempts to parse given string to find start and end.
- Interval(QString);
+ explicit Interval(QString);
/// Copy constructor
Interval(const Interval&);
@@ -115,9 +115,9 @@ public:
/// Constructor - with empty list.
IntervalList(void);
/// Constructor - with a list created by parsing the input string
- IntervalList(QString);
+ explicit IntervalList(QString);
/// Constructor - with a list containing a single Interval
- IntervalList(Interval);
+ explicit IntervalList(Interval);
/// Copy Constructor
IntervalList(const IntervalList&);
@@ -196,7 +196,7 @@ class MantidWSIndexDialog : public QDialog
class QLineEditWithErrorMark : public QWidget{
public:
/// constructor that will join togheter the QLineEdit and an 'invisible' * label.
- QLineEditWithErrorMark(QWidget * parent = 0);
+ explicit QLineEditWithErrorMark(QWidget *parent = 0);
/// virtual destructor to allow Qt to deallocate all objects
virtual ~QLineEditWithErrorMark(){};
/// provide acess to the QLineEdit
diff --git a/MantidPlot/src/Mantid/RemoveErrorsDialog.h b/MantidPlot/src/Mantid/RemoveErrorsDialog.h
index 5c0816bf273..77c61caf79b 100644
--- a/MantidPlot/src/Mantid/RemoveErrorsDialog.h
+++ b/MantidPlot/src/Mantid/RemoveErrorsDialog.h
@@ -10,7 +10,7 @@ namespace Ui {
class RemoveErrorsDialog : public QDialog {
Q_OBJECT
public:
- RemoveErrorsDialog(QWidget *parent = 0);
+ explicit RemoveErrorsDialog(QWidget *parent = 0);
~RemoveErrorsDialog();
//! Supply the dialog with a curves list
diff --git a/MantidPlot/src/Mantid/UserFitFunctionDialog.h b/MantidPlot/src/Mantid/UserFitFunctionDialog.h
index d86543b4485..e14934000b6 100644
--- a/MantidPlot/src/Mantid/UserFitFunctionDialog.h
+++ b/MantidPlot/src/Mantid/UserFitFunctionDialog.h
@@ -50,7 +50,7 @@ class UserFitFunctionDialog : public QDialog
public:
/// Default constructor
- UserFitFunctionDialog(QWidget *parent);
+ explicit UserFitFunctionDialog(QWidget *parent);
/// The constructed expression
QString expression()const{return ui.teExpression->toPlainText();}
diff --git a/MantidPlot/src/Matrix.cpp b/MantidPlot/src/Matrix.cpp
index d345ff9617a..cdfb4c0dbab 100644
--- a/MantidPlot/src/Matrix.cpp
+++ b/MantidPlot/src/Matrix.cpp
@@ -457,7 +457,7 @@ bool Matrix::canCalculate(bool useMuParser)
double *x = mup->defineVariable("x");
double *y = mup->defineVariable("y");
- if (!mup->compile(formula_str))
+ if (!mup->compile(ScriptCode(formula_str)))
return false;
double r = 1.0;
@@ -467,7 +467,7 @@ bool Matrix::canCalculate(bool useMuParser)
if (codeLines == 1 && gsl_isnan(mup->evalSingleLine()))
return false;
else if (codeLines > 1){
- QVariant res = mup->evaluate(formula_str);
+ QVariant res = mup->evaluate(ScriptCode(formula_str));
if (!res.canConvert(QVariant::Double))
return false;
}
@@ -487,7 +487,7 @@ bool Matrix::canCalculate(bool useMuParser)
double y = 1.0;
script->setDouble(y, "y");
- QVariant res = script->evaluate(formula_str);
+ QVariant res = script->evaluate(ScriptCode(formula_str));
if (!res.canConvert(QVariant::Double))
return false;
}
diff --git a/MantidPlot/src/MatrixModel.cpp b/MantidPlot/src/MatrixModel.cpp
index 61b7b2e0a3d..5112d2b0431 100644
--- a/MantidPlot/src/MatrixModel.cpp
+++ b/MantidPlot/src/MatrixModel.cpp
@@ -827,8 +827,8 @@ bool MatrixModel::muParserCalculate(int startRow, int endRow, int startCol, int
double *x = mup->defineVariable("x");
double *y = mup->defineVariable("y");
- if (!mup->compile( d_matrix->formula())){
- QApplication::restoreOverrideCursor();
+ if (!mup->compile(ScriptCode(d_matrix->formula()))) {
+ QApplication::restoreOverrideCursor();
return false;
}
@@ -860,7 +860,7 @@ bool MatrixModel::muParserCalculate(int startRow, int endRow, int startCol, int
double c = col + 1.0;
*cj = c; *cc = c;
*x = x_start + col*dx;
- res = mup->evaluate(d_matrix->formula());
+ res = mup->evaluate(ScriptCode(d_matrix->formula()));
if (res.canConvert(QVariant::Double))
d_data[aux++] = res.toDouble();
else
@@ -911,8 +911,8 @@ bool MatrixModel::calculate(int startRow, int endRow, int startCol, int endCol)
script->setDouble(c, "j");
script->setDouble(c, "col");
script->setDouble(x_start + col*dx, "x");
- res = script->evaluate(formula);
- if (res.canConvert(QVariant::Double))
+ res = script->evaluate(ScriptCode(formula));
+ if (res.canConvert(QVariant::Double))
d_data[aux++] = res.toDouble();
else {
QApplication::restoreOverrideCursor();
diff --git a/MantidPlot/src/MatrixModel.h b/MantidPlot/src/MatrixModel.h
index c3633bf08c9..2a092ce71b0 100644
--- a/MantidPlot/src/MatrixModel.h
+++ b/MantidPlot/src/MatrixModel.h
@@ -46,7 +46,7 @@ class MatrixModel : public QAbstractTableModel
Q_OBJECT
protected:
- MatrixModel(QObject *parent);
+ explicit MatrixModel(QObject *parent);
public:
MatrixModel(int rows = 32, int cols = 32, QObject *parent = 0);
diff --git a/MantidPlot/src/Plot.h b/MantidPlot/src/Plot.h
index 9aecdb0bf68..541e3d88d96 100644
--- a/MantidPlot/src/Plot.h
+++ b/MantidPlot/src/Plot.h
@@ -43,7 +43,7 @@ class Grid;
/// Helper class to delay deletion of curves
struct Detacher : public QObject
{
- Detacher(QwtPlotItem* plotItem);
+ explicit Detacher(QwtPlotItem *plotItem);
~Detacher();
private:
Detacher();
diff --git a/MantidPlot/src/PlotCurve.cpp b/MantidPlot/src/PlotCurve.cpp
index c58c8618fa4..34cd741fdf2 100644
--- a/MantidPlot/src/PlotCurve.cpp
+++ b/MantidPlot/src/PlotCurve.cpp
@@ -112,7 +112,7 @@ QString PlotCurve::saveCurveLayout()
void PlotCurve::restoreCurveLayout(const QStringList& lst)
{
QStringList::const_iterator line = lst.begin();
- for (line++; line != lst.end(); ++line){
+ for (++line; line != lst.end(); ++line) {
QString s = *line;
if (s == "<Pen>"){
QPen pen;
diff --git a/MantidPlot/src/PlotCurve.h b/MantidPlot/src/PlotCurve.h
index 7c78c68e9b0..751293ab2b8 100644
--- a/MantidPlot/src/PlotCurve.h
+++ b/MantidPlot/src/PlotCurve.h
@@ -50,7 +50,7 @@ class PlotCurve: public QObject, public QwtPlotCurve
{
Q_OBJECT
public:
- PlotCurve(const QString& name = QString());
+ explicit PlotCurve(const QString &name = QString());
PlotCurve(const PlotCurve& c);
virtual PlotCurve* clone(const Graph*)const = 0;
diff --git a/MantidPlot/src/PlotToolInterface.h b/MantidPlot/src/PlotToolInterface.h
index a2ea164ceb7..5497175a4fb 100644
--- a/MantidPlot/src/PlotToolInterface.h
+++ b/MantidPlot/src/PlotToolInterface.h
@@ -75,8 +75,8 @@ class PlotToolInterface
Rtti_PlotUserTool = 1000
};
- PlotToolInterface(Graph *graph) { d_graph = graph; }
- virtual ~PlotToolInterface() {};
+ explicit PlotToolInterface(Graph *graph) { d_graph = graph; }
+ virtual ~PlotToolInterface() {};
virtual int rtti() const { return Rtti_PlotTool;};
Graph* graph()const{return d_graph;}
diff --git a/MantidPlot/src/PythonScript.cpp b/MantidPlot/src/PythonScript.cpp
index a83c5a096e4..7453f5b3397 100644
--- a/MantidPlot/src/PythonScript.cpp
+++ b/MantidPlot/src/PythonScript.cpp
@@ -729,9 +729,8 @@ namespace
*/
struct InstallTrace
{
- InstallTrace(PythonScript & scriptObject)
- : m_sipWrappedScript(NULL)
- {
+ explicit InstallTrace(PythonScript &scriptObject)
+ : m_sipWrappedScript(NULL) {
if(scriptObject.reportProgress())
{
m_sipWrappedScript = scriptObject.createSipInstanceFromMe();
diff --git a/MantidPlot/src/PythonScript.h b/MantidPlot/src/PythonScript.h
index 8575c2d54f3..d27bb8d2895 100644
--- a/MantidPlot/src/PythonScript.h
+++ b/MantidPlot/src/PythonScript.h
@@ -105,9 +105,7 @@ private:
struct PythonPathHolder
{
/// Update the path with the given entry
- PythonPathHolder(const QString & entry)
- : m_path(entry)
- {
+ explicit PythonPathHolder(const QString &entry) : m_path(entry) {
const QFileInfo filePath(m_path);
if( filePath.exists() )
{
diff --git a/MantidPlot/src/PythonScripting.h b/MantidPlot/src/PythonScripting.h
index cd6b6aae697..b3b0ce59b2e 100644
--- a/MantidPlot/src/PythonScripting.h
+++ b/MantidPlot/src/PythonScripting.h
@@ -110,7 +110,7 @@ public:
private:
/// Constructor
- PythonScripting(ApplicationWindow *parent);
+ explicit PythonScripting(ApplicationWindow *parent);
/// Default constructor
PythonScripting();
/// Start the environment
diff --git a/MantidPlot/src/QwtHistogram.h b/MantidPlot/src/QwtHistogram.h
index c7f155d532e..7ba32a4d39b 100644
--- a/MantidPlot/src/QwtHistogram.h
+++ b/MantidPlot/src/QwtHistogram.h
@@ -35,9 +35,9 @@ class QwtHistogram: public QwtBarCurve
{
public:
QwtHistogram(Table *t, const QString& xColName, const QString& name, int startRow, int endRow);
- QwtHistogram(Matrix *m);
+ explicit QwtHistogram(Matrix *m);
- void copy(const QwtHistogram *h);
+ void copy(const QwtHistogram *h);
QwtDoubleRect boundingRect() const;
diff --git a/MantidPlot/src/ScaleDraw.cpp b/MantidPlot/src/ScaleDraw.cpp
index a003c6c801f..5c156c2fc5a 100644
--- a/MantidPlot/src/ScaleDraw.cpp
+++ b/MantidPlot/src/ScaleDraw.cpp
@@ -149,9 +149,8 @@ QwtText ScaleDraw::label(double value) const
day = (QDate::shortDayName (val)).left(1);
break;
}
- return QwtText(day);
- break;
- }
+ return QwtText(day);
+ }
case Month:
{
@@ -173,9 +172,8 @@ QwtText ScaleDraw::label(double value) const
day = (QDate::shortMonthName (val)).left(1);
break;
}
- return QwtText(day);
- break;
- }
+ return QwtText(day);
+ }
case Time:
return QwtText(d_date_time_origin.time().addMSecs((int)value).toString(d_format_info));
diff --git a/MantidPlot/src/ScalePicker.h b/MantidPlot/src/ScalePicker.h
index 55add36a5a9..aa22be626da 100644
--- a/MantidPlot/src/ScalePicker.h
+++ b/MantidPlot/src/ScalePicker.h
@@ -42,9 +42,9 @@ class ScalePicker: public QObject
{
Q_OBJECT
public:
- ScalePicker(QwtPlot *plot);
+ explicit ScalePicker(QwtPlot *plot);
- //! Returns the bounding rectangle of a scale without the title.
+ //! Returns the bounding rectangle of a scale without the title.
QRect scaleRect(const QwtScaleWidget *) const;
//! Returns the bounding rectangle of a scale excluding the title and the tick labels.
diff --git a/MantidPlot/src/Script.h b/MantidPlot/src/Script.h
index a934a7ac0df..b1b5c0650b6 100644
--- a/MantidPlot/src/Script.h
+++ b/MantidPlot/src/Script.h
@@ -159,7 +159,7 @@ private:
class ScriptTask : public QFutureInterface<bool>, public QRunnable
{
public:
- ScriptTask(Script & script);
+ explicit ScriptTask(Script &script);
QFuture<bool> start();
void run();
diff --git a/MantidPlot/src/ScriptCode.h b/MantidPlot/src/ScriptCode.h
index d9c8231a787..b8f31707970 100644
--- a/MantidPlot/src/ScriptCode.h
+++ b/MantidPlot/src/ScriptCode.h
@@ -15,11 +15,11 @@ public:
/// Empty code
ScriptCode();
/// Code from a C-string with zero offset
- ScriptCode(const char * codeStr);
+ explicit ScriptCode(const char *codeStr);
/// Code from a C-string with a defined offset
ScriptCode(const char * codeStr, const int offset);
/// Code from a QString with zero offset
- ScriptCode(const QString & codeStr);
+ explicit ScriptCode(const QString &codeStr);
/// Code from a QString with a defined offset
ScriptCode(const QString & codeStr, const int offset);
diff --git a/MantidPlot/src/ScriptFileInterpreter.cpp b/MantidPlot/src/ScriptFileInterpreter.cpp
index c0ae279689b..24a43facf0a 100644
--- a/MantidPlot/src/ScriptFileInterpreter.cpp
+++ b/MantidPlot/src/ScriptFileInterpreter.cpp
@@ -422,7 +422,7 @@ void ScriptFileInterpreter::showFindReplaceDialog()
void ScriptFileInterpreter::executeAll(const Script::ExecutionMode mode)
{
m_runner->clearLocals();
- executeCode(m_editor->text(), mode);
+ executeCode(ScriptCode(m_editor->text()), mode);
}
/**
diff --git a/MantidPlot/src/ScriptOutputDisplay.h b/MantidPlot/src/ScriptOutputDisplay.h
index cffda351b19..1a8ee46a1d7 100644
--- a/MantidPlot/src/ScriptOutputDisplay.h
+++ b/MantidPlot/src/ScriptOutputDisplay.h
@@ -13,7 +13,7 @@ class ScriptOutputDisplay : public QTextEdit
public:
/// Constructor
- ScriptOutputDisplay(QWidget *parent = NULL);
+ explicit ScriptOutputDisplay(QWidget *parent = NULL);
/// Is there anything here
bool isEmpty() const;
diff --git a/MantidPlot/src/Scripted.h b/MantidPlot/src/Scripted.h
index 89e2c450d73..0a559847492 100644
--- a/MantidPlot/src/Scripted.h
+++ b/MantidPlot/src/Scripted.h
@@ -18,7 +18,8 @@ class ScriptingEnv;
class ScriptingChangeEvent : public QEvent
{
public:
- ScriptingChangeEvent(ScriptingEnv *e) : QEvent(SCRIPTING_CHANGE_EVENT), env(e) {}
+ explicit ScriptingChangeEvent(ScriptingEnv *e)
+ : QEvent(SCRIPTING_CHANGE_EVENT), env(e) {}
ScriptingEnv *scriptingEnv() const { return env; }
Type type() const { return SCRIPTING_CHANGE_EVENT; }
private:
diff --git a/MantidPlot/src/SelectionMoveResizer.h b/MantidPlot/src/SelectionMoveResizer.h
index 5226ee30439..ab6b9d4099b 100644
--- a/MantidPlot/src/SelectionMoveResizer.h
+++ b/MantidPlot/src/SelectionMoveResizer.h
@@ -92,14 +92,14 @@ class SelectionMoveResizer : public QWidget
public:
//! Construct a new MoveResizer with the given marker as the only target.
- SelectionMoveResizer(LegendWidget *target);
- //! Construct a new MoveResizer with the given marker as the only target.
- SelectionMoveResizer(ArrowMarker *target);
- //! Construct a new MoveResizer with the given marker as the only target.
- SelectionMoveResizer(ImageMarker *target);
- //! Construct a new MoveResizer with the given widget as the only target.
- SelectionMoveResizer(QWidget *target);
- //! Clean up after myself.
+ explicit SelectionMoveResizer(LegendWidget *target);
+ //! Construct a new MoveResizer with the given marker as the only target.
+ explicit SelectionMoveResizer(ArrowMarker *target);
+ //! Construct a new MoveResizer with the given marker as the only target.
+ explicit SelectionMoveResizer(ImageMarker *target);
+ //! Construct a new MoveResizer with the given widget as the only target.
+ explicit SelectionMoveResizer(QWidget *target);
+ //! Clean up after myself.
~SelectionMoveResizer();
/**\brief React on geometry changes of parent and targets.
*/
diff --git a/MantidPlot/src/Spectrogram.h b/MantidPlot/src/Spectrogram.h
index ca720aa917d..d999a64f347 100644
--- a/MantidPlot/src/Spectrogram.h
+++ b/MantidPlot/src/Spectrogram.h
@@ -67,7 +67,7 @@ class Spectrogram: public QObject, public QwtPlotSpectrogram, public MantidQt::A
public:
Spectrogram();
- Spectrogram(Matrix *m);
+ explicit Spectrogram(Matrix *m);
Spectrogram(const QString &wsName, const Mantid::API::IMDWorkspace_const_sptr & workspace);
Spectrogram(Function2D *f,int nrows, int ncols,double left, double top, double width, double height,double minz,double maxz);//Mantid
Spectrogram(Function2D *f,int nrows, int ncols,QwtDoubleRect bRect,double minz,double maxz);//Mantid
@@ -225,7 +225,7 @@ protected:
class SpectrogramData: public QwtRasterData
{
public:
- SpectrogramData(const QwtDoubleRect &rect):QwtRasterData(rect){}
+ explicit SpectrogramData(const QwtDoubleRect &rect) : QwtRasterData(rect) {}
virtual double getMinPositiveValue()const = 0;
};
@@ -233,10 +233,8 @@ public:
class MatrixData: public SpectrogramData
{
public:
- MatrixData(Matrix *m):
- SpectrogramData(m->boundingRect()),
- d_matrix(m)
- {
+ explicit MatrixData(Matrix *m)
+ : SpectrogramData(m->boundingRect()), d_matrix(m) {
n_rows = d_matrix->numRows();
n_cols = d_matrix->numCols();
diff --git a/MantidPlot/src/TSVSerialiser.h b/MantidPlot/src/TSVSerialiser.h
index 4bd2e582e5b..d1122150130 100644
--- a/MantidPlot/src/TSVSerialiser.h
+++ b/MantidPlot/src/TSVSerialiser.h
@@ -38,7 +38,7 @@ public:
TSVSerialiser();
- TSVSerialiser(const std::string& lines);
+ explicit TSVSerialiser(const std::string &lines);
void parseLines(const std::string& lines);
std::string outputLines() const;
diff --git a/MantidPlot/src/Table.cpp b/MantidPlot/src/Table.cpp
index 5803d2f6c8d..508cff28729 100644
--- a/MantidPlot/src/Table.cpp
+++ b/MantidPlot/src/Table.cpp
@@ -321,7 +321,7 @@ void Table::cellEdited(int row, int col)
script->setInt(row+1, "i");
script->setInt(col+1, "j");
- QVariant ret = script->evaluate(d_table->text(row,col));
+ QVariant ret = script->evaluate(ScriptCode(d_table->text(row, col)));
if(ret.type()==QVariant::Int || ret.type()==QVariant::UInt || ret.type()==QVariant::LongLong || ret.type()==QVariant::ULongLong)
d_table->setText(row, col, ret.toString());
else if(ret.canCast(QVariant::Double))
@@ -560,7 +560,7 @@ bool Table::muParserCalculate(int col, int startRow, int endRow, bool notifyChan
mup->defineVariable("sr", startRow + 1.0);
mup->defineVariable("er", endRow + 1.0);
- if (!mup->compile(cmd)){
+ if (!mup->compile(ScriptCode(cmd))) {
QApplication::restoreOverrideCursor();
return false;
}
@@ -579,7 +579,7 @@ bool Table::muParserCalculate(int col, int startRow, int endRow, bool notifyChan
QVariant ret;
for (int i = startRow; i <= endRow; i++){
*r = i + 1.0;
- ret = mup->evaluate(cmd);
+ ret = mup->evaluate(ScriptCode(cmd));
if(ret.type() == QVariant::Double) {
d_table->setText(i, col, loc.toString(ret.toDouble(), f, prec));
} else if(ret.canConvert(QVariant::String))
@@ -632,7 +632,7 @@ bool Table::calculate(int col, int startRow, int endRow, bool forceMuParser, boo
connect(colscript, SIGNAL(error(const QString&,const QString&,int)), scriptingEnv(), SIGNAL(error(const QString&,const QString&,int)));
connect(colscript, SIGNAL(print(const QString&)), scriptingEnv(), SIGNAL(print(const QString&)));
- if (!colscript->compile(cmd)){
+ if (!colscript->compile(ScriptCode(cmd))) {
QApplication::restoreOverrideCursor();
return false;
}
@@ -648,7 +648,7 @@ bool Table::calculate(int col, int startRow, int endRow, bool forceMuParser, boo
QVariant ret;
for (int i = startRow; i <= endRow; i++){
colscript->setDouble(i + 1.0, "i");
- ret = colscript->evaluate(cmd);
+ ret = colscript->evaluate(ScriptCode(cmd));
if(ret.type() == QVariant::Double)
d_table->setText(i, col, loc.toString(ret.toDouble(), f, prec));
else if(ret.canConvert(QVariant::String))
@@ -2915,7 +2915,7 @@ void Table::restore(const QStringList& lst)
{
int col = (*i).mid(9,(*i).length()-11).toInt();
QString formula;
- for (i++; i!=lst.end() && *i != "</col>"; ++i)
+ for (++i; i != lst.end() && *i != "</col>"; ++i)
formula += *i + "\n";
formula.truncate(formula.length()-1);
commands[col] = formula;
diff --git a/MantidPlot/src/TextEditor.h b/MantidPlot/src/TextEditor.h
index 288f9736a50..3f7910f981a 100644
--- a/MantidPlot/src/TextEditor.h
+++ b/MantidPlot/src/TextEditor.h
@@ -39,7 +39,7 @@ class TextEditor: public QTextEdit
Q_OBJECT
public:
- TextEditor(Graph *g);
+ explicit TextEditor(Graph *g);
~TextEditor();
void formatText(const QString & prefix, const QString & postfix);
diff --git a/MantidPlot/src/TextFileIO.h b/MantidPlot/src/TextFileIO.h
index 76fd805a323..6cd7b77e793 100644
--- a/MantidPlot/src/TextFileIO.h
+++ b/MantidPlot/src/TextFileIO.h
@@ -12,7 +12,7 @@ class TextFileIO
{
public:
/// Construct the object with a list of file filters
- TextFileIO(QStringList fileFilters = QStringList());
+ explicit TextFileIO(QStringList fileFilters = QStringList());
/// Save to a file
bool save(const QString & txt, const QString & filename) const;
diff --git a/MantidPlot/src/TiledWindow.cpp b/MantidPlot/src/TiledWindow.cpp
index 62fd19b5334..45876ee006b 100644
--- a/MantidPlot/src/TiledWindow.cpp
+++ b/MantidPlot/src/TiledWindow.cpp
@@ -139,7 +139,7 @@ namespace {
{
public:
/// Constructor
- InnerWidget(QWidget *parent): QWidget(parent),m_draw(false) {}
+ explicit InnerWidget(QWidget *parent) : QWidget(parent), m_draw(false) {}
/**
* Work out where to put the marker.
diff --git a/MantidPlot/src/TiledWindow.h b/MantidPlot/src/TiledWindow.h
index 5b48cd67fde..aef6fa15535 100644
--- a/MantidPlot/src/TiledWindow.h
+++ b/MantidPlot/src/TiledWindow.h
@@ -173,7 +173,7 @@ class Tile: public QFrame
{
public:
/// Constructor
- Tile(QWidget *parent);
+ explicit Tile(QWidget *parent);
/// Destructor
~Tile();
/// Set the widget.
diff --git a/MantidPlot/src/TitlePicker.h b/MantidPlot/src/TitlePicker.h
index a0927e88711..10e29756e5c 100644
--- a/MantidPlot/src/TitlePicker.h
+++ b/MantidPlot/src/TitlePicker.h
@@ -36,7 +36,7 @@ class TitlePicker: public QObject
Q_OBJECT
public:
- TitlePicker(QwtPlot *plot);
+ explicit TitlePicker(QwtPlot *plot);
void setSelected(bool select = true);
bool selected(){return d_selected;};
diff --git a/MantidPlot/src/UserFunction.h b/MantidPlot/src/UserFunction.h
index 090629c6c73..d5680ce8bc5 100644
--- a/MantidPlot/src/UserFunction.h
+++ b/MantidPlot/src/UserFunction.h
@@ -57,7 +57,7 @@ private:
class UserFunction2D : public Function2D
{
public:
- UserFunction2D(const QString& s);
+ explicit UserFunction2D(const QString &s);
/// Get function value
double operator()(double x, double y);
/// Get minimum positive value.
diff --git a/MantidPlot/src/lib/3rdparty/qtcolorpicker/src/qtcolorpicker.cpp b/MantidPlot/src/lib/3rdparty/qtcolorpicker/src/qtcolorpicker.cpp
index 3e1bf061c9b..6d5ec13d059 100644
--- a/MantidPlot/src/lib/3rdparty/qtcolorpicker/src/qtcolorpicker.cpp
+++ b/MantidPlot/src/lib/3rdparty/qtcolorpicker/src/qtcolorpicker.cpp
@@ -144,7 +144,7 @@ class ColorPickerButton : public QFrame
Q_OBJECT
public:
- ColorPickerButton(QWidget *parent);
+ explicit ColorPickerButton(QWidget *parent);
signals:
void clicked();
diff --git a/MantidPlot/src/muParserScripting.h b/MantidPlot/src/muParserScripting.h
index ac4440c86fa..ec9f149190d 100644
--- a/MantidPlot/src/muParserScripting.h
+++ b/MantidPlot/src/muParserScripting.h
@@ -49,7 +49,10 @@ class muParserScripting: public ScriptingEnv
public:
static const char *langName;
- muParserScripting(ApplicationWindow *parent) : ScriptingEnv(parent, langName) { d_initialized=true; }
+ explicit muParserScripting(ApplicationWindow *parent)
+ : ScriptingEnv(parent, langName) {
+ d_initialized = true;
+ }
static ScriptingEnv *constructor(ApplicationWindow *parent) { return new muParserScripting(parent); }
/// Set the system arguments. Throws an exception as it is not supported
diff --git a/MantidPlot/src/plot2D/ImageSymbol.h b/MantidPlot/src/plot2D/ImageSymbol.h
index 6b6b9de2b95..c2662e91980 100644
--- a/MantidPlot/src/plot2D/ImageSymbol.h
+++ b/MantidPlot/src/plot2D/ImageSymbol.h
@@ -32,7 +32,7 @@
class ImageSymbol: public QwtSymbol
{
public:
- ImageSymbol(const QString& fileName);
+ explicit ImageSymbol(const QString &fileName);
ImageSymbol(const QPixmap& pixmap, const QString& fileName = QString());
virtual ImageSymbol *clone() const;
diff --git a/MantidQt/CustomInterfaces/src/StepScan.cpp b/MantidQt/CustomInterfaces/src/StepScan.cpp
index 9b5df3cf3c2..0b85128ac61 100644
--- a/MantidQt/CustomInterfaces/src/StepScan.cpp
+++ b/MantidQt/CustomInterfaces/src/StepScan.cpp
@@ -255,8 +255,7 @@ namespace {
class DisableGUI_RAII
{
public:
- DisableGUI_RAII(StepScan * gui) : the_gui(gui)
- {
+ explicit DisableGUI_RAII(StepScan *gui) : the_gui(gui) {
QApplication::setOverrideCursor(QCursor(Qt::BusyCursor));
the_gui->setAttribute( Qt::WA_TransparentForMouseEvents );
}
diff --git a/MantidQt/MantidWidgets/src/SelectWorkspacesDialog.cpp b/MantidQt/MantidWidgets/src/SelectWorkspacesDialog.cpp
index 09c5fa2037c..b1ac1905040 100644
--- a/MantidQt/MantidWidgets/src/SelectWorkspacesDialog.cpp
+++ b/MantidQt/MantidWidgets/src/SelectWorkspacesDialog.cpp
@@ -26,11 +26,8 @@ namespace MantidWidgets
const std::string m_type;
const bool m_isMatrixWorkspace;
public:
- WorkspaceIsNotOfType(const std::string &type) :
- m_type(type),
- m_isMatrixWorkspace(type == "MatrixWorkspace")
- {
- }
+ explicit WorkspaceIsNotOfType(const std::string &type)
+ : m_type(type), m_isMatrixWorkspace(type == "MatrixWorkspace") {}
bool operator()(Mantid::API::Workspace_sptr ws) const
{
if ( m_type.empty() ) return false;
diff --git a/MantidQt/SliceViewer/src/CompositePeaksPresenter.cpp b/MantidQt/SliceViewer/src/CompositePeaksPresenter.cpp
index 200ad1d8c22..5ab124172da 100644
--- a/MantidQt/SliceViewer/src/CompositePeaksPresenter.cpp
+++ b/MantidQt/SliceViewer/src/CompositePeaksPresenter.cpp
@@ -473,7 +473,7 @@ private:
const QString m_wsName;
public:
- MatchWorkspaceName(const QString &name) : m_wsName(name) {}
+ explicit MatchWorkspaceName(const QString &name) : m_wsName(name) {}
bool operator()(SetPeaksWorkspaces::value_type ws) {
const std::string wsName = ws->name();
const std::string toMatch = m_wsName.toStdString();
@@ -550,7 +550,7 @@ private:
PeaksPresenter *m_toFind;
public:
- MatchPointer(PeaksPresenter *toFind) : m_toFind(toFind) {}
+ explicit MatchPointer(PeaksPresenter *toFind) : m_toFind(toFind) {}
bool operator()(PeaksPresenter_sptr candidate) {
return candidate.get() == m_toFind;
}
diff --git a/MantidQt/SpectrumViewer/src/ColorMaps.cpp b/MantidQt/SpectrumViewer/src/ColorMaps.cpp
index b140b53c22b..ccea13d4e08 100644
--- a/MantidQt/SpectrumViewer/src/ColorMaps.cpp
+++ b/MantidQt/SpectrumViewer/src/ColorMaps.cpp
@@ -152,8 +152,8 @@ void ColorMaps::GetIntensityMap( double control_s,
double scale = 1.0 / log( s );
for ( size_t i = 0; i < n_entries - 1; i++ )
{
- intensity_table[i] = scale *
- log( 1.0+((s-1.0)*(double)i) / (double)(n_entries-1) );
+ intensity_table[i] = scale * log1p((s - 1.0) * static_cast<double>(i) /
+ static_cast<double>(n_entries - 1));
}
intensity_table[n_entries - 1] = 1.0; // this could have been calculated
// by running the loop one step
--
GitLab