rename GUI/Support/Data/ComboProperty -> GUI/Model/Type/

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.

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;

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;
 

GUI/Support/Data/ComboProperty.cpp → 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"
 

GUI/Support/Data/ComboProperty.h → 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

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>

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"

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,

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>

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"

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"

Tests/Unit/GUI/Comparators.cpp

 #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;

Tests/Unit/GUI/TestComboProperty.cpp

-#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"