From eccd1483258a49e34409f41174b840d809d864b2 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Tue, 2 Nov 2021 10:50:57 +0100 Subject: [PATCH] ctd --- GUI/Items/LayerItem.cpp | 1 - GUI/Items/RectangularDetectorItem.cpp | 1 + GUI/Items/RectangularDetectorItem.h | 3 +-- GUI/Models/Instrument/InstrumentsTreeModel.cpp | 1 - GUI/Project/projectmanager.cpp | 1 - GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp | 1 + GUI/mainwindow/mainwindow.cpp | 1 - 7 files changed, 3 insertions(+), 6 deletions(-) diff --git a/GUI/Items/LayerItem.cpp b/GUI/Items/LayerItem.cpp index 8ed3bc8f023..59ba149c1ed 100644 --- a/GUI/Items/LayerItem.cpp +++ b/GUI/Items/LayerItem.cpp @@ -18,7 +18,6 @@ #include "GUI/Items/MultiLayerItem.h" #include "GUI/Items/ParticleLayoutItem.h" #include "GUI/Models/Group/GroupInfo.h" -#include "GUI/Models/Group/SelectionDescriptor.h" #include "GUI/Models/Types/DoubleDescriptor.h" #include "GUI/Models/Types/UIntDescriptor.h" diff --git a/GUI/Items/RectangularDetectorItem.cpp b/GUI/Items/RectangularDetectorItem.cpp index cb64fc2adc3..dc1e11a23d1 100644 --- a/GUI/Items/RectangularDetectorItem.cpp +++ b/GUI/Items/RectangularDetectorItem.cpp @@ -17,6 +17,7 @@ #include "GUI/Items/AxesItems.h" #include "GUI/Items/VectorItem.h" #include "GUI/utils/Error.h" +#include "GUI/Models/Group/ComboProperty.h" namespace { const double default_detector_width = 20.0; diff --git a/GUI/Items/RectangularDetectorItem.h b/GUI/Items/RectangularDetectorItem.h index 3836ba75198..31a77053709 100644 --- a/GUI/Items/RectangularDetectorItem.h +++ b/GUI/Items/RectangularDetectorItem.h @@ -15,12 +15,11 @@ #ifndef BORNAGAIN_GUI_ITEMS_RECTANGULARDETECTORITEM_H #define BORNAGAIN_GUI_ITEMS_RECTANGULARDETECTORITEM_H -#include "Base/Vector/Vectors3D.h" #include "GUI/Items/DetectorItems.h" -#include "GUI/Models/Group/ComboProperty.h" class BasicAxisItem; class VectorItem; +class ComboProperty; class BA_CORE_API_ RectangularDetectorItem : public DetectorItem { private: diff --git a/GUI/Models/Instrument/InstrumentsTreeModel.cpp b/GUI/Models/Instrument/InstrumentsTreeModel.cpp index 768b1751439..cb545ef99bd 100644 --- a/GUI/Models/Instrument/InstrumentsTreeModel.cpp +++ b/GUI/Models/Instrument/InstrumentsTreeModel.cpp @@ -14,7 +14,6 @@ #include "GUI/Models/Instrument/InstrumentsTreeModel.h" #include "GUI/Application/Application.h" -#include "GUI/Application/ApplicationSettings.h" #include "GUI/Items/InstrumentItems.h" #include <QtCore> #include <QtGui> diff --git a/GUI/Project/projectmanager.cpp b/GUI/Project/projectmanager.cpp index 3922b4e05d4..756a0228d27 100644 --- a/GUI/Project/projectmanager.cpp +++ b/GUI/Project/projectmanager.cpp @@ -13,7 +13,6 @@ // ************************************************************************************************ #include "GUI/Project/projectmanager.h" -#include "GUI/Project/projectdocument.h" #include "Base/Utils/Assert.h" #include "GUI/Application/Application.h" #include "GUI/InfoWidgets/ProjectLoadProblemDialog.h" diff --git a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp index b462530a165..1afa79b8571 100644 --- a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp +++ b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp @@ -15,6 +15,7 @@ #include "GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.h" #include "GUI/Items/RectangularDetectorItem.h" #include "GUI/Views/InstrumentWidgets/VectorEditor.h" +#include "GUI/Models/Group/ComboProperty.h" #include <QComboBox> #include <QDoubleSpinBox> diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp index abc170c6675..393eccd27c2 100644 --- a/GUI/mainwindow/mainwindow.cpp +++ b/GUI/mainwindow/mainwindow.cpp @@ -14,7 +14,6 @@ #include "GUI/mainwindow/mainwindow.h" #include "GUI/Application/Application.h" -#include "GUI/Models/Data/ApplicationModels.h" #include "GUI/Models/Job/JobModel.h" #include "GUI/Project/projectmanager.h" #include "GUI/Views/InstrumentWidgets/InstrumentView.h" -- GitLab