Fix cppcheck warnings suppression set 64

mantidproject · Jan 29, 2025 · 29c19cd · 29c19cd
1 parent 6d8fd5e
commit 29c19cd
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 37 deletions.
diff --git a/buildconfig/CMake/CppCheck_Suppressions.txt.in b/buildconfig/CMake/CppCheck_Suppressions.txt.in
@@ -942,21 +942,6 @@ returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Indirect/Reductio
 returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferData.h:158
 returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferData.h:193
 returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferData.h:199
-returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferData.h:218
-missingOverride:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferModel.h:51
-missingOverride:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Inelastic/QENSFitting/ConvolutionModel.h:21
-missingOverride:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Inelastic/QENSFitting/FittingModel.h:47
-returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Inelastic/QENSFitting/FittingModel.h:99
-returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.h:38
-returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.h:39
-missingOverride:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateView.h:32
-returnByReference:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/TemplateSubType.h:97
-constVariablePointer:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp:189
-constVariablePointer:${CMAKE_SOURCE_DIR}/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp:894
-constParameterPointer:${CMAKE_SOURCE_DIR}/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h:37
-constParameterPointer:${CMAKE_SOURCE_DIR}/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h:42
-missingOverride:${CMAKE_SOURCE_DIR}/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmInputHistory.h:29
-virtualCallInConstructor:${CMAKE_SOURCE_DIR}/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h:34
 passedByValue:${CMAKE_SOURCE_DIR}/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h:35
 returnByReference:${CMAKE_SOURCE_DIR}/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmPropertiesWidget.h:50
 returnByReference:${CMAKE_SOURCE_DIR}/qt/widgets/common/inc/MantidQtWidgets/Common/BatchAlgorithmRunner.h:73

diff --git a/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferData.h b/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferData.h
@@ -215,7 +215,7 @@ class IETPlotData {
               const IETBackgroundData &backgroundData)
       : m_inputData(inputData), m_conversionData(conversionData), m_backgroundData(backgroundData) {}
 
-  IETInputData getInputData() const { return m_inputData; }
+  const IETInputData &getInputData() const { return m_inputData; }
   IETConversionData getConversionData() const { return m_conversionData; }
   IETBackgroundData getBackgroundData() const { return m_backgroundData; }
 

diff --git a/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferModel.h b/qt/scientific_interfaces/Indirect/Reduction/ISISEnergyTransferModel.h
@@ -48,7 +48,7 @@ class MANTIDQT_INDIRECT_DLL IIETModel {
 class MANTIDQT_INDIRECT_DLL IETModel : public IIETModel {
 public:
   IETModel();
-  ~IETModel() = default;
+  ~IETModel() override = default;
 
   void setInstrumentProperties(IAlgorithmRuntimeProps &properties, InstrumentData const &instData) override;
 

diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/ConvolutionModel.h b/qt/scientific_interfaces/Inelastic/QENSFitting/ConvolutionModel.h
@@ -18,7 +18,7 @@ using ExtendedResolutionType = IndexCollectionType<WorkspaceID, std::string>;
 class MANTIDQT_INELASTIC_DLL ConvolutionModel : public FittingModel {
 public:
   ConvolutionModel();
-  ~ConvolutionModel() = default;
+  ~ConvolutionModel() override = default;
 
   std::optional<double> getInstrumentResolution(WorkspaceID workspaceID) const;
 

diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/FittingModel.h b/qt/scientific_interfaces/Inelastic/QENSFitting/FittingModel.h
@@ -44,7 +44,7 @@ static const std::string MULTI_STRING = "Multi";
 class MANTIDQT_INELASTIC_DLL FittingModel : public IFittingModel {
 public:
   FittingModel();
-  virtual ~FittingModel() = default;
+  virtual ~FittingModel() override = default;
 
   void validate(IUserInputValidator *validator) const override;
 
@@ -96,7 +96,7 @@ class MANTIDQT_INELASTIC_DLL FittingModel : public IFittingModel {
   IFitPlotModel *getFitPlotModel() const override;
 
   // Used for testing purposes
-  [[nodiscard]] inline std::string getFitString() const noexcept { return m_fitString; }
+  [[nodiscard]] const inline std::string &getFitString() const noexcept { return m_fitString; }
 
 protected:
   std::string createOutputName(const std::string &fitMode, const std::string &workspaceName,

diff --git a/...ientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.cpp b/...ientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.cpp
@@ -63,7 +63,7 @@ void SingleFunctionTemplateModel::updateAvailableFunctions(
   m_fitType = m_fitTypeList.front();
 }
 
-std::vector<std::string> SingleFunctionTemplateModel::getFunctionList() { return m_fitTypeList; }
+const std::vector<std::string> &SingleFunctionTemplateModel::getFunctionList() { return m_fitTypeList; }
 
 int SingleFunctionTemplateModel::getEnumIndex() {
   auto const findIter = std::find(m_fitTypeList.cbegin(), m_fitTypeList.cend(), m_fitType);
@@ -100,7 +100,7 @@ void SingleFunctionTemplateModel::setFitType(const std::string &type) {
   estimateFunctionParameters();
 }
 
-std::string SingleFunctionTemplateModel::getFitType() { return m_fitType; }
+const std::string &SingleFunctionTemplateModel::getFitType() { return m_fitType; }
 
 EstimationDataSelector SingleFunctionTemplateModel::getEstimationDataSelector() const {
   return [](const std::vector<double> &x, const std::vector<double> &y,

diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.h b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.h
@@ -35,8 +35,8 @@ class MANTIDQT_INELASTIC_DLL SingleFunctionTemplateModel : public FunctionModel
   void updateAvailableFunctions(const std::map<std::string, std::string> &functionInitialisationStrings);
 
   void setFitType(const std::string &name);
-  std::string getFitType();
-  std::vector<std::string> getFunctionList();
+  const std::string &getFitType();
+  const std::vector<std::string> &getFunctionList();
   int getEnumIndex();
   void setGlobal(std::string const &parameterName, bool isGlobal) override;
 

diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateView.h b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateView.h
@@ -29,7 +29,7 @@ class MANTIDQT_INELASTIC_DLL SingleFunctionTemplateView : public FunctionTemplat
   Q_OBJECT
 public:
   explicit SingleFunctionTemplateView(TemplateBrowserCustomizations customizations);
-  virtual ~SingleFunctionTemplateView() = default;
+  virtual ~SingleFunctionTemplateView() override = default;
 
   void updateParameterNames(const std::map<int, std::string> &parameterNames) override;
   void setGlobalParametersQuiet(std::vector<std::string> const &globals) override;

diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/TemplateSubType.h b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/TemplateSubType.h
@@ -94,7 +94,7 @@ template <class Type> struct TemplateSubTypeImpl : public TemplateSubType {
     return descriptions;
   }
 
-  std::string getFunctionName(Type type) const { return g_typeMap[type].function; }
+  const std::string &getFunctionName(Type type) const { return g_typeMap[type].function; }
 
   void applyToType(Type type, std::function<void(ParamID)> paramFun) const {
     applyToParamIDRange(g_typeMap[type].blocks.front(), g_typeMap[type].blocks.back(), paramFun);

diff --git a/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp b/qt/scientific_interfaces/Muon/MuonAnalysisHelper.cpp
@@ -186,7 +186,7 @@ void printRunInfo(const MatrixWorkspace_sptr &runWs, std::ostringstream &out) {
   if (run.hasProperty("Temp_Sample")) {
     // Filter the temperatures by the start and end times for the run.
     Mantid::Kernel::TimeROI timeroi(start, end);
-    auto tempSample = run.getProperty("Temp_Sample");
+    const auto *tempSample = run.getProperty("Temp_Sample");
 
     if (const auto *tempSampleTimeSeries = dynamic_cast<const ITimeSeriesProperty *>(tempSample)) {
       out << tempSampleTimeSeries->timeAverageValue(&timeroi);
@@ -891,7 +891,7 @@ bool isReloadGroupingNecessary(const std::shared_ptr<Mantid::API::Workspace> &cu
   // Check if field direction has changed, even if instrument hasn't
   // (e.g. MUSR - same instrument can have different field directions)
   if (!reloadNecessary) {
-    Mantid::Kernel::Property *loadedField = nullptr, *currentField = nullptr;
+    const Mantid::Kernel::Property *loadedField = nullptr, *currentField = nullptr;
     try {
       loadedField = loadedData->run().getLogData("main_field_direction");
       currentField = currentData->run().getLogData("main_field_direction");

diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmHintStrategy.h
@@ -32,14 +32,16 @@ class AlgorithmHintStrategy : public HintStrategy {
   std::vector<Hint> createHints() override {
     std::vector<Hint> hints;
     auto properties = m_algorithm->getProperties();
-    properties.erase(
-        std::remove_if(properties.begin(), properties.end(),
-                       [this](Mantid::Kernel::Property *property) -> bool { return isBlacklisted(property->name()); }),
-        properties.end());
+    properties.erase(std::remove_if(properties.begin(), properties.end(),
+                                    [this](const Mantid::Kernel::Property *property) -> bool {
+                                      return isBlacklisted(property->name());
+                                    }),
+                     properties.end());
     hints.reserve(properties.size());
-    std::transform(
-        properties.cbegin(), properties.cend(), std::back_inserter(hints),
-        [](Mantid::Kernel::Property *property) -> Hint { return Hint(property->name(), property->documentation()); });
+    std::transform(properties.cbegin(), properties.cend(), std::back_inserter(hints),
+                   [](const Mantid::Kernel::Property *property) -> Hint {
+                     return Hint(property->name(), property->documentation());
+                   });
 
     return hints;
   }

diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmInputHistory.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmInputHistory.h
@@ -26,7 +26,7 @@ class EXPORT_OPT_MANTIDQT_COMMON AbstractAlgorithmInputHistory : public MantidWi
   AbstractAlgorithmInputHistory(const AbstractAlgorithmInputHistory &) = delete;
   AbstractAlgorithmInputHistory &operator=(const AbstractAlgorithmInputHistory &) = delete;
   /// Abstract destructor
-  virtual ~AbstractAlgorithmInputHistory() = 0;
+  virtual ~AbstractAlgorithmInputHistory() override = 0;
 
   /// Update the old values that are stored here. Only valid
   /// values are stored here

diff --git a/...ts/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h b/...ts/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h
@@ -31,7 +31,7 @@ class EXPORT_OPT_MANTIDQT_COMMON AlgorithmProgressDialogPresenter : public Algor
   AlgorithmProgressDialogPresenter(QWidget *parent, IAlgorithmProgressDialogWidget *view,
                                    AlgorithmProgressModel &model);
 
-  void algorithmStartedSlot(Mantid::API::AlgorithmID) override;
+  void algorithmStartedSlot(Mantid::API::AlgorithmID) override final;
   void updateProgressBarSlot(Mantid::API::AlgorithmID, const double progress, const QString message,
                              const double estimatedTime, const int progressPrecision) override;
   void algorithmEndedSlot(Mantid::API::AlgorithmID) override;