From 5f95f5681575635c1ad9fcc71d64a441e229a96d Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <svechnikovmv@gmail.com> Date: Fri, 17 Feb 2023 12:58:46 +0100 Subject: [PATCH] ProjectDocument: clean headers --- GUI/Model/Project/ProjectDocument.cpp | 5 +---- GUI/Model/Project/ProjectDocument.h | 6 +----- GUI/View/Fit/MinimizerSettingsWidget.cpp | 1 + GUI/View/Projection/SaveProjectionsAssistant.cpp | 2 +- GUI/View/SampleDesigner/SampleEditorController.cpp | 1 + 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp index 6f29cf9f69e..50fd961d721 100644 --- a/GUI/Model/Project/ProjectDocument.cpp +++ b/GUI/Model/Project/ProjectDocument.cpp @@ -15,11 +15,10 @@ #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Data/RealItem.h" #include "GUI/Model/Device/InstrumentItems.h" -#include "GUI/Model/Project/LinkInstrumentManager.h" #include "GUI/Model/Sample/ItemWithMaterial.h" #include "GUI/Model/Sample/MaterialItem.h" #include "GUI/Model/Sample/SampleItem.h" -#include "GUI/Support/Data/SimulationOptionsItem.h" +#include "GUI/Support/Data/ID.h" #include "GUI/Support/IO/ProjectUtils.h" #include "GUI/Support/XML/UtilXML.h" #include "GUI/Util/DeserializationException.h" @@ -27,8 +26,6 @@ #include "GUI/Util/MessageService.h" #include "GUI/Util/Path.h" #include <QStandardPaths> -#include <QXmlStreamReader> -#include <memory> std::optional<ProjectDocument*> gProjectDocument; diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h index e0ba67c124d..f4f0eccc810 100644 --- a/GUI/Model/Project/ProjectDocument.h +++ b/GUI/Model/Project/ProjectDocument.h @@ -15,20 +15,16 @@ #ifndef BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H #define BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H -#include "GUI/Model/Device/InstrumentItems.h" #include "GUI/Model/Device/InstrumentsEditController.h" #include "GUI/Model/Model/JobModel.h" #include "GUI/Model/Model/RealModel.h" #include "GUI/Model/Project/LinkInstrumentManager.h" #include "GUI/Model/Sample/SampleModel.h" -#include "GUI/Support/Data/ID.h" #include "GUI/Support/Data/SimulationOptionsItem.h" -#include <QObject> -#include <QVariant> -#include <memory> class MessageService; class QIODevice; +class ProjectDocument; extern std::optional<ProjectDocument*> gProjectDocument; diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp index d91596a6a20..4917468437b 100644 --- a/GUI/View/Fit/MinimizerSettingsWidget.cpp +++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp @@ -13,6 +13,7 @@ // ************************************************************************************************ #include "GUI/View/Fit/MinimizerSettingsWidget.h" +#include "Base/Util/Assert.h" #include "GUI/Model/Job/FitSuiteItem.h" #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Project/ProjectDocument.h" diff --git a/GUI/View/Projection/SaveProjectionsAssistant.cpp b/GUI/View/Projection/SaveProjectionsAssistant.cpp index f32462627ee..ccf0a9f3613 100644 --- a/GUI/View/Projection/SaveProjectionsAssistant.cpp +++ b/GUI/View/Projection/SaveProjectionsAssistant.cpp @@ -13,6 +13,7 @@ // ************************************************************************************************ #include "GUI/View/Projection/SaveProjectionsAssistant.h" +#include "Base/Axis/IAxis.h" #include "Base/Py/PyFmt.h" #include "Device/Data/Datafield.h" #include "GUI/Application/ApplicationSettings.h" @@ -22,7 +23,6 @@ #include "GUI/Util/Error.h" #include <QFileDialog> #include <QTextStream> - #include <boost/polymorphic_cast.hpp> using boost::polymorphic_downcast; diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp index 13f32e84c85..fe11da8eb7e 100644 --- a/GUI/View/SampleDesigner/SampleEditorController.cpp +++ b/GUI/View/SampleDesigner/SampleEditorController.cpp @@ -13,6 +13,7 @@ // ************************************************************************************************ #include "GUI/View/SampleDesigner/SampleEditorController.h" +#include "Base/Util/Assert.h" #include "GUI/Model/CatSample/FormFactorItemCatalog.h" #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Model/Sample/CompoundItem.h" -- GitLab