From 34ab74557737731dd7948181ba01f523cd87366d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Nov 2021 10:20:19 +0100
Subject: [PATCH] rm includes, forward declarations

---
 GUI/Views/SampleDesigner/LayerEditorUtils.cpp |  2 +-
 GUI/Views/SampleDesigner/LayerEditorUtils.h   | 20 +++++++++----------
 GUI/Views/SampleDesigner/MesoCrystalForm.cpp  |  1 -
 GUI/Views/SampleDesigner/MultiLayerForm.cpp   |  3 ---
 .../SampleDesigner/ParticleCoreShellForm.cpp  |  1 +
 .../SampleDesigner/ParticleCoreShellForm.h    |  6 +++---
 GUI/Views/SampleDesigner/ParticleForm.cpp     |  3 ---
 7 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
index bf82525f465..f8b7663b77d 100644
--- a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
@@ -28,7 +28,7 @@
 #include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
 #include "GUI/Views/SampleDesigner/ParticleCoreShellForm.h"
 #include "GUI/Views/SampleDesigner/ParticleForm.h"
-#include "GUI/Views/SampleDesigner/SampleEditorController.h"
+#include "GUI/Views/SampleDesigner/FormLayouter.h"
 
 #include <QLabel>
 #include <QMenu>
diff --git a/GUI/Views/SampleDesigner/LayerEditorUtils.h b/GUI/Views/SampleDesigner/LayerEditorUtils.h
index 0713dafe573..fbf4f94b4b0 100644
--- a/GUI/Views/SampleDesigner/LayerEditorUtils.h
+++ b/GUI/Views/SampleDesigner/LayerEditorUtils.h
@@ -21,21 +21,21 @@
 #include <QList>
 #include <functional>
 
-class QLabel;
 class DoubleSpinBox;
-class QGridLayout;
-class SampleEditorController;
-class VectorDescriptor;
-class QString;
-class LayerZeroRoughnessItem;
-class LayerBasicRoughnessItem;
 class FTDecayFunction1DItem;
-class FormFactorItem;
 class FTDistribution1DItem;
-class RotationItem;
-class QWidget;
+class FormFactorItem;
 class ItemWithParticles;
+class LayerBasicRoughnessItem;
+class LayerZeroRoughnessItem;
+class QGridLayout;
+class QLabel;
 class QPushButton;
+class QString;
+class QWidget;
+class RotationItem;
+class SampleEditorController;
+class VectorDescriptor;
 
 //! Utility functions to support layer oriented sample editor
 namespace LayerEditorUtils {
diff --git a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
index eef4f0c3667..4ae21db0435 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalForm.cpp
@@ -21,7 +21,6 @@
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
 #include "GUI/utils/ActionFactory.h"
 
 #include <QAction>
diff --git a/GUI/Views/SampleDesigner/MultiLayerForm.cpp b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
index 7e3ada05559..59999edf5e9 100644
--- a/GUI/Views/SampleDesigner/MultiLayerForm.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
@@ -17,15 +17,12 @@
 #include "GUI/Items/MultiLayerItem.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
-#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/Views/SampleDesigner/LayerForm.h"
 #include "GUI/Views/SampleDesigner/MesoCrystalForm.h"
 #include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
 #include "GUI/Views/SampleDesigner/ParticleCoreShellForm.h"
 #include "GUI/Views/SampleDesigner/ParticleForm.h"
 #include "GUI/Views/SampleDesigner/ParticleLayoutForm.h"
-#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/utils/LayoutUtils.h"
 
 #include <QBoxLayout>
 #include <QLabel>
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
index e154b03750d..c1c0e24f543 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
@@ -22,6 +22,7 @@
 #include "GUI/Views/SampleDesigner/SampleEditorController.h"
 #include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
 #include "GUI/utils/ActionFactory.h"
+#include "GUI/Views/SampleDesigner/FormLayouter.h"
 
 #include <QAction>
 #include <QComboBox>
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellForm.h b/GUI/Views/SampleDesigner/ParticleCoreShellForm.h
index 98132b1bb21..34230707d87 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellForm.h
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellForm.h
@@ -15,14 +15,14 @@
 #ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLFORM_H
 #define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_PARTICLECORESHELLFORM_H
 
-#include "GUI/Views/SampleDesigner/FormLayouter.h"
 #include <QGroupBox>
 #include <memory>
 
-class ParticleCoreShellItem;
-class SampleEditorController;
+class FormLayouter;
 class GroupBoxCollapser;
+class ParticleCoreShellItem;
 class QComboBox;
+class SampleEditorController;
 
 //! Form for editing a core/shell particle
 class ParticleCoreShellForm : public QGroupBox {
diff --git a/GUI/Views/SampleDesigner/ParticleForm.cpp b/GUI/Views/SampleDesigner/ParticleForm.cpp
index e3630ca9339..2adb9232f66 100644
--- a/GUI/Views/SampleDesigner/ParticleForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleForm.cpp
@@ -15,13 +15,10 @@
 #include "GUI/Views/SampleDesigner/ParticleForm.h"
 #include "GUI/Items/FormFactorItems.h"
 #include "GUI/Items/ParticleItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
 #include "GUI/Models/Types/VectorDescriptor.h"
 #include "GUI/Views/SampleDesigner/FormLayouter.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
-#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
 #include "GUI/utils/ActionFactory.h"
 
 #include <QAction>
-- 
GitLab