From 6d901fc9532742a71d9d95579e24da100e486715 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Wed, 29 Nov 2023 18:54:15 +0100
Subject: [PATCH] recommended by clang-tidy
---
GUI/Model/Data/DataItem.cpp | 6 +++---
GUI/Model/Data/DataItem.h | 6 +++---
GUI/Model/Descriptor/DistributionItems.cpp | 2 --
GUI/Model/Descriptor/VectorProperty.cpp | 2 --
GUI/Model/Detector/DetectorItem.cpp | 4 +---
GUI/Model/Job/FitParameterContainerItem.cpp | 8 ++++----
GUI/Model/Job/FitParameterContainerItem.h | 6 +++---
7 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp
index 752a1ba9877..665e1e50cbf 100644
--- a/GUI/Model/Data/DataItem.cpp
+++ b/GUI/Model/Data/DataItem.cpp
@@ -166,19 +166,19 @@ void DataItem::setYrange(double lower, double upper)
emit itemAxesRangeChanged();
}
-void DataItem::checkXranges(DataItem* sourceItem)
+void DataItem::checkXranges(DataItem* sourceItem) const
{
if (xSize() != sourceItem->xSize())
throw std::runtime_error("Data and simulation have different number of x bins");
}
-void DataItem::checkYranges(DataItem* sourceItem)
+void DataItem::checkYranges(DataItem* sourceItem) const
{
if (ySize() != sourceItem->ySize())
throw std::runtime_error("Data and simulation have different number of x bins");
}
-void DataItem::checkXYranges(DataItem* sourceItem)
+void DataItem::checkXYranges(DataItem* sourceItem) const
{
checkXranges(sourceItem);
checkYranges(sourceItem);
diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h
index aa5a8988938..4960a5284c7 100644
--- a/GUI/Model/Data/DataItem.h
+++ b/GUI/Model/Data/DataItem.h
@@ -84,9 +84,9 @@ public:
void setYrange(double lower, double upper);
// Adjust zoom range of this item to the other items range
- void checkXranges(DataItem* sourceItem);
- void checkYranges(DataItem* sourceItem);
- void checkXYranges(DataItem* sourceItem);
+ void checkXranges(DataItem* sourceItem) const;
+ void checkYranges(DataItem* sourceItem) const;
+ void checkXYranges(DataItem* sourceItem) const;
const BasicAxisItem* axItemX() const;
BasicAxisItem* axItemX();
diff --git a/GUI/Model/Descriptor/DistributionItems.cpp b/GUI/Model/Descriptor/DistributionItems.cpp
index 583cc18b5a5..54d20b8d733 100644
--- a/GUI/Model/Descriptor/DistributionItems.cpp
+++ b/GUI/Model/Descriptor/DistributionItems.cpp
@@ -38,8 +38,6 @@ const QString BaseData("BaseData");
} // namespace Tag
} // namespace
-using std::variant;
-
DistributionItem::DistributionItem() = default;
void DistributionItem::initRelSamplingWidth()
diff --git a/GUI/Model/Descriptor/VectorProperty.cpp b/GUI/Model/Descriptor/VectorProperty.cpp
index a1c616b6fa6..fadc1e541c5 100644
--- a/GUI/Model/Descriptor/VectorProperty.cpp
+++ b/GUI/Model/Descriptor/VectorProperty.cpp
@@ -26,8 +26,6 @@ const QString Z("Z");
} // namespace Tag
} // namespace
-using std::variant;
-
void VectorProperty::init(const QString& label, const QString& tooltip, const QString& uidPrefix)
{
init(label, tooltip, R3(), 3, 0.01, RealLimits::limitless(), uidPrefix);
diff --git a/GUI/Model/Detector/DetectorItem.cpp b/GUI/Model/Detector/DetectorItem.cpp
index 219c6716ef4..d3f5081451c 100644
--- a/GUI/Model/Detector/DetectorItem.cpp
+++ b/GUI/Model/Detector/DetectorItem.cpp
@@ -24,8 +24,6 @@
#include "GUI/Model/Mask/MaskItems.h"
#include "GUI/Support/XML/Backup.h"
-using Units::deg;
-
namespace {
namespace Tag {
@@ -90,7 +88,7 @@ std::unique_ptr<IDetector> DetectorItem::createDetector() const
void DetectorItem::importMasks(const MaskContainerItem* item)
{
ASSERT(item);
- m_maskContainerItem.reset(new MaskContainerItem);
+ m_maskContainerItem = std::make_unique<MaskContainerItem>();
GUI::Util::copyContents(item, m_maskContainerItem.get());
}
diff --git a/GUI/Model/Job/FitParameterContainerItem.cpp b/GUI/Model/Job/FitParameterContainerItem.cpp
index a1d6cadf936..732cdd67fb3 100644
--- a/GUI/Model/Job/FitParameterContainerItem.cpp
+++ b/GUI/Model/Job/FitParameterContainerItem.cpp
@@ -105,7 +105,7 @@ FitParameterContainerItem::fitParameterItem(const ParameterItem* parameterItem)
QVector<FitParameterItem*> FitParameterContainerItem::fitParameterItems() const
{
- return QVector<FitParameterItem*>(m_fitParameterItems.begin(), m_fitParameterItems.end());
+ return {m_fitParameterItems.begin(), m_fitParameterItems.end()};
}
QStringList FitParameterContainerItem::fitParameterNames() const
@@ -116,7 +116,7 @@ QStringList FitParameterContainerItem::fitParameterNames() const
return result;
}
-void FitParameterContainerItem::removeLink(const ParameterItem* parameterItem)
+void FitParameterContainerItem::removeLink(const ParameterItem* parameterItem) const
{
if (FitParameterItem* fitParItem = fitParameterItem(parameterItem))
fitParItem->removeLink(parameterItem->link());
@@ -130,7 +130,7 @@ FitParameterItem* FitParameterContainerItem::createBareFitParameterItem()
return fitPar;
}
-bool FitParameterContainerItem::isEmpty()
+bool FitParameterContainerItem::isEmpty() const
{
return fitParameterItems().isEmpty();
}
@@ -138,7 +138,7 @@ bool FitParameterContainerItem::isEmpty()
//! Propagate values to the corresponding parameter tree items of parameterContainer.
void FitParameterContainerItem::setValuesInParameterContainer(
- const std::vector<double>& values, ParameterContainerItem* parameterContainer)
+ const std::vector<double>& values, ParameterContainerItem* parameterContainer) const
{
ASSERT(parameterContainer);
diff --git a/GUI/Model/Job/FitParameterContainerItem.h b/GUI/Model/Job/FitParameterContainerItem.h
index 4cd7fbb1d53..feba4747ada 100644
--- a/GUI/Model/Job/FitParameterContainerItem.h
+++ b/GUI/Model/Job/FitParameterContainerItem.h
@@ -57,13 +57,13 @@ public:
//! Returns list of fit parameter display names
QStringList fitParameterNames() const;
- void removeLink(const ParameterItem* parameterItem);
+ void removeLink(const ParameterItem* parameterItem) const;
FitParameterItem* createBareFitParameterItem();
- bool isEmpty();
+ bool isEmpty() const;
void setValuesInParameterContainer(const std::vector<double>& values,
- class ParameterContainerItem* parameterContainer);
+ class ParameterContainerItem* parameterContainer) const;
void pullValuesFromParameterContainer(class ParameterContainerItem* parameterContainer);
mumufit::Parameters createParameters() const;
--
GitLab