From 649c6785df5b68badb7727698fda6efd1c9904fb Mon Sep 17 00:00:00 2001 From: Matthias Puchner <github@mpuchner.de> Date: Tue, 1 Feb 2022 05:43:45 +0100 Subject: [PATCH] rm obsolete includes; rectify includes --- GUI/Model/Item/InstrumentItems.cpp | 3 +-- GUI/Model/OfItem/ParameterTreeUtils.cpp | 1 - GUI/View/Instrument/DistributionEditor.cpp | 5 ++--- Tests/Unit/GUI/TestAxesItems.cpp | 1 - Tests/Unit/GUI/TestSessionItemUtils.cpp | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/GUI/Model/Item/InstrumentItems.cpp b/GUI/Model/Item/InstrumentItems.cpp index 4b248b473cc..ec1ffe4e623 100644 --- a/GUI/Model/Item/InstrumentItems.cpp +++ b/GUI/Model/Item/InstrumentItems.cpp @@ -13,7 +13,6 @@ // ************************************************************************************************ #include "GUI/Model/Item/InstrumentItems.h" -#include "../MakeItem/DetectorItemCatalog.h" #include "Base/Const/Units.h" #include "Base/Pixel/RectangularPixel.h" #include "Core/Simulation/DepthProbeSimulation.h" @@ -22,7 +21,6 @@ #include "Device/Coord/CoordSystem2D.h" #include "Device/Detector/RectangularDetector.h" #include "Device/Detector/SphericalDetector.h" -#include "GUI/Model/BaseItem/GroupItem.h" #include "GUI/Model/Item/BackgroundItems.h" #include "GUI/Model/Item/BeamWavelengthItem.h" #include "GUI/Model/Item/DetectorItems.h" @@ -31,6 +29,7 @@ #include "GUI/Model/Item/RectangularDetectorItem.h" #include "GUI/Model/Item/SphericalDetectorItem.h" #include "GUI/Model/MakeItem/BackgroundItemCatalog.h" +#include "GUI/Model/MakeItem/DetectorItemCatalog.h" #include "GUI/Model/MakeItem/InstrumentItemCatalog.h" #include "GUI/Model/XML/Serializer.h" #include "GUI/Util/CoordName.h" diff --git a/GUI/Model/OfItem/ParameterTreeUtils.cpp b/GUI/Model/OfItem/ParameterTreeUtils.cpp index c50104423b5..1cd553b4c1a 100644 --- a/GUI/Model/OfItem/ParameterTreeUtils.cpp +++ b/GUI/Model/OfItem/ParameterTreeUtils.cpp @@ -13,7 +13,6 @@ // ************************************************************************************************ #include "GUI/Model/OfItem/ParameterTreeUtils.h" -#include "GUI/Model/BaseItem/PropertyItem.h" #include "GUI/Model/Item/AxesItems.h" #include "GUI/Model/Item/BackgroundItems.h" #include "GUI/Model/Item/BeamAngleItems.h" diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp index 97bbe4a3b8d..eeb5f45cb17 100644 --- a/GUI/View/Instrument/DistributionEditor.cpp +++ b/GUI/View/Instrument/DistributionEditor.cpp @@ -15,14 +15,13 @@ #include "GUI/View/Instrument/DistributionEditor.h" #include "GUI/Model/Item/BeamDistributionItem.h" #include "GUI/Model/Item/DistributionItems.h" +#include "GUI/Model/MakeItem/DistributionItemCatalog.h" #include "GUI/Model/Model/SessionModel.h" #include "GUI/Model/Types/DoubleDescriptor.h" #include "GUI/View/Instrument/DistributionForms.h" #include "GUI/View/Instrument/EditDistributionDialog.h" #include "GUI/View/PropertyEditor/GroupInfoBox.h" - -#include "../Tool/WidgetUtils.h" -#include "GUI/Model/MakeItem/DistributionItemCatalog.h" +#include "GUI/View/Tool/WidgetUtils.h" #include <QComboBox> #include <QFormLayout> #include <QStackedLayout> diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp index da8a7067095..6ed1babf44a 100644 --- a/Tests/Unit/GUI/TestAxesItems.cpp +++ b/Tests/Unit/GUI/TestAxesItems.cpp @@ -2,7 +2,6 @@ #include "Base/Axis/PointwiseAxis.h" #include "Base/Axis/VariableBinAxis.h" #include "Base/Const/Units.h" -#include "GUI/Model/BaseItem/PropertyItem.h" #include "GUI/Model/Item/AxesItems.h" #include "GUI/Model/Item/PointwiseAxisItem.h" #include "GUI/Util/Error.h" diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp index af7185afac2..cbdb377ea38 100644 --- a/Tests/Unit/GUI/TestSessionItemUtils.cpp +++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp @@ -1,4 +1,3 @@ -#include "GUI/Model/BaseItem/PropertyItem.h" #include "GUI/Model/Model/SessionModel.h" #include "GUI/Support/Type/VariantUtil.h" #include "GUI/Util/ComboProperty.h" -- GitLab