From 37598fc7bfce97f5b6638f98a799a05241cc83bf Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Nov 2021 19:27:38 +0100
Subject: [PATCH] mv GUI/Projects under GUI/Models/
---
GUI/CMakeLists.txt | 1 -
GUI/Items/projectmanager.cpp | 4 ++--
GUI/Items/projectmanager.h | 2 +-
GUI/{ => Models}/Project/LinkInstrumentManager.cpp | 4 ++--
GUI/{ => Models}/Project/LinkInstrumentManager.h | 8 ++++----
GUI/{ => Models}/Project/OutputDataIOHistory.cpp | 4 ++--
GUI/{ => Models}/Project/OutputDataIOHistory.h | 8 ++++----
GUI/{ => Models}/Project/OutputDataIOService.cpp | 6 +++---
GUI/{ => Models}/Project/OutputDataIOService.h | 10 +++++-----
GUI/{ => Models}/Project/ProjectUtils.cpp | 6 +++---
GUI/{ => Models}/Project/ProjectUtils.h | 8 ++++----
GUI/{ => Models}/Project/projectdocument.cpp | 10 +++++-----
GUI/{ => Models}/Project/projectdocument.h | 8 ++++----
.../ImportDataWidgets/RealDataPropertiesWidget.cpp | 4 ++--
GUI/Views/InstrumentWidgets/InstrumentListView.cpp | 2 +-
GUI/Views/InstrumentWidgets/InstrumentView.cpp | 2 +-
GUI/Views/MaterialEditor/MaterialEditorDialog.cpp | 2 +-
GUI/Views/SampleDesigner/DesignerScene.cpp | 2 +-
GUI/Views/Toplevel/ImportDataView.cpp | 2 +-
GUI/Views/Toplevel/ProjectSettingsView.cpp | 2 +-
GUI/Views/Toplevel/ProjectSettingsView.h | 2 +-
GUI/Views/Toplevel/SampleView.cpp | 2 +-
GUI/Views/Toplevel/SimulationView.cpp | 2 +-
GUI/mainwindow/AutosaveController.cpp | 4 ++--
GUI/mainwindow/PyImportAssistant.cpp | 2 +-
GUI/mainwindow/SaveService.cpp | 4 ++--
GUI/mainwindow/SaveThread.cpp | 2 +-
GUI/mainwindow/newprojectdialog.cpp | 2 +-
Tests/Unit/GUI/TestDataItemViews.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 4 ++--
Tests/Unit/GUI/TestOutputDataIOService.cpp | 4 ++--
Tests/Unit/GUI/TestProjectDocument.cpp | 4 ++--
Tests/Unit/GUI/TestProjectUtils.cpp | 2 +-
Tests/Unit/GUI/TestSaveService.cpp | 4 ++--
Tests/Unit/GUI/TestSavingSpecularData.cpp | 4 ++--
Tests/Unit/GUI/Utils.cpp | 2 +-
36 files changed, 70 insertions(+), 71 deletions(-)
rename GUI/{ => Models}/Project/LinkInstrumentManager.cpp (97%)
rename GUI/{ => Models}/Project/LinkInstrumentManager.h (88%)
rename GUI/{ => Models}/Project/OutputDataIOHistory.cpp (97%)
rename GUI/{ => Models}/Project/OutputDataIOHistory.h (90%)
rename GUI/{ => Models}/Project/OutputDataIOService.cpp (96%)
rename GUI/{ => Models}/Project/OutputDataIOService.h (84%)
rename GUI/{ => Models}/Project/ProjectUtils.cpp (90%)
rename GUI/{ => Models}/Project/ProjectUtils.h (88%)
rename GUI/{ => Models}/Project/projectdocument.cpp (97%)
rename GUI/{ => Models}/Project/projectdocument.h (94%)
diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index 023ef1f0454..330fcf14a8e 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -19,7 +19,6 @@ set(include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/InfoWidgets
${CMAKE_CURRENT_SOURCE_DIR}/Items
${CMAKE_CURRENT_SOURCE_DIR}/Mapper
- ${CMAKE_CURRENT_SOURCE_DIR}/Project
${CMAKE_CURRENT_SOURCE_DIR}/Session
${CMAKE_CURRENT_SOURCE_DIR}/mainwindow
${CMAKE_CURRENT_SOURCE_DIR}/utils
diff --git a/GUI/Items/projectmanager.cpp b/GUI/Items/projectmanager.cpp
index 0acaae2a3d4..adefd736079 100644
--- a/GUI/Items/projectmanager.cpp
+++ b/GUI/Items/projectmanager.cpp
@@ -17,8 +17,8 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/InfoWidgets/ProjectLoadProblemDialog.h"
#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Project/ProjectUtils.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/mainwindow/SaveService.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/mainwindow/newprojectdialog.h"
diff --git a/GUI/Items/projectmanager.h b/GUI/Items/projectmanager.h
index a971a272186..857c0d497af 100644
--- a/GUI/Items/projectmanager.h
+++ b/GUI/Items/projectmanager.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_ITEMS_PROJECTMANAGER_H
#define BORNAGAIN_GUI_ITEMS_PROJECTMANAGER_H
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include <QObject>
#include <QStringList>
diff --git a/GUI/Project/LinkInstrumentManager.cpp b/GUI/Models/Project/LinkInstrumentManager.cpp
similarity index 97%
rename from GUI/Project/LinkInstrumentManager.cpp
rename to GUI/Models/Project/LinkInstrumentManager.cpp
index ffd659fe21f..d5b93bcc19f 100644
--- a/GUI/Project/LinkInstrumentManager.cpp
+++ b/GUI/Models/Project/LinkInstrumentManager.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/LinkInstrumentManager.cpp
+//! @file GUI/Models/Project/LinkInstrumentManager.cpp
//! @brief Implements class LinkInstrumentManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Project/LinkInstrumentManager.h"
+#include "GUI/Models/Project/LinkInstrumentManager.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
diff --git a/GUI/Project/LinkInstrumentManager.h b/GUI/Models/Project/LinkInstrumentManager.h
similarity index 88%
rename from GUI/Project/LinkInstrumentManager.h
rename to GUI/Models/Project/LinkInstrumentManager.h
index a6b03dab7be..11ae07ab5c8 100644
--- a/GUI/Project/LinkInstrumentManager.h
+++ b/GUI/Models/Project/LinkInstrumentManager.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/LinkInstrumentManager.h
+//! @file GUI/Models/Project/LinkInstrumentManager.h
//! @brief Defines class LinkInstrumentManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_PROJECT_LINKINSTRUMENTMANAGER_H
-#define BORNAGAIN_GUI_PROJECT_LINKINSTRUMENTMANAGER_H
+#ifndef BORNAGAIN_GUI_MODELS_PROJECT_LINKINSTRUMENTMANAGER_H
+#define BORNAGAIN_GUI_MODELS_PROJECT_LINKINSTRUMENTMANAGER_H
#include <QList>
#include <QObject>
@@ -52,4 +52,4 @@ private:
RealDataModel* m_realDataModel;
};
-#endif // BORNAGAIN_GUI_PROJECT_LINKINSTRUMENTMANAGER_H
+#endif // BORNAGAIN_GUI_MODELS_PROJECT_LINKINSTRUMENTMANAGER_H
diff --git a/GUI/Project/OutputDataIOHistory.cpp b/GUI/Models/Project/OutputDataIOHistory.cpp
similarity index 97%
rename from GUI/Project/OutputDataIOHistory.cpp
rename to GUI/Models/Project/OutputDataIOHistory.cpp
index 8dfe83cc3da..35ccfadd437 100644
--- a/GUI/Project/OutputDataIOHistory.cpp
+++ b/GUI/Models/Project/OutputDataIOHistory.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/OutputDataIOHistory.cpp
+//! @file GUI/Models/Project/OutputDataIOHistory.cpp
//! @brief Defines OutputDataIOHistory classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Project/OutputDataIOHistory.h"
+#include "GUI/Models/Project/OutputDataIOHistory.h"
#include "Base/Utils/Assert.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/SaveLoadInterface.h"
diff --git a/GUI/Project/OutputDataIOHistory.h b/GUI/Models/Project/OutputDataIOHistory.h
similarity index 90%
rename from GUI/Project/OutputDataIOHistory.h
rename to GUI/Models/Project/OutputDataIOHistory.h
index ccf9f969393..89bf9c42dc1 100644
--- a/GUI/Project/OutputDataIOHistory.h
+++ b/GUI/Models/Project/OutputDataIOHistory.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/OutputDataIOHistory.h
+//! @file GUI/Models/Project/OutputDataIOHistory.h
//! @brief Defines OutputDataIOHistory classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOHISTORY_H
-#define BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOHISTORY_H
+#ifndef BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOHISTORY_H
+#define BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOHISTORY_H
#include <QDateTime>
#include <QMap>
@@ -80,4 +80,4 @@ private:
QMap<QString, OutputDataDirHistory> m_dir_history;
};
-#endif // BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOHISTORY_H
+#endif // BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOHISTORY_H
diff --git a/GUI/Project/OutputDataIOService.cpp b/GUI/Models/Project/OutputDataIOService.cpp
similarity index 96%
rename from GUI/Project/OutputDataIOService.cpp
rename to GUI/Models/Project/OutputDataIOService.cpp
index b352df93764..2b0e8eb5f22 100644
--- a/GUI/Project/OutputDataIOService.cpp
+++ b/GUI/Models/Project/OutputDataIOService.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/OutputDataIOService.cpp
+//! @file GUI/Models/Project/OutputDataIOService.cpp
//! @brief Implements class OutputDataIOService
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/Project/OutputDataIOService.h"
+#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Models/Data/ApplicationModels.h"
-#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/MessageService.h"
#include "GUI/utils/SaveLoadInterface.h"
#include <QFile>
diff --git a/GUI/Project/OutputDataIOService.h b/GUI/Models/Project/OutputDataIOService.h
similarity index 84%
rename from GUI/Project/OutputDataIOService.h
rename to GUI/Models/Project/OutputDataIOService.h
index 0234ee1d4df..c45e5fc3c94 100644
--- a/GUI/Project/OutputDataIOService.h
+++ b/GUI/Models/Project/OutputDataIOService.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/OutputDataIOService.h
+//! @file GUI/Models/Project/OutputDataIOService.h
//! @brief Defines class OutputDataIOService
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOSERVICE_H
-#define BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOSERVICE_H
+#ifndef BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOSERVICE_H
+#define BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOSERVICE_H
-#include "GUI/Project/OutputDataIOHistory.h"
+#include "GUI/Models/Project/OutputDataIOHistory.h"
#include <QObject>
class ApplicationModels;
@@ -49,4 +49,4 @@ private:
ApplicationModels* m_applicationModels;
};
-#endif // BORNAGAIN_GUI_PROJECT_OUTPUTDATAIOSERVICE_H
+#endif // BORNAGAIN_GUI_MODELS_PROJECT_OUTPUTDATAIOSERVICE_H
diff --git a/GUI/Project/ProjectUtils.cpp b/GUI/Models/Project/ProjectUtils.cpp
similarity index 90%
rename from GUI/Project/ProjectUtils.cpp
rename to GUI/Models/Project/ProjectUtils.cpp
index b57f1c80d00..f86b266648b 100644
--- a/GUI/Project/ProjectUtils.cpp
+++ b/GUI/Models/Project/ProjectUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/ProjectUtils.cpp
+//! @file GUI/Models/Project/ProjectUtils.cpp
//! @brief Implements ProjectUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/Project/ProjectUtils.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Project/projectdocument.h"
#include <QFileInfo>
QString GUI::Project::Utils::projectName(const QString& projectFileName)
diff --git a/GUI/Project/ProjectUtils.h b/GUI/Models/Project/ProjectUtils.h
similarity index 88%
rename from GUI/Project/ProjectUtils.h
rename to GUI/Models/Project/ProjectUtils.h
index 1ce08899ccc..4794e8671f0 100644
--- a/GUI/Project/ProjectUtils.h
+++ b/GUI/Models/Project/ProjectUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/ProjectUtils.h
+//! @file GUI/Models/Project/ProjectUtils.h
//! @brief Defines namespace GUI::Project::Utils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
-#define BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
+#ifndef BORNAGAIN_GUI_MODELS_PROJECT_PROJECTUTILS_H
+#define BORNAGAIN_GUI_MODELS_PROJECT_PROJECTUTILS_H
#include <QString>
@@ -44,4 +44,4 @@ bool hasAutosavedData(const QString& projectFileName);
} // namespace GUI::Project::Utils
-#endif // BORNAGAIN_GUI_PROJECT_PROJECTUTILS_H
+#endif // BORNAGAIN_GUI_MODELS_PROJECT_PROJECTUTILS_H
diff --git a/GUI/Project/projectdocument.cpp b/GUI/Models/Project/projectdocument.cpp
similarity index 97%
rename from GUI/Project/projectdocument.cpp
rename to GUI/Models/Project/projectdocument.cpp
index 21569a85554..516f161825f 100644
--- a/GUI/Project/projectdocument.cpp
+++ b/GUI/Models/Project/projectdocument.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/projectdocument.cpp
+//! @file GUI/Models/Project/projectdocument.cpp
//! @brief Implements class ProjectDocument
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Project/LinkInstrumentManager.h"
-#include "GUI/Project/OutputDataIOService.h"
-#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Models/Project/LinkInstrumentManager.h"
+#include "GUI/Models/Project/OutputDataIOService.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/MessageService.h"
diff --git a/GUI/Project/projectdocument.h b/GUI/Models/Project/projectdocument.h
similarity index 94%
rename from GUI/Project/projectdocument.h
rename to GUI/Models/Project/projectdocument.h
index 2ebc08b95e7..de633b63b00 100644
--- a/GUI/Project/projectdocument.h
+++ b/GUI/Models/Project/projectdocument.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Project/projectdocument.h
+//! @file GUI/Models/Project/projectdocument.h
//! @brief Defines class ProjectDocument
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
-#define BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
+#ifndef BORNAGAIN_GUI_MODELS_PROJECT_PROJECTDOCUMENT_H
+#define BORNAGAIN_GUI_MODELS_PROJECT_PROJECTDOCUMENT_H
#include "GUI/Models/Data/ApplicationModels.h"
#include <QObject>
@@ -139,4 +139,4 @@ inline ProjectDocument::Functionalities toFunctionalities(const QVariant& v)
v.value<ProjectDocument::Functionalities::Int>());
}
-#endif // BORNAGAIN_GUI_PROJECT_PROJECTDOCUMENT_H
+#endif // BORNAGAIN_GUI_MODELS_PROJECT_PROJECTDOCUMENT_H
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index dab781eeb5e..623e20780c8 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -16,8 +16,8 @@
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/LinkInstrumentManager.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/LinkInstrumentManager.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/mainwindow/mainwindow.h"
#include <QComboBox>
#include <QLabel>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
index a0e6829c107..3a6772e5ed5 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListModel.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentView.cpp b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
index 53e8ab8fdb2..b805a09425d 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
@@ -16,7 +16,7 @@
#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/InstrumentWidgets/InstrumentEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
#include <QBoxLayout>
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index a34144c229e..0a455ec8599 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -21,7 +21,7 @@
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/utils/GUIHelpers.h"
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index f5da0b66316..c708653ce37 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -25,7 +25,7 @@
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
diff --git a/GUI/Views/Toplevel/ImportDataView.cpp b/GUI/Views/Toplevel/ImportDataView.cpp
index 26c5a6575bb..9659bf847a0 100644
--- a/GUI/Views/Toplevel/ImportDataView.cpp
+++ b/GUI/Views/Toplevel/ImportDataView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/Toplevel/ImportDataView.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/Views/Toplevel/ProjectSettingsView.cpp b/GUI/Views/Toplevel/ProjectSettingsView.cpp
index 1f98b377b77..88a51dbbfec 100644
--- a/GUI/Views/Toplevel/ProjectSettingsView.cpp
+++ b/GUI/Views/Toplevel/ProjectSettingsView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/utils/qstringutils.h"
#include "ui_ProjectSettingsView.h"
diff --git a/GUI/Views/Toplevel/ProjectSettingsView.h b/GUI/Views/Toplevel/ProjectSettingsView.h
index 74bec93f37f..0918fe9fdaa 100644
--- a/GUI/Views/Toplevel/ProjectSettingsView.h
+++ b/GUI/Views/Toplevel/ProjectSettingsView.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include <QWidget>
namespace Ui {
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index 94784e6d839..c7887115760 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -16,7 +16,7 @@
#include "GUI/CommonWidgets/DocksController.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index 6334493db45..0023cdd81af 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -27,7 +27,7 @@
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Sample/SampleValidator.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
#include "GUI/mainwindow/mainwindow.h"
diff --git a/GUI/mainwindow/AutosaveController.cpp b/GUI/mainwindow/AutosaveController.cpp
index e5ac7e6c247..52d48338119 100644
--- a/GUI/mainwindow/AutosaveController.cpp
+++ b/GUI/mainwindow/AutosaveController.cpp
@@ -14,8 +14,8 @@
#include "GUI/mainwindow/AutosaveController.h"
#include "GUI/CommonWidgets/UpdateTimer.h"
-#include "GUI/Project/ProjectUtils.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Project/projectdocument.h"
#include <QDir>
namespace {
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index 1d9a970960d..0886033870c 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -24,7 +24,7 @@
#include "GUI/Items/projectmanager.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
-#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/Helpers.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/GUI/mainwindow/SaveService.cpp b/GUI/mainwindow/SaveService.cpp
index 54219729be7..caffc8e8afe 100644
--- a/GUI/mainwindow/SaveService.cpp
+++ b/GUI/mainwindow/SaveService.cpp
@@ -14,8 +14,8 @@
#include "GUI/mainwindow/SaveService.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Project/ProjectUtils.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/mainwindow/AutosaveController.h"
#include "GUI/mainwindow/SaveThread.h"
#include "GUI/utils/Error.h"
diff --git a/GUI/mainwindow/SaveThread.cpp b/GUI/mainwindow/SaveThread.cpp
index b99ea795f2f..796548688d0 100644
--- a/GUI/mainwindow/SaveThread.cpp
+++ b/GUI/mainwindow/SaveThread.cpp
@@ -14,7 +14,7 @@
#include "GUI/mainwindow/SaveThread.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
SaveThread::SaveThread(QObject* parent) : QThread(parent), m_document(nullptr) {}
diff --git a/GUI/mainwindow/newprojectdialog.cpp b/GUI/mainwindow/newprojectdialog.cpp
index d376827e078..567549b836a 100644
--- a/GUI/mainwindow/newprojectdialog.cpp
+++ b/GUI/mainwindow/newprojectdialog.cpp
@@ -14,7 +14,7 @@
#include "GUI/mainwindow/newprojectdialog.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include <QFileDialog>
#include <QGroupBox>
#include <QLabel>
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 744463ba495..42bb25b752e 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -5,7 +5,7 @@
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/MessageService.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 5b477a67da0..695c6d55365 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -5,8 +5,8 @@
#include "GUI/Items/RectangularDetectorItem.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/LinkInstrumentManager.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/LinkInstrumentManager.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index 18576c5d4cf..b6c0e056184 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -9,8 +9,8 @@
#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Project/OutputDataIOService.h"
-#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Models/Project/OutputDataIOService.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 980bdaa711d..e7544b4bc93 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -5,8 +5,8 @@
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/ProjectUtils.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index 19680662b92..1c32ea0b191 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,5 +1,5 @@
#include "GUI/Items/ItemFileNameUtils.h"
-#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Utils.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 28eb5bdcfbe..4a61dbc8a68 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -5,8 +5,8 @@
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/ProjectUtils.h"
-#include "GUI/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/mainwindow/AutosaveController.h"
#include "GUI/mainwindow/SaveService.h"
#include "GUI/utils/Error.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 6cb7181ec6f..1ad97d8d93b 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -12,8 +12,8 @@
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Project/OutputDataIOService.h"
-#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Models/Project/OutputDataIOService.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 29191e0961f..7d7c4819078 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -18,7 +18,7 @@
#include "Device/Histo/IntensityDataIOFactory.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SessionModel.h"
-#include "GUI/Project/ProjectUtils.h"
+#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
#include <QDir>
--
GitLab