From 683535620108dc3bcefb5383ce4bf11f405bac5c Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Thu, 30 Nov 2023 08:04:28 +0100
Subject: [PATCH] tidy/modernize-pass-by-value
---
GUI/Model/Data/DataItem.cpp | 5 +++--
GUI/Model/Data/DataItem.h | 2 +-
GUI/Model/Job/FitParameterItem.cpp | 5 +++--
GUI/Model/Job/FitParameterItem.h | 2 +-
GUI/Model/Job/ParameterBackup.cpp | 5 +++--
GUI/Model/Job/ParameterBackup.h | 2 +-
GUI/Model/Job/ParameterTreeItems.cpp | 5 +++--
GUI/Model/Job/ParameterTreeItems.h | 2 +-
Tests/Functional/Mumufit/ResidualTestPlan.cpp | 3 ++-
Tests/Functional/Mumufit/ScalarTestPlan.cpp | 3 ++-
10 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp
index 665e1e50cbf..cfd3ef5e9ca 100644
--- a/GUI/Model/Data/DataItem.cpp
+++ b/GUI/Model/Data/DataItem.cpp
@@ -22,6 +22,7 @@
#include "GUI/Support/Util/MessageService.h"
#include "GUI/Support/XML/UtilXML.h"
#include <QFile>
+#include <utility>
namespace {
namespace Tag {
@@ -35,8 +36,8 @@ const QString YAxis("YAxis");
} // namespace
-DataItem::DataItem(const QString& modelType)
- : TYPE(modelType)
+DataItem::DataItem(QString modelType)
+ : TYPE(std::move(modelType))
, m_fname("undefined")
, m_xAxis(std::make_unique<BasicAxisItem>())
, m_yAxis(std::make_unique<AmplitudeAxisItem>())
diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index 4960a5284c7..8196f390c76 100644
--- a/GUI/Model/Data/DataItem.h
+++ b/GUI/Model/Data/DataItem.h
@@ -34,7 +34,7 @@ class MessageService;
class DataItem : public QObject {
Q_OBJECT
protected:
- explicit DataItem(const QString& modelType);
+ explicit DataItem(QString modelType);
public:
~DataItem();
diff --git a/GUI/Model/Job/FitParameterItem.cpp b/GUI/Model/Job/FitParameterItem.cpp
index 14537de50f7..476afa47bf5 100644
--- a/GUI/Model/Job/FitParameterItem.cpp
+++ b/GUI/Model/Job/FitParameterItem.cpp
@@ -16,6 +16,7 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitParameterLinkItem.h"
#include "GUI/Support/XML/UtilXML.h"
+#include <utility>
namespace {
namespace Tag {
@@ -34,9 +35,9 @@ const QString BaseData("BaseData");
} // namespace Tag
} // namespace
-FitTypeItem::FitTypeItem(const ComboProperty& type, QObject* parent)
+FitTypeItem::FitTypeItem(ComboProperty type, QObject* parent)
: QObject(parent)
- , m_type(type)
+ , m_type(std::move(type))
{
setObjectName("Type");
}
diff --git a/GUI/Model/Job/FitParameterItem.h b/GUI/Model/Job/FitParameterItem.h
index c6af7789c3b..a5d580e02d9 100644
--- a/GUI/Model/Job/FitParameterItem.h
+++ b/GUI/Model/Job/FitParameterItem.h
@@ -25,7 +25,7 @@ class FitParameterLinkItem;
class FitTypeItem : public QObject {
Q_OBJECT
public:
- explicit FitTypeItem(const ComboProperty& type, QObject* parent = nullptr);
+ explicit FitTypeItem(ComboProperty type, QObject* parent = nullptr);
const ComboProperty& type() const { return m_type; }
void setType(const ComboProperty& c) { m_type = c; }
diff --git a/GUI/Model/Job/ParameterBackup.cpp b/GUI/Model/Job/ParameterBackup.cpp
index bc4b0c29343..ae3ffef4bad 100644
--- a/GUI/Model/Job/ParameterBackup.cpp
+++ b/GUI/Model/Job/ParameterBackup.cpp
@@ -14,6 +14,7 @@
#include "GUI/Model/Job/ParameterBackup.h"
#include "GUI/Support/XML/UtilXML.h"
+#include <utility>
namespace {
namespace Tag {
@@ -25,8 +26,8 @@ const QString BackupValue("BackupValue");
} // namespace Tag
} // namespace
-ParameterBackup::ParameterBackup(const QString& title)
- : m_title(title)
+ParameterBackup::ParameterBackup(QString title)
+ : m_title(std::move(title))
{
}
diff --git a/GUI/Model/Job/ParameterBackup.h b/GUI/Model/Job/ParameterBackup.h
index 72396e57e8e..5b48308d0f9 100644
--- a/GUI/Model/Job/ParameterBackup.h
+++ b/GUI/Model/Job/ParameterBackup.h
@@ -22,7 +22,7 @@
class ParameterBackup {
public:
- ParameterBackup(const QString& title = "");
+ ParameterBackup(QString title = "");
QString title() const { return m_title; }
void setTitle(const QString& title) { m_title = title; }
diff --git a/GUI/Model/Job/ParameterTreeItems.cpp b/GUI/Model/Job/ParameterTreeItems.cpp
index f9b5b1f683e..3c923c5aa62 100644
--- a/GUI/Model/Job/ParameterTreeItems.cpp
+++ b/GUI/Model/Job/ParameterTreeItems.cpp
@@ -15,6 +15,7 @@
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "Base/Util/Assert.h"
#include "GUI/Support/XML/UtilXML.h"
+#include <utility>
namespace {
namespace Tag {
@@ -49,9 +50,9 @@ ParameterItem* findParameterItem(QObject* item, const QString& link)
// class ParameterLabelItem
// ************************************************************************************************
-ParameterLabelItem::ParameterLabelItem(const QString& title, QObject* parent)
+ParameterLabelItem::ParameterLabelItem(QString title, QObject* parent)
: QObject(parent)
- , m_title(title)
+ , m_title(std::move(title))
{
}
diff --git a/GUI/Model/Job/ParameterTreeItems.h b/GUI/Model/Job/ParameterTreeItems.h
index ead125bf52d..21f2591982e 100644
--- a/GUI/Model/Job/ParameterTreeItems.h
+++ b/GUI/Model/Job/ParameterTreeItems.h
@@ -31,7 +31,7 @@
class ParameterLabelItem : public QObject {
Q_OBJECT
public:
- ParameterLabelItem(const QString& title, QObject* parent);
+ ParameterLabelItem(QString title, QObject* parent);
QString title() const { return m_title; }
void setTitle(const QString& title) { m_title = title; }
diff --git a/Tests/Functional/Mumufit/ResidualTestPlan.cpp b/Tests/Functional/Mumufit/ResidualTestPlan.cpp
index 00a7341e2aa..70b630aa22c 100644
--- a/Tests/Functional/Mumufit/ResidualTestPlan.cpp
+++ b/Tests/Functional/Mumufit/ResidualTestPlan.cpp
@@ -16,11 +16,12 @@
#include "Fit/Kernel/Minimizer.h"
#include <cassert>
#include <iostream>
+#include <utility>
using namespace mumufit;
ResidualTestPlan::ResidualTestPlan(const std::string&, test_funct_t func)
- : m_test_func(func)
+ : m_test_func(std::move(func))
{
m_xvalues.resize(101);
for (int i = 0; i <= 100; ++i)
diff --git a/Tests/Functional/Mumufit/ScalarTestPlan.cpp b/Tests/Functional/Mumufit/ScalarTestPlan.cpp
index b16512e6bcd..1e1570f8079 100644
--- a/Tests/Functional/Mumufit/ScalarTestPlan.cpp
+++ b/Tests/Functional/Mumufit/ScalarTestPlan.cpp
@@ -17,12 +17,13 @@
#include <cmath>
#include <iostream>
#include <sstream>
+#include <utility>
using namespace mumufit;
ScalarTestPlan::ScalarTestPlan(const std::string&, scalar_function_t func, double expected_minimum,
double tolerance)
- : m_objective_function(func)
+ : m_objective_function(std::move(func))
, m_expected_minimum(expected_minimum)
, m_tolerance_on_minimum(tolerance)
{
--
GitLab