ctd, plus some complex fwd decl

GUI/View/Plot2D/ColorMapCanvas.h

@@ -23,12 +23,10 @@ class IntensityDataItem;
 class PlotStatusLabel;
 class QCustomPlot;
 
-//! The ColorMapCanvas class contains ColorMap for intensity data presentation, and provide
-//! control of font size, status string appearance
+//! Contains ColorMap for intensity data presentation, and provide control
+//! of font size, status string appearance
 
 class ColorMapCanvas : public QWidget {
-    Q_OBJECT
-
 public:
     explicit ColorMapCanvas(QWidget* parent = nullptr);
 

GUI/View/Plot2D/IntensityDataCanvas.h

@@ -17,15 +17,14 @@
 
 #include "GUI/View/Common/DataAccessWidget.h"
 
-class IntensityDataItem;
 class ColorMapCanvas;
+class IntensityDataItem;
 class QAction;
 
 //! The IntensityDataCanvas class represents IntensityDataItem as color map,
 //! provides standard actions (reset view, save as) for external toolbars and context menus.
 
 class IntensityDataCanvas : public DataAccessWidget {
-    Q_OBJECT
 public:
     explicit IntensityDataCanvas(QWidget* parent = nullptr);
 

GUI/View/Plot2D/IntensityDataWidget.cpp

@@ -18,6 +18,7 @@
 #include "GUI/View/Common/IntensityDataPropertyWidget.h"
 #include "GUI/View/Plot2D/IntensityDataCanvas.h"
 #include "GUI/View/Plot2D/IntensityDataFFTPresenter.h"
+#include <QAction>
 #include <QBoxLayout>
 #include <QMenu>
 

GUI/View/Plot2D/IntensityDataWidget.h

@@ -16,17 +16,17 @@
 #define BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATAWIDGET_H
 
 #include "GUI/View/Common/DataAccessWidget.h"
-#include <QAction>
+#include <QList>
 
 class IntensityDataCanvas;
 class IntensityDataPropertyWidget;
 class IntensityDataFFTPresenter;
+class QAction;
 
 //! A common widget to display color map (IntensityDataCanvas) and properties
 //! (ItemPropertyWidget) of intensity data item.
 
 class IntensityDataWidget : public DataAccessWidget {
-    Q_OBJECT
 public:
     IntensityDataWidget(QWidget* parent = nullptr);
 

GUI/View/SampleDesigner/CompoundForm.cpp

@@ -18,8 +18,8 @@
 #include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-
 #include <QAction>
+#include <QFormLayout>
 #include <QPushButton>
 
 CompoundForm::CompoundForm(QWidget* parent, CompoundItem* compositionItem,

GUI/View/SampleDesigner/CompoundForm.h

@@ -15,16 +15,17 @@
 #ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_COMPOUNDFORM_H
 #define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_COMPOUNDFORM_H
 
-#include <QFormLayout>
 #include <QGroupBox>
+#include <QList>
 
-class SampleEditorController;
 class CompoundItem;
 class ItemWithParticles;
+class QAction;
+class QFormLayout;
+class SampleEditorController;
 
 //! Form for editing a particle composition
 class CompoundForm : public QGroupBox {
-    Q_OBJECT
 public:
     CompoundForm(QWidget* parent, CompoundItem* compositionItem, SampleEditorController* ec,
                  bool allowRemove = true);

GUI/View/SampleDesigner/CoreAndShellForm.h

@@ -19,14 +19,13 @@
 #include <QGroupBox>
 #include <memory>
 
+class CoreAndShellItem;
 class FormLayouter;
 class GroupBoxCollapser;
-class CoreAndShellItem;
 class SampleEditorController;
 
 //! Form for editing a core/shell particle
 class CoreAndShellForm : public QGroupBox {
-    Q_OBJECT
 public:
     CoreAndShellForm(QWidget* parent, CoreAndShellItem* item, SampleEditorController* ec,
                      bool allowRemove = true);
@@ -44,7 +43,6 @@ private:
     void showCoreInRealspace();
     void showShellInRealspace();
 
-private:
     CoreAndShellItem* m_item;
     QAction* m_removeAction = nullptr;
     SampleEditorController* m_ec;

GUI/View/SampleDesigner/LayerForm.cpp

@@ -20,6 +20,7 @@
 #include "GUI/Support/Util/ActionFactory.h"
 #include "GUI/Support/Util/WidgetMoverButton.h"
 #include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
 #include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"

GUI/View/SampleDesigner/LayerForm.h

@@ -15,16 +15,18 @@
 #ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERFORM_H
 #define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERFORM_H
 
-#include "GUI/View/SampleDesigner/FormLayouter.h"
 #include <QGroupBox>
 #include <memory>
 
+class FormLayouter;
 class GroupBoxCollapser;
+class LayerItem;
+class ParticleLayoutItem;
+class SampleEditorController;
 class WidgetMoverButton;
 
 //! Form for editing a layer
 class LayerForm : public QGroupBox {
-    Q_OBJECT
 public:
     LayerForm(QWidget* parent, LayerItem* layer, SampleEditorController* ec);
 

GUI/View/SampleDesigner/MaterialInplaceForm.h

@@ -15,15 +15,14 @@
 #ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
 #define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
 
-#include <QGridLayout>
 #include <QWidget>
 
 class ItemWithMaterial;
+class QGridLayout;
 class SampleEditorController;
 
 //! Form to select a material and to edit it in-place
 class MaterialInplaceForm : public QWidget {
-    Q_OBJECT
 public:
     MaterialInplaceForm(QWidget* parent, ItemWithMaterial* item, SampleEditorController* ec);
 

GUI/View/SampleDesigner/ParticleForm.h

@@ -22,7 +22,6 @@ class SampleEditorController;
 
 //! Form for editing a particle
 class ParticleForm : public QGroupBox {
-    Q_OBJECT
 public:
     ParticleForm(QWidget* parent, ParticleItem* item, bool allowAbundance,
                  SampleEditorController* ec, bool allowRemove = true);

GUI/View/SampleDesigner/ParticleLayoutForm.cpp

@@ -20,6 +20,7 @@
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "GUI/Support/Util/ActionFactory.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/InterferenceForm.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/View/SampleDesigner/LayerForm.h"

GUI/View/SampleDesigner/ParticleLayoutForm.h

@@ -19,17 +19,16 @@
 #include <QGroupBox>
 #include <QList>
 
-class SampleEditorController;
-class ParticleLayoutItem;
-class LayerForm;
-class ItemWithParticles;
 class DoubleSpinBox;
-class LayerItem;
 class GroupBoxCollapser;
+class ItemWithParticles;
+class LayerForm;
+class LayerItem;
+class ParticleLayoutItem;
+class SampleEditorController;
 
 //! Form for editing a particle layout
 class ParticleLayoutForm : public QGroupBox {
-    Q_OBJECT
 public:
     ParticleLayoutForm(LayerForm* parent, ParticleLayoutItem* layoutItem,
                        SampleEditorController* ec);

GUI/View/SampleDesigner/SampleForm.cpp

@@ -19,16 +19,19 @@
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/SampleDesigner/CompoundForm.h"
 #include "GUI/View/SampleDesigner/CoreAndShellForm.h"
+#include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/LayerForm.h"
 #include "GUI/View/SampleDesigner/MesocrystalForm.h"
 #include "GUI/View/SampleDesigner/ParticleForm.h"
 #include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
+#include "GUI/View/SampleDesigner/SampleEditorController.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
-#include <QBoxLayout>
+#include "GUI/View/Tool/LayoutUtils.h"
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QTextEdit>
+#include <QVBoxLayout>
 
 namespace {
 

GUI/View/SampleDesigner/SampleForm.h

@@ -15,17 +15,17 @@
 #ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEFORM_H
 #define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEFORM_H
 
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QWidget>
 
-class SampleItem;
-class SampleEditorController;
-class LayerItem;
 class LayerForm;
+class LayerItem;
+class QPushButton;
+class QVBoxLayout;
+class SampleEditorController;
+class SampleItem;
 
 //! Form to present/edit a sample
 class SampleForm : public QWidget {
-    Q_OBJECT
 public:
     SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorController* ec);