From d17073fd5b268a79bcca7596fd35b91257850832 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Nov 2021 15:07:09 +0100
Subject: [PATCH] mv out of Varia/
---
GUI/Models/{Varia => Group}/DistributionItems.cpp | 4 ++--
GUI/Models/{Varia => Group}/DistributionItems.h | 8 ++++----
GUI/Models/Group/GroupInfo.h | 2 +-
GUI/Models/Group/GroupItemController.cpp | 2 +-
GUI/Models/{Varia => Group}/ItemCatalog.cpp | 4 ++--
GUI/Models/{Varia => Group}/ItemCatalog.h | 8 ++++----
GUI/Models/{Varia => Group}/ItemFactory.cpp | 6 +++---
GUI/Models/{Varia => Group}/ItemFactory.h | 8 ++++----
GUI/Models/Instrument/BeamDistributionItem.h | 4 ++--
GUI/Models/Job/JobModelFunctions.cpp | 2 +-
GUI/Models/{Varia => Sample}/ItemWithMaterial.cpp | 4 ++--
GUI/Models/{Varia => Sample}/ItemWithMaterial.h | 8 ++++----
GUI/Models/Sample/LayerItem.h | 2 +-
GUI/Models/Sample/ParticleItem.h | 2 +-
GUI/Models/Sample/ParticleLayoutItem.cpp | 2 +-
GUI/Models/Sample/SampleModel.cpp | 2 +-
GUI/Models/Session/SessionItem.cpp | 2 +-
GUI/Models/Session/SessionModel.cpp | 2 +-
GUI/Models/{Varia => Types}/ItemWithDistribution.h | 8 ++++----
GUI/Views/InstrumentWidgets/DistributionEditor.cpp | 4 ++--
GUI/Views/InstrumentWidgets/DistributionForms.cpp | 4 ++--
GUI/Views/InstrumentWidgets/DistributionPlot.cpp | 2 +-
GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp | 2 +-
GUI/Views/MaterialEditor/MaterialEditorDialog.cpp | 2 +-
GUI/Views/SampleDesigner/DesignerScene.cpp | 2 +-
GUI/Views/SampleDesigner/MaterialInplaceForm.cpp | 2 +-
GUI/Views/SampleDesigner/SampleToolBox.cpp | 2 +-
GUI/Views/SampleDesigner/SampleTreeWidget.cpp | 2 +-
Tests/Unit/GUI/TestGroupItem.cpp | 2 +-
29 files changed, 52 insertions(+), 52 deletions(-)
rename GUI/Models/{Varia => Group}/DistributionItems.cpp (99%)
rename GUI/Models/{Varia => Group}/DistributionItems.h (96%)
rename GUI/Models/{Varia => Group}/ItemCatalog.cpp (99%)
rename GUI/Models/{Varia => Group}/ItemCatalog.h (90%)
rename GUI/Models/{Varia => Group}/ItemFactory.cpp (88%)
rename GUI/Models/{Varia => Group}/ItemFactory.h (86%)
rename GUI/Models/{Varia => Sample}/ItemWithMaterial.cpp (95%)
rename GUI/Models/{Varia => Sample}/ItemWithMaterial.h (86%)
rename GUI/Models/{Varia => Types}/ItemWithDistribution.h (80%)
diff --git a/GUI/Models/Varia/DistributionItems.cpp b/GUI/Models/Group/DistributionItems.cpp
similarity index 99%
rename from GUI/Models/Varia/DistributionItems.cpp
rename to GUI/Models/Group/DistributionItems.cpp
index 056e4ecaf19..8784d46e21d 100644
--- a/GUI/Models/Varia/DistributionItems.cpp
+++ b/GUI/Models/Group/DistributionItems.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/DistributionItems.cpp
+//! @file GUI/Models/Group/DistributionItems.cpp
//! @brief Implements class DistributionItem and several subclasses
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Varia/DistributionItems.h"
+#include "GUI/Models/Group/DistributionItems.h"
#include "GUI/Models/Group/GroupInfo.h"
#include "GUI/Models/Varia/RealLimitsItems.h"
#include "Param/Distrib/Distributions.h"
diff --git a/GUI/Models/Varia/DistributionItems.h b/GUI/Models/Group/DistributionItems.h
similarity index 96%
rename from GUI/Models/Varia/DistributionItems.h
rename to GUI/Models/Group/DistributionItems.h
index db16b14d0a0..a4734847bba 100644
--- a/GUI/Models/Varia/DistributionItems.h
+++ b/GUI/Models/Group/DistributionItems.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/DistributionItems.h
+//! @file GUI/Models/Group/DistributionItems.h
//! @brief Defines class DistributionItem and several subclasses
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_DISTRIBUTIONITEMS_H
-#define BORNAGAIN_GUI_MODELS_VARIA_DISTRIBUTIONITEMS_H
+#ifndef BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
+#define BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
#include "GUI/Models/Session/SessionItem.h"
@@ -208,4 +208,4 @@ public:
void setRightWidth(double right_width);
};
-#endif // BORNAGAIN_GUI_MODELS_VARIA_DISTRIBUTIONITEMS_H
+#endif // BORNAGAIN_GUI_MODELS_GROUP_DISTRIBUTIONITEMS_H
diff --git a/GUI/Models/Group/GroupInfo.h b/GUI/Models/Group/GroupInfo.h
index 5966333b3f8..a700e07629b 100644
--- a/GUI/Models/Group/GroupInfo.h
+++ b/GUI/Models/Group/GroupInfo.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
#define BORNAGAIN_GUI_MODELS_GROUP_GROUPINFO_H
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
#include <QString>
#include <QStringList>
#include <QVector>
diff --git a/GUI/Models/Group/GroupItemController.cpp b/GUI/Models/Group/GroupItemController.cpp
index be94c0d17bf..132ef94fabf 100644
--- a/GUI/Models/Group/GroupItemController.cpp
+++ b/GUI/Models/Group/GroupItemController.cpp
@@ -15,7 +15,7 @@
#include "GUI/Models/Group/GroupItemController.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Session/SessionItem.h"
-#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Group/ItemFactory.h"
GroupItemController::GroupItemController(SessionItem* groupItem, GroupInfo groupInfo)
: m_groupItem(groupItem), m_groupInfo(groupInfo)
diff --git a/GUI/Models/Varia/ItemCatalog.cpp b/GUI/Models/Group/ItemCatalog.cpp
similarity index 99%
rename from GUI/Models/Varia/ItemCatalog.cpp
rename to GUI/Models/Group/ItemCatalog.cpp
index cc82c8aabbc..b08d03c7020 100644
--- a/GUI/Models/Varia/ItemCatalog.cpp
+++ b/GUI/Models/Group/ItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ItemCatalog.cpp
+//! @file GUI/Models/Group/ItemCatalog.cpp
//! @brief Implements class ItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
#include "Base/Utils/Assert.h"
#include "GUI/Models/Data/Data1DViewItem.h"
#include "GUI/Models/Data/DataProperties.h"
diff --git a/GUI/Models/Varia/ItemCatalog.h b/GUI/Models/Group/ItemCatalog.h
similarity index 90%
rename from GUI/Models/Varia/ItemCatalog.h
rename to GUI/Models/Group/ItemCatalog.h
index d0b57d2c4c4..964a1a0f455 100644
--- a/GUI/Models/Varia/ItemCatalog.h
+++ b/GUI/Models/Group/ItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ItemCatalog.h
+//! @file GUI/Models/Group/ItemCatalog.h
//! @brief Defines class ItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_ITEMCATALOG_H
-#define BORNAGAIN_GUI_MODELS_VARIA_ITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
+#define BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
#include "Base/Utils/IFactory.h"
#include <QMap>
@@ -64,4 +64,4 @@ private:
};
-#endif // BORNAGAIN_GUI_MODELS_VARIA_ITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODELS_GROUP_ITEMCATALOG_H
diff --git a/GUI/Models/Varia/ItemFactory.cpp b/GUI/Models/Group/ItemFactory.cpp
similarity index 88%
rename from GUI/Models/Varia/ItemFactory.cpp
rename to GUI/Models/Group/ItemFactory.cpp
index 947d47da6f9..1ae12723d55 100644
--- a/GUI/Models/Varia/ItemFactory.cpp
+++ b/GUI/Models/Group/ItemFactory.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ItemFactory.cpp
+//! @file GUI/Models/Group/ItemFactory.cpp
//! @brief Implements class ItemFactory
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/Models/Session/SessionItem.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
SessionItem* GUI::Model::ItemFactory::CreateItem(const QString& model_name, SessionItem* parent)
{
diff --git a/GUI/Models/Varia/ItemFactory.h b/GUI/Models/Group/ItemFactory.h
similarity index 86%
rename from GUI/Models/Varia/ItemFactory.h
rename to GUI/Models/Group/ItemFactory.h
index 7f610cb4ad1..61cf6ab8bb4 100644
--- a/GUI/Models/Varia/ItemFactory.h
+++ b/GUI/Models/Group/ItemFactory.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ItemFactory.h
+//! @file GUI/Models/Group/ItemFactory.h
//! @brief Defines namespace GUI::Model::ItemFactory
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_ITEMFACTORY_H
-#define BORNAGAIN_GUI_MODELS_VARIA_ITEMFACTORY_H
+#ifndef BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
+#define BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
#include <QString>
@@ -39,4 +39,4 @@ template <typename ItemType> ItemType* CreateItem(SessionItem* parent)
}; // namespace GUI::Model::ItemFactory
-#endif // BORNAGAIN_GUI_MODELS_VARIA_ITEMFACTORY_H
+#endif // BORNAGAIN_GUI_MODELS_GROUP_ITEMFACTORY_H
diff --git a/GUI/Models/Instrument/BeamDistributionItem.h b/GUI/Models/Instrument/BeamDistributionItem.h
index 27cac4d8194..5afd96d19e2 100644
--- a/GUI/Models/Instrument/BeamDistributionItem.h
+++ b/GUI/Models/Instrument/BeamDistributionItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
#define BORNAGAIN_GUI_MODELS_INSTRUMENT_BEAMDISTRIBUTIONITEM_H
-#include "GUI/Models/Varia/DistributionItems.h"
-#include "GUI/Models/Varia/ItemWithDistribution.h"
+#include "GUI/Models/Group/DistributionItems.h"
+#include "GUI/Models/Types/ItemWithDistribution.h"
#include "Param/Distrib/ParameterDistribution.h"
//! The BeamDistributionItem handles wavelength, inclination and azimuthal parameter
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Models/Job/JobModelFunctions.cpp
index 110cdb959c1..6176b81340e 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Models/Job/JobModelFunctions.cpp
@@ -31,7 +31,7 @@
#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/ItemFileNameUtils.h"
diff --git a/GUI/Models/Varia/ItemWithMaterial.cpp b/GUI/Models/Sample/ItemWithMaterial.cpp
similarity index 95%
rename from GUI/Models/Varia/ItemWithMaterial.cpp
rename to GUI/Models/Sample/ItemWithMaterial.cpp
index 817fd3bafeb..31c4726e151 100644
--- a/GUI/Models/Varia/ItemWithMaterial.cpp
+++ b/GUI/Models/Sample/ItemWithMaterial.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ItemWithMaterial.cpp
+//! @file GUI/Models/Sample/ItemWithMaterial.cpp
//! @brief Implements class ItemWithMaterial
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModelFunctions.h"
#include "GUI/Models/Material/MaterialItemContainer.h"
diff --git a/GUI/Models/Varia/ItemWithMaterial.h b/GUI/Models/Sample/ItemWithMaterial.h
similarity index 86%
rename from GUI/Models/Varia/ItemWithMaterial.h
rename to GUI/Models/Sample/ItemWithMaterial.h
index 8b3bec7bae6..63fe344c957 100644
--- a/GUI/Models/Varia/ItemWithMaterial.h
+++ b/GUI/Models/Sample/ItemWithMaterial.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ItemWithMaterial.h
+//! @file GUI/Models/Sample/ItemWithMaterial.h
//! @brief Defines abstract item with a material property
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHMATERIAL_H
-#define BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHMATERIAL_H
+#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
+#define BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
#include "GUI/Models/Session/SessionGraphicsItem.h"
@@ -45,4 +45,4 @@ protected:
ItemWithMaterial(const QString& model_type);
};
-#endif // BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHMATERIAL_H
+#endif // BORNAGAIN_GUI_MODELS_SAMPLE_ITEMWITHMATERIAL_H
diff --git a/GUI/Models/Sample/LayerItem.h b/GUI/Models/Sample/LayerItem.h
index 6f5b9f5f2f8..80cd481f753 100644
--- a/GUI/Models/Sample/LayerItem.h
+++ b/GUI/Models/Sample/LayerItem.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODELS_SAMPLE_LAYERITEM_H
#include "GUI/Models/Group/SelectionDescriptor.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
#include <variant>
class LayerZeroRoughnessItem;
diff --git a/GUI/Models/Sample/ParticleItem.h b/GUI/Models/Sample/ParticleItem.h
index 6585bdc4365..f70ccd01151 100644
--- a/GUI/Models/Sample/ParticleItem.h
+++ b/GUI/Models/Sample/ParticleItem.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODELS_SAMPLE_PARTICLEITEM_H
#include "GUI/Models/Sample/ItemWithParticles.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
class FormFactorItem;
class GroupItem;
diff --git a/GUI/Models/Sample/ParticleLayoutItem.cpp b/GUI/Models/Sample/ParticleLayoutItem.cpp
index 7721b838fc0..46936758a64 100644
--- a/GUI/Models/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Models/Sample/ParticleLayoutItem.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
namespace {
diff --git a/GUI/Models/Sample/SampleModel.cpp b/GUI/Models/Sample/SampleModel.cpp
index a83999d5963..b2ec19334e3 100644
--- a/GUI/Models/Sample/SampleModel.cpp
+++ b/GUI/Models/Sample/SampleModel.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Parameter/PropertyItem.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/ItemWithMaterial.h"
+#include "GUI/Models/Sample/ItemWithMaterial.h"
#include <QApplication>
#include <QFontMetrics>
#include <QPixmap>
diff --git a/GUI/Models/Session/SessionItem.cpp b/GUI/Models/Session/SessionItem.cpp
index 90cbdd28f85..19d74e4db76 100644
--- a/GUI/Models/Session/SessionItem.cpp
+++ b/GUI/Models/Session/SessionItem.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/ItemFactory.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 77d3c170c63..0a8059ba246 100644
--- a/GUI/Models/Session/SessionModel.cpp
+++ b/GUI/Models/Session/SessionModel.cpp
@@ -15,7 +15,7 @@
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Session/SessionItemTags.h"
#include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/Models/Varia/ItemFactory.h"
+#include "GUI/Models/Group/ItemFactory.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include <QFile>
diff --git a/GUI/Models/Varia/ItemWithDistribution.h b/GUI/Models/Types/ItemWithDistribution.h
similarity index 80%
rename from GUI/Models/Varia/ItemWithDistribution.h
rename to GUI/Models/Types/ItemWithDistribution.h
index a82914a8848..3496b96b3dd 100644
--- a/GUI/Models/Varia/ItemWithDistribution.h
+++ b/GUI/Models/Types/ItemWithDistribution.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ItemWithDistribution.h
+//! @file GUI/Models/Types/ItemWithDistribution.h
//! @brief Defines abstract item with a distribution
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHDISTRIBUTION_H
-#define BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHDISTRIBUTION_H
+#ifndef BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
+#define BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
#include "Wrap/WinDllMacros.h"
@@ -33,4 +33,4 @@ public:
virtual ~ItemWithDistribution() = default;
};
-#endif // BORNAGAIN_GUI_MODELS_VARIA_ITEMWITHDISTRIBUTION_H
+#endif // BORNAGAIN_GUI_MODELS_TYPES_ITEMWITHDISTRIBUTION_H
diff --git a/GUI/Views/InstrumentWidgets/DistributionEditor.cpp b/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
index 222eafca6ec..488953c681b 100644
--- a/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionEditor.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/DistributionItems.h"
-#include "GUI/Models/Varia/ItemWithDistribution.h"
+#include "GUI/Models/Group/DistributionItems.h"
+#include "GUI/Models/Types/ItemWithDistribution.h"
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
#include "GUI/Views/InstrumentWidgets/EditDistributionDialog.h"
#include "GUI/Views/PropertyEditor/GroupInfoBox.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionForms.cpp b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
index 99fa6f673d0..d35eb802aab 100644
--- a/GUI/Views/InstrumentWidgets/DistributionForms.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
-#include "GUI/Models/Varia/DistributionItems.h"
-#include "GUI/Models/Varia/ItemWithDistribution.h"
+#include "GUI/Models/Group/DistributionItems.h"
+#include "GUI/Models/Types/ItemWithDistribution.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include "GUI/Widgets/Common/ScientificSpinBox.h"
diff --git a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
index 8840b990cfe..8d7b9a27182 100644
--- a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
-#include "GUI/Models/Varia/DistributionItems.h"
+#include "GUI/Models/Group/DistributionItems.h"
#include "GUI/Models/Varia/RealLimitsItems.h"
#include "GUI/Widgets/Info/CautionSign.h"
#include "Param/Distrib/Distributions.h"
diff --git a/GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp b/GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp
index f6b489ae308..acc0ce7e9f0 100644
--- a/GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp
+++ b/GUI/Views/InstrumentWidgets/EditDistributionDialog.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/EditDistributionDialog.h"
-#include "GUI/Models/Varia/ItemWithDistribution.h"
+#include "GUI/Models/Types/ItemWithDistribution.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 54445d9eac0..cd6238e4ea4 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -20,7 +20,7 @@
#include "GUI/Models/Project/ProjectDocument.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/ItemWithMaterial.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/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 62f946409c4..d750f5ac0ac 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -24,7 +24,7 @@
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Trafo/RotationItems.h"
-#include "GUI/Models/Varia/ItemFactory.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 93cb312c508..5ff6b989a01 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -19,7 +19,7 @@
#include "GUI/Models/Session/ModelPath.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/VectorDescriptor.h"
-#include "GUI/Models/Varia/ItemWithMaterial.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"
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index e270578ec54..1ed4be293dd 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Sample/MultiLayerItem.h"
#include "GUI/Models/Sample/ParticleLayoutItem.h"
#include "GUI/Models/Trafo/TransformationItem.h"
-#include "GUI/Models/Varia/ItemCatalog.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 7384ab6f16d..908c8738d66 100644
--- a/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/Views/SampleDesigner/SampleTreeWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Models/Varia/ItemCatalog.h"
+#include "GUI/Models/Group/ItemCatalog.h"
#include "GUI/Views/SampleDesigner/ItemTreeView.h"
#include <QAction>
#include <QMenu>
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index 5dcd7aa3424..02e2852ad89 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -3,7 +3,7 @@
#include "GUI/Models/Sample/FormFactorItems.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/DistributionItems.h"
+#include "GUI/Models/Group/DistributionItems.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
--
GitLab