From baf4270a573397b5d040f725b5303f8561407cd5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 30 Nov 2023 08:30:42 +0100
Subject: [PATCH] tidy/readability-redundant-member-init + manual correction
---
Device/Beam/Beam.cpp | 3 +--
Device/Detector/IDetector.cpp | 3 +--
GUI/Model/Mask/MaskItems.cpp | 1 -
GUI/Model/Model/FitParameterModel.cpp | 3 +--
GUI/Model/Sample/MaterialItem.cpp | 3 +--
GUI/View/Sample/HeinzFormLayout.cpp | 3 +--
Sim/Fitting/ObjectiveMetric.cpp | 15 +++------------
7 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/Device/Beam/Beam.cpp b/Device/Beam/Beam.cpp
index 2b9e176c66d..739018a9920 100644
--- a/Device/Beam/Beam.cpp
+++ b/Device/Beam/Beam.cpp
@@ -24,8 +24,7 @@ using std::numbers::pi;
//... Constructors, destructors:
Beam::Beam(double intensity, double wavelength, double alpha, double phi)
- : INode()
- , m_intensity(intensity)
+ : m_intensity(intensity)
, m_wavelength(wavelength)
, m_alpha(alpha)
, m_phi(phi)
diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp
index dee16f00e66..ed6451990cf 100644
--- a/Device/Detector/IDetector.cpp
+++ b/Device/Detector/IDetector.cpp
@@ -76,8 +76,7 @@ IDetector::IDetector(Frame* frame)
}
IDetector::IDetector(const IDetector& other)
- : INode()
- , m_explicitROI(other.m_explicitROI)
+ : m_explicitROI(other.m_explicitROI)
, m_frame(other.m_frame->clone())
, m_polAnalyzer(other.m_polAnalyzer)
, m_resolution(other.m_resolution ? other.m_resolution->clone() : nullptr)
diff --git a/GUI/Model/Mask/MaskItems.cpp b/GUI/Model/Mask/MaskItems.cpp
index 86b47f0122b..dd866f8e6dc 100644
--- a/GUI/Model/Mask/MaskItems.cpp
+++ b/GUI/Model/Mask/MaskItems.cpp
@@ -262,7 +262,6 @@ void RectangleItem::readFrom(QXmlStreamReader* r)
/* ------------------------------------------------------------------------- */
RegionOfInterestItem::RegionOfInterestItem()
- : RectangleItem()
{
setMaskName("RegionOfInterest");
setMaskValue(false);
diff --git a/GUI/Model/Model/FitParameterModel.cpp b/GUI/Model/Model/FitParameterModel.cpp
index 427e7a66bd8..7c747f3f907 100644
--- a/GUI/Model/Model/FitParameterModel.cpp
+++ b/GUI/Model/Model/FitParameterModel.cpp
@@ -21,8 +21,7 @@
#include <QMimeData>
FitParameterModel::FitParameterModel(FitParameterContainerItem* fitParContainer, JobItem* jobItem)
- : QAbstractItemModel()
- , m_fitParameterContainer(fitParContainer)
+ : m_fitParameterContainer(fitParContainer)
, m_jobItem(jobItem)
{
addColumn(COL_NAME, "Name", "Name of fit parameter");
diff --git a/GUI/Model/Sample/MaterialItem.cpp b/GUI/Model/Sample/MaterialItem.cpp
index 1a6177069c6..b6636aa28c7 100644
--- a/GUI/Model/Sample/MaterialItem.cpp
+++ b/GUI/Model/Sample/MaterialItem.cpp
@@ -55,8 +55,7 @@ MaterialItem::MaterialItem()
}
MaterialItem::MaterialItem(const MaterialItem& other)
- : QObject()
- , m_name(other.m_name)
+ : m_name(other.m_name)
, m_id(other.m_id)
, m_color(other.m_color)
, m_magnetization(other.m_magnetization)
diff --git a/GUI/View/Sample/HeinzFormLayout.cpp b/GUI/View/Sample/HeinzFormLayout.cpp
index 80c511789a4..ca9600501a8 100644
--- a/GUI/View/Sample/HeinzFormLayout.cpp
+++ b/GUI/View/Sample/HeinzFormLayout.cpp
@@ -37,8 +37,7 @@ QLabel* createBoldLabel(const QString& text)
HeinzFormLayout::HeinzFormLayout(SampleEditorController* ec)
- : QFormLayout()
- , m_ec(ec)
+ : m_ec(ec)
{
QFormLayout::setFormAlignment(Qt::AlignLeft | Qt::AlignBottom);
QFormLayout::setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
diff --git a/Sim/Fitting/ObjectiveMetric.cpp b/Sim/Fitting/ObjectiveMetric.cpp
index 8b0151c6600..03350fb2404 100644
--- a/Sim/Fitting/ObjectiveMetric.cpp
+++ b/Sim/Fitting/ObjectiveMetric.cpp
@@ -121,10 +121,7 @@ double Chi2Metric::computeFromArrays(std::vector<double> sim_data,
// ----------------------- Poisson-like metric ---------------------------
-PoissonLikeMetric::PoissonLikeMetric()
- : Chi2Metric()
-{
-}
+PoissonLikeMetric::PoissonLikeMetric() {}
PoissonLikeMetric* PoissonLikeMetric::clone() const
{
@@ -201,10 +198,7 @@ double LogMetric::computeFromArrays(std::vector<double> sim_data,
// ----------------------- Relative difference ---------------------------
-meanRelativeDifferenceMetric::meanRelativeDifferenceMetric()
- : Chi2Metric()
-{
-}
+meanRelativeDifferenceMetric::meanRelativeDifferenceMetric() {}
meanRelativeDifferenceMetric* meanRelativeDifferenceMetric::clone() const
{
@@ -231,10 +225,7 @@ double meanRelativeDifferenceMetric::computeFromArrays(std::vector<double> sim_d
// ----------------------- RQ4 metric ---------------------------
-RQ4Metric::RQ4Metric()
- : Chi2Metric()
-{
-}
+RQ4Metric::RQ4Metric() {}
RQ4Metric* RQ4Metric::clone() const
{
--
GitLab