From cf246fd7582c7d2cae64ed40aede57122cb32a03 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 8 Feb 2022 12:41:21 +0100
Subject: [PATCH] mv src

---
 .../{Project => Device}/InstrumentsEditController.cpp     | 4 ++--
 GUI/Model/{Project => Device}/InstrumentsEditController.h | 8 ++++----
 GUI/Model/Project/ProjectDocument.h                       | 2 +-
 GUI/Model/State/InstrumentLibrary.h                       | 2 +-
 GUI/View/Import/RealDataPropertiesWidget.cpp              | 2 +-
 GUI/View/Instrument/InstrumentEditController.cpp          | 2 +-
 GUI/View/Instrument/InstrumentListModel.cpp               | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename GUI/Model/{Project => Device}/InstrumentsEditController.cpp (94%)
 rename GUI/Model/{Project => Device}/InstrumentsEditController.h (93%)

diff --git a/GUI/Model/Project/InstrumentsEditController.cpp b/GUI/Model/Device/InstrumentsEditController.cpp
similarity index 94%
rename from GUI/Model/Project/InstrumentsEditController.cpp
rename to GUI/Model/Device/InstrumentsEditController.cpp
index e22ac16121f..9b46bb344c9 100644
--- a/GUI/Model/Project/InstrumentsEditController.cpp
+++ b/GUI/Model/Device/InstrumentsEditController.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Project/InstrumentsEditController.cpp
+//! @file      GUI/Model/Device/InstrumentsEditController.cpp
 //! @brief     Implements class InstrumentsEditController
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Project/InstrumentsEditController.h"
+#include "GUI/Model/Device/InstrumentsEditController.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 
 InstrumentsEditController::InstrumentsEditController(InstrumentItems* instruments)
diff --git a/GUI/Model/Project/InstrumentsEditController.h b/GUI/Model/Device/InstrumentsEditController.h
similarity index 93%
rename from GUI/Model/Project/InstrumentsEditController.h
rename to GUI/Model/Device/InstrumentsEditController.h
index 76e1874ad83..d6ceb4a193e 100644
--- a/GUI/Model/Project/InstrumentsEditController.h
+++ b/GUI/Model/Device/InstrumentsEditController.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Project/InstrumentsEditController.h
+//! @file      GUI/Model/Device/InstrumentsEditController.h
 //! @brief     Defines class InstrumentsEditController
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_PROJECT_INSTRUMENTSEDITCONTROLLER_H
-#define BORNAGAIN_GUI_MODEL_PROJECT_INSTRUMENTSEDITCONTROLLER_H
+#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTSEDITCONTROLLER_H
+#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTSEDITCONTROLLER_H
 
 #include "GUI/Model/Device/InstrumentItems.h"
 #include <QObject>
@@ -92,4 +92,4 @@ template <typename T> T* InstrumentsEditController::addInstrument()
     return t;
 }
 
-#endif // BORNAGAIN_GUI_MODEL_PROJECT_INSTRUMENTSEDITCONTROLLER_H
+#endif // BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTSEDITCONTROLLER_H
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index 114b0e6958b..cd16af36fb0 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -18,7 +18,7 @@
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Model/ApplicationModels.h"
 #include "GUI/Model/Sample/MultiLayerItems.h"
-#include "GUI/Model/Project/InstrumentsEditController.h"
+#include "GUI/Model/Device/InstrumentsEditController.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
 #include <QObject>
 #include <QVariant>
diff --git a/GUI/Model/State/InstrumentLibrary.h b/GUI/Model/State/InstrumentLibrary.h
index aba32ad5b3f..15cfb3f4336 100644
--- a/GUI/Model/State/InstrumentLibrary.h
+++ b/GUI/Model/State/InstrumentLibrary.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_MODEL_STATE_INSTRUMENTLIBRARY_H
 
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Project/InstrumentsEditController.h"
+#include "GUI/Model/Device/InstrumentsEditController.h"
 
 class InstrumentLibrary {
 public:
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 2f9fabecf81..e648863ba34 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Import/RealDataPropertiesWidget.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/Model/Project/InstrumentsEditController.h"
+#include "GUI/Model/Device/InstrumentsEditController.h"
 #include "GUI/Model/Project/LinkInstrumentManager.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Global/Globals.h"
diff --git a/GUI/View/Instrument/InstrumentEditController.cpp b/GUI/View/Instrument/InstrumentEditController.cpp
index 4aeee8dd0c5..b19733b0eee 100644
--- a/GUI/View/Instrument/InstrumentEditController.cpp
+++ b/GUI/View/Instrument/InstrumentEditController.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Instrument/InstrumentEditController.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/PointwiseAxisItem.h"
-#include "GUI/Model/Project/InstrumentsEditController.h"
+#include "GUI/Model/Device/InstrumentsEditController.h"
 #include "GUI/Model/Descriptor/DoubleDescriptor.h"
 
 InstrumentEditController::InstrumentEditController(InstrumentsEditController* ec,
diff --git a/GUI/View/Instrument/InstrumentListModel.cpp b/GUI/View/Instrument/InstrumentListModel.cpp
index 29de139caf4..f4b885e73bc 100644
--- a/GUI/View/Instrument/InstrumentListModel.cpp
+++ b/GUI/View/Instrument/InstrumentListModel.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Instrument/InstrumentListModel.h"
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Project/InstrumentsEditController.h"
+#include "GUI/Model/Device/InstrumentsEditController.h"
 
 namespace {
 
-- 
GitLab