From 5092460b08abff4dd453762f0f5a9d8a82fe47e2 Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de> Date: Wed, 9 Nov 2022 11:15:19 +0100 Subject: [PATCH] cleanup --- GUI/Model/Job/FitParameterContainerItem.cpp | 1 - GUI/Model/Job/FitParameterItem.h | 3 ++- GUI/Model/Job/FitParameterLinkItem.cpp | 1 - GUI/Model/Model/FitParameterModel.cpp | 9 +-------- GUI/Model/Model/JobModel.cpp | 1 - 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/GUI/Model/Job/FitParameterContainerItem.cpp b/GUI/Model/Job/FitParameterContainerItem.cpp index 401a829d12a..a0a8ad4bf4e 100644 --- a/GUI/Model/Job/FitParameterContainerItem.cpp +++ b/GUI/Model/Job/FitParameterContainerItem.cpp @@ -13,7 +13,6 @@ // ************************************************************************************************ #include "GUI/Model/Job/FitParameterContainerItem.h" -#include "Base/Util/Assert.h" #include "Fit/Param/Parameters.h" #include "GUI/Model/Data/SessionData.h" #include "GUI/Model/Job/FitParameterItem.h" diff --git a/GUI/Model/Job/FitParameterItem.h b/GUI/Model/Job/FitParameterItem.h index 4ec654255ba..59e8ccf036a 100644 --- a/GUI/Model/Job/FitParameterItem.h +++ b/GUI/Model/Job/FitParameterItem.h @@ -60,7 +60,8 @@ private: RealLimits m_limits; // no need to save/load }; -//! Holds double values which can be enabled or disabled, accessible from FitparameterModel +//! Holds floating-point variables which can be enabled or disabled, accessible from +//! FitparameterModel class FitEditableDoubleItem : public FitDoubleItem { public: explicit FitEditableDoubleItem(double value, bool isEnabled, QObject* parent = nullptr); diff --git a/GUI/Model/Job/FitParameterLinkItem.cpp b/GUI/Model/Job/FitParameterLinkItem.cpp index 83242e7a086..a40d405d724 100644 --- a/GUI/Model/Job/FitParameterLinkItem.cpp +++ b/GUI/Model/Job/FitParameterLinkItem.cpp @@ -14,7 +14,6 @@ #include "GUI/Model/Job/FitParameterLinkItem.h" #include "GUI/Support/XML/UtilXML.h" -#include <QXmlStreamWriter> namespace { diff --git a/GUI/Model/Model/FitParameterModel.cpp b/GUI/Model/Model/FitParameterModel.cpp index 1631c416fad..88d864ec97b 100644 --- a/GUI/Model/Model/FitParameterModel.cpp +++ b/GUI/Model/Model/FitParameterModel.cpp @@ -16,19 +16,12 @@ #include "GUI/Model/Job/FitParameterContainerItem.h" #include "GUI/Model/Job/FitParameterItem.h" #include "GUI/Model/Job/FitParameterLinkItem.h" +#include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Model/FitParameterHelper.h" -#include "GUI/Model/Model/JobModel.h" -#include "GUI/Model/Model/ModelPath.h" #include "GUI/Model/Model/SessionXML.h" -#include "GUI/Util/ComboProperty.h" -#include "GUI/Util/Error.h" #include <QColor> #include <QMimeData> -#include <boost/polymorphic_cast.hpp> - -using boost::polymorphic_downcast; - FitParameterModel::FitParameterModel(FitParameterContainerItem* fitParContainer, JobItem* jobItem) : QAbstractItemModel(jobItem) , m_fitParameterContainer(fitParContainer) diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp index 80360a6d9f6..0da52237c37 100644 --- a/GUI/Model/Model/JobModel.cpp +++ b/GUI/Model/Model/JobModel.cpp @@ -15,7 +15,6 @@ #include "GUI/Model/Model/JobModel.h" #include "GUI/Model/Data/RealItem.h" #include "GUI/Model/Device/InstrumentItems.h" -#include "GUI/Model/Device/PointwiseAxisItem.h" #include "GUI/Model/Job/FitSuiteItem.h" #include "GUI/Model/Job/ParameterTreeItems.h" #include "GUI/Model/Model/ParameterTreeUtils.h" -- GitLab