From 6638a3d1ef8529ad424209f5f286fac062f76c87 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 16 Jan 2022 22:14:48 +0100
Subject: [PATCH] clang-format
---
Core/Export/PyFmt2.cpp | 2 +-
Core/Export/SampleToPython.cpp | 2 +-
Core/Export/SimulationToPython.cpp | 2 +-
Device/Histo/HistoUtils.cpp | 3 +-
GUI/Model/BaseItem/GroupItemController.cpp | 2 +-
GUI/Model/BaseItem/SessionItem.cpp | 2 +-
GUI/Model/Item/BeamItems.cpp | 2 +-
GUI/Model/Item/BeamItems.h | 2 +-
GUI/Model/Item/Data1DViewItem.cpp | 4 +-
GUI/Model/Item/Data1DViewItem.h | 2 +-
GUI/Model/Item/DataItem.h | 2 +-
GUI/Model/Item/DataProperties.cpp | 4 +-
GUI/Model/Item/DataPropertyContainer.cpp | 2 +-
GUI/Model/Item/DataViewUtils.cpp | 4 +-
GUI/Model/Item/DetectorItems.cpp | 2 +-
GUI/Model/Item/InstrumentItems.cpp | 4 +-
GUI/Model/Item/InterferenceItems.cpp | 6 +--
GUI/Model/Item/JobFunctions.cpp | 18 ++++-----
GUI/Model/Item/JobItem.cpp | 10 ++---
GUI/Model/Item/JobItem.h | 6 +--
GUI/Model/Item/JobItemUtils.cpp | 2 +-
GUI/Model/Item/LayerRoughnessItems.cpp | 2 +-
GUI/Model/Item/MesoCrystalItem.cpp | 4 +-
GUI/Model/Item/MinimizerItem.h | 2 +-
GUI/Model/Item/MultiLayerItem.cpp | 2 +-
GUI/Model/Item/ParticleCompositionItem.cpp | 2 +-
GUI/Model/Item/ParticleCoreShellItem.cpp | 4 +-
GUI/Model/Item/ParticleItem.cpp | 4 +-
GUI/Model/Item/ParticleLayoutItem.cpp | 4 +-
GUI/Model/Item/RealDataItem.cpp | 4 +-
.../Item/SpecularBeamInclinationItem.cpp | 2 +-
GUI/Model/MakeItem/ItemCatalog.cpp | 40 +++++++++----------
GUI/Model/MakeItem/ItemFactory.cpp | 2 +-
GUI/Model/Model/ApplicationModels.cpp | 2 +-
GUI/Model/Model/FitParameterModel.cpp | 2 +-
GUI/Model/Model/InstrumentModel.cpp | 2 +-
GUI/Model/Model/JobModel.cpp | 14 +++----
GUI/Model/Model/ParameterTuningModel.cpp | 2 +-
GUI/Model/Model/RealDataModel.cpp | 2 +-
GUI/Model/Model/SessionModel.cpp | 4 +-
GUI/Model/OfItem/ParameterTreeUtils.cpp | 20 +++++-----
GUI/Model/Project/LinkInstrumentManager.cpp | 4 +-
GUI/Model/Project/ProjectDocument.cpp | 8 ++--
GUI/Model/Project/ProjectDocument.h | 2 +-
GUI/Model/To/ToDomain.cpp | 2 +-
GUI/View/Fit/FilterPropertyProxy.cpp | 2 +-
GUI/View/Fit/FitObjectiveBuilder.cpp | 4 +-
GUI/View/Fit/FitParameterWidget.cpp | 4 +-
GUI/View/Fit/FitSessionController.cpp | 2 +-
GUI/View/Fit/ParameterTuningWidget.cpp | 2 +-
GUI/View/FromDomain/FromDomain.cpp | 8 ++--
GUI/View/FromDomain/GUISampleBuilder.cpp | 4 +-
GUI/View/Import/RealDataMaskWidget.cpp | 2 +-
GUI/View/Import/RealDataPropertiesWidget.cpp | 2 +-
GUI/View/Import/SpecularDataImportWidget.cpp | 2 +-
GUI/View/Instrument/DistributionPlot.cpp | 2 +-
.../Instrument/InclinationAnglesEditor.cpp | 2 +-
GUI/View/Job/JobResultsPresenter.cpp | 2 +-
GUI/View/Mask/MaskGraphicsScene.cpp | 2 +-
GUI/View/Mask/MaskViewFactory.cpp | 2 +-
.../MaterialEditor/MaterialEditorDialog.cpp | 6 +--
.../MaterialEditor/MaterialEditorModel.cpp | 2 +-
.../FitComparisonController.cpp | 2 +-
.../FitComparisonViewController.cpp | 6 +--
.../PlotComparison/FitComparisonWidget.cpp | 4 +-
.../PlotComparison/FitComparisonWidget1D.cpp | 4 +-
GUI/View/PlotComparison/Plot1D.cpp | 2 +-
.../SpecularDataPropertyWidget.cpp | 2 +-
GUI/View/Realspace/RealSpaceBuilderUtils.cpp | 2 +-
GUI/View/SampleDesigner/LayerForm.cpp | 4 +-
.../LayerOrientedSampleEditor.cpp | 2 +-
.../SampleDesigner/MaterialInplaceForm.cpp | 2 +-
.../SampleDesigner/ParticleCoreShellForm.cpp | 2 +-
GUI/View/SampleDesigner/ParticleForm.cpp | 2 +-
.../SampleDesigner/SampleEditorController.cpp | 6 +--
.../SampleDesigner/SampleEditorController.h | 2 +-
GUI/View/SampleDesigner/SampleListView.cpp | 2 +-
GUI/View/SampleDesigner/SampleView.cpp | 2 +-
GUI/View/Tool/DataItemUtils.cpp | 2 +-
GUI/View/Toplevel/SessionModelView.cpp | 6 +--
GUI/View/Toplevel/SimulationView.cpp | 10 ++---
Sample/Correlations/FTDecay1D.cpp | 2 +-
Sample/Correlations/FTDecay2D.cpp | 2 +-
Sample/Correlations/FTDistributions1D.cpp | 2 +-
Sample/Correlations/FTDistributions2D.cpp | 2 +-
Tests/Functional/GUI/Check.cpp | 2 +-
Tests/Functional/PyEmbedded/Tests.cpp | 2 +-
Tests/Unit/GUI/TestAxesItems.cpp | 2 +-
Tests/Unit/GUI/TestDataItemViews.cpp | 4 +-
Tests/Unit/GUI/TestDetectorItems.cpp | 2 +-
Tests/Unit/GUI/TestFitParameterModel.cpp | 2 +-
Tests/Unit/GUI/TestGroupItem.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 6 +--
Tests/Unit/GUI/TestOutputDataIOService.cpp | 6 +--
Tests/Unit/GUI/TestProjectDocument.cpp | 6 +--
Tests/Unit/GUI/TestRealDataModel.cpp | 2 +-
Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp | 4 +-
Tests/Unit/GUI/TestSaveService.cpp | 6 +--
Tests/Unit/GUI/TestSavingSpecularData.cpp | 10 ++---
Tests/Unit/GUI/TestSessionItemUtils.cpp | 2 +-
Tests/Unit/GUI/TestSessionModel.cpp | 14 +++----
Tests/Unit/GUI/TestSessionXML.cpp | 10 ++---
102 files changed, 212 insertions(+), 211 deletions(-)
diff --git a/Core/Export/PyFmt2.cpp b/Core/Export/PyFmt2.cpp
index b2f4fc65b74..d4aa7930f51 100644
--- a/Core/Export/PyFmt2.cpp
+++ b/Core/Export/PyFmt2.cpp
@@ -17,8 +17,8 @@
#include "Base/Axis/PointwiseAxis.h"
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
-#include "Base/Util/Algorithms.h"
#include "Base/Py/PyFmt.h"
+#include "Base/Util/Algorithms.h"
#include "Base/Util/StringUtils.h"
#include "Core/Export/PyFmtLimits.h"
#include "Device/Mask/Ellipse.h"
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index ed8632c17c9..46932f75f3a 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "Core/Export/SampleToPython.h"
-#include "Base/Util/Assert.h"
#include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
#include "Base/Vector/RotMatrix.h"
#include "Core/Export/ComponentKeyHandler.h"
#include "Core/Export/MaterialKeyHandler.h"
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index ff43d6b1b22..92311368aad 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "Core/Export/SimulationToPython.h"
-#include "Base/Util/Algorithms.h"
#include "Base/Py/PyFmt.h"
+#include "Base/Util/Algorithms.h"
#include "Core/Background/ConstantBackground.h"
#include "Core/Background/PoissonNoiseBackground.h"
#include "Core/Export/PyFmt2.h"
diff --git a/Device/Histo/HistoUtils.cpp b/Device/Histo/HistoUtils.cpp
index 89cd850ab0f..a44512186a1 100644
--- a/Device/Histo/HistoUtils.cpp
+++ b/Device/Histo/HistoUtils.cpp
@@ -81,7 +81,8 @@ double DataUtils::Histo::getRelativeDifference(const IHistogram& dat, const IHis
//! Returns true is relative difference is below threshold; prints informative output
bool DataUtils::Histo::checkRelativeDifference(const OutputData<double>& dat,
- const OutputData<double>& ref, const double threshold)
+ const OutputData<double>& ref,
+ const double threshold)
{
const std::unique_ptr<const IHistogram> histo(IHistogram::createHistogram(dat));
if (histo->getMinimum() == 0 && histo->getMaximum() == 0) {
diff --git a/GUI/Model/BaseItem/GroupItemController.cpp b/GUI/Model/BaseItem/GroupItemController.cpp
index 91450b9a8c7..55a81b701f1 100644
--- a/GUI/Model/BaseItem/GroupItemController.cpp
+++ b/GUI/Model/BaseItem/GroupItemController.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/BaseItem/GroupItemController.h"
-#include "GUI/Model/MakeItem/ItemFactory.h"
#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/MakeItem/ItemFactory.h"
#include "GUI/Util/ComboProperty.h"
#include <utility>
diff --git a/GUI/Model/BaseItem/SessionItem.cpp b/GUI/Model/BaseItem/SessionItem.cpp
index 4ba4116c8f2..27b2d182f36 100644
--- a/GUI/Model/BaseItem/SessionItem.cpp
+++ b/GUI/Model/BaseItem/SessionItem.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Model/MakeItem/ItemFactory.h"
#include "GUI/Model/BaseItem/GroupItem.h"
#include "GUI/Model/BaseItem/PropertyItem.h"
+#include "GUI/Model/MakeItem/ItemFactory.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Support/Data/SessionFlags.h"
#include "GUI/Support/Data/SessionItemData.h"
diff --git a/GUI/Model/Item/BeamItems.cpp b/GUI/Model/Item/BeamItems.cpp
index 8604f1c2e19..d8157c29e47 100644
--- a/GUI/Model/Item/BeamItems.cpp
+++ b/GUI/Model/Item/BeamItems.cpp
@@ -16,11 +16,11 @@
#include "Base/Axis/IAxis.h"
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
#include "GUI/Model/BaseItem/GroupItem.h"
#include "GUI/Model/Item/BeamAngleItems.h"
#include "GUI/Model/Item/BeamWavelengthItem.h"
#include "GUI/Model/Item/FootprintItems.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
#include "GUI/Model/Item/VectorItem.h"
#include <cmath>
diff --git a/GUI/Model/Item/BeamItems.h b/GUI/Model/Item/BeamItems.h
index 1e9182385df..73315555c4b 100644
--- a/GUI/Model/Item/BeamItems.h
+++ b/GUI/Model/Item/BeamItems.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_ITEM_BEAMITEMS_H
#define BORNAGAIN_GUI_MODEL_ITEM_BEAMITEMS_H
-#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
#include <heinz/Vectors3D.h>
class BasicAxisItem;
diff --git a/GUI/Model/Item/Data1DViewItem.cpp b/GUI/Model/Item/Data1DViewItem.cpp
index 4208df33961..832ba913571 100644
--- a/GUI/Model/Item/Data1DViewItem.cpp
+++ b/GUI/Model/Item/Data1DViewItem.cpp
@@ -14,11 +14,11 @@
#include "GUI/Model/Item/Data1DViewItem.h"
#include "GUI/Model/Item/AxesItems.h"
-#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/DataItem.h"
#include "GUI/Model/Item/DataProperties.h"
#include "GUI/Model/Item/DataPropertyContainer.h"
#include "GUI/Model/Item/DataViewUtils.h"
-#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Item/Data1DViewItem.h b/GUI/Model/Item/Data1DViewItem.h
index 0313060d435..47a0dd0b123 100644
--- a/GUI/Model/Item/Data1DViewItem.h
+++ b/GUI/Model/Item/Data1DViewItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_ITEM_DATA1DVIEWITEM_H
#define BORNAGAIN_GUI_MODEL_ITEM_DATA1DVIEWITEM_H
-#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Group/SelectionDescriptor.h"
class AmplitudeAxisItem;
class BasicAxisItem;
diff --git a/GUI/Model/Item/DataItem.h b/GUI/Model/Item/DataItem.h
index 341842f22e1..f6f301f864f 100644
--- a/GUI/Model/Item/DataItem.h
+++ b/GUI/Model/Item/DataItem.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_GUI_MODEL_ITEM_DATAITEM_H
#include "Device/Data/OutputData.h"
-#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Support/IO/SaveLoadInterface.h"
#include <QDateTime>
#include <mutex>
diff --git a/GUI/Model/Item/DataProperties.cpp b/GUI/Model/Item/DataProperties.cpp
index f4d3759e1cd..9dcf1959c71 100644
--- a/GUI/Model/Item/DataProperties.cpp
+++ b/GUI/Model/Item/DataProperties.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Item/DataProperties.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Item/DataPropertyContainer.cpp b/GUI/Model/Item/DataPropertyContainer.cpp
index 7e821351e72..ec12fcc31ac 100644
--- a/GUI/Model/Item/DataPropertyContainer.cpp
+++ b/GUI/Model/Item/DataPropertyContainer.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Item/DataPropertyContainer.h"
-#include "GUI/Model/Item/DataProperties.h"
#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/DataProperties.h"
#include "GUI/Util/Error.h"
DataPropertyContainer::DataPropertyContainer()
diff --git a/GUI/Model/Item/DataViewUtils.cpp b/GUI/Model/Item/DataViewUtils.cpp
index 06f58f5957d..aab2550b32b 100644
--- a/GUI/Model/Item/DataViewUtils.cpp
+++ b/GUI/Model/Item/DataViewUtils.cpp
@@ -14,10 +14,10 @@
#include "GUI/Model/Item/DataViewUtils.h"
#include "Device/Coord/ICoordSystem.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/Data1DViewItem.h"
#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Util/CoordName.h"
namespace {
diff --git a/GUI/Model/Item/DetectorItems.cpp b/GUI/Model/Item/DetectorItems.cpp
index a11270f2564..1f4ef2e282a 100644
--- a/GUI/Model/Item/DetectorItems.cpp
+++ b/GUI/Model/Item/DetectorItems.cpp
@@ -17,9 +17,9 @@
#include "Device/Mask/IShape2D.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "GUI/Model/Group/GroupInfo.h"
+#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Item/ResolutionFunctionItems.h"
#include "GUI/Model/Item/SphericalDetectorItem.h"
-#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Model/SessionModel.h"
namespace {
diff --git a/GUI/Model/Item/InstrumentItems.cpp b/GUI/Model/Item/InstrumentItems.cpp
index 8a8b9ae31c6..eb5144414e0 100644
--- a/GUI/Model/Item/InstrumentItems.cpp
+++ b/GUI/Model/Item/InstrumentItems.cpp
@@ -21,12 +21,12 @@
#include "Device/Coord/CoordSystem2D.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/SphericalDetector.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/RealDataItem.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"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/RectangularDetectorItem.h"
#include "GUI/Model/Item/SphericalDetectorItem.h"
#include "GUI/Model/Item/VectorItem.h"
diff --git a/GUI/Model/Item/InterferenceItems.cpp b/GUI/Model/Item/InterferenceItems.cpp
index c0094b9a4d0..dfe0026e93a 100644
--- a/GUI/Model/Item/InterferenceItems.cpp
+++ b/GUI/Model/Item/InterferenceItems.cpp
@@ -14,12 +14,12 @@
#include "GUI/Model/Item/InterferenceItems.h"
#include "Base/Const/Units.h"
-#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
#include "GUI/Model/Item/FTDecayFunctionItems.h"
-#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
#include "GUI/Model/Item/FTDistributionItems.h"
-#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
#include "GUI/Model/Item/Lattice2DItems.h"
+#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
+#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
+#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
#include "GUI/Model/Types/UIntDescriptor.h"
#include "GUI/Model/XML/Serializer.h"
#include "Sample/Aggregate/Interferences.h"
diff --git a/GUI/Model/Item/JobFunctions.cpp b/GUI/Model/Item/JobFunctions.cpp
index 52d74716c16..900c1a62fa2 100644
--- a/GUI/Model/Item/JobFunctions.cpp
+++ b/GUI/Model/Item/JobFunctions.cpp
@@ -15,19 +15,19 @@
#include "GUI/Model/Item/JobFunctions.h"
#include "Base/Util/Assert.h"
#include "Device/Instrument/Instrument.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
+#include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/DataPropertyContainer.h"
#include "GUI/Model/Item/FitSuiteItem.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/MinimizerItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/JobItemUtils.h"
#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Item/Data1DViewItem.h"
-#include "GUI/Model/Item/DataPropertyContainer.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Item/MinimizerItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/Model/Item/JobItem.cpp b/GUI/Model/Item/JobItem.cpp
index 329b1ba03ac..558690711ed 100644
--- a/GUI/Model/Item/JobItem.cpp
+++ b/GUI/Model/Item/JobItem.cpp
@@ -14,14 +14,14 @@
#include "GUI/Model/Item/JobItem.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
+#include "GUI/Model/Item/Data1DViewItem.h"
#include "GUI/Model/Item/FitSuiteItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/JobItemUtils.h"
-#include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
#include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
#include "GUI/Support/Data/XML.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Util/DeserializationException.h"
diff --git a/GUI/Model/Item/JobItem.h b/GUI/Model/Item/JobItem.h
index 66d1af3797e..1d3418bda7e 100644
--- a/GUI/Model/Item/JobItem.h
+++ b/GUI/Model/Item/JobItem.h
@@ -15,12 +15,12 @@
#ifndef BORNAGAIN_GUI_MODEL_ITEM_JOBITEM_H
#define BORNAGAIN_GUI_MODEL_ITEM_JOBITEM_H
+#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Item/ParameterTreeItems.h"
#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Item/MultiLayerItem.h"
-#include "GUI/Model/BaseItem/SessionItem.h"
#include "GUI/Model/Model/SessionModel.h" // call to model() from templated fct
-#include "GUI/Support/Data/JobStatus.h" // enum cannot be forward declared
+#include "GUI/Support/Data/JobStatus.h" // enum cannot be forward declared
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include <QDateTime>
#include <optional>
diff --git a/GUI/Model/Item/JobItemUtils.cpp b/GUI/Model/Item/JobItemUtils.cpp
index d66ac1aa0e4..7cfcd6d91b7 100644
--- a/GUI/Model/Item/JobItemUtils.cpp
+++ b/GUI/Model/Item/JobItemUtils.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Item/JobItemUtils.h"
#include "Core/Simulation/ISimulation.h"
#include "Device/Histo/SimulationResult.h"
-#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Util/CoordName.h"
namespace {
diff --git a/GUI/Model/Item/LayerRoughnessItems.cpp b/GUI/Model/Item/LayerRoughnessItems.cpp
index ea99394fa91..fcfb6fe7ecb 100644
--- a/GUI/Model/Item/LayerRoughnessItems.cpp
+++ b/GUI/Model/Item/LayerRoughnessItems.cpp
@@ -14,9 +14,9 @@
#include "GUI/Model/Item/LayerRoughnessItems.h"
+#include "GUI/Model/Model/SessionXML.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/XML/Serializer.h"
-#include "GUI/Model/Model/SessionXML.h"
using namespace GUI::Session::XML;
diff --git a/GUI/Model/Item/MesoCrystalItem.cpp b/GUI/Model/Item/MesoCrystalItem.cpp
index aa978db5a40..f58cf465186 100644
--- a/GUI/Model/Item/MesoCrystalItem.cpp
+++ b/GUI/Model/Item/MesoCrystalItem.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Model/Item/MesoCrystalItem.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/Item/FormFactorItems.h"
-#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
#include "GUI/Model/Item/ParticleCompositionItem.h"
#include "GUI/Model/Item/ParticleCoreShellItem.h"
#include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
+#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
#include "GUI/Model/MakeItem/RotationItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Util/Error.h"
diff --git a/GUI/Model/Item/MinimizerItem.h b/GUI/Model/Item/MinimizerItem.h
index e5ca8958582..835c7ffa2e4 100644
--- a/GUI/Model/Item/MinimizerItem.h
+++ b/GUI/Model/Item/MinimizerItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_ITEM_MINIMIZERITEM_H
#define BORNAGAIN_GUI_MODEL_ITEM_MINIMIZERITEM_H
-#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Group/SelectionDescriptor.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/UIntDescriptor.h"
#include <variant>
diff --git a/GUI/Model/Item/MultiLayerItem.cpp b/GUI/Model/Item/MultiLayerItem.cpp
index 7299837459b..863d5b8b098 100644
--- a/GUI/Model/Item/MultiLayerItem.cpp
+++ b/GUI/Model/Item/MultiLayerItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Item/LayerItem.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/XML/Serializer.h"
#include <QXmlStreamWriter>
MultiLayerItem::MultiLayerItem()
diff --git a/GUI/Model/Item/ParticleCompositionItem.cpp b/GUI/Model/Item/ParticleCompositionItem.cpp
index 461c5abd5f3..732ac9924be 100644
--- a/GUI/Model/Item/ParticleCompositionItem.cpp
+++ b/GUI/Model/Item/ParticleCompositionItem.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Item/ParticleCompositionItem.h"
-#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
#include "GUI/Model/Item/ParticleCoreShellItem.h"
#include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
#include "GUI/Model/MakeItem/RotationItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
#include "Sample/Particle/MesoCrystal.h"
diff --git a/GUI/Model/Item/ParticleCoreShellItem.cpp b/GUI/Model/Item/ParticleCoreShellItem.cpp
index dc7c81f2c4e..26bf682d0c1 100644
--- a/GUI/Model/Item/ParticleCoreShellItem.cpp
+++ b/GUI/Model/Item/ParticleCoreShellItem.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Item/ParticleCoreShellItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Item/ParticleItem.h"
-#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Support/Type/VariantUtil.h"
#include "GUI/Util/Error.h"
#include "Sample/Particle/Particle.h"
diff --git a/GUI/Model/Item/ParticleItem.cpp b/GUI/Model/Item/ParticleItem.cpp
index 7a9d4dce5a2..19883f6a362 100644
--- a/GUI/Model/Item/ParticleItem.cpp
+++ b/GUI/Model/Item/ParticleItem.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Item/ParticleItem.h"
-#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/Item/FormFactorItems.h"
+#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/Item/ParticleCoreShellItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/MakeItem/RotationItemCatalog.h"
#include "GUI/Model/XML/Serializer.h"
#include "Sample/Particle/Particle.h"
diff --git a/GUI/Model/Item/ParticleLayoutItem.cpp b/GUI/Model/Item/ParticleLayoutItem.cpp
index 170a3e4d6be..e1586325f7e 100644
--- a/GUI/Model/Item/ParticleLayoutItem.cpp
+++ b/GUI/Model/Item/ParticleLayoutItem.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Model/Item/ParticleLayoutItem.h"
-#include "GUI/Model/MakeItem/InterferenceItemCatalog.h"
#include "GUI/Model/Item/InterferenceItems.h"
-#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
#include "GUI/Model/Item/Lattice2DItems.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
#include "GUI/Model/Item/ParticleCompositionItem.h"
#include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/InterferenceItemCatalog.h"
+#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
#include "GUI/Model/XML/Serializer.h"
ParticleLayoutItem::ParticleLayoutItem()
diff --git a/GUI/Model/Item/RealDataItem.cpp b/GUI/Model/Item/RealDataItem.cpp
index 3a708629072..36c026ed828 100644
--- a/GUI/Model/Item/RealDataItem.cpp
+++ b/GUI/Model/Item/RealDataItem.cpp
@@ -14,13 +14,13 @@
#include "GUI/Model/Item/RealDataItem.h"
#include "Device/Data/DataUtils.h"
+#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/JobItemUtils.h"
#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Item/ProjectionItems.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Support/IO/AbstractDataLoader1D.h"
diff --git a/GUI/Model/Item/SpecularBeamInclinationItem.cpp b/GUI/Model/Item/SpecularBeamInclinationItem.cpp
index c672edf66d9..f943ff318d8 100644
--- a/GUI/Model/Item/SpecularBeamInclinationItem.cpp
+++ b/GUI/Model/Item/SpecularBeamInclinationItem.cpp
@@ -14,8 +14,8 @@
#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
#include "Base/Const/Units.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
#include "GUI/Model/BaseItem/GroupItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
namespace {
diff --git a/GUI/Model/MakeItem/ItemCatalog.cpp b/GUI/Model/MakeItem/ItemCatalog.cpp
index bc2e4e1f088..0876d2680da 100644
--- a/GUI/Model/MakeItem/ItemCatalog.cpp
+++ b/GUI/Model/MakeItem/ItemCatalog.cpp
@@ -14,40 +14,40 @@
#include "GUI/Model/MakeItem/ItemCatalog.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/FitParameterContainerItem.h"
-#include "GUI/Model/Item/FitParameterItem.h"
-#include "GUI/Model/Item/FitParameterLinkItem.h"
-#include "GUI/Model/Item/FitSuiteItem.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/MinimizerItem.h"
-#include "GUI/Model/Item/ParameterTreeItems.h"
+#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Item/BackgroundItems.h"
#include "GUI/Model/Item/BeamAngleItems.h"
#include "GUI/Model/Item/BeamWavelengthItem.h"
-#include "GUI/Model/Item/FootprintItems.h"
-#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/RectangularDetectorItem.h"
-#include "GUI/Model/Item/ResolutionFunctionItems.h"
-#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
-#include "GUI/Model/Item/SphericalDetectorItem.h"
-#include "GUI/Model/Item/MaskItems.h"
-#include "GUI/Model/Item/ProjectionItems.h"
#include "GUI/Model/Item/Data1DViewItem.h"
#include "GUI/Model/Item/DataProperties.h"
#include "GUI/Model/Item/DataPropertyContainer.h"
+#include "GUI/Model/Item/FitParameterContainerItem.h"
+#include "GUI/Model/Item/FitParameterItem.h"
+#include "GUI/Model/Item/FitParameterLinkItem.h"
+#include "GUI/Model/Item/FitSuiteItem.h"
+#include "GUI/Model/Item/FootprintItems.h"
#include "GUI/Model/Item/FormFactorItems.h"
+#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
#include "GUI/Model/Item/InterferenceItems.h"
+#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
+#include "GUI/Model/Item/MinimizerItem.h"
+#include "GUI/Model/Item/ParameterTreeItems.h"
#include "GUI/Model/Item/ParticleCompositionItem.h"
#include "GUI/Model/Item/ParticleCoreShellItem.h"
#include "GUI/Model/Item/ParticleItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
+#include "GUI/Model/Item/ProjectionItems.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/RealLimitsItems.h"
+#include "GUI/Model/Item/RectangularDetectorItem.h"
+#include "GUI/Model/Item/ResolutionFunctionItems.h"
+#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
+#include "GUI/Model/Item/SphericalDetectorItem.h"
#include "GUI/Model/Item/VectorItem.h"
ItemCatalog::ItemCatalog()
diff --git a/GUI/Model/MakeItem/ItemFactory.cpp b/GUI/Model/MakeItem/ItemFactory.cpp
index 228754a94b0..841a38ba82c 100644
--- a/GUI/Model/MakeItem/ItemFactory.cpp
+++ b/GUI/Model/MakeItem/ItemFactory.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/MakeItem/ItemFactory.h"
-#include "GUI/Model/MakeItem/ItemCatalog.h"
#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/MakeItem/ItemCatalog.h"
SessionItem* GUI::Model::ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
{
diff --git a/GUI/Model/Model/ApplicationModels.cpp b/GUI/Model/Model/ApplicationModels.cpp
index 4b55501d17e..5077e34a98d 100644
--- a/GUI/Model/Model/ApplicationModels.cpp
+++ b/GUI/Model/Model/ApplicationModels.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Model/ApplicationModels.h"
-#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Model/SampleModel.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/Util/DeserializationException.h"
diff --git a/GUI/Model/Model/FitParameterModel.cpp b/GUI/Model/Model/FitParameterModel.cpp
index 7d129ee741b..5230a803f31 100644
--- a/GUI/Model/Model/FitParameterModel.cpp
+++ b/GUI/Model/Model/FitParameterModel.cpp
@@ -14,9 +14,9 @@
#include "GUI/Model/Model/FitParameterModel.h"
#include "GUI/Model/Item/FitParameterContainerItem.h"
-#include "GUI/Model/Model/FitParameterHelper.h"
#include "GUI/Model/Item/FitParameterItem.h"
#include "GUI/Model/Item/FitParameterLinkItem.h"
+#include "GUI/Model/Model/FitParameterHelper.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/ModelPath.h"
#include "GUI/Model/Model/SessionXML.h"
diff --git a/GUI/Model/Model/InstrumentModel.cpp b/GUI/Model/Model/InstrumentModel.cpp
index 334872cf539..8f2f47a70d5 100644
--- a/GUI/Model/Model/InstrumentModel.cpp
+++ b/GUI/Model/Model/InstrumentModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
#include "GUI/Model/BaseItem/GroupItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
#include "GUI/Model/Model/SessionXML.h"
#include "GUI/Util/String.h"
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index ed34e7e7f39..f11c9ac34e4 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -13,17 +13,17 @@
// ************************************************************************************************
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/JobFunctions.h"
-#include "GUI/Model/Model/JobQueueData.h"
-#include "GUI/Model/OfItem/ParameterTreeUtils.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
#include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Item/JobFunctions.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Model/JobQueueData.h"
#include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/OfItem/ParameterTreeUtils.h"
JobModel::JobModel(QObject* parent)
: SessionModel(GUI::Session::XML::JobModelTag, parent)
diff --git a/GUI/Model/Model/ParameterTuningModel.cpp b/GUI/Model/Model/ParameterTuningModel.cpp
index 39e72b08380..388cb1e7382 100644
--- a/GUI/Model/Model/ParameterTuningModel.cpp
+++ b/GUI/Model/Model/ParameterTuningModel.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Model/ParameterTuningModel.h"
-#include "GUI/Model/Model/FitParameterHelper.h"
#include "GUI/Model/Item/ParameterTreeItems.h"
+#include "GUI/Model/Model/FitParameterHelper.h"
#include "GUI/Model/Model/SessionXML.h"
#include <QMimeData>
diff --git a/GUI/Model/Model/RealDataModel.cpp b/GUI/Model/Model/RealDataModel.cpp
index 504f2dd3045..3eba4339c61 100644
--- a/GUI/Model/Model/RealDataModel.cpp
+++ b/GUI/Model/Model/RealDataModel.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Model/SessionXML.h"
RealDataModel::RealDataModel(QObject* parent)
diff --git a/GUI/Model/Model/SessionModel.cpp b/GUI/Model/Model/SessionModel.cpp
index c0a0b013ef4..8011e772f19 100644
--- a/GUI/Model/Model/SessionModel.cpp
+++ b/GUI/Model/Model/SessionModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Model/Model/SessionModel.h"
-#include "GUI/Model/MakeItem/ItemFactory.h"
-#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/BaseItem/SessionItem.h"
+#include "GUI/Model/Item/MaterialItem.h"
+#include "GUI/Model/MakeItem/ItemFactory.h"
#include "GUI/Model/Model/SessionXML.h"
#include "GUI/Support/Data/SessionFlags.h"
#include "GUI/Support/Data/SessionItemTags.h"
diff --git a/GUI/Model/OfItem/ParameterTreeUtils.cpp b/GUI/Model/OfItem/ParameterTreeUtils.cpp
index 5c637edba4c..c9f03a59b36 100644
--- a/GUI/Model/OfItem/ParameterTreeUtils.cpp
+++ b/GUI/Model/OfItem/ParameterTreeUtils.cpp
@@ -13,26 +13,26 @@
// ************************************************************************************************
#include "GUI/Model/OfItem/ParameterTreeUtils.h"
-#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/ParameterTreeItems.h"
+#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
-#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
-#include "GUI/Model/MakeItem/InterferenceItemCatalog.h"
#include "GUI/Model/Item/InterferenceItems.h"
-#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
-#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Item/ParameterTreeItems.h"
#include "GUI/Model/Item/ParticleCompositionItem.h"
#include "GUI/Model/Item/ParticleCoreShellItem.h"
#include "GUI/Model/Item/ParticleItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/MakeItem/FTDecayFunctionItemCatalogs.h"
+#include "GUI/Model/MakeItem/FTDistributionItemCatalogs.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
+#include "GUI/Model/MakeItem/InterferenceItemCatalog.h"
+#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
+#include "GUI/Model/MakeItem/Lattice2DItemCatalog.h"
#include "GUI/Model/MakeItem/RotationItemCatalog.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
namespace {
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index a07cc8d4afa..66b9b83c2d6 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 500885d5447..3177a4a08a4 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Model/SampleModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/OutputDataIOService.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
-#include "GUI/Model/Item/MultiLayerItem.h"
-#include "GUI/Model/Model/SampleModel.h"
#include "GUI/Model/XML/Serializer.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/Support/Data/XML.h"
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index 7bb9828f649..a67ae373ae8 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
#define BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
-#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Model/ApplicationModels.h"
+#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Model/SampleModel.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include <QObject>
diff --git a/GUI/Model/To/ToDomain.cpp b/GUI/Model/To/ToDomain.cpp
index 080e5dd6392..29c08dbad62 100644
--- a/GUI/Model/To/ToDomain.cpp
+++ b/GUI/Model/To/ToDomain.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/To/ToDomain.h"
-#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/Item/InterferenceItems.h"
#include "GUI/Model/Item/LayerItem.h"
#include "GUI/Model/Item/LayerRoughnessItems.h"
+#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Item/ParticleCompositionItem.h"
diff --git a/GUI/View/Fit/FilterPropertyProxy.cpp b/GUI/View/Fit/FilterPropertyProxy.cpp
index 7546d865271..601059be375 100644
--- a/GUI/View/Fit/FilterPropertyProxy.cpp
+++ b/GUI/View/Fit/FilterPropertyProxy.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/Fit/FilterPropertyProxy.h"
#include "GUI/Model/BaseItem/GroupItem.h"
#include "GUI/Model/BaseItem/PropertyItem.h"
-#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Support/Data/SessionFlags.h"
int FilterPropertyProxy::columnCount(const QModelIndex& parent) const
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
index 7a7d029b45a..3ec9e32d3de 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -18,12 +18,12 @@
#include "Core/Simulation/ISimulation.h"
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
-#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/DataItem.h"
#include "GUI/Model/Item/FitParameterContainerItem.h"
#include "GUI/Model/Item/FitSuiteItem.h"
#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/MinimizerItem.h"
-#include "GUI/Model/Item/DataItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/To/DomainSimulationBuilder.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Fit/GUIFitObserver.h"
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index 723c592fbaf..4bca75a1c57 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -14,13 +14,13 @@
#include "GUI/View/Fit/FitParameterWidget.h"
#include "GUI/Model/Item/FitParameterContainerItem.h"
-#include "GUI/Model/Model/FitParameterHelper.h"
#include "GUI/Model/Item/FitParameterItem.h"
#include "GUI/Model/Item/FitParameterLinkItem.h"
-#include "GUI/Model/Model/FitParameterModel.h"
#include "GUI/Model/Item/FitSuiteItem.h"
#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/ParameterTreeItems.h"
+#include "GUI/Model/Model/FitParameterHelper.h"
+#include "GUI/Model/Model/FitParameterModel.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/View/Fit/FilterPropertyProxy.h"
#include "GUI/View/Fit/FitParameterDelegate.h"
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index ab7c7901d0a..a7fb2dc49bc 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Fit/FitSessionController.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
#include "GUI/Model/Item/FitParameterContainerItem.h"
#include "GUI/Model/Item/FitParameterItem.h"
#include "GUI/Model/Item/FitSuiteItem.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
#include "GUI/Model/Item/JobItem.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp
index e3500328933..7182c583e08 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/Fit/ParameterTuningWidget.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/Item/IntensityDataItem.h"
#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/ParameterTreeItems.h"
-#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/Fit/ParameterTuningDelegate.h"
diff --git a/GUI/View/FromDomain/FromDomain.cpp b/GUI/View/FromDomain/FromDomain.cpp
index f28cc86f215..15eb5b69390 100644
--- a/GUI/View/FromDomain/FromDomain.cpp
+++ b/GUI/View/FromDomain/FromDomain.cpp
@@ -37,14 +37,14 @@
#include "GUI/Model/Item/BeamAngleItems.h"
#include "GUI/Model/Item/BeamWavelengthItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Item/RectangularDetectorItem.h"
-#include "GUI/Model/Item/ResolutionFunctionItems.h"
-#include "GUI/Model/Item/SphericalDetectorItem.h"
-#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
#include "GUI/Model/Item/ParticleItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Item/RectangularDetectorItem.h"
+#include "GUI/Model/Item/ResolutionFunctionItems.h"
+#include "GUI/Model/Item/SphericalDetectorItem.h"
#include "GUI/Util/Error.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
diff --git a/GUI/View/FromDomain/GUISampleBuilder.cpp b/GUI/View/FromDomain/GUISampleBuilder.cpp
index e06e7b4cdf8..171f90512be 100644
--- a/GUI/View/FromDomain/GUISampleBuilder.cpp
+++ b/GUI/View/FromDomain/GUISampleBuilder.cpp
@@ -13,15 +13,15 @@
// ************************************************************************************************
#include "GUI/View/FromDomain/GUISampleBuilder.h"
-#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Item/ParticleCompositionItem.h"
#include "GUI/Model/Item/ParticleCoreShellItem.h"
#include "GUI/Model/Item/ParticleItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/View/FromDomain/FromDomain.h"
#include "Sample/Aggregate/ParticleLayout.h"
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index a0cc01cf117..6bbdf39057d 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/MaskItems.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/View/Mask/MaskEditor.h"
#include <QAction>
#include <QBoxLayout>
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 4df6d7cb1de..4087f201f54 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataPropertiesWidget.h"
-#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Import/SpecularDataImportWidget.cpp b/GUI/View/Import/SpecularDataImportWidget.cpp
index 8a9ee378b9c..9a668ef5c39 100644
--- a/GUI/View/Import/SpecularDataImportWidget.cpp
+++ b/GUI/View/Import/SpecularDataImportWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Import/SpecularDataImportWidget.h"
+#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Support/IO/AbstractDataLoaderResultModel.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/View/Global/Globals.h"
diff --git a/GUI/View/Instrument/DistributionPlot.cpp b/GUI/View/Instrument/DistributionPlot.cpp
index efd1787a61d..4be24a6ce6d 100644
--- a/GUI/View/Instrument/DistributionPlot.cpp
+++ b/GUI/View/Instrument/DistributionPlot.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Instrument/DistributionPlot.h"
-#include "GUI/Model/Item/ResolutionItems.h"
#include "GUI/Model/Item/RealLimitsItems.h"
+#include "GUI/Model/Item/ResolutionItems.h"
#include "GUI/View/Info/CautionSign.h"
#include "Param/Distrib/Distributions.h"
#include <QLabel>
diff --git a/GUI/View/Instrument/InclinationAnglesEditor.cpp b/GUI/View/Instrument/InclinationAnglesEditor.cpp
index b140aabe6ef..ca7d5ad1c05 100644
--- a/GUI/View/Instrument/InclinationAnglesEditor.cpp
+++ b/GUI/View/Instrument/InclinationAnglesEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Instrument/InclinationAnglesEditor.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
#include "GUI/Model/BaseItem/GroupItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
#include "GUI/Model/Item/SpecularBeamInclinationItem.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/View/Instrument/SphericalAxisEditor.h"
diff --git a/GUI/View/Job/JobResultsPresenter.cpp b/GUI/View/Job/JobResultsPresenter.cpp
index c516ac44ee3..2010f9eadba 100644
--- a/GUI/View/Job/JobResultsPresenter.cpp
+++ b/GUI/View/Job/JobResultsPresenter.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Job/JobResultsPresenter.h"
-#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/View/Job/JobViewActivities.h"
#include "GUI/View/Plot2D/IntensityDataWidget.h"
#include "GUI/View/PlotComparison/FitComparisonWidget.h"
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index 32f54c2f78f..98c719c9b97 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Mask/MaskGraphicsScene.h"
#include "GUI/Model/BaseItem/GroupItem.h"
+#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Item/ProjectionItems.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Mask/ColorMapSceneAdaptor.h"
diff --git a/GUI/View/Mask/MaskViewFactory.cpp b/GUI/View/Mask/MaskViewFactory.cpp
index 17e455eb549..5e131598bd5 100644
--- a/GUI/View/Mask/MaskViewFactory.cpp
+++ b/GUI/View/Mask/MaskViewFactory.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Mask/MaskViewFactory.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Item/ProjectionItems.h"
-#include "GUI/Model/BaseItem/SessionItem.h"
#include "GUI/Util/Error.h"
#include "GUI/View/Mask/EllipseView.h"
#include "GUI/View/Mask/LineViews.h"
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 36acac7672f..16c95abecff 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,13 +14,13 @@
#include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Application/ApplicationSettings.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
#include "GUI/Model/Item/MaterialItem.h"
+#include "GUI/Model/Item/VectorItem.h"
#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
#include "GUI/Model/Model/SampleModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
-#include "GUI/Model/Item/VectorItem.h"
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
#include "GUI/View/Tool/EditUtil.h"
#include "GUI/View/Tool/StyleUtils.h"
diff --git a/GUI/View/MaterialEditor/MaterialEditorModel.cpp b/GUI/View/MaterialEditor/MaterialEditorModel.cpp
index 18df7d083d4..780b6bf77e8 100644
--- a/GUI/View/MaterialEditor/MaterialEditorModel.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorModel.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
#include "GUI/Model/Item/MaterialItem.h"
+#include "GUI/Model/Item/VectorItem.h"
#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
-#include "GUI/Model/Item/VectorItem.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/View/PlotComparison/FitComparisonController.cpp b/GUI/View/PlotComparison/FitComparisonController.cpp
index 02b99bc97f0..ea39bb4974c 100644
--- a/GUI/View/PlotComparison/FitComparisonController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonController.cpp
@@ -16,9 +16,9 @@
#include "Device/Data/DataUtils.h"
#include "GUI/Model/Item/AxesItems.h"
#include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
#include "GUI/View/PlotComparison/PropertyRepeater.h"
namespace {
diff --git a/GUI/View/PlotComparison/FitComparisonViewController.cpp b/GUI/View/PlotComparison/FitComparisonViewController.cpp
index 964c904f26f..a3f86edf34c 100644
--- a/GUI/View/PlotComparison/FitComparisonViewController.cpp
+++ b/GUI/View/PlotComparison/FitComparisonViewController.cpp
@@ -15,11 +15,11 @@
#include "GUI/View/PlotComparison/FitComparisonViewController.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Model/Item/AxesItems.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/Data1DViewItem.h"
#include "GUI/Model/Item/DataPropertyContainer.h"
+#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/PlotComparison/PropertyRepeater.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index 79e5fb5fcdc..9fc3e9d6a2b 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/PlotComparison/FitComparisonWidget.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/FitSuiteItem.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/PlotComparison/FitComparisonController.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index 3323b1a4d1e..700422b4c06 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
-#include "GUI/Model/Item/RealDataItem.h"
+#include "GUI/Model/Item/Data1DViewItem.h"
#include "GUI/Model/Item/FitSuiteItem.h"
#include "GUI/Model/Item/JobItem.h"
-#include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/PlotComparison/FitComparisonViewController.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
diff --git a/GUI/View/PlotComparison/Plot1D.cpp b/GUI/View/PlotComparison/Plot1D.cpp
index c205fbf65c0..2fd278c5256 100644
--- a/GUI/View/PlotComparison/Plot1D.cpp
+++ b/GUI/View/PlotComparison/Plot1D.cpp
@@ -15,9 +15,9 @@
#include "GUI/View/PlotComparison/Plot1D.h"
#include "GUI/Model/Item/AxesItems.h"
#include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/DataItem.h"
#include "GUI/Model/Item/DataProperties.h"
#include "GUI/Model/Item/DataPropertyContainer.h"
-#include "GUI/Model/Item/DataItem.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
#include "GUI/View/PlotUtil/RangeUtils.h"
diff --git a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
index 0d6a6738425..01f274097b4 100644
--- a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/PropertyEditor/SpecularDataPropertyWidget.h"
#include "GUI/Model/Item/AxesItems.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
#include "GUI/Model/Item/Data1DViewItem.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/Realspace/RealSpaceBuilderUtils.cpp b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
index f10927ebc67..2ea80bf6019 100644
--- a/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
+++ b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
@@ -16,12 +16,12 @@
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
#include "GUI/Model/Item/ParticleCompositionItem.h"
#include "GUI/Model/Item/ParticleCoreShellItem.h"
#include "GUI/Model/Item/ParticleItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/View/Realspace/Particle3DContainer.h"
#include "GUI/View/Realspace/RealSpaceBuilder.h"
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index c203c9571af..ba606e6885e 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/LayerForm.h"
-#include "GUI/Model/Item/MaterialItem.h"
-#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index 56b0b22c760..903173d840a 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/SampleDesigner/LayerOrientedSampleEditor.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Item/LayerItem.h"
#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/MultiLayerForm.h"
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 1220db2ec56..bee4f43434b 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "Base/Util/Assert.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
#include "GUI/Model/Item/MaterialItem.h"
#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/VectorDescriptor.h"
#include "GUI/View/Edit/DoubleLineEdit.h"
diff --git a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
index 57fbcf334dc..aac24561278 100644
--- a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/ParticleCoreShellForm.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/Item/FormFactorItems.h"
#include "GUI/Model/Item/ParticleCoreShellItem.h"
#include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/Types/VectorDescriptor.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
diff --git a/GUI/View/SampleDesigner/ParticleForm.cpp b/GUI/View/SampleDesigner/ParticleForm.cpp
index 3cb815a70bf..dd4989cf1b7 100644
--- a/GUI/View/SampleDesigner/ParticleForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleForm.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/ParticleForm.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/Item/FormFactorItems.h"
#include "GUI/Model/Item/ParticleItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/Types/VectorDescriptor.h"
#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp
index d98177aede6..b1049089234 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorController.cpp
@@ -13,9 +13,6 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/SampleEditorController.h"
-#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/Item/InterferenceItems.h"
#include "GUI/Model/Item/LayerItem.h"
#include "GUI/Model/Item/MesoCrystalItem.h"
@@ -24,6 +21,9 @@
#include "GUI/Model/Item/ParticleCoreShellItem.h"
#include "GUI/Model/Item/ParticleItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Types/UIntDescriptor.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/SampleDesigner/InterferenceForm.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.h b/GUI/View/SampleDesigner/SampleEditorController.h
index 1b3eaf715a5..84d63ba7b98 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.h
+++ b/GUI/View/SampleDesigner/SampleEditorController.h
@@ -15,9 +15,9 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
+#include "GUI/Model/Item/SampleItem.h"
#include "GUI/Model/MakeItem/FormFactorItemCatalog.h"
#include "GUI/Model/MakeItem/ItemWithParticlesCatalog.h"
-#include "GUI/Model/Item/SampleItem.h"
#include <QUndoStack>
class MultiLayerItem;
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index a7f3346d513..529db44a365 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/SampleDesigner/SampleListView.h"
#include "Base/Util/SysUtils.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include "GUI/View/FromDomain/GUIExamplesFactory.h"
#include "GUI/View/SampleDesigner/SampleListModel.h"
diff --git a/GUI/View/SampleDesigner/SampleView.cpp b/GUI/View/SampleDesigner/SampleView.cpp
index 53379800cef..8b5f459cba9 100644
--- a/GUI/View/SampleDesigner/SampleView.cpp
+++ b/GUI/View/SampleDesigner/SampleView.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/SampleView.h"
-#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Item/ItemWithParticles.h"
#include "GUI/Model/Item/LayerItem.h"
#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
#include "GUI/Model/Model/SampleModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Common/DocksController.h"
#include "GUI/View/Common/StyledToolBar.h"
#include "GUI/View/Realspace/RealSpaceCanvas.h"
diff --git a/GUI/View/Tool/DataItemUtils.cpp b/GUI/View/Tool/DataItemUtils.cpp
index 89138a4f411..d20447d37c5 100644
--- a/GUI/View/Tool/DataItemUtils.cpp
+++ b/GUI/View/Tool/DataItemUtils.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Tool/DataItemUtils.h"
#include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/SpecularDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
namespace {
diff --git a/GUI/View/Toplevel/SessionModelView.cpp b/GUI/View/Toplevel/SessionModelView.cpp
index 99b8b4beb16..ed5b8c86cc3 100644
--- a/GUI/View/Toplevel/SessionModelView.cpp
+++ b/GUI/View/Toplevel/SessionModelView.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/SessionModelView.h"
-#include "GUI/Model/Model/RealDataModel.h"
+#include "GUI/Model/Item/ItemWithMaterial.h"
#include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Item/ItemWithMaterial.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Model/SampleModel.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/View/Project/ProjectManager.h"
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index 16433967215..e916298befe 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -13,15 +13,15 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/SimulationView.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Item/MultiLayerItem.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Model/SampleModel.h"
+#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/SampleValidator.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "GUI/View/Global/Globals.h"
diff --git a/Sample/Correlations/FTDecay1D.cpp b/Sample/Correlations/FTDecay1D.cpp
index c61a5b7c2f0..0b942329c23 100644
--- a/Sample/Correlations/FTDecay1D.cpp
+++ b/Sample/Correlations/FTDecay1D.cpp
@@ -14,8 +14,8 @@
#include "Sample/Correlations/FTDecay1D.h"
#include "Base/Math/Functions.h"
-#include "Base/Util/Assert.h"
#include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
#include <algorithm>
// ************************************************************************************************
diff --git a/Sample/Correlations/FTDecay2D.cpp b/Sample/Correlations/FTDecay2D.cpp
index 3c0504da85b..896669ef4ef 100644
--- a/Sample/Correlations/FTDecay2D.cpp
+++ b/Sample/Correlations/FTDecay2D.cpp
@@ -14,8 +14,8 @@
#include "Sample/Correlations/FTDecay2D.h"
#include "Base/Math/Functions.h"
-#include "Base/Util/Assert.h"
#include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
#include <algorithm>
// ************************************************************************************************
diff --git a/Sample/Correlations/FTDistributions1D.cpp b/Sample/Correlations/FTDistributions1D.cpp
index 3ba3987b085..b5825f9e993 100644
--- a/Sample/Correlations/FTDistributions1D.cpp
+++ b/Sample/Correlations/FTDistributions1D.cpp
@@ -15,8 +15,8 @@
#include "Sample/Correlations/FTDistributions1D.h"
#include "Base/Math/Constants.h"
#include "Base/Math/Functions.h"
-#include "Base/Util/Assert.h"
#include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
#include <limits>
namespace {
diff --git a/Sample/Correlations/FTDistributions2D.cpp b/Sample/Correlations/FTDistributions2D.cpp
index c66c553fbc4..acb41867785 100644
--- a/Sample/Correlations/FTDistributions2D.cpp
+++ b/Sample/Correlations/FTDistributions2D.cpp
@@ -15,8 +15,8 @@
#include "Sample/Correlations/FTDistributions2D.h"
#include "Base/Math/Bessel.h"
#include "Base/Math/IntegratorGK.h"
-#include "Base/Util/Assert.h"
#include "Base/Py/PyFmt.h"
+#include "Base/Util/Assert.h"
#include <limits>
// ************************************************************************************************
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 403d7b687b7..3078c9c60bb 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -20,9 +20,9 @@
#include "Device/Histo/IntensityDataIOFactory.h"
#include "Device/Histo/SimulationResult.h"
#include "GUI/Model/Item/InstrumentItems.h"
+#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Model/SampleModel.h"
#include "GUI/Model/To/DomainSimulationBuilder.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
diff --git a/Tests/Functional/PyEmbedded/Tests.cpp b/Tests/Functional/PyEmbedded/Tests.cpp
index 8cffa32c68c..d3f1a87c7ec 100644
--- a/Tests/Functional/PyEmbedded/Tests.cpp
+++ b/Tests/Functional/PyEmbedded/Tests.cpp
@@ -14,8 +14,8 @@
#include "BABuild.h"
#include "BAVersion.h"
#include "Base/Py/PyCore.h"
-#include "Base/Py/PyUtils.h"
#include "Base/Py/PyFmt.h"
+#include "Base/Py/PyUtils.h"
#include "Base/Util/SysUtils.h"
#include "Core/Export/ExportToPython.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 9d6776d8691..622d93e4808 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -1,8 +1,8 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/VariableBinAxis.h"
#include "Base/Const/Units.h"
-#include "GUI/Model/Item/AxesItems.h"
#include "GUI/Model/BaseItem/PropertyItem.h"
+#include "GUI/Model/Item/AxesItems.h"
#include "GUI/Util/Error.h"
#include "GUI/View/FromDomain/FromDomain.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 7b6fa5e3741..5207ca829ff 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -1,7 +1,7 @@
-#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/SpecularDataItem.h"
#include "GUI/Model/Item/DataProperties.h"
#include "GUI/Model/Item/DataPropertyContainer.h"
+#include "GUI/Model/Item/SpecularDataItem.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index 3f72dc001ac..895abfe4e3b 100644
--- a/Tests/Unit/GUI/TestDetectorItems.cpp
+++ b/Tests/Unit/GUI/TestDetectorItems.cpp
@@ -3,10 +3,10 @@
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Model/Item/RectangularDetectorItem.h"
#include "GUI/Model/Item/ResolutionFunctionItems.h"
#include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Util/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestFitParameterModel.cpp b/Tests/Unit/GUI/TestFitParameterModel.cpp
index 846d75d63e9..2e2cf5a3b3b 100644
--- a/Tests/Unit/GUI/TestFitParameterModel.cpp
+++ b/Tests/Unit/GUI/TestFitParameterModel.cpp
@@ -1,8 +1,8 @@
#include "GUI/Model/Item/FitParameterContainerItem.h"
#include "GUI/Model/Item/FitParameterItem.h"
#include "GUI/Model/Item/FitParameterLinkItem.h"
-#include "GUI/Model/Model/FitParameterModel.h"
#include "GUI/Model/Item/FitSuiteItem.h"
+#include "GUI/Model/Model/FitParameterModel.h"
#include "GUI/Model/Model/JobModel.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index 8f39ab9738f..224b9f6b32b 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,6 +1,6 @@
#include "GUI/Model/BaseItem/GroupItem.h"
-#include "GUI/Model/Item/ResolutionItems.h"
#include "GUI/Model/Item/FormFactorItems.h"
+#include "GUI/Model/Item/ResolutionItems.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Support/Type/VariantUtil.h"
#include "GUI/Util/ComboProperty.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index c3015b91f75..8a01eac87c9 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,10 +1,10 @@
#include "GUI/Model/Item/AxesItems.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Item/RectangularDetectorItem.h"
+#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index b89ffa4ed7e..7df1fc52295 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -1,12 +1,12 @@
#include "Device/Histo/IntensityDataIOFactory.h"
#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
+#include "GUI/Model/Item/JobFunctions.h"
#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Model/ApplicationModels.h"
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Item/JobFunctions.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/OutputDataIOService.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Support/IO/ProjectUtils.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 2b913286f98..770ba369b16 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,9 +1,9 @@
+#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobItemUtils.h"
#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Util/Path.h"
diff --git a/Tests/Unit/GUI/TestRealDataModel.cpp b/Tests/Unit/GUI/TestRealDataModel.cpp
index 2ac40299d42..b1dbe5f2c22 100644
--- a/Tests/Unit/GUI/TestRealDataModel.cpp
+++ b/Tests/Unit/GUI/TestRealDataModel.cpp
@@ -1,7 +1,7 @@
#include "Base/Axis/PointwiseAxis.h"
+#include "GUI/Model/Item/DataItem.h"
#include "GUI/Model/Item/RealDataItem.h"
#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/DataItem.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
index 94e46af9526..0b8c202be6f 100644
--- a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
@@ -1,8 +1,8 @@
-#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Model/ApplicationModels.h"
#include "GUI/Model/Item/FormFactorItems.h"
#include "GUI/Model/Item/ParticleItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Model/ApplicationModels.h"
+#include "GUI/Model/Model/MaterialModel.h"
#include "GUI/Model/Model/SampleModel.h"
#include "GUI/View/Realspace/Particle3DContainer.h"
#include "GUI/View/Realspace/RealSpaceBuilder.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 94121245fdc..4c2d2bd345c 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -1,9 +1,9 @@
+#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobItemUtils.h"
#include "GUI/Model/Item/RealDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Item/JobItemUtils.h"
+#include "GUI/Model/Model/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/IO/ProjectUtils.h"
#include "GUI/Util/Error.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index fd26410beac..03a2829c42c 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -1,14 +1,14 @@
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/Model/Item/PointwiseAxisItem.h"
-#include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/BaseItem/GroupItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Item/IntensityDataItem.h"
+#include "GUI/Model/Item/JobFunctions.h"
+#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/Item/PointwiseAxisItem.h"
#include "GUI/Model/Model/ApplicationModels.h"
+#include "GUI/Model/Model/InstrumentModel.h"
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Item/JobFunctions.h"
#include "GUI/Model/Project/OutputDataIOService.h"
#include "GUI/Support/IO/ItemFileNameUtils.h"
#include "GUI/Support/IO/ProjectUtils.h"
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index 8ef8c830e6a..a44424e1411 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -1,6 +1,6 @@
#include "GUI/Model/BaseItem/PropertyItem.h"
-#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Support/Type/VariantUtil.h"
#include "GUI/Util/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 46de7f3ba92..57386f86d0f 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,14 +1,14 @@
-#include "GUI/Model/Item/JobItem.h"
+#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Item/MaskItems.h"
-#include "GUI/Model/Model/MaterialModel.h"
-#include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Item/JobItem.h"
#include "GUI/Model/Item/LayerItem.h"
+#include "GUI/Model/Item/MaskItems.h"
#include "GUI/Model/Item/MultiLayerItem.h"
-#include "GUI/Model/Model/SampleModel.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Item/VectorItem.h"
+#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/MaterialModel.h"
+#include "GUI/Model/Model/SampleModel.h"
#include "GUI/Support/Data/SessionItemTags.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index 311537af4c8..c8439c5e350 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -1,17 +1,17 @@
+#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Item/BackgroundItems.h"
-#include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/InstrumentModel.h"
-#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Item/FormFactorItems.h"
+#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/Model/Item/LayerItem.h"
#include "GUI/Model/Item/MultiLayerItem.h"
#include "GUI/Model/Item/ParticleItem.h"
#include "GUI/Model/Item/ParticleLayoutItem.h"
+#include "GUI/Model/Model/InstrumentModel.h"
+#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/SampleModel.h"
-#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Model/SessionModel.h"
-#include "GUI/Model/XML/Serializer.h"
#include "GUI/Model/Model/SessionXML.h"
+#include "GUI/Model/XML/Serializer.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
--
GitLab