From f47ca40dc8fd0448030b213ca512156741159f1b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Nov 2021 15:25:07 +0100
Subject: [PATCH] rm GUI/Models/Varia
---
GUI/Models/Data/ApplicationModels.cpp | 2 +-
GUI/Models/Data/Data1DViewItem.cpp | 2 +-
GUI/Models/Data/DataItem.cpp | 2 +-
GUI/Models/Data/DataProperties.cpp | 2 +-
GUI/Models/Data/DocumentModel.cpp | 2 +-
GUI/Models/Domain/DomainSimulationBuilder.cpp | 2 +-
GUI/Models/Domain/GUIObjectBuilder.cpp | 2 +-
GUI/Models/Domain/TransformToDomain.cpp | 2 +-
GUI/Models/Fit/FitParameterItems.cpp | 2 +-
GUI/Models/Fit/MinimizerItemCatalog.h | 2 +-
GUI/Models/Group/DistributionItems.cpp | 2 +-
GUI/Models/Group/GroupItem.cpp | 2 +-
GUI/Models/Group/GroupItemController.cpp | 4 ++--
GUI/Models/Group/ItemCatalog.cpp | 4 ++--
GUI/Models/Group/ItemFactory.cpp | 2 +-
GUI/Models/Group/SelectionDescriptor.h | 2 +-
GUI/Models/Instrument/BeamDistributionItem.cpp | 2 +-
GUI/Models/Instrument/InstrumentModel.cpp | 2 +-
GUI/Models/Instrument/RectangularDetectorItem.cpp | 2 +-
GUI/Models/Job/JobItem.cpp | 2 +-
GUI/Models/Job/JobItemUtils.h | 2 +-
GUI/Models/Job/JobModelFunctions.cpp | 2 +-
GUI/Models/Mapper/ComponentProxyModel.cpp | 2 +-
GUI/Models/Mapper/ComponentProxyStrategy.cpp | 2 +-
GUI/Models/Sample/ParticleItem.h | 2 +-
GUI/Models/Sample/ParticleLayoutItem.cpp | 2 +-
GUI/Models/Sample/SampleModel.cpp | 2 +-
GUI/Models/{Varia => Session}/RealLimitsItems.cpp | 4 ++--
GUI/Models/{Varia => Session}/RealLimitsItems.h | 8 ++++----
GUI/Models/Session/SessionItem.cpp | 2 +-
GUI/Models/Session/SessionModel.cpp | 2 +-
GUI/Models/Session/SessionXML.cpp | 2 +-
GUI/Models/{Varia => Session}/SimulationOptionsItem.cpp | 6 +++---
GUI/Models/{Varia => Session}/SimulationOptionsItem.h | 8 ++++----
GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp | 2 +-
GUI/Views/InstrumentWidgets/DistributionEditor.cpp | 2 +-
GUI/Views/InstrumentWidgets/DistributionPlot.cpp | 2 +-
GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp | 2 +-
GUI/Views/JobWidgets/FitComparisonViewController.cpp | 2 +-
GUI/Views/MaterialEditor/MaterialEditorDialog.cpp | 2 +-
GUI/Views/PropertyEditor/ComponentFlatView.cpp | 2 +-
GUI/Views/PropertyEditor/CustomEditors.cpp | 2 +-
GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp | 2 +-
GUI/Views/PropertyEditor/PropertyEditorFactory.cpp | 2 +-
GUI/Views/SampleDesigner/DesignerScene.cpp | 2 +-
GUI/Views/SampleDesigner/MaterialInplaceForm.cpp | 4 ++--
GUI/Views/SampleDesigner/SampleToolBox.cpp | 2 +-
GUI/Views/SampleDesigner/SampleTreeWidget.cpp | 2 +-
GUI/Views/Toplevel/SimulationView.cpp | 4 ++--
GUI/{Models/Group => utils}/ComboProperty.cpp | 4 ++--
GUI/{Models/Group => utils}/ComboProperty.h | 8 ++++----
Tests/Unit/GUI/Comparators.cpp | 2 +-
Tests/Unit/GUI/TestComboProperty.cpp | 2 +-
Tests/Unit/GUI/TestComponentProxyModel.cpp | 4 ++--
Tests/Unit/GUI/TestComponentUtils.cpp | 2 +-
Tests/Unit/GUI/TestDataItemViews.cpp | 2 +-
Tests/Unit/GUI/TestDetectorItems.cpp | 2 +-
Tests/Unit/GUI/TestGroupItem.cpp | 4 ++--
Tests/Unit/GUI/TestMapperCases.cpp | 4 ++--
Tests/Unit/GUI/TestProxyModelStrategy.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemUtils.cpp | 2 +-
61 files changed, 81 insertions(+), 81 deletions(-)
rename GUI/Models/{Varia => Session}/RealLimitsItems.cpp (97%)
rename GUI/Models/{Varia => Session}/RealLimitsItems.h (92%)
rename GUI/Models/{Varia => Session}/SimulationOptionsItem.cpp (97%)
rename GUI/Models/{Varia => Session}/SimulationOptionsItem.h (89%)
rename GUI/{Models/Group => utils}/ComboProperty.cpp (98%)
rename GUI/{Models/Group => utils}/ComboProperty.h (91%)
diff --git a/GUI/Models/Data/ApplicationModels.cpp b/GUI/Models/Data/ApplicationModels.cpp
index 61276968999..98d628d6340 100644
--- a/GUI/Models/Data/ApplicationModels.cpp
+++ b/GUI/Models/Data/ApplicationModels.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
#include "GUI/utils/DeserializationException.h"
#include <QtCore/QXmlStreamWriter>
diff --git a/GUI/Models/Data/Data1DViewItem.cpp b/GUI/Models/Data/Data1DViewItem.cpp
index 502a54b3184..dcb50ce5fd8 100644
--- a/GUI/Models/Data/Data1DViewItem.cpp
+++ b/GUI/Models/Data/Data1DViewItem.cpp
@@ -18,8 +18,8 @@
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/DataViewUtils.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Job/JobItem.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Models/Data/DataItem.cpp b/GUI/Models/Data/DataItem.cpp
index 4a42d37e9f7..c63441dcca2 100644
--- a/GUI/Models/Data/DataItem.cpp
+++ b/GUI/Models/Data/DataItem.cpp
@@ -14,7 +14,7 @@
#include "GUI/Models/Data/DataItem.h"
#include "Device/Histo/IntensityDataIOFactory.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/Error.h"
void DataItem::setOutputData(OutputData<double>* data)
diff --git a/GUI/Models/Data/DataProperties.cpp b/GUI/Models/Data/DataProperties.cpp
index 30d9f78d92f..7e8fdc912cf 100644
--- a/GUI/Models/Data/DataProperties.cpp
+++ b/GUI/Models/Data/DataProperties.cpp
@@ -14,9 +14,9 @@
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Session/ModelPath.h"
#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/Error.h"
#include <QColor>
diff --git a/GUI/Models/Data/DocumentModel.cpp b/GUI/Models/Data/DocumentModel.cpp
index dbb153f52bc..c0053736577 100644
--- a/GUI/Models/Data/DocumentModel.cpp
+++ b/GUI/Models/Data/DocumentModel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
DocumentModel::DocumentModel(QObject* parent)
: SessionModel(GUI::Session::XML::DocumentModelTag, parent)
diff --git a/GUI/Models/Domain/DomainSimulationBuilder.cpp b/GUI/Models/Domain/DomainSimulationBuilder.cpp
index e8ddf315762..c74e9c15533 100644
--- a/GUI/Models/Domain/DomainSimulationBuilder.cpp
+++ b/GUI/Models/Domain/DomainSimulationBuilder.cpp
@@ -26,7 +26,7 @@
#include "GUI/Models/Instrument/FootprintItems.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Models/Domain/GUIObjectBuilder.cpp b/GUI/Models/Domain/GUIObjectBuilder.cpp
index 52876b4f6bc..029dda791ae 100644
--- a/GUI/Models/Domain/GUIObjectBuilder.cpp
+++ b/GUI/Models/Domain/GUIObjectBuilder.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
#include "Resample/Options/SimulationOptions.h"
namespace {
diff --git a/GUI/Models/Domain/TransformToDomain.cpp b/GUI/Models/Domain/TransformToDomain.cpp
index 887ddbf34d8..3b3f53afded 100644
--- a/GUI/Models/Domain/TransformToDomain.cpp
+++ b/GUI/Models/Domain/TransformToDomain.cpp
@@ -31,12 +31,12 @@
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
#include "GUI/Models/Trafo/RotationItems.h"
#include "GUI/Models/Trafo/TransformationItem.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/UIntDescriptor.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Resample/Options/SimulationOptions.h"
#include "Sample/Particle/MesoCrystal.h"
diff --git a/GUI/Models/Fit/FitParameterItems.cpp b/GUI/Models/Fit/FitParameterItems.cpp
index 5e05f4a4129..d007b5318ff 100644
--- a/GUI/Models/Fit/FitParameterItems.cpp
+++ b/GUI/Models/Fit/FitParameterItems.cpp
@@ -16,9 +16,9 @@
#include "Base/Utils/Assert.h"
#include "Fit/Param/Parameters.h"
#include "GUI/Models/Fit/ParameterTreeItems.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Session/ModelPath.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/Error.h"
#include <cmath>
diff --git a/GUI/Models/Fit/MinimizerItemCatalog.h b/GUI/Models/Fit/MinimizerItemCatalog.h
index b500faf79fa..9294aa072fc 100644
--- a/GUI/Models/Fit/MinimizerItemCatalog.h
+++ b/GUI/Models/Fit/MinimizerItemCatalog.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEMCATALOG_H
#define BORNAGAIN_GUI_MODELS_FIT_MINIMIZERITEMCATALOG_H
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/ComboProperty.h"
class MinimizerItem;
diff --git a/GUI/Models/Group/DistributionItems.cpp b/GUI/Models/Group/DistributionItems.cpp
index 8784d46e21d..51403bcfd45 100644
--- a/GUI/Models/Group/DistributionItems.cpp
+++ b/GUI/Models/Group/DistributionItems.cpp
@@ -14,7 +14,7 @@
#include "GUI/Models/Group/DistributionItems.h"
#include "GUI/Models/Group/GroupInfo.h"
-#include "GUI/Models/Varia/RealLimitsItems.h"
+#include "GUI/Models/Session/RealLimitsItems.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/RangedDistributions.h"
#include <cmath>
diff --git a/GUI/Models/Group/GroupItem.cpp b/GUI/Models/Group/GroupItem.cpp
index 31bb86ef818..f3fbfb740c5 100644
--- a/GUI/Models/Group/GroupItem.cpp
+++ b/GUI/Models/Group/GroupItem.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/Error.h"
GroupItem::GroupItem() : SessionItem(M_TYPE)
diff --git a/GUI/Models/Group/GroupItemController.cpp b/GUI/Models/Group/GroupItemController.cpp
index 132ef94fabf..1bf34dfc23a 100644
--- a/GUI/Models/Group/GroupItemController.cpp
+++ b/GUI/Models/Group/GroupItemController.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Group/GroupItemController.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Models/Group/ItemFactory.h"
+#include "GUI/Models/Session/SessionItem.h"
+#include "GUI/utils/ComboProperty.h"
GroupItemController::GroupItemController(SessionItem* groupItem, GroupInfo groupInfo)
: m_groupItem(groupItem), m_groupInfo(groupInfo)
diff --git a/GUI/Models/Group/ItemCatalog.cpp b/GUI/Models/Group/ItemCatalog.cpp
index b08d03c7020..20f82aa15f5 100644
--- a/GUI/Models/Group/ItemCatalog.cpp
+++ b/GUI/Models/Group/ItemCatalog.cpp
@@ -55,11 +55,11 @@
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Sample/ResolutionFunctionItems.h"
+#include "GUI/Models/Session/RealLimitsItems.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
#include "GUI/Models/Trafo/RotationItems.h"
#include "GUI/Models/Trafo/TransformationItem.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/RealLimitsItems.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
#include "GUI/utils/Error.h"
ItemCatalog::ItemCatalog()
diff --git a/GUI/Models/Group/ItemFactory.cpp b/GUI/Models/Group/ItemFactory.cpp
index 1ae12723d55..f50edb06929 100644
--- a/GUI/Models/Group/ItemFactory.cpp
+++ b/GUI/Models/Group/ItemFactory.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Group/ItemFactory.h"
-#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Models/Group/ItemCatalog.h"
+#include "GUI/Models/Session/SessionItem.h"
SessionItem* GUI::Model::ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
{
diff --git a/GUI/Models/Group/SelectionDescriptor.h b/GUI/Models/Group/SelectionDescriptor.h
index 4a05518e9fd..48cb709465f 100644
--- a/GUI/Models/Group/SelectionDescriptor.h
+++ b/GUI/Models/Group/SelectionDescriptor.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_GROUP_SELECTIONDESCRIPTOR_H
#define BORNAGAIN_GUI_MODELS_GROUP_SELECTIONDESCRIPTOR_H
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/utils/ComboProperty.h"
#include <QString>
#include <QStringList>
#include <functional>
diff --git a/GUI/Models/Instrument/BeamDistributionItem.cpp b/GUI/Models/Instrument/BeamDistributionItem.cpp
index 1002cf834ea..22c93ab20b8 100644
--- a/GUI/Models/Instrument/BeamDistributionItem.cpp
+++ b/GUI/Models/Instrument/BeamDistributionItem.cpp
@@ -14,7 +14,7 @@
#include "GUI/Models/Instrument/BeamDistributionItem.h"
#include "GUI/Models/Group/GroupItem.h"
-#include "GUI/Models/Varia/RealLimitsItems.h"
+#include "GUI/Models/Session/RealLimitsItems.h"
#include "Param/Distrib/Distributions.h"
namespace {
diff --git a/GUI/Models/Instrument/InstrumentModel.cpp b/GUI/Models/Instrument/InstrumentModel.cpp
index b9122ccadbf..bd128cf3a1c 100644
--- a/GUI/Models/Instrument/InstrumentModel.cpp
+++ b/GUI/Models/Instrument/InstrumentModel.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Mapper/ModelUtils.h"
#include "GUI/Models/Data/PointwiseAxisItem.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
+#include "GUI/Models/Mapper/ModelUtils.h"
InstrumentModel::InstrumentModel(QObject* parent)
: SessionModel(GUI::Session::XML::InstrumentModelTag, parent)
diff --git a/GUI/Models/Instrument/RectangularDetectorItem.cpp b/GUI/Models/Instrument/RectangularDetectorItem.cpp
index 6fdec91e4f8..38f7a8b7ce9 100644
--- a/GUI/Models/Instrument/RectangularDetectorItem.cpp
+++ b/GUI/Models/Instrument/RectangularDetectorItem.cpp
@@ -15,8 +15,8 @@
#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "Device/Detector/RectangularDetector.h"
#include "GUI/Models/Data/AxesItems.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/Error.h"
namespace {
diff --git a/GUI/Models/Job/JobItem.cpp b/GUI/Models/Job/JobItem.cpp
index 19a8b953948..d7721e958fd 100644
--- a/GUI/Models/Job/JobItem.cpp
+++ b/GUI/Models/Job/JobItem.cpp
@@ -24,7 +24,7 @@
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/ItemFileNameUtils.h"
diff --git a/GUI/Models/Job/JobItemUtils.h b/GUI/Models/Job/JobItemUtils.h
index 33390d9b6bc..78c8dedd7e3 100644
--- a/GUI/Models/Job/JobItemUtils.h
+++ b/GUI/Models/Job/JobItemUtils.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODELS_JOB_JOBITEMUTILS_H
#include "Device/Detector/IDetector.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/ComboProperty.h"
#include <QMap>
class DataItem;
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Models/Job/JobModelFunctions.cpp
index 6176b81340e..de6f4c54a72 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Models/Job/JobModelFunctions.cpp
@@ -30,8 +30,8 @@
#include "GUI/Models/Job/JobItemUtils.h"
#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ItemWithMaterial.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/ItemFileNameUtils.h"
diff --git a/GUI/Models/Mapper/ComponentProxyModel.cpp b/GUI/Models/Mapper/ComponentProxyModel.cpp
index 0602afbf208..29e4a41d12c 100644
--- a/GUI/Models/Mapper/ComponentProxyModel.cpp
+++ b/GUI/Models/Mapper/ComponentProxyModel.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Mapper/ComponentProxyModel.h"
-#include "GUI/Models/Mapper/ComponentProxyStrategy.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Mapper/ComponentProxyStrategy.h"
#include "GUI/Models/Session/SessionModel.h"
#include <QSet>
#include <functional>
diff --git a/GUI/Models/Mapper/ComponentProxyStrategy.cpp b/GUI/Models/Mapper/ComponentProxyStrategy.cpp
index 4cc0b09cf19..0c37f427b59 100644
--- a/GUI/Models/Mapper/ComponentProxyStrategy.cpp
+++ b/GUI/Models/Mapper/ComponentProxyStrategy.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Mapper/ComponentProxyStrategy.h"
+#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Mapper/ComponentProxyModel.h"
#include "GUI/Models/Mapper/ComponentUtils.h"
-#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Session/ModelPath.h"
#include "GUI/Models/Session/SessionModel.h"
diff --git a/GUI/Models/Sample/ParticleItem.h b/GUI/Models/Sample/ParticleItem.h
index f70ccd01151..3bdc431446d 100644
--- a/GUI/Models/Sample/ParticleItem.h
+++ b/GUI/Models/Sample/ParticleItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
#define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
-#include "GUI/Models/Sample/ItemWithParticles.h"
#include "GUI/Models/Sample/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithParticles.h"
class FormFactorItem;
class GroupItem;
diff --git a/GUI/Models/Sample/ParticleLayoutItem.cpp b/GUI/Models/Sample/ParticleLayoutItem.cpp
index 46936758a64..54e74453dad 100644
--- a/GUI/Models/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Models/Sample/ParticleLayoutItem.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/Models/Sample/ParticleLayoutItem.h"
+#include "GUI/Models/Group/ItemCatalog.h"
#include "GUI/Models/Sample/InterferenceItems.h"
#include "GUI/Models/Sample/Lattice2DItems.h"
#include "GUI/Models/Sample/MesoCrystalItem.h"
@@ -21,7 +22,6 @@
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/Models/Group/ItemCatalog.h"
namespace {
diff --git a/GUI/Models/Sample/SampleModel.cpp b/GUI/Models/Sample/SampleModel.cpp
index b2ec19334e3..180a60fdf44 100644
--- a/GUI/Models/Sample/SampleModel.cpp
+++ b/GUI/Models/Sample/SampleModel.cpp
@@ -16,8 +16,8 @@
#include "GUI/Models/Mapper/ModelUtils.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Parameter/PropertyItem.h"
-#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ItemWithMaterial.h"
+#include "GUI/Models/Sample/MultiLayerItem.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/Models/Varia/RealLimitsItems.cpp b/GUI/Models/Session/RealLimitsItems.cpp
similarity index 97%
rename from GUI/Models/Varia/RealLimitsItems.cpp
rename to GUI/Models/Session/RealLimitsItems.cpp
index 59e666f6560..698f16a935f 100644
--- a/GUI/Models/Varia/RealLimitsItems.cpp
+++ b/GUI/Models/Session/RealLimitsItems.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/RealLimitsItems.cpp
+//! @file GUI/Models/Session/RealLimitsItems.cpp
//! @brief Defines RealLimitsItems's classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Varia/RealLimitsItems.h"
+#include "GUI/Models/Session/RealLimitsItems.h"
namespace {
const QString tooltip_min_value = "Minimum allowed value, value included.";
diff --git a/GUI/Models/Varia/RealLimitsItems.h b/GUI/Models/Session/RealLimitsItems.h
similarity index 92%
rename from GUI/Models/Varia/RealLimitsItems.h
rename to GUI/Models/Session/RealLimitsItems.h
index 132fdaf9009..c9f30ed2db4 100644
--- a/GUI/Models/Varia/RealLimitsItems.h
+++ b/GUI/Models/Session/RealLimitsItems.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/RealLimitsItems.h
+//! @file GUI/Models/Session/RealLimitsItems.h
//! @brief Defines RealLimitsItems's classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_REALLIMITSITEMS_H
-#define BORNAGAIN_GUI_MODELS_VARIA_REALLIMITSITEMS_H
+#ifndef BORNAGAIN_GUI_MODELS_SESSION_REALLIMITSITEMS_H
+#define BORNAGAIN_GUI_MODELS_SESSION_REALLIMITSITEMS_H
#include <optional>
@@ -89,4 +89,4 @@ public:
using RealLimitsItem::setUpperLimit;
};
-#endif // BORNAGAIN_GUI_MODELS_VARIA_REALLIMITSITEMS_H
+#endif // BORNAGAIN_GUI_MODELS_SESSION_REALLIMITSITEMS_H
diff --git a/GUI/Models/Session/SessionItem.cpp b/GUI/Models/Session/SessionItem.cpp
index 19d74e4db76..a6d26393931 100644
--- a/GUI/Models/Session/SessionItem.cpp
+++ b/GUI/Models/Session/SessionItem.cpp
@@ -14,12 +14,12 @@
#include "GUI/Models/Fit/ParameterTreeItems.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/Models/Parameter/PropertyItem.h"
#include "GUI/Models/Session/SessionItemData.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Group/ItemFactory.h"
//! Constructs new item with given model type. The type must be defined.
SessionItem::SessionItem(const QString& modelType)
diff --git a/GUI/Models/Session/SessionModel.cpp b/GUI/Models/Session/SessionModel.cpp
index 0a8059ba246..47d3d4daa27 100644
--- a/GUI/Models/Session/SessionModel.cpp
+++ b/GUI/Models/Session/SessionModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include <QFile>
diff --git a/GUI/Models/Session/SessionXML.cpp b/GUI/Models/Session/SessionXML.cpp
index 53f9c9b2296..67a692cd976 100644
--- a/GUI/Models/Session/SessionXML.cpp
+++ b/GUI/Models/Session/SessionXML.cpp
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Material/MaterialItem.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionModel.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/DeserializationException.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/MessageService.h"
diff --git a/GUI/Models/Varia/SimulationOptionsItem.cpp b/GUI/Models/Session/SimulationOptionsItem.cpp
similarity index 97%
rename from GUI/Models/Varia/SimulationOptionsItem.cpp
rename to GUI/Models/Session/SimulationOptionsItem.cpp
index 4236b10ce39..1b617070f3f 100644
--- a/GUI/Models/Varia/SimulationOptionsItem.cpp
+++ b/GUI/Models/Session/SimulationOptionsItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/SimulationOptionsItem.cpp
+//! @file GUI/Models/Session/SimulationOptionsItem.cpp
//! @brief Defines class SimulationOptionsItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
+#include "GUI/utils/ComboProperty.h"
#include <thread>
// !! Attention !! Do not change the following texts, despite they are not matching the
diff --git a/GUI/Models/Varia/SimulationOptionsItem.h b/GUI/Models/Session/SimulationOptionsItem.h
similarity index 89%
rename from GUI/Models/Varia/SimulationOptionsItem.h
rename to GUI/Models/Session/SimulationOptionsItem.h
index 34ccc90a59e..11c16467a86 100644
--- a/GUI/Models/Varia/SimulationOptionsItem.h
+++ b/GUI/Models/Session/SimulationOptionsItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/SimulationOptionsItem.h
+//! @file GUI/Models/Session/SimulationOptionsItem.h
//! @brief Defines class SimulationOptionsItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_SIMULATIONOPTIONSITEM_H
-#define BORNAGAIN_GUI_MODELS_VARIA_SIMULATIONOPTIONSITEM_H
+#ifndef BORNAGAIN_GUI_MODELS_SESSION_SIMULATIONOPTIONSITEM_H
+#define BORNAGAIN_GUI_MODELS_SESSION_SIMULATIONOPTIONSITEM_H
#include "GUI/Models/Session/SessionItem.h"
#include <QMap>
@@ -58,4 +58,4 @@ public:
bool includeSpecularPeak() const;
};
-#endif // BORNAGAIN_GUI_MODELS_VARIA_SIMULATIONOPTIONSITEM_H
+#endif // BORNAGAIN_GUI_MODELS_SESSION_SIMULATIONOPTIONSITEM_H
diff --git a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
index 81eefd75c5c..908b7e79007 100644
--- a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Views/InstrumentWidgets/VectorEditor.h"
+#include "GUI/utils/ComboProperty.h"
#include <QComboBox>
#include <QDoubleSpinBox>
diff --git a/GUI/Views/InstrumentWidgets/DistributionEditor.cpp b/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
index 488953c681b..07afd08b938 100644
--- a/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
-#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Group/DistributionItems.h"
+#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/ItemWithDistribution.h"
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
#include "GUI/Views/InstrumentWidgets/EditDistributionDialog.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
index 8d7b9a27182..f837fb276dc 100644
--- a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
#include "GUI/Models/Group/DistributionItems.h"
-#include "GUI/Models/Varia/RealLimitsItems.h"
+#include "GUI/Models/Session/RealLimitsItems.h"
#include "GUI/Widgets/Info/CautionSign.h"
#include "Param/Distrib/Distributions.h"
#include <QLabel>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index 529a203923a..d3a76a69faf 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -15,12 +15,12 @@
#include "GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h"
#include "GUI/Models/Data/IntensityDataItem.h"
#include "GUI/Models/Data/RealDataItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/Main/ProjectManager.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/GUIHelpers.h"
#include <QAction>
#include <QMouseEvent>
diff --git a/GUI/Views/JobWidgets/FitComparisonViewController.cpp b/GUI/Views/JobWidgets/FitComparisonViewController.cpp
index 305e61765bd..a7f16730f25 100644
--- a/GUI/Views/JobWidgets/FitComparisonViewController.cpp
+++ b/GUI/Views/JobWidgets/FitComparisonViewController.cpp
@@ -20,10 +20,10 @@
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/RealDataItem.h"
#include "GUI/Models/Data/SpecularDataItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/IntensityDataWidgets/PropertyRepeater.h"
+#include "GUI/utils/ComboProperty.h"
namespace {
const double relative_diff_min_1d = 1e-05;
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index cd6238e4ea4..2c3a7749e62 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -18,9 +18,9 @@
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Sample/ItemWithMaterial.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
#include "GUI/Widgets/Common/StyleUtils.h"
diff --git a/GUI/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
index 318e8b0161b..243ae1a1668 100644
--- a/GUI/Views/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/ComponentFlatView.h"
-#include "GUI/Models/Mapper/ComponentUtils.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Mapper/ComponentUtils.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
#include "GUI/Views/PropertyEditor/PropertyWidgetItem.h"
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index d4b17e3d061..3143b7d760a 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -15,12 +15,12 @@
#include "GUI/Views/PropertyEditor/CustomEditors.h"
#include "Base/Utils/Assert.h"
#include "Fit/Param/RealLimits.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/State/SessionData.h"
#include "GUI/Views/Main/ProjectManager.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Widgets/Common/ScientificSpinBox.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp b/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp
index d4db8d25456..bd3b6423dab 100644
--- a/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp
+++ b/GUI/Views/PropertyEditor/MultiComboPropertyEditor.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QComboBox>
#include <QEvent>
diff --git a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
index 413a681441a..a9e2c9ef69b 100644
--- a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Session/SessionFlags.h"
#include "GUI/Models/Session/SessionItem.h"
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
#include "GUI/Widgets/Common/ScientificSpinBox.h"
+#include "GUI/utils/ComboProperty.h"
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index d750f5ac0ac..5eca1c04db1 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/DesignerScene.h"
+#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
@@ -24,7 +25,6 @@
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Trafo/RotationItems.h"
-#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index 5ff6b989a01..4be24ce18cb 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -16,11 +16,11 @@
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
#include "GUI/Models/Session/ModelPath.h"
+#include "GUI/Models/State/SessionData.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Models/Sample/ItemWithMaterial.h"
-#include "GUI/Models/State/SessionData.h"
#include "GUI/Views/Edit/DoubleLineEdit.h"
#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index 1ed4be293dd..07ce7038815 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleToolBox.h"
+#include "GUI/Models/Group/ItemCatalog.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Trafo/TransformationItem.h"
-#include "GUI/Models/Group/ItemCatalog.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/SampleToolBoxTreeWidget.h"
#include <QApplication>
diff --git a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
index 908c8738d66..99233de87c8 100644
--- a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
+#include "GUI/Models/Group/ItemCatalog.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Models/Group/ItemCatalog.h"
#include "GUI/Views/SampleDesigner/ItemTreeView.h"
#include <QAction>
#include <QMenu>
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index 6ecd1553889..879baf26a0b 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SimulationView.h"
-#include "GUI/Models/Mapper/ModelUtils.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Data/RealDataItem.h"
@@ -22,11 +21,12 @@
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Mapper/ModelUtils.h"
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Sample/SampleValidator.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
#include "GUI/Models/State/SessionData.h"
#include "GUI/Views/Main/MainWindow.h"
#include "GUI/Views/Main/ProjectManager.h"
diff --git a/GUI/Models/Group/ComboProperty.cpp b/GUI/utils/ComboProperty.cpp
similarity index 98%
rename from GUI/Models/Group/ComboProperty.cpp
rename to GUI/utils/ComboProperty.cpp
index 5b676ce738b..d4c8e537c90 100644
--- a/GUI/Models/Group/ComboProperty.cpp
+++ b/GUI/utils/ComboProperty.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Group/ComboProperty.cpp
+//! @file GUI/utils/ComboProperty.cpp
//! @brief Implements class ComboProperty
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/ComboProperty.h"
#include "Base/Utils/Assert.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/Models/Group/ComboProperty.h b/GUI/utils/ComboProperty.h
similarity index 91%
rename from GUI/Models/Group/ComboProperty.h
rename to GUI/utils/ComboProperty.h
index 23bcf520752..9b7a25441a3 100644
--- a/GUI/Models/Group/ComboProperty.h
+++ b/GUI/utils/ComboProperty.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Group/ComboProperty.h
+//! @file GUI/utils/ComboProperty.h
//! @brief Defines class ComboProperty
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_GROUP_COMBOPROPERTY_H
-#define BORNAGAIN_GUI_MODELS_GROUP_COMBOPROPERTY_H
+#ifndef BORNAGAIN_GUI_UTILS_COMBOPROPERTY_H
+#define BORNAGAIN_GUI_UTILS_COMBOPROPERTY_H
#include <QStringList>
#include <QVariant>
@@ -72,4 +72,4 @@ private:
Q_DECLARE_METATYPE(ComboProperty)
-#endif // BORNAGAIN_GUI_MODELS_GROUP_COMBOPROPERTY_H
+#endif // BORNAGAIN_GUI_UTILS_COMBOPROPERTY_H
diff --git a/Tests/Unit/GUI/Comparators.cpp b/Tests/Unit/GUI/Comparators.cpp
index 993c9ce0e9d..c66d8940df9 100644
--- a/Tests/Unit/GUI/Comparators.cpp
+++ b/Tests/Unit/GUI/Comparators.cpp
@@ -1,5 +1,5 @@
#include "Tests/Unit/GUI/Comparators.h"
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/ComboProperty.h"
#include <QMetaType>
bool Comparators::m_is_registered = false;
diff --git a/Tests/Unit/GUI/TestComboProperty.cpp b/Tests/Unit/GUI/TestComboProperty.cpp
index 1612159d4bd..6f525d18551 100644
--- a/Tests/Unit/GUI/TestComboProperty.cpp
+++ b/Tests/Unit/GUI/TestComboProperty.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Comparators.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
index 37b7f9afda3..e6a5fb3828a 100644
--- a/Tests/Unit/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -1,8 +1,7 @@
+#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Mapper/ComponentProxyModel.h"
#include "GUI/Models/Mapper/ComponentProxyStrategy.h"
#include "GUI/Models/Mapper/ModelUtils.h"
-#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
@@ -10,6 +9,7 @@
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestComponentUtils.cpp b/Tests/Unit/GUI/TestComponentUtils.cpp
index c4142fcf8f4..82b2d92b78f 100644
--- a/Tests/Unit/GUI/TestComponentUtils.cpp
+++ b/Tests/Unit/GUI/TestComponentUtils.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Models/Mapper/ComponentUtils.h"
#include "GUI/Models/Group/GroupItem.h"
+#include "GUI/Models/Mapper/ComponentUtils.h"
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionModel.h"
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 548606f51cc..ef462212c7a 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -4,8 +4,8 @@
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Data/SpecularDataItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Project/ProjectDocument.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/MessageService.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index 01fffc4f4f7..511c8b35d02 100644
--- a/Tests/Unit/GUI/TestDetectorItems.cpp
+++ b/Tests/Unit/GUI/TestDetectorItems.cpp
@@ -2,12 +2,12 @@
#include "Device/Detector/IDetector2D.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Instrument/RectangularDetectorItem.h"
#include "GUI/Models/Sample/ResolutionFunctionItems.h"
#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
class TestDetectorItems : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index 02e2852ad89..6f41178dd0e 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -1,9 +1,9 @@
-#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Models/Group/DistributionItems.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Group/DistributionItems.h"
+#include "GUI/utils/ComboProperty.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestMapperCases.cpp b/Tests/Unit/GUI/TestMapperCases.cpp
index 701bdeefc24..d6bf3238a95 100644
--- a/Tests/Unit/GUI/TestMapperCases.cpp
+++ b/Tests/Unit/GUI/TestMapperCases.cpp
@@ -1,5 +1,4 @@
#include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Sample/LayerItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleCompositionItem.h"
@@ -7,7 +6,8 @@
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/Models/Varia/SimulationOptionsItem.h"
+#include "GUI/Models/Session/SimulationOptionsItem.h"
+#include "GUI/utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QtTest>
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index f11e5e2ba37..e929ad0d5f0 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -1,7 +1,7 @@
+#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Mapper/ComponentProxyModel.h"
#include "GUI/Models/Mapper/ComponentProxyStrategy.h"
#include "GUI/Models/Mapper/ModelUtils.h"
-#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Parameter/PropertyItem.h"
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Sample/ParticleItem.h"
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index b21490b52b2..5ce57bc7fd3 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -1,8 +1,8 @@
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Parameter/PropertyItem.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/VectorItem.h"
+#include "GUI/utils/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
class TestSessionItemUtils : public ::testing::Test {
--
GitLab