diff --git a/buildconfig/CMake/CppCheck_Suppressions.txt.in b/buildconfig/CMake/CppCheck_Suppressions.txt.in index 1c61c77af22a..ba6b5267a94a 100644 --- a/buildconfig/CMake/CppCheck_Suppressions.txt.in +++ b/buildconfig/CMake/CppCheck_Suppressions.txt.in @@ -881,21 +881,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 index 7cb8c8edace1..aed2d119054c 100644 --- 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 index 2d451eec74d9..7b329adb1aad 100644 --- 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 index 0a3c0c0138b4..6a9cb1c9aac6 100644 --- a/qt/scientific_interfaces/Inelastic/QENSFitting/ConvolutionModel.h +++ b/qt/scientific_interfaces/Inelastic/QENSFitting/ConvolutionModel.h @@ -18,7 +18,7 @@ using ExtendedResolutionType = IndexCollectionType; class MANTIDQT_INELASTIC_DLL ConvolutionModel : public FittingModel { public: ConvolutionModel(); - ~ConvolutionModel() = default; + ~ConvolutionModel() override = default; std::optional getInstrumentResolution(WorkspaceID workspaceID) const; diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/FittingModel.h b/qt/scientific_interfaces/Inelastic/QENSFitting/FittingModel.h index 1c318d879ead..c938642779cf 100644 --- 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/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.cpp b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.cpp index bfcc88ac30c3..287b0bd0fd57 100644 --- a/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.cpp +++ b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.cpp @@ -63,7 +63,7 @@ void SingleFunctionTemplateModel::updateAvailableFunctions( m_fitType = m_fitTypeList.front(); } -std::vector SingleFunctionTemplateModel::getFunctionList() { return m_fitTypeList; } +const std::vector &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 &x, const std::vector &y, diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.h b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateModel.h index 534833418759..c95eec555835 100644 --- 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 &functionInitialisationStrings); void setFitType(const std::string &name); - std::string getFitType(); - std::vector getFunctionList(); + const std::string &getFitType(); + const std::vector &getFunctionList(); int getEnumIndex(); void setGlobal(std::string const ¶meterName, bool isGlobal) override; diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateView.h b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/SingleFunctionTemplateView.h index 52583ad2db25..35b2ea5d67e8 100644 --- 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 ¶meterNames) override; void setGlobalParametersQuiet(std::vector const &globals) override; diff --git a/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/TemplateSubType.h b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/TemplateSubType.h index 5f3398b350c8..b2ee41616d0f 100644 --- a/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/TemplateSubType.h +++ b/qt/scientific_interfaces/Inelastic/QENSFitting/FunctionBrowser/TemplateSubType.h @@ -94,7 +94,7 @@ template 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 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 index c438877cdc91..0e59d1488663 100644 --- 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(tempSample)) { out << tempSampleTimeSeries->timeAverageValue(&timeroi); @@ -891,7 +891,7 @@ bool isReloadGroupingNecessary(const std::shared_ptr &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 index 17bce17ef0cc..3a9f977a9cf1 100644 --- 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 createHints() override { std::vector 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 index 8960e10fb398..5c2adf3adc88 100644 --- 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/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h index 83bc4ae31316..4faa8481ce87 100644 --- a/qt/widgets/common/inc/MantidQtWidgets/Common/AlgorithmProgress/AlgorithmProgressDialogPresenter.h +++ b/qt/widgets/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;