From cdd3be975016dfffec6ecbfcc6e76fe24b993677 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 14 Mar 2024 09:08:59 +0100
Subject: [PATCH] rename GUI/Support/Data/ComboProperty -> GUI/Model/Type/
---
GUI/Model/Mini/MinimizerItemCatalog.h | 2 +-
GUI/Model/Mini/MinimizerItems.h | 2 +-
GUI/Model/Tune/FitParameterItem.h | 2 +-
GUI/{Support/Data => Model/Type}/ComboProperty.cpp | 4 ++--
GUI/{Support/Data => Model/Type}/ComboProperty.h | 8 ++++----
GUI/View/Base/AppConfig.cpp | 2 +-
GUI/View/Main/ActionManager.cpp | 2 +-
GUI/View/Numeric/ComboUtil.cpp | 2 +-
GUI/View/ParEdit/CustomEditors.cpp | 2 +-
GUI/View/ParEdit/FitParameterDelegate.cpp | 2 +-
GUI/View/Setup/AxisPanel.cpp | 2 +-
Tests/Unit/GUI/Comparators.cpp | 2 +-
Tests/Unit/GUI/TestComboProperty.cpp | 2 +-
13 files changed, 17 insertions(+), 17 deletions(-)
rename GUI/{Support/Data => Model/Type}/ComboProperty.cpp (98%)
rename GUI/{Support/Data => Model/Type}/ComboProperty.h (92%)
diff --git a/GUI/Model/Mini/MinimizerItemCatalog.h b/GUI/Model/Mini/MinimizerItemCatalog.h
index f214f75b94c..780578aa9b9 100644
--- a/GUI/Model/Mini/MinimizerItemCatalog.h
+++ b/GUI/Model/Mini/MinimizerItemCatalog.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMCATALOG_H
#define BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMCATALOG_H
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
//! The MinimizerItemCatalog class is a static class to provide MinimizerItem
//! with the list of available minimizers/algorithms.
diff --git a/GUI/Model/Mini/MinimizerItems.h b/GUI/Model/Mini/MinimizerItems.h
index dd4c758cd64..614a8e151d5 100644
--- a/GUI/Model/Mini/MinimizerItems.h
+++ b/GUI/Model/Mini/MinimizerItems.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMS_H
#define BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMS_H
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
class GSLLMAMinimizerItem;
class GSLMultiMinimizerItem;
diff --git a/GUI/Model/Tune/FitParameterItem.h b/GUI/Model/Tune/FitParameterItem.h
index ee0a91822f3..297d9da01fb 100644
--- a/GUI/Model/Tune/FitParameterItem.h
+++ b/GUI/Model/Tune/FitParameterItem.h
@@ -17,7 +17,7 @@
#include "Base/Type/OwningVector.h"
#include "Fit/Param/AttLimits.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
class FitParameterLinkItem;
diff --git a/GUI/Support/Data/ComboProperty.cpp b/GUI/Model/Type/ComboProperty.cpp
similarity index 98%
rename from GUI/Support/Data/ComboProperty.cpp
rename to GUI/Model/Type/ComboProperty.cpp
index ec69c2b5467..2c235ec460c 100644
--- a/GUI/Support/Data/ComboProperty.cpp
+++ b/GUI/Model/Type/ComboProperty.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Support/Data/ComboProperty.cpp
+//! @file GUI/Model/Type/ComboProperty.cpp
//! @brief Implements class ComboProperty.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
#include "Base/Util/Assert.h"
#include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Support/Data/ComboProperty.h b/GUI/Model/Type/ComboProperty.h
similarity index 92%
rename from GUI/Support/Data/ComboProperty.h
rename to GUI/Model/Type/ComboProperty.h
index 78740edf24e..30a36aff4e2 100644
--- a/GUI/Support/Data/ComboProperty.h
+++ b/GUI/Model/Type/ComboProperty.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Support/Data/ComboProperty.h
+//! @file GUI/Model/Type/ComboProperty.h
//! @brief Defines class ComboProperty.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_SUPPORT_DATA_COMBOPROPERTY_H
-#define BORNAGAIN_GUI_SUPPORT_DATA_COMBOPROPERTY_H
+#ifndef BORNAGAIN_GUI_MODEL_TYPE_COMBOPROPERTY_H
+#define BORNAGAIN_GUI_MODEL_TYPE_COMBOPROPERTY_H
#include <QStringList>
#include <QVariant>
@@ -78,4 +78,4 @@ private:
Q_DECLARE_METATYPE(ComboProperty)
-#endif // BORNAGAIN_GUI_SUPPORT_DATA_COMBOPROPERTY_H
+#endif // BORNAGAIN_GUI_MODEL_TYPE_COMBOPROPERTY_H
diff --git a/GUI/View/Base/AppConfig.cpp b/GUI/View/Base/AppConfig.cpp
index 17bb1d5efc4..a9c464921a1 100644
--- a/GUI/View/Base/AppConfig.cpp
+++ b/GUI/View/Base/AppConfig.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Base/AppConfig.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
#include "GUI/View/Base/ColorGradient.h"
#include <QDir>
#include <QSettings>
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 2597b0bf361..db536c954fd 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Assert.h"
#include "Base/Util/SysUtil.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Base/mainwindow_constants.h"
diff --git a/GUI/View/Numeric/ComboUtil.cpp b/GUI/View/Numeric/ComboUtil.cpp
index cf043c7649e..673ce44418d 100644
--- a/GUI/View/Numeric/ComboUtil.cpp
+++ b/GUI/View/Numeric/ComboUtil.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Numeric/ComboUtil.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
QComboBox* GUI::Util::createComboBox(std::function<ComboProperty()> comboFunction,
diff --git a/GUI/View/ParEdit/CustomEditors.cpp b/GUI/View/ParEdit/CustomEditors.cpp
index 03a7ecc5fec..fc3f52b2b85 100644
--- a/GUI/View/ParEdit/CustomEditors.cpp
+++ b/GUI/View/ParEdit/CustomEditors.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/ParEdit/CustomEditors.h"
#include "Base/Util/Assert.h"
#include "Fit/Param/RealLimits.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
#include "GUI/View/Base/CustomEventFilters.h"
#include "GUI/View/Numeric/ScientificSpinBox.h"
#include <QBoxLayout>
diff --git a/GUI/View/ParEdit/FitParameterDelegate.cpp b/GUI/View/ParEdit/FitParameterDelegate.cpp
index d0732b0e93d..b8cf2938dba 100644
--- a/GUI/View/ParEdit/FitParameterDelegate.cpp
+++ b/GUI/View/ParEdit/FitParameterDelegate.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Tune/FitParameterItem.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
#include "GUI/View/Base/CustomEventFilters.h"
#include "GUI/View/Numeric/ScientificSpinBox.h"
#include "GUI/View/ParEdit/CustomEditors.h"
diff --git a/GUI/View/Setup/AxisPanel.cpp b/GUI/View/Setup/AxisPanel.cpp
index 68fa1fb633d..55a85a1605a 100644
--- a/GUI/View/Setup/AxisPanel.cpp
+++ b/GUI/View/Setup/AxisPanel.cpp
@@ -23,7 +23,7 @@
#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/DataSource.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
#include "GUI/View/Base/LayoutUtil.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
diff --git a/Tests/Unit/GUI/Comparators.cpp b/Tests/Unit/GUI/Comparators.cpp
index 9348d3605c3..5afe2ffc7d9 100644
--- a/Tests/Unit/GUI/Comparators.cpp
+++ b/Tests/Unit/GUI/Comparators.cpp
@@ -1,6 +1,6 @@
#include "Tests/Unit/GUI/Comparators.h"
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/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 a4360d8c077..137dd873cdb 100644
--- a/Tests/Unit/GUI/TestComboProperty.cpp
+++ b/Tests/Unit/GUI/TestComboProperty.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Support/Data/ComboProperty.h"
+#include "GUI/Model/Type/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Comparators.h"
#include "Tests/Unit/GUI/Utils.h"
--
GitLab