From 0faf2aacb1fddcb511eb7bdcb81dffb614036be9 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Thu, 7 Mar 2024 17:20:29 +0100 Subject: [PATCH] no need to include QXmlStreamWriter, provided by QXmlStreamReader --- GUI/Model/Axis/BasicAxisItem.h | 1 - GUI/Model/Data/DataItem.h | 1 - GUI/Model/Device/InstrumentsSet.h | 2 +- GUI/Model/Files/DatafileItem.h | 1 - GUI/Model/Files/DatafilesSet.h | 1 - GUI/Model/Job/BatchInfo.h | 1 - GUI/Model/Job/JobsSet.h | 1 - GUI/Model/Mask/MasksSet.h | 2 +- GUI/Model/Sample/ItemWithMaterial.h | 2 +- GUI/Model/Sample/SampleItem.cpp | 1 - GUI/Model/Tune/FitParameterContainerItem.h | 1 - GUI/Model/Tune/FitParameterLinkItem.h | 1 - GUI/Support/Data/ComboProperty.h | 1 - GUI/Support/Data/SimulationOptionsItem.h | 2 +- GUI/Support/XML/Backup.h | 2 +- GUI/Support/XML/UtilXML.h | 2 +- 16 files changed, 6 insertions(+), 16 deletions(-) diff --git a/GUI/Model/Axis/BasicAxisItem.h b/GUI/Model/Axis/BasicAxisItem.h index 5e158e809ce..229079c89ab 100644 --- a/GUI/Model/Axis/BasicAxisItem.h +++ b/GUI/Model/Axis/BasicAxisItem.h @@ -17,7 +17,6 @@ #include <QObject> #include <QXmlStreamReader> -#include <QXmlStreamWriter> class Scale; diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h index b0d8d97bfe3..b90893d5ba0 100644 --- a/GUI/Model/Data/DataItem.h +++ b/GUI/Model/Data/DataItem.h @@ -17,7 +17,6 @@ #include <QDateTime> #include <QXmlStreamReader> -#include <QXmlStreamWriter> #include <mutex> class AmplitudeAxisItem; diff --git a/GUI/Model/Device/InstrumentsSet.h b/GUI/Model/Device/InstrumentsSet.h index 48e9bed36f3..91920e4bfcb 100644 --- a/GUI/Model/Device/InstrumentsSet.h +++ b/GUI/Model/Device/InstrumentsSet.h @@ -17,7 +17,7 @@ #include "GUI/Model/Device/InstrumentItems.h" #include "GUI/Model/Type/SetWithModel.h" -#include <QXmlStreamWriter> +#include <QXmlStreamReader> class InstrumentsSet : public SetWithModel<InstrumentItem> { public: diff --git a/GUI/Model/Files/DatafileItem.h b/GUI/Model/Files/DatafileItem.h index 763e0f326a2..6e3fd21e289 100644 --- a/GUI/Model/Files/DatafileItem.h +++ b/GUI/Model/Files/DatafileItem.h @@ -18,7 +18,6 @@ #include "GUI/Model/Type/NamedItem.h" #include <QObject> #include <QXmlStreamReader> -#include <QXmlStreamWriter> class Data1DItem; class Data2DItem; diff --git a/GUI/Model/Files/DatafilesSet.h b/GUI/Model/Files/DatafilesSet.h index a04d4224b96..99ea7964f38 100644 --- a/GUI/Model/Files/DatafilesSet.h +++ b/GUI/Model/Files/DatafilesSet.h @@ -18,7 +18,6 @@ #include "GUI/Model/Files/DatafileItem.h" #include "GUI/Model/Files/DatafilesCleaner.h" #include "GUI/Model/Type/SetWithModel.h" -#include <QXmlStreamWriter> class DataItem; diff --git a/GUI/Model/Job/BatchInfo.h b/GUI/Model/Job/BatchInfo.h index 02d8b7a3c5d..c842b9c5270 100644 --- a/GUI/Model/Job/BatchInfo.h +++ b/GUI/Model/Job/BatchInfo.h @@ -18,7 +18,6 @@ #include <QDateTime> #include <QObject> #include <QXmlStreamReader> -#include <QXmlStreamWriter> enum class JobStatus; diff --git a/GUI/Model/Job/JobsSet.h b/GUI/Model/Job/JobsSet.h index 7eff8a0928b..c6a6cc84578 100644 --- a/GUI/Model/Job/JobsSet.h +++ b/GUI/Model/Job/JobsSet.h @@ -19,7 +19,6 @@ #include "GUI/Model/Files/DatafilesCleaner.h" #include <QObject> #include <QXmlStreamReader> -#include <QXmlStreamWriter> class DataItem; class ISimulation; diff --git a/GUI/Model/Mask/MasksSet.h b/GUI/Model/Mask/MasksSet.h index ba7a2cc4b5d..420656a0ccf 100644 --- a/GUI/Model/Mask/MasksSet.h +++ b/GUI/Model/Mask/MasksSet.h @@ -18,7 +18,7 @@ #include "Base/Types/VectorWC.h" #include "GUI/Model/Mask/MaskItems.h" #include <QModelIndex> -#include <QXmlStreamWriter> +#include <QXmlStreamReader> class RegionOfInterestItem; diff --git a/GUI/Model/Sample/ItemWithMaterial.h b/GUI/Model/Sample/ItemWithMaterial.h index d054227e86b..77168cceedc 100644 --- a/GUI/Model/Sample/ItemWithMaterial.h +++ b/GUI/Model/Sample/ItemWithMaterial.h @@ -17,7 +17,7 @@ #include <QColor> #include <QString> -#include <QXmlStreamWriter> +#include <QXmlStreamReader> #include <functional> class MaterialItem; diff --git a/GUI/Model/Sample/SampleItem.cpp b/GUI/Model/Sample/SampleItem.cpp index e2afc4f7e5b..79ea452080d 100644 --- a/GUI/Model/Sample/SampleItem.cpp +++ b/GUI/Model/Sample/SampleItem.cpp @@ -18,7 +18,6 @@ #include "GUI/Support/Style/PredefinedColors.h" #include "GUI/Support/XML/Backup.h" #include "GUI/Support/XML/UtilXML.h" -#include <QXmlStreamWriter> namespace { namespace Tag { diff --git a/GUI/Model/Tune/FitParameterContainerItem.h b/GUI/Model/Tune/FitParameterContainerItem.h index e1247866df0..80ffa0ab317 100644 --- a/GUI/Model/Tune/FitParameterContainerItem.h +++ b/GUI/Model/Tune/FitParameterContainerItem.h @@ -19,7 +19,6 @@ #include "GUI/Model/Tune/FitParameterLinkItem.h" #include <QObject> #include <QXmlStreamReader> -#include <QXmlStreamWriter> namespace mumufit { class Parameters; diff --git a/GUI/Model/Tune/FitParameterLinkItem.h b/GUI/Model/Tune/FitParameterLinkItem.h index 984ccaa90d3..7bd6405352c 100644 --- a/GUI/Model/Tune/FitParameterLinkItem.h +++ b/GUI/Model/Tune/FitParameterLinkItem.h @@ -17,7 +17,6 @@ #include <QObject> #include <QXmlStreamReader> -#include <QXmlStreamWriter> //! Holds link value, accessible from FitparameterModel. class LinkItem : public QObject { diff --git a/GUI/Support/Data/ComboProperty.h b/GUI/Support/Data/ComboProperty.h index f5580e9f246..78740edf24e 100644 --- a/GUI/Support/Data/ComboProperty.h +++ b/GUI/Support/Data/ComboProperty.h @@ -19,7 +19,6 @@ #include <QVariant> #include <QVector> #include <QXmlStreamReader> -#include <QXmlStreamWriter> //! Custom property to define list of string values with multiple selections. //! Intended for QVariant. diff --git a/GUI/Support/Data/SimulationOptionsItem.h b/GUI/Support/Data/SimulationOptionsItem.h index dc7a489a418..b4691b342b6 100644 --- a/GUI/Support/Data/SimulationOptionsItem.h +++ b/GUI/Support/Data/SimulationOptionsItem.h @@ -15,7 +15,7 @@ #ifndef BORNAGAIN_GUI_SUPPORT_DATA_SIMULATIONOPTIONSITEM_H #define BORNAGAIN_GUI_SUPPORT_DATA_SIMULATIONOPTIONSITEM_H -#include <QXmlStreamWriter> +#include <QXmlStreamReader> //! The SimulationOptionsItem class holds simulation status (run policy, number of threads, //! integration flag). Used in SimulationView to define job settings. When job is started, diff --git a/GUI/Support/XML/Backup.h b/GUI/Support/XML/Backup.h index 2845ec7660a..d05b5eabcad 100644 --- a/GUI/Support/XML/Backup.h +++ b/GUI/Support/XML/Backup.h @@ -16,7 +16,7 @@ #define BORNAGAIN_GUI_SUPPORT_XML_BACKUP_H #include "Base/Util/Assert.h" -#include <QXmlStreamWriter> +#include <QXmlStreamReader> namespace { namespace Tag { diff --git a/GUI/Support/XML/UtilXML.h b/GUI/Support/XML/UtilXML.h index 8454df4ab3e..f6ae2b84883 100644 --- a/GUI/Support/XML/UtilXML.h +++ b/GUI/Support/XML/UtilXML.h @@ -15,7 +15,7 @@ #ifndef BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H #define BORNAGAIN_GUI_SUPPORT_XML_UTILXML_H -#include <QXmlStreamWriter> // used in every including file +#include <QXmlStreamReader> // used in every including file, also provides QXmlStreamWriter #include <heinz/Complex.h> #include <heinz/Vectors3D.h> -- GitLab