From 1a961034424cccb3e1a1ab5cb0210bfc5d61c514 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Nov 2021 00:39:34 +0100
Subject: [PATCH] mv Proxy related sources to GUI/Mapper
---
GUI/{Models/Proxy => Mapper}/ComponentProxyModel.cpp | 6 +++---
GUI/{Models/Proxy => Mapper}/ComponentProxyModel.h | 10 +++++-----
.../Proxy => Mapper}/ComponentProxyStrategy.cpp | 8 ++++----
GUI/{Models/Proxy => Mapper}/ComponentProxyStrategy.h | 10 +++++-----
GUI/{Models/Proxy => Mapper}/ComponentUtils.cpp | 4 ++--
GUI/{Models/Proxy => Mapper}/ComponentUtils.h | 8 ++++----
GUI/{Models/Proxy => Mapper}/ProxyModelStrategy.cpp | 4 ++--
GUI/{Models/Proxy => Mapper}/ProxyModelStrategy.h | 8 ++++----
GUI/Views/PropertyEditor/ComponentFlatView.cpp | 2 +-
GUI/Views/PropertyEditor/ComponentTreeView.cpp | 2 +-
Tests/Unit/GUI/TestComponentProxyModel.cpp | 4 ++--
Tests/Unit/GUI/TestComponentUtils.cpp | 2 +-
Tests/Unit/GUI/TestProxyModelStrategy.cpp | 4 ++--
13 files changed, 36 insertions(+), 36 deletions(-)
rename GUI/{Models/Proxy => Mapper}/ComponentProxyModel.cpp (97%)
rename GUI/{Models/Proxy => Mapper}/ComponentProxyModel.h (89%)
rename GUI/{Models/Proxy => Mapper}/ComponentProxyStrategy.cpp (96%)
rename GUI/{Models/Proxy => Mapper}/ComponentProxyStrategy.h (83%)
rename GUI/{Models/Proxy => Mapper}/ComponentUtils.cpp (96%)
rename GUI/{Models/Proxy => Mapper}/ComponentUtils.h (84%)
rename GUI/{Models/Proxy => Mapper}/ProxyModelStrategy.cpp (96%)
rename GUI/{Models/Proxy => Mapper}/ProxyModelStrategy.h (89%)
diff --git a/GUI/Models/Proxy/ComponentProxyModel.cpp b/GUI/Mapper/ComponentProxyModel.cpp
similarity index 97%
rename from GUI/Models/Proxy/ComponentProxyModel.cpp
rename to GUI/Mapper/ComponentProxyModel.cpp
index 8041cc118a5..3655e839c18 100644
--- a/GUI/Models/Proxy/ComponentProxyModel.cpp
+++ b/GUI/Mapper/ComponentProxyModel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Proxy/ComponentProxyModel.cpp
+//! @file GUI/Mapper/ComponentProxyModel.cpp
//! @brief Implements class ComponentProxyModel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Models/Proxy/ComponentProxyModel.h"
-#include "GUI/Models/Proxy/ComponentProxyStrategy.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
#include "GUI/Session/GroupItem.h"
#include "GUI/Session/SessionModel.h"
#include <QSet>
diff --git a/GUI/Models/Proxy/ComponentProxyModel.h b/GUI/Mapper/ComponentProxyModel.h
similarity index 89%
rename from GUI/Models/Proxy/ComponentProxyModel.h
rename to GUI/Mapper/ComponentProxyModel.h
index 9466a5e895a..9565b1c3b9d 100644
--- a/GUI/Models/Proxy/ComponentProxyModel.h
+++ b/GUI/Mapper/ComponentProxyModel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Proxy/ComponentProxyModel.h
+//! @file GUI/Mapper/ComponentProxyModel.h
//! @brief Defines class ComponentProxyModel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_PROXY_COMPONENTPROXYMODEL_H
-#define BORNAGAIN_GUI_MODELS_PROXY_COMPONENTPROXYMODEL_H
+#ifndef BORNAGAIN_GUI_MAPPER_COMPONENTPROXYMODEL_H
+#define BORNAGAIN_GUI_MAPPER_COMPONENTPROXYMODEL_H
-#include "GUI/Models/Proxy/ProxyModelStrategy.h"
+#include "GUI/Mapper/ProxyModelStrategy.h"
#include <QAbstractProxyModel>
#include <QMap>
#include <QPersistentModelIndex>
@@ -68,4 +68,4 @@ private:
std::unique_ptr<ProxyModelStrategy> m_proxyStrategy;
};
-#endif // BORNAGAIN_GUI_MODELS_PROXY_COMPONENTPROXYMODEL_H
+#endif // BORNAGAIN_GUI_MAPPER_COMPONENTPROXYMODEL_H
diff --git a/GUI/Models/Proxy/ComponentProxyStrategy.cpp b/GUI/Mapper/ComponentProxyStrategy.cpp
similarity index 96%
rename from GUI/Models/Proxy/ComponentProxyStrategy.cpp
rename to GUI/Mapper/ComponentProxyStrategy.cpp
index 227ce7aeae8..f35d4bb7c2c 100644
--- a/GUI/Models/Proxy/ComponentProxyStrategy.cpp
+++ b/GUI/Mapper/ComponentProxyStrategy.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Proxy/ComponentProxyStrategy.cpp
+//! @file GUI/Mapper/ComponentProxyStrategy.cpp
//! @brief Implements class ComponentProxyStrategy
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Models/Proxy/ComponentProxyStrategy.h"
-#include "GUI/Models/Proxy/ComponentProxyModel.h"
-#include "GUI/Models/Proxy/ComponentUtils.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Session/GroupItem.h"
#include "GUI/Session/ModelPath.h"
#include "GUI/Session/SessionModel.h"
diff --git a/GUI/Models/Proxy/ComponentProxyStrategy.h b/GUI/Mapper/ComponentProxyStrategy.h
similarity index 83%
rename from GUI/Models/Proxy/ComponentProxyStrategy.h
rename to GUI/Mapper/ComponentProxyStrategy.h
index bea1eb3f16a..c0e7f74dd9d 100644
--- a/GUI/Models/Proxy/ComponentProxyStrategy.h
+++ b/GUI/Mapper/ComponentProxyStrategy.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Proxy/ComponentProxyStrategy.h
+//! @file GUI/Mapper/ComponentProxyStrategy.h
//! @brief Defines class ComponentProxyStrategy
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_PROXY_COMPONENTPROXYSTRATEGY_H
-#define BORNAGAIN_GUI_MODELS_PROXY_COMPONENTPROXYSTRATEGY_H
+#ifndef BORNAGAIN_GUI_MAPPER_COMPONENTPROXYSTRATEGY_H
+#define BORNAGAIN_GUI_MAPPER_COMPONENTPROXYSTRATEGY_H
-#include "GUI/Models/Proxy/ProxyModelStrategy.h"
+#include "GUI/Mapper/ProxyModelStrategy.h"
//! Strategy for ComponentProxyModel which hides extra level of GroupProperty.
@@ -39,4 +39,4 @@ private:
int parentVisibleRow(const SessionItem& item);
};
-#endif // BORNAGAIN_GUI_MODELS_PROXY_COMPONENTPROXYSTRATEGY_H
+#endif // BORNAGAIN_GUI_MAPPER_COMPONENTPROXYSTRATEGY_H
diff --git a/GUI/Models/Proxy/ComponentUtils.cpp b/GUI/Mapper/ComponentUtils.cpp
similarity index 96%
rename from GUI/Models/Proxy/ComponentUtils.cpp
rename to GUI/Mapper/ComponentUtils.cpp
index c2b04d6510b..d37e60d4a28 100644
--- a/GUI/Models/Proxy/ComponentUtils.cpp
+++ b/GUI/Mapper/ComponentUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Proxy/ComponentUtils.cpp
+//! @file GUI/Mapper/ComponentUtils.cpp
//! @brief Implements ComponentUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Proxy/ComponentUtils.h"
+#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Session/AxesItems.h"
#include "GUI/Session/GroupItem.h"
#include "GUI/Session/MaterialDataItems.h"
diff --git a/GUI/Models/Proxy/ComponentUtils.h b/GUI/Mapper/ComponentUtils.h
similarity index 84%
rename from GUI/Models/Proxy/ComponentUtils.h
rename to GUI/Mapper/ComponentUtils.h
index f46a860e9e1..388a002abfa 100644
--- a/GUI/Models/Proxy/ComponentUtils.h
+++ b/GUI/Mapper/ComponentUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Proxy/ComponentUtils.h
+//! @file GUI/Mapper/ComponentUtils.h
//! @brief Defines namespace GUI::Model::ComponentUtils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_PROXY_COMPONENTUTILS_H
-#define BORNAGAIN_GUI_MODELS_PROXY_COMPONENTUTILS_H
+#ifndef BORNAGAIN_GUI_MAPPER_COMPONENTUTILS_H
+#define BORNAGAIN_GUI_MAPPER_COMPONENTUTILS_H
#include <QList>
#include <QStringList>
@@ -32,4 +32,4 @@ QList<const SessionItem*> componentItems(const SessionItem& item);
} // namespace GUI::Model::ComponentUtils
-#endif // BORNAGAIN_GUI_MODELS_PROXY_COMPONENTUTILS_H
+#endif // BORNAGAIN_GUI_MAPPER_COMPONENTUTILS_H
diff --git a/GUI/Models/Proxy/ProxyModelStrategy.cpp b/GUI/Mapper/ProxyModelStrategy.cpp
similarity index 96%
rename from GUI/Models/Proxy/ProxyModelStrategy.cpp
rename to GUI/Mapper/ProxyModelStrategy.cpp
index 05ac249dff4..b2218b40dd1 100644
--- a/GUI/Models/Proxy/ProxyModelStrategy.cpp
+++ b/GUI/Mapper/ProxyModelStrategy.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Proxy/ProxyModelStrategy.cpp
+//! @file GUI/Mapper/ProxyModelStrategy.cpp
//! @brief Implements class ProxyModelStrategy
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Proxy/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Session/SessionModel.h"
diff --git a/GUI/Models/Proxy/ProxyModelStrategy.h b/GUI/Mapper/ProxyModelStrategy.h
similarity index 89%
rename from GUI/Models/Proxy/ProxyModelStrategy.h
rename to GUI/Mapper/ProxyModelStrategy.h
index b0c27cb86ec..7bea724a61e 100644
--- a/GUI/Models/Proxy/ProxyModelStrategy.h
+++ b/GUI/Mapper/ProxyModelStrategy.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Proxy/ProxyModelStrategy.h
+//! @file GUI/Mapper/ProxyModelStrategy.h
//! @brief Defines class ProxyModelStrategy
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_PROXY_PROXYMODELSTRATEGY_H
-#define BORNAGAIN_GUI_MODELS_PROXY_PROXYMODELSTRATEGY_H
+#ifndef BORNAGAIN_GUI_MAPPER_PROXYMODELSTRATEGY_H
+#define BORNAGAIN_GUI_MAPPER_PROXYMODELSTRATEGY_H
#include <QPersistentModelIndex>
@@ -59,4 +59,4 @@ protected:
bool processSourceIndex(const QModelIndex& index);
};
-#endif // BORNAGAIN_GUI_MODELS_PROXY_PROXYMODELSTRATEGY_H
+#endif // BORNAGAIN_GUI_MAPPER_PROXYMODELSTRATEGY_H
diff --git a/GUI/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
index 33fa4f13e2b..8d20393b9e1 100644
--- a/GUI/Views/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentFlatView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/ComponentFlatView.h"
-#include "GUI/Models/Proxy/ComponentUtils.h"
+#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Session/GroupItem.h"
#include "GUI/Session/SessionModel.h"
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
diff --git a/GUI/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
index daf2bd507bb..474646567aa 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/ComponentTreeView.h"
-#include "GUI/Models/Proxy/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Session/SessionModel.h"
#include "GUI/CommonWidgets/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
diff --git a/Tests/Unit/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
index 48ed5c9370f..0f029b8874b 100644
--- a/Tests/Unit/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -1,6 +1,6 @@
#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Proxy/ComponentProxyModel.h"
-#include "GUI/Models/Proxy/ComponentProxyStrategy.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
#include "GUI/Session/FormFactorItems.h"
#include "GUI/Session/GroupItem.h"
#include "GUI/Session/LayerItem.h"
diff --git a/Tests/Unit/GUI/TestComponentUtils.cpp b/Tests/Unit/GUI/TestComponentUtils.cpp
index 67656ecbc6e..db33fda0fb8 100644
--- a/Tests/Unit/GUI/TestComponentUtils.cpp
+++ b/Tests/Unit/GUI/TestComponentUtils.cpp
@@ -1,4 +1,4 @@
-#include "GUI/Models/Proxy/ComponentUtils.h"
+#include "GUI/Mapper/ComponentUtils.h"
#include "GUI/Session/FormFactorItems.h"
#include "GUI/Session/GroupItem.h"
#include "GUI/Session/ParticleItem.h"
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index a0b9b67a3d9..861fab9bbfd 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Models/Proxy/ComponentProxyModel.h"
-#include "GUI/Models/Proxy/ComponentProxyStrategy.h"
+#include "GUI/Mapper/ComponentProxyModel.h"
+#include "GUI/Mapper/ComponentProxyStrategy.h"
#include "GUI/Session/FormFactorItems.h"
#include "GUI/Session/GroupItem.h"
#include "GUI/Mapper/ModelUtils.h"
--
GitLab