From 033ebdea68a540b4ea583dbb44e097b680cc8cb8 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 8 Feb 2022 11:03:39 +0100
Subject: [PATCH] mv types to support

---
 GUI/Model/BaseItem/GroupItemController.h           | 2 +-
 GUI/Model/Descriptor/DoubleDescriptor.h            | 2 +-
 GUI/Model/Descriptor/UIntDescriptor.h              | 2 +-
 GUI/Model/Descriptor/UIntProperty.h                | 2 +-
 GUI/Model/Device/DetectorItems.cpp                 | 2 +-
 GUI/Model/Item/DistributionItems.cpp               | 2 +-
 GUI/Model/MakeItem/ResolutionFunctionItemCatalog.h | 2 +-
 GUI/{Model/Types => Support/Type}/GroupInfo.cpp    | 4 ++--
 GUI/{Model/Types => Support/Type}/GroupInfo.h      | 8 ++++----
 GUI/{Model/Types => Support/Type}/Unit.cpp         | 4 ++--
 GUI/{Model/Types => Support/Type}/Unit.h           | 8 ++++----
 GUI/View/Tool/WidgetUtils.h                        | 2 +-
 Tests/Unit/GUI/TestDetectorItems.cpp               | 2 +-
 13 files changed, 21 insertions(+), 21 deletions(-)
 rename GUI/{Model/Types => Support/Type}/GroupInfo.cpp (95%)
 rename GUI/{Model/Types => Support/Type}/GroupInfo.h (89%)
 rename GUI/{Model/Types => Support/Type}/Unit.cpp (96%)
 rename GUI/{Model/Types => Support/Type}/Unit.h (89%)

diff --git a/GUI/Model/BaseItem/GroupItemController.h b/GUI/Model/BaseItem/GroupItemController.h
index eac403719af..0c8cf1725c1 100644
--- a/GUI/Model/BaseItem/GroupItemController.h
+++ b/GUI/Model/BaseItem/GroupItemController.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_BASEITEM_GROUPITEMCONTROLLER_H
 #define BORNAGAIN_GUI_MODEL_BASEITEM_GROUPITEMCONTROLLER_H
 
-#include "GUI/Model/Types/GroupInfo.h"
+#include "GUI/Support/Type/GroupInfo.h"
 #include <QStringList>
 #include <QVariant>
 
diff --git a/GUI/Model/Descriptor/DoubleDescriptor.h b/GUI/Model/Descriptor/DoubleDescriptor.h
index 89c99bd9991..66108fa1601 100644
--- a/GUI/Model/Descriptor/DoubleDescriptor.h
+++ b/GUI/Model/Descriptor/DoubleDescriptor.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODEL_DESCRIPTOR_DOUBLEDESCRIPTOR_H
 
 #include "Fit/Param/RealLimits.h"
-#include "GUI/Model/Types/Unit.h"
+#include "GUI/Support/Type/Unit.h"
 #include <QList>
 #include <QString>
 #include <functional>
diff --git a/GUI/Model/Descriptor/UIntDescriptor.h b/GUI/Model/Descriptor/UIntDescriptor.h
index 00bf66957c9..36c6f04388c 100644
--- a/GUI/Model/Descriptor/UIntDescriptor.h
+++ b/GUI/Model/Descriptor/UIntDescriptor.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODEL_DESCRIPTOR_UINTDESCRIPTOR_H
 
 #include "Fit/Param/RealLimits.h"
-#include "GUI/Model/Types/Unit.h"
+#include "GUI/Support/Type/Unit.h"
 #include <QString>
 #include <functional>
 #include <variant>
diff --git a/GUI/Model/Descriptor/UIntProperty.h b/GUI/Model/Descriptor/UIntProperty.h
index c0da0a88b48..90a1e1696e3 100644
--- a/GUI/Model/Descriptor/UIntProperty.h
+++ b/GUI/Model/Descriptor/UIntProperty.h
@@ -17,7 +17,7 @@
 
 #include "Fit/Param/RealLimits.h"
 #include "GUI/Model/Descriptor/UIntDescriptor.h"
-#include "GUI/Model/Types/Unit.h"
+#include "GUI/Support/Type/Unit.h"
 #include <QString>
 #include <functional>
 #include <variant>
diff --git a/GUI/Model/Device/DetectorItems.cpp b/GUI/Model/Device/DetectorItems.cpp
index 02a153c4f2a..d6ddf1ad142 100644
--- a/GUI/Model/Device/DetectorItems.cpp
+++ b/GUI/Model/Device/DetectorItems.cpp
@@ -16,7 +16,7 @@
 #include "Device/Detector/IDetector2D.h"
 #include "Device/Mask/IShape2D.h"
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Model/Types/GroupInfo.h"
+#include "GUI/Support/Type/GroupInfo.h"
 #include "GUI/Model/Device/MaskItems.h"
 #include "GUI/Model/Device/ResolutionFunctionItems.h"
 #include "GUI/Model/Device/SphericalDetectorItem.h"
diff --git a/GUI/Model/Item/DistributionItems.cpp b/GUI/Model/Item/DistributionItems.cpp
index e7c5b0781c0..6cd4754093b 100644
--- a/GUI/Model/Item/DistributionItems.cpp
+++ b/GUI/Model/Item/DistributionItems.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Item/DistributionItems.h"
-#include "GUI/Model/Types/GroupInfo.h"
+#include "GUI/Support/Type/GroupInfo.h"
 #include "GUI/Model/Descriptor/DoubleDescriptor.h"
 #include "GUI/Model/XML/Serializer.h"
 #include "Param/Distrib/Distributions.h"
diff --git a/GUI/Model/MakeItem/ResolutionFunctionItemCatalog.h b/GUI/Model/MakeItem/ResolutionFunctionItemCatalog.h
index c7648a5ba13..657655ac9ec 100644
--- a/GUI/Model/MakeItem/ResolutionFunctionItemCatalog.h
+++ b/GUI/Model/MakeItem/ResolutionFunctionItemCatalog.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_MAKEITEM_RESOLUTIONFUNCTIONITEMCATALOG_H
 #define BORNAGAIN_GUI_MODEL_MAKEITEM_RESOLUTIONFUNCTIONITEMCATALOG_H
 
-#include "GUI/Model/Types/Unit.h"
+#include "GUI/Support/Type/Unit.h"
 #include <QString>
 #include <QVector>
 #include <variant>
diff --git a/GUI/Model/Types/GroupInfo.cpp b/GUI/Support/Type/GroupInfo.cpp
similarity index 95%
rename from GUI/Model/Types/GroupInfo.cpp
rename to GUI/Support/Type/GroupInfo.cpp
index 24d709d7d29..c2fc92c09c8 100644
--- a/GUI/Model/Types/GroupInfo.cpp
+++ b/GUI/Support/Type/GroupInfo.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Types/GroupInfo.cpp
+//! @file      GUI/Support/Type/GroupInfo.cpp
 //! @brief     Defines class GroupInfo
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Types/GroupInfo.h"
+#include "GUI/Support/Type/GroupInfo.h"
 #include "Base/Util/Assert.h"
 
 GroupInfo::GroupInfo(bool is_sorted)
diff --git a/GUI/Model/Types/GroupInfo.h b/GUI/Support/Type/GroupInfo.h
similarity index 89%
rename from GUI/Model/Types/GroupInfo.h
rename to GUI/Support/Type/GroupInfo.h
index f57769864f6..45208678262 100644
--- a/GUI/Model/Types/GroupInfo.h
+++ b/GUI/Support/Type/GroupInfo.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Types/GroupInfo.h
+//! @file      GUI/Support/Type/GroupInfo.h
 //! @brief     Defines class GroupInfo
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_TYPES_GROUPINFO_H
-#define BORNAGAIN_GUI_MODEL_TYPES_GROUPINFO_H
+#ifndef BORNAGAIN_GUI_SUPPORT_TYPE_GROUPINFO_H
+#define BORNAGAIN_GUI_SUPPORT_TYPE_GROUPINFO_H
 
 #include <QString>
 #include <QStringList>
@@ -52,4 +52,4 @@ private:
     QVector<TypeAndLabel> m_info;
 };
 
-#endif // BORNAGAIN_GUI_MODEL_TYPES_GROUPINFO_H
+#endif // BORNAGAIN_GUI_SUPPORT_TYPE_GROUPINFO_H
diff --git a/GUI/Model/Types/Unit.cpp b/GUI/Support/Type/Unit.cpp
similarity index 96%
rename from GUI/Model/Types/Unit.cpp
rename to GUI/Support/Type/Unit.cpp
index 2d063195a8d..e04a37521c0 100644
--- a/GUI/Model/Types/Unit.cpp
+++ b/GUI/Support/Type/Unit.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Types/Unit.cpp
+//! @file      GUI/Support/Type/Unit.cpp
 //! @brief     Implements class Unit
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Types/Unit.h"
+#include "GUI/Support/Type/Unit.h"
 #include "Base/Const/Units.h"
 #include "Base/Util/Assert.h"
 #include <QString>
diff --git a/GUI/Model/Types/Unit.h b/GUI/Support/Type/Unit.h
similarity index 89%
rename from GUI/Model/Types/Unit.h
rename to GUI/Support/Type/Unit.h
index 98f30ec0c71..106bba5895c 100644
--- a/GUI/Model/Types/Unit.h
+++ b/GUI/Support/Type/Unit.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Types/Unit.h
+//! @file      GUI/Support/Type/Unit.h
 //! @brief     Defines class Unit
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_TYPES_UNIT_H
-#define BORNAGAIN_GUI_MODEL_TYPES_UNIT_H
+#ifndef BORNAGAIN_GUI_SUPPORT_TYPE_UNIT_H
+#define BORNAGAIN_GUI_SUPPORT_TYPE_UNIT_H
 
 class QString;
 
@@ -43,4 +43,4 @@ double convert(double d, Unit from, Unit to);
 //! Returns the string for the given unit
 QString unitAsString(const Unit& unit);
 
-#endif // BORNAGAIN_GUI_MODEL_TYPES_UNIT_H
+#endif // BORNAGAIN_GUI_SUPPORT_TYPE_UNIT_H
diff --git a/GUI/View/Tool/WidgetUtils.h b/GUI/View/Tool/WidgetUtils.h
index a8d40cc932c..0401588fd3e 100644
--- a/GUI/View/Tool/WidgetUtils.h
+++ b/GUI/View/Tool/WidgetUtils.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_VIEW_TOOL_WIDGETUTILS_H
 
 #include "GUI/Model/Descriptor/SelectionDescriptor.h"
-#include "GUI/Model/Types/Unit.h"
+#include "GUI/Support/Type/Unit.h"
 #include "GUI/View/PropertyEditor/CustomEventFilters.h"
 #include <QComboBox>
 #include <variant>
diff --git a/Tests/Unit/GUI/TestDetectorItems.cpp b/Tests/Unit/GUI/TestDetectorItems.cpp
index b9e589bd523..d9047e16532 100644
--- a/Tests/Unit/GUI/TestDetectorItems.cpp
+++ b/Tests/Unit/GUI/TestDetectorItems.cpp
@@ -6,7 +6,7 @@
 #include "GUI/Model/Device/RectangularDetectorItem.h"
 #include "GUI/Model/Device/ResolutionFunctionItems.h"
 #include "GUI/Model/Device/SphericalDetectorItem.h"
-#include "GUI/Model/Types/Unit.h"
+#include "GUI/Support/Type/Unit.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class TestDetectorItems : public ::testing::Test {
-- 
GitLab