From 06e95f2617a3c4721371990184de6cc0e635f77b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Nov 2021 13:30:57 +0100
Subject: [PATCH] mv

---
 GUI/Mapper/ComponentUtils.cpp                    | 2 +-
 GUI/Models/Job/ParameterTreeUtils.cpp            | 2 +-
 GUI/Models/Parameter/FilterPropertyProxy.cpp     | 2 +-
 GUI/Models/{Varia => Parameter}/PropertyItem.cpp | 4 ++--
 GUI/Models/{Varia => Parameter}/PropertyItem.h   | 8 ++++----
 GUI/Models/Sample/SampleModel.cpp                | 2 +-
 GUI/Models/Session/SessionItem.cpp               | 2 +-
 GUI/Models/Session/SessionItemUtils.cpp          | 2 +-
 GUI/Models/Varia/ItemCatalog.cpp                 | 2 +-
 GUI/Views/MaskWidgets/MaskGraphicsScene.cpp      | 2 +-
 Tests/Unit/GUI/TestAxesItems.cpp                 | 2 +-
 Tests/Unit/GUI/TestProxyModelStrategy.cpp        | 2 +-
 Tests/Unit/GUI/TestSessionItemUtils.cpp          | 2 +-
 Tests/Unit/GUI/TestSessionModel.cpp              | 2 +-
 Tests/Unit/GUI/TestSessionXML.cpp                | 2 +-
 Tests/Unit/GUI/Utils.h                           | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)
 rename GUI/Models/{Varia => Parameter}/PropertyItem.cpp (85%)
 rename GUI/Models/{Varia => Parameter}/PropertyItem.h (77%)

diff --git a/GUI/Mapper/ComponentUtils.cpp b/GUI/Mapper/ComponentUtils.cpp
index 450b48a329d..500a988ad21 100644
--- a/GUI/Mapper/ComponentUtils.cpp
+++ b/GUI/Mapper/ComponentUtils.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Group/GroupItem.h"
 #include "GUI/Models/Material/MaterialDataItems.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 
 namespace {
 QList<const SessionItem*> groupItems(const GroupItem& item);
diff --git a/GUI/Models/Job/ParameterTreeUtils.cpp b/GUI/Models/Job/ParameterTreeUtils.cpp
index 75fb26d8c2f..8440f0d9cbb 100644
--- a/GUI/Models/Job/ParameterTreeUtils.cpp
+++ b/GUI/Models/Job/ParameterTreeUtils.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Models/Material/MaterialItemContainer.h"
 #include "GUI/Models/Parameter/ParameterTreeItems.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/utils/Error.h"
 #include <QStack>
 
diff --git a/GUI/Models/Parameter/FilterPropertyProxy.cpp b/GUI/Models/Parameter/FilterPropertyProxy.cpp
index 03407370b71..eab900ace45 100644
--- a/GUI/Models/Parameter/FilterPropertyProxy.cpp
+++ b/GUI/Models/Parameter/FilterPropertyProxy.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Models/Group/GroupItem.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 
 int FilterPropertyProxy::columnCount(const QModelIndex& parent) const
 {
diff --git a/GUI/Models/Varia/PropertyItem.cpp b/GUI/Models/Parameter/PropertyItem.cpp
similarity index 85%
rename from GUI/Models/Varia/PropertyItem.cpp
rename to GUI/Models/Parameter/PropertyItem.cpp
index 441e90a3901..227e6cdf1cd 100644
--- a/GUI/Models/Varia/PropertyItem.cpp
+++ b/GUI/Models/Parameter/PropertyItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/PropertyItem.cpp
+//! @file      GUI/Models/Parameter/PropertyItem.cpp
 //! @brief     Implements class PropertyItem
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,6 +12,6 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 
 PropertyItem::PropertyItem() : SessionItem(M_TYPE) {}
diff --git a/GUI/Models/Varia/PropertyItem.h b/GUI/Models/Parameter/PropertyItem.h
similarity index 77%
rename from GUI/Models/Varia/PropertyItem.h
rename to GUI/Models/Parameter/PropertyItem.h
index 35b017da12e..676920da69b 100644
--- a/GUI/Models/Varia/PropertyItem.h
+++ b/GUI/Models/Parameter/PropertyItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/PropertyItem.h
+//! @file      GUI/Models/Parameter/PropertyItem.h
 //! @brief     Defines class PropertyItem
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_PROPERTYITEM_H
-#define BORNAGAIN_GUI_MODELS_VARIA_PROPERTYITEM_H
+#ifndef BORNAGAIN_GUI_MODELS_PARAMETER_PROPERTYITEM_H
+#define BORNAGAIN_GUI_MODELS_PARAMETER_PROPERTYITEM_H
 
 #include "GUI/Models/Session/SessionItem.h"
 
@@ -25,4 +25,4 @@ public:
     PropertyItem();
 };
 
-#endif // BORNAGAIN_GUI_MODELS_VARIA_PROPERTYITEM_H
+#endif // BORNAGAIN_GUI_MODELS_PARAMETER_PROPERTYITEM_H
diff --git a/GUI/Models/Sample/SampleModel.cpp b/GUI/Models/Sample/SampleModel.cpp
index 69019163d4b..ab30d0da4ee 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/Sample/MultiLayerItem.h"
 #include "GUI/Models/Varia/ItemWithMaterial.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include <QApplication>
 #include <QFontMetrics>
 #include <QPixmap>
diff --git a/GUI/Models/Session/SessionItem.cpp b/GUI/Models/Session/SessionItem.cpp
index 126ac2defed..05d4e7b0bb0 100644
--- a/GUI/Models/Session/SessionItem.cpp
+++ b/GUI/Models/Session/SessionItem.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Models/Session/SessionItemUtils.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Varia/ItemFactory.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 
 //! Constructs new item with given model type. The type must be defined.
 SessionItem::SessionItem(const QString& modelType)
diff --git a/GUI/Models/Session/SessionItemUtils.cpp b/GUI/Models/Session/SessionItemUtils.cpp
index 80133b522f2..118f12f6fcc 100644
--- a/GUI/Models/Session/SessionItemUtils.cpp
+++ b/GUI/Models/Session/SessionItemUtils.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Sample/ParticleCompositionItem.h"
 #include "GUI/Models/Sample/ParticleCoreShellItem.h"
 #include "GUI/Models/Session/SessionGraphicsItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include <QColor>
 #include <QIcon>
 #include <QPixmap>
diff --git a/GUI/Models/Varia/ItemCatalog.cpp b/GUI/Models/Varia/ItemCatalog.cpp
index d6f3ab00078..d9be19b398f 100644
--- a/GUI/Models/Varia/ItemCatalog.cpp
+++ b/GUI/Models/Varia/ItemCatalog.cpp
@@ -57,7 +57,7 @@
 #include "GUI/Models/Trafo/RotationItems.h"
 #include "GUI/Models/Trafo/TransformationItem.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Models/Varia/RealLimitsItems.h"
 #include "GUI/Models/Varia/SimulationOptionsItem.h"
 #include "GUI/utils/Error.h"
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index d840f6e51bc..1664998902f 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Trafo/ProjectionItems.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h"
 #include "GUI/Views/MaskWidgets/MaskGraphicsProxy.h"
 #include "GUI/Views/MaskWidgets/MaskViewFactory.h"
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 8d93a972e74..60864ba8040 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -3,7 +3,7 @@
 #include "Base/Const/Units.h"
 #include "GUI/Models/Data/AxesItems.h"
 #include "GUI/Models/Domain/TransformFromDomain.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/utils/Error.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index bdb0772eb74..e7c449bcc48 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -6,7 +6,7 @@
 #include "GUI/Models/Sample/ParticleItem.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class TestProxyModelStrategy : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index eb363d6f8a2..188ee7cb0e8 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -2,7 +2,7 @@
 #include "GUI/Models/Session/SessionItemUtils.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class TestSessionItemUtils : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 8b7d3295818..29a9f26fe0c 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -9,7 +9,7 @@
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Session/SessionItemTags.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QSignalSpy>
 #include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index c1696127ab9..cb01cf479ce 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -3,7 +3,7 @@
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Sample/ParticleItem.h"
 #include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
index 753270563c9..77070c34d1b 100644
--- a/Tests/Unit/GUI/Utils.h
+++ b/Tests/Unit/GUI/Utils.h
@@ -17,7 +17,7 @@
 #define BORNAGAIN_TESTS_UNIT_GUI_UTILS_H
 
 #include "GUI/Models/Session/SessionXML.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include <QString>
 #include <QXmlStreamWriter>
 
-- 
GitLab