From 413f0be362ad1ce9093ad7c86c3d88ca83129d9d Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sat, 8 Apr 2023 08:36:04 +0200
Subject: [PATCH] mv-src GUI/Model/Data/RealItem. GUI/Model/Device/
---
GUI/Model/Device/InstrumentItems.cpp | 2 +-
GUI/Model/{Data => Device}/RealItem.cpp | 4 ++--
GUI/Model/{Data => Device}/RealItem.h | 8 ++++----
GUI/Model/Job/JobItem.cpp | 2 +-
GUI/Model/Model/JobModel.cpp | 2 +-
GUI/Model/Model/RealModel.cpp | 2 +-
GUI/Model/Project/LinkInstrumentManager.cpp | 2 +-
GUI/Model/Project/ProjectDocument.cpp | 2 +-
GUI/View/Common/DataAccessWidget.h | 2 +-
GUI/View/Fit/FitObjectiveBuilder.cpp | 2 +-
GUI/View/Import/ImportDataUtil.cpp | 2 +-
GUI/View/Import/RealDataPropertiesWidget.cpp | 2 +-
GUI/View/Import/RealDataSelectorWidget.cpp | 2 +-
GUI/View/Import/RealDataTreeModel.cpp | 2 +-
GUI/View/Loaders/AutomaticDataLoader1D.cpp | 2 +-
GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp | 2 +-
GUI/View/Loaders/QREDataLoader.cpp | 2 +-
GUI/View/Toplevel/SimulationView.cpp | 2 +-
Tests/Unit/GUI/TestAutosaveController.cpp | 2 +-
Tests/Unit/GUI/TestJobModel.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 2 +-
Tests/Unit/GUI/TestRealModel.cpp | 2 +-
Tests/Unit/GUI/Utils.cpp | 2 +-
24 files changed, 28 insertions(+), 28 deletions(-)
rename GUI/Model/{Data => Device}/RealItem.cpp (99%)
rename GUI/Model/{Data => Device}/RealItem.h (95%)
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 6507cc29cbf..f8afe04a109 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -24,7 +24,7 @@
#include "GUI/Model/Axis/PointwiseAxisItem.h"
#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamAngleItems.h"
diff --git a/GUI/Model/Data/RealItem.cpp b/GUI/Model/Device/RealItem.cpp
similarity index 99%
rename from GUI/Model/Data/RealItem.cpp
rename to GUI/Model/Device/RealItem.cpp
index 6cd617b1f93..3bfd74ff905 100644
--- a/GUI/Model/Data/RealItem.cpp
+++ b/GUI/Model/Device/RealItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/RealItem.cpp
+//! @file GUI/Model/Device/RealItem.cpp
//! @brief Implements class RealItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "Device/Coord/ICoordSystem.h"
#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
diff --git a/GUI/Model/Data/RealItem.h b/GUI/Model/Device/RealItem.h
similarity index 95%
rename from GUI/Model/Data/RealItem.h
rename to GUI/Model/Device/RealItem.h
index 8a4d5681329..05d3140a81a 100644
--- a/GUI/Model/Data/RealItem.h
+++ b/GUI/Model/Device/RealItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/RealItem.h
+//! @file GUI/Model/Device/RealItem.h
//! @brief Defines class RealItem
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DATA_REALITEM_H
-#define BORNAGAIN_GUI_MODEL_DATA_REALITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_DEVICE_REALITEM_H
+#define BORNAGAIN_GUI_MODEL_DEVICE_REALITEM_H
#include <QObject>
@@ -152,4 +152,4 @@ private:
std::unique_ptr<AbstractDataLoader> m_dataLoader;
};
-#endif // BORNAGAIN_GUI_MODEL_DATA_REALITEM_H
+#endif // BORNAGAIN_GUI_MODEL_DEVICE_REALITEM_H
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 2aadba0af6f..68cb5d75ff2 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -18,7 +18,7 @@
#include "Device/Detector/SimulationAreaIterator.h" // roiIndex
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index e6d9478610c..874b31f717d 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Model/ParameterTreeUtil.h"
diff --git a/GUI/Model/Model/RealModel.cpp b/GUI/Model/Model/RealModel.cpp
index ba217bcce5a..39759a3f74f 100644
--- a/GUI/Model/Model/RealModel.cpp
+++ b/GUI/Model/Model/RealModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Model/RealModel.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/Project/LinkInstrumentManager.cpp b/GUI/Model/Project/LinkInstrumentManager.cpp
index de50ebf90da..802634054fd 100644
--- a/GUI/Model/Project/LinkInstrumentManager.cpp
+++ b/GUI/Model/Project/LinkInstrumentManager.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index c6914fdde1d..2aa32e35781 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
diff --git a/GUI/View/Common/DataAccessWidget.h b/GUI/View/Common/DataAccessWidget.h
index e1ad70c3a4b..9a8ed9f40f3 100644
--- a/GUI/View/Common/DataAccessWidget.h
+++ b/GUI/View/Common/DataAccessWidget.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
#define BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/JobItem.h"
#include <QWidget>
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
index 03d65373ba8..c8676156d6d 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -18,7 +18,7 @@
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
diff --git a/GUI/View/Import/ImportDataUtil.cpp b/GUI/View/Import/ImportDataUtil.cpp
index 8276267b40e..ebab5ce9d00 100644
--- a/GUI/View/Import/ImportDataUtil.cpp
+++ b/GUI/View/Import/ImportDataUtil.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Import/ImportDataUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DataFormatUtil.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/View/Loaders/QREDataLoader.h"
#include <QApplication>
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 34c8ea419a6..5effb00c429 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataPropertiesWidget.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Tool/Globals.h"
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 01ed39abb23..443a700246b 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Import/RealDataSelectorWidget.h"
#include "Device/Data/Datafield.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/Support/Util/Error.h"
diff --git a/GUI/View/Import/RealDataTreeModel.cpp b/GUI/View/Import/RealDataTreeModel.cpp
index b374e40c0ce..390be810582 100644
--- a/GUI/View/Import/RealDataTreeModel.cpp
+++ b/GUI/View/Import/RealDataTreeModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
#include <QApplication>
diff --git a/GUI/View/Loaders/AutomaticDataLoader1D.cpp b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
index e93bb5abcdd..10078bf1dc5 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Loaders/AutomaticDataLoader1D.h"
#include "Base/Util/Assert.h"
#include "Device/IO/ReadReflectometry.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Support/XML/DeserializationException.h"
diff --git a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
index 4e9975e5d53..39833a13795 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1DResultModel.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
#include "Base/Axis/Frame.h"
#include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
AutomaticDataLoader1DResultModel::AutomaticDataLoader1DResultModel(RealItem* item)
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index c90d51fb33e..8d99662d2d1 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -17,7 +17,7 @@
#include "Base/Util/Assert.h"
#include "Device/Coord/CoordSystem1D.h"
#include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Support/Util/CoordName.h"
#include "GUI/Support/XML/DeserializationException.h"
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index f21e0a7c2bf..07e45201780 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Toplevel/SimulationView.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
diff --git a/Tests/Unit/GUI/TestAutosaveController.cpp b/Tests/Unit/GUI/TestAutosaveController.cpp
index eb464f8694d..2863ee75ecf 100644
--- a/Tests/Unit/GUI/TestAutosaveController.cpp
+++ b/Tests/Unit/GUI/TestAutosaveController.cpp
@@ -1,7 +1,7 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
#include "GUI/Support/IO/ProjectUtil.h"
diff --git a/Tests/Unit/GUI/TestJobModel.cpp b/Tests/Unit/GUI/TestJobModel.cpp
index 3230782d4c7..44e054a7c42 100644
--- a/Tests/Unit/GUI/TestJobModel.cpp
+++ b/Tests/Unit/GUI/TestJobModel.cpp
@@ -1,7 +1,7 @@
#include "Device/Data/Datafield.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 1c94f88b616..f075af901ef 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,7 +1,7 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
#include "GUI/Model/Data/DataItemUtil.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/Model/Model/RealModel.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index b08a6896f1c..32b8cc34ef6 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,7 +1,7 @@
#include "Device/Coord/ICoordSystem.h"
#include "GUI/Model/Data/DataItemUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/Tests/Unit/GUI/TestRealModel.cpp b/Tests/Unit/GUI/TestRealModel.cpp
index c028b70130a..3e52a965fb9 100644
--- a/Tests/Unit/GUI/TestRealModel.cpp
+++ b/Tests/Unit/GUI/TestRealModel.cpp
@@ -3,7 +3,7 @@
#include "Device/Data/Datafield.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentModel.h"
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 367fe693adb..5f5ec3ff30c 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -18,7 +18,7 @@
#include "Device/Histo/DiffUtil.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Data/RealItem.h"
+#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Support/IO/ProjectUtil.h"
--
GitLab