Bravo team cppcheck set 20 (#38754)

* Deal with constVariableReference suppressions * Add missing overrides * Fix returnByReference cppcheck suppressions * Remove useless Override s * Fix uninitDerivedMemberVar * Fix cppcheck suppression errors * Fix EigenVector.cpp in line with cpp fixes * Update Framework/Crystal/src/SaveLauenorm.cpp Co-authored-by: Jonathan Haigh <[email protected]> * Update Framework/Crystal/src/SaveLauenorm.cpp Co-authored-by: Jonathan Haigh <[email protected]> --------- Co-authored-by: Jonathan Haigh <[email protected]>
mantidproject · Jan 31, 2025 · 081abb6 · 081abb6
1 parent ec588a8
commit 081abb6
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 32 deletions.
diff --git a/Framework/API/inc/MantidAPI/IFunctionMW.h b/Framework/API/inc/MantidAPI/IFunctionMW.h
@@ -41,7 +41,7 @@ class MANTID_API_DLL IFunctionMW : public virtual IFunction {
   /// Keep a weak pointer to the workspace
   std::weak_ptr<const API::MatrixWorkspace> m_workspace;
   /// An index to a spectrum
-  size_t m_workspaceIndex;
+  size_t m_workspaceIndex = 0;
 };
 
 } // namespace API

diff --git a/Framework/Crystal/src/SaveLauenorm.cpp b/Framework/Crystal/src/SaveLauenorm.cpp
@@ -161,7 +161,7 @@ void SaveLauenorm::exec() {
   double minD = EMPTY_DBL();
   for (int wi = 0; wi < ws->getNumberPeaks(); wi++) {
 
-    Peak &p = peaks[wi];
+    const Peak &p = peaks[wi];
     double intensity = p.getIntensity();
     double sigI = p.getSigmaIntensity();
     if (intensity == 0.0 || !(std::isfinite(sigI)))
@@ -231,7 +231,7 @@ void SaveLauenorm::exec() {
   // Go through each peak at this run / bank
   for (int wi = 0; wi < ws->getNumberPeaks(); wi++) {
 
-    Peak &p = peaks[wi];
+    const Peak &p = peaks[wi];
     double intensity = p.getIntensity();
     double sigI = p.getSigmaIntensity();
     if (intensity == 0.0 || !(std::isfinite(sigI)))

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h
@@ -58,7 +58,7 @@ class MANTID_CURVEFITTING_DLL Fit1D : public API::Algorithm {
   virtual void functionDeriv(const double *in, API::Jacobian *out, const double *xValues, const size_t nData);
 
 protected:
-  ~Fit1D() = default;
+  ~Fit1D() override = default;
   // Overridden Algorithm methods
   void init() override;
   void exec() override;

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
@@ -49,7 +49,7 @@ struct MANTID_CURVEFITTING_DLL V3DFromHKLColumnExtractor {
 class MANTID_CURVEFITTING_DLL PawleyFit : public API::Algorithm {
 public:
   PawleyFit();
-  virtual ~PawleyFit() = default;
+  virtual ~PawleyFit() override = default;
   const std::string name() const override { return "PawleyFit"; }
   int version() const override { return 1; }
   const std::vector<std::string> seeAlso() const override { return {"PoldiPeakSearch"}; }

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/EigenVector.h b/Framework/CurveFitting/inc/MantidCurveFitting/EigenVector.h
@@ -88,7 +88,7 @@ class MANTID_CURVEFITTING_DLL EigenVector {
   /// Sort this vector in order defined by an index array
   void sort(const std::vector<size_t> &indices);
   /// Copy the values to an std vector of doubles
-  std::vector<double> toStdVector() const;
+  const std::vector<double> &toStdVector() const;
   /// Return a reference to m_data
   std::vector<double> &StdVectorRef();
 

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
@@ -31,7 +31,6 @@ class MANTID_CURVEFITTING_DLL BSpline : public BackgroundFunction {
   BSpline();
   /// overwrite IFunction base class methods
   std::string name() const override { return "BSpline"; }
-  const std::string category() const override { return "Background"; }
   void function1D(double *out, const double *xValues, const size_t nData) const override;
   void derivative1D(double *out, const double *xValues, size_t nData, const size_t order) const override;
 

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
@@ -34,7 +34,6 @@ class MANTID_CURVEFITTING_DLL Chebyshev : public BackgroundFunction {
 
   /// overwrite IFunction base class methods
   std::string name() const override { return "Chebyshev"; }
-  const std::string category() const override { return "Background"; }
   void function1D(double *out, const double *xValues, const size_t nData) const override;
   void functionDeriv1D(API::Jacobian *out, const double *xValues, const size_t nData) override;
 

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
@@ -102,7 +102,6 @@ class MANTID_CURVEFITTING_DLL Convolution : public API::CompositeFunction {
 
   /// overwrite IFunction base class methods
   std::string name() const override { return "Convolution"; }
-  const std::string category() const override { return "General"; }
   /// Function you want to fit to.
   void function(const API::FunctionDomain &domain, API::FunctionValues &values) const override;
   void functionFFTMode(const API::FunctionDomain &domain, API::FunctionValues &values) const;

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldFunction.h
@@ -23,7 +23,6 @@ class MANTID_CURVEFITTING_DLL CrystalFieldFunction : public API::IFunction {
 public:
   CrystalFieldFunction();
   std::string name() const override { return "CrystalFieldFunction"; }
-  const std::string category() const override { return "General"; }
   size_t getNumberDomains() const override;
   std::vector<API::IFunction_sptr> createEquivalentFunctions() const override;
   /// Evaluate the function

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldMultiSpectrum.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldMultiSpectrum.h
@@ -23,7 +23,6 @@ class MANTID_CURVEFITTING_DLL CrystalFieldMultiSpectrum : public API::FunctionGe
 
   void init() override;
   std::string name() const override { return "CrystalFieldMultiSpectrum"; }
-  const std::string category() const override { return "General"; }
   size_t getNumberDomains() const override;
   void setAttribute(const std::string &name, const Attribute &) override;
   std::vector<API::IFunction_sptr> createEquivalentFunctions() const override;

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldSpectrum.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldSpectrum.h
@@ -21,7 +21,6 @@ class MANTID_CURVEFITTING_DLL CrystalFieldSpectrum : public API::FunctionGenerat
 
   void init() override;
   std::string name() const override { return "CrystalFieldSpectrum"; }
-  const std::string category() const override { return "General"; }
   void buildTargetFunction() const override;
 
 protected:

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
@@ -36,7 +36,6 @@ class MANTID_CURVEFITTING_DLL CubicSpline : public BackgroundFunction {
 
   /// overwrite IFunction base class methods
   std::string name() const override { return "CubicSpline"; }
-  const std::string category() const override { return "Background"; }
   void function1D(double *out, const double *xValues, const size_t nData) const override;
   void derivative1D(double *out, const double *xValues, size_t nData, const size_t order) const override;
   void setParameter(size_t i, const double &value, bool explicitlySet = true) override;

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
@@ -22,8 +22,6 @@ class MANTID_CURVEFITTING_DLL FullprofPolynomial : public BackgroundFunction {
   /// Overwrite IFunction base class
   std::string name() const override { return "FullprofPolynomial"; }
 
-  const std::string category() const override { return "Background"; }
-
   void function1D(double *out, const double *xValues, const size_t nData) const override;
 
   void functionDeriv1D(API::Jacobian *out, const double *xValues, const size_t nData) override;

diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
@@ -49,7 +49,7 @@ class MANTID_CURVEFITTING_DLL PawleyParameterFunction : virtual public API::IFun
   std::string getProfileFunctionName() const { return getAttribute("ProfileFunction").asString(); }
 
   /// Returns the name of the stored function's center parameter
-  std::string getProfileFunctionCenterParameterName() const { return m_profileFunctionCenterParameterName; }
+  const std::string &getProfileFunctionCenterParameterName() const { return m_profileFunctionCenterParameterName; }
 
   void function(const API::FunctionDomain &domain, API::FunctionValues &values) const override;
   void functionDeriv(const API::FunctionDomain &domain, API::Jacobian &jacobian) override;

diff --git a/Framework/CurveFitting/src/EigenVector.cpp b/Framework/CurveFitting/src/EigenVector.cpp
@@ -273,7 +273,7 @@ void EigenVector::sort(const std::vector<size_t> &indices) {
 }
 
 /// Copy the values to an std vector of doubles
-std::vector<double> EigenVector::toStdVector() const { return m_data; }
+const std::vector<double> &EigenVector::toStdVector() const { return m_data; }
 
 /// return reference to m_data
 std::vector<double> &EigenVector::StdVectorRef() { return m_data; }

diff --git a/buildconfig/CMake/CppCheck_Suppressions.txt.in b/buildconfig/CMake/CppCheck_Suppressions.txt.in
@@ -312,22 +312,7 @@ containerOutOfBounds:${CMAKE_SOURCE_DIR}/Framework/Crystal/src/SaveHKL.cpp:607
 passedByValue:${CMAKE_SOURCE_DIR}/Framework/Crystal/src/SaveIsawPeaks.cpp:508
 constVariable:${CMAKE_SOURCE_DIR}/Framework/Crystal/src/SaveIsawUB.cpp:49
 constVariable:${CMAKE_SOURCE_DIR}/Framework/Crystal/src/SaveIsawUB.cpp:50
-constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Crystal/src/SaveLauenorm.cpp:164
-constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Crystal/src/SaveLauenorm.cpp:234
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Crystal/src/SelectCellWithForm.cpp:134
-missingOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h:61
-missingOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h:52
-returnByReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/EigenVector.h:91
-uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h:34
-uninitDerivedMemberVar:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h:28
-uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h:37
-uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h:105
-uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldFunction.h:26
-uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldMultiSpectrum.h:26
-uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CrystalFieldSpectrum.h:24
-uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h:39
-uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h:25
-returnByReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h:52
 uselessOverride:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h:64
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/Algorithms/EstimateFitParameters.cpp:214
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/CurveFitting/src/Algorithms/EstimateFitParameters.cpp:260