From e2501302fb1e21ebadd377ce4995be9e3d13cdd8 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Nov 2021 20:50:18 +0100
Subject: [PATCH] mv GUI/mainwindow -> GUI/Views/Main
---
App/main.cpp | 2 +-
.../ImportDataWidgets/RealDataPropertiesWidget.cpp | 2 +-
.../ImportDataWidgets/RealDataSelectorWidget.cpp | 4 ++--
.../InstrumentWidgets/InstrumentLibraryEditor.cpp | 2 +-
GUI/Views/InstrumentWidgets/InstrumentListView.cpp | 2 +-
.../IntensityDataWidgets/IntensityDataCanvas.cpp | 4 ++--
GUI/Views/JobWidgets/JobProgressAssistant.cpp | 2 +-
GUI/Views/JobWidgets/JobView.cpp | 4 ++--
.../Main}/AutosaveController.cpp | 4 ++--
GUI/{mainwindow => Views/Main}/AutosaveController.h | 8 ++++----
GUI/{mainwindow => Views/Main}/PyImportAssistant.cpp | 6 +++---
GUI/{mainwindow => Views/Main}/PyImportAssistant.h | 8 ++++----
GUI/{mainwindow => Views/Main}/SaveService.cpp | 8 ++++----
GUI/{mainwindow => Views/Main}/SaveService.h | 8 ++++----
GUI/{mainwindow => Views/Main}/SaveThread.cpp | 4 ++--
GUI/{mainwindow => Views/Main}/SaveThread.h | 8 ++++----
.../Main}/aboutapplicationdialog.cpp | 4 ++--
.../Main}/aboutapplicationdialog.h | 8 ++++----
GUI/{mainwindow => Views/Main}/actionmanager.cpp | 12 ++++++------
GUI/{mainwindow => Views/Main}/actionmanager.h | 8 ++++----
GUI/{mainwindow => Views/Main}/mainwindow.cpp | 8 ++++----
GUI/{mainwindow => Views/Main}/mainwindow.h | 8 ++++----
GUI/{mainwindow => Views/Main}/newprojectdialog.cpp | 4 ++--
GUI/{mainwindow => Views/Main}/newprojectdialog.h | 8 ++++----
GUI/{mainwindow => Views/Main}/projectmanager.cpp | 10 +++++-----
GUI/{mainwindow => Views/Main}/projectmanager.h | 8 ++++----
GUI/Views/MaskWidgets/MaskEditorCanvas.cpp | 2 +-
GUI/Views/MaterialEditor/MaterialEditorDialog.cpp | 2 +-
.../ProjectionsWidgets/SaveProjectionsAssistant.cpp | 2 +-
GUI/Views/PropertyEditor/CustomEditors.cpp | 2 +-
GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp | 2 +-
GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp | 2 +-
.../SpecularDataWidgets/SpecularDataImportWidget.cpp | 2 +-
GUI/Views/Toplevel/ImportDataView.cpp | 2 +-
GUI/Views/Toplevel/SampleView.cpp | 2 +-
GUI/Views/Toplevel/SessionModelView.cpp | 4 ++--
GUI/Views/Toplevel/SimulationView.cpp | 4 ++--
GUI/Views/Toplevel/TestView.cpp | 2 +-
GUI/Views/Toplevel/WelcomeView.cpp | 2 +-
Tests/Unit/GUI/TestSaveService.cpp | 4 ++--
40 files changed, 94 insertions(+), 94 deletions(-)
rename GUI/{mainwindow => Views/Main}/AutosaveController.cpp (97%)
rename GUI/{mainwindow => Views/Main}/AutosaveController.h (89%)
rename GUI/{mainwindow => Views/Main}/PyImportAssistant.cpp (98%)
rename GUI/{mainwindow => Views/Main}/PyImportAssistant.h (87%)
rename GUI/{mainwindow => Views/Main}/SaveService.cpp (96%)
rename GUI/{mainwindow => Views/Main}/SaveService.h (88%)
rename GUI/{mainwindow => Views/Main}/SaveThread.cpp (92%)
rename GUI/{mainwindow => Views/Main}/SaveThread.h (84%)
rename GUI/{mainwindow => Views/Main}/aboutapplicationdialog.cpp (97%)
rename GUI/{mainwindow => Views/Main}/aboutapplicationdialog.h (79%)
rename GUI/{mainwindow => Views/Main}/actionmanager.cpp (97%)
rename GUI/{mainwindow => Views/Main}/actionmanager.h (90%)
rename GUI/{mainwindow => Views/Main}/mainwindow.cpp (98%)
rename GUI/{mainwindow => Views/Main}/mainwindow.h (94%)
rename GUI/{mainwindow => Views/Main}/newprojectdialog.cpp (98%)
rename GUI/{mainwindow => Views/Main}/newprojectdialog.h (88%)
rename GUI/{mainwindow => Views/Main}/projectmanager.cpp (98%)
rename GUI/{mainwindow => Views/Main}/projectmanager.h (93%)
diff --git a/App/main.cpp b/App/main.cpp
index ef67b107d0e..b58aab127ca 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -17,7 +17,7 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/Loaders/DataLoaderUtil.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/hostosinfo.h"
#include "config_build.h"
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index 623e20780c8..e4c63ddb652 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -18,7 +18,7 @@
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Project/LinkInstrumentManager.h"
#include "GUI/Models/Project/projectdocument.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include <QComboBox>
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 6adb8405e4b..51ad340b7b9 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -18,14 +18,14 @@
#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/GUIHelpers.h"
#include <QFileDialog>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
index b09fee36dba..cca226cdc24 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -18,7 +18,7 @@
#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Session/SessionData.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include "ui_InstrumentLibraryEditor.h"
#include <QAction>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
index 3a6772e5ed5..62212679ac5 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
@@ -19,7 +19,7 @@
#include "GUI/Session/SessionData.h"
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListModel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include <QAction>
#include <QListView>
#include <QMessageBox>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index 5f1391f928d..f3b2e2d093b 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -15,12 +15,12 @@
#include "GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/utils/GUIHelpers.h"
#include <QAction>
#include <QMouseEvent>
diff --git a/GUI/Views/JobWidgets/JobProgressAssistant.cpp b/GUI/Views/JobWidgets/JobProgressAssistant.cpp
index dde51f8419d..285977d6e70 100644
--- a/GUI/Views/JobWidgets/JobProgressAssistant.cpp
+++ b/GUI/Views/JobWidgets/JobProgressAssistant.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/JobWidgets/JobProgressAssistant.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include <QProgressBar>
JobProgressAssistant::JobProgressAssistant(MainWindow* mainWindow, JobModel* jobModel)
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 00da33d2ff3..3bc96673498 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/Widgets/Common/DocksController.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Views/FitWidgets/FitActivityPanel.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
@@ -24,7 +24,7 @@
#include "GUI/Views/JobWidgets/JobResultsPresenter.h"
#include "GUI/Views/JobWidgets/JobSelectorWidget.h"
#include "GUI/Views/JobWidgets/JobViewActivities.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include <QMenu>
JobView::JobView(MainWindow* mainWindow, ProjectDocument* document)
diff --git a/GUI/mainwindow/AutosaveController.cpp b/GUI/Views/Main/AutosaveController.cpp
similarity index 97%
rename from GUI/mainwindow/AutosaveController.cpp
rename to GUI/Views/Main/AutosaveController.cpp
index c196767203b..ac3d2533a6e 100644
--- a/GUI/mainwindow/AutosaveController.cpp
+++ b/GUI/Views/Main/AutosaveController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/AutosaveController.cpp
+//! @file GUI/Views/Main/AutosaveController.cpp
//! @brief Implements class AutosaveController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/AutosaveController.h"
+#include "GUI/Views/Main/AutosaveController.h"
#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/projectdocument.h"
diff --git a/GUI/mainwindow/AutosaveController.h b/GUI/Views/Main/AutosaveController.h
similarity index 89%
rename from GUI/mainwindow/AutosaveController.h
rename to GUI/Views/Main/AutosaveController.h
index 50a1d126e47..5a5e4acdcbc 100644
--- a/GUI/mainwindow/AutosaveController.h
+++ b/GUI/Views/Main/AutosaveController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/AutosaveController.h
+//! @file GUI/Views/Main/AutosaveController.h
//! @brief Defines class AutosaveController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_AUTOSAVECONTROLLER_H
-#define BORNAGAIN_GUI_MAINWINDOW_AUTOSAVECONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
#include <QObject>
@@ -59,4 +59,4 @@ private:
UpdateTimer* m_timer;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_AUTOSAVECONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_AUTOSAVECONTROLLER_H
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/Views/Main/PyImportAssistant.cpp
similarity index 98%
rename from GUI/mainwindow/PyImportAssistant.cpp
rename to GUI/Views/Main/PyImportAssistant.cpp
index 7b7c5b2fde7..a2be57f619e 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/Views/Main/PyImportAssistant.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/PyImportAssistant.cpp
+//! @file GUI/Views/Main/PyImportAssistant.cpp
//! @brief Implements class PyImportAssistant
//!
//! @homepage http://www.bornagainproject.org
@@ -14,14 +14,14 @@
#ifdef BORNAGAIN_PYTHON
-#include "GUI/mainwindow/PyImportAssistant.h"
+#include "GUI/Views/Main/PyImportAssistant.h"
#include "BABuild.h"
#include "Base/Utils/Assert.h"
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Widgets/Info/ComboSelectorDialog.h"
#include "GUI/Widgets/Info/DetailedMessageBox.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Models/Project/ProjectUtils.h"
diff --git a/GUI/mainwindow/PyImportAssistant.h b/GUI/Views/Main/PyImportAssistant.h
similarity index 87%
rename from GUI/mainwindow/PyImportAssistant.h
rename to GUI/Views/Main/PyImportAssistant.h
index 5b85a672ba0..b987eb448b2 100644
--- a/GUI/mainwindow/PyImportAssistant.h
+++ b/GUI/Views/Main/PyImportAssistant.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/PyImportAssistant.h
+//! @file GUI/Views/Main/PyImportAssistant.h
//! @brief Implements class PyImportAssistant
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PYIMPORTASSISTANT_H
-#define BORNAGAIN_GUI_MAINWINDOW_PYIMPORTASSISTANT_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
#ifdef BORNAGAIN_PYTHON
@@ -47,4 +47,4 @@ private:
#endif // BORNAGAIN_PYTHON
-#endif // BORNAGAIN_GUI_MAINWINDOW_PYIMPORTASSISTANT_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_PYIMPORTASSISTANT_H
diff --git a/GUI/mainwindow/SaveService.cpp b/GUI/Views/Main/SaveService.cpp
similarity index 96%
rename from GUI/mainwindow/SaveService.cpp
rename to GUI/Views/Main/SaveService.cpp
index caffc8e8afe..7eb9d98b4b6 100644
--- a/GUI/mainwindow/SaveService.cpp
+++ b/GUI/Views/Main/SaveService.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/SaveService.cpp
+//! @file GUI/Views/Main/SaveService.cpp
//! @brief Implements class SaveService
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/SaveService.h"
+#include "GUI/Views/Main/SaveService.h"
#include "Base/Utils/Assert.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/Views/Main/AutosaveController.h"
+#include "GUI/Views/Main/SaveThread.h"
#include "GUI/utils/Error.h"
#include <QApplication>
#include <QCoreApplication>
diff --git a/GUI/mainwindow/SaveService.h b/GUI/Views/Main/SaveService.h
similarity index 88%
rename from GUI/mainwindow/SaveService.h
rename to GUI/Views/Main/SaveService.h
index 2dbef3831ae..d501b76ecbf 100644
--- a/GUI/mainwindow/SaveService.h
+++ b/GUI/Views/Main/SaveService.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/SaveService.h
+//! @file GUI/Views/Main/SaveService.h
//! @brief Defines class SaveService
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_SAVESERVICE_H
-#define BORNAGAIN_GUI_MAINWINDOW_SAVESERVICE_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
#include <QObject>
#include <QQueue>
@@ -61,4 +61,4 @@ private:
ProjectDocument* m_document;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_SAVESERVICE_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_SAVESERVICE_H
diff --git a/GUI/mainwindow/SaveThread.cpp b/GUI/Views/Main/SaveThread.cpp
similarity index 92%
rename from GUI/mainwindow/SaveThread.cpp
rename to GUI/Views/Main/SaveThread.cpp
index 796548688d0..3bf98202aab 100644
--- a/GUI/mainwindow/SaveThread.cpp
+++ b/GUI/Views/Main/SaveThread.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/SaveThread.cpp
+//! @file GUI/Views/Main/SaveThread.cpp
//! @brief Defines SaveThread classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/SaveThread.h"
+#include "GUI/Views/Main/SaveThread.h"
#include "Base/Utils/Assert.h"
#include "GUI/Models/Project/projectdocument.h"
diff --git a/GUI/mainwindow/SaveThread.h b/GUI/Views/Main/SaveThread.h
similarity index 84%
rename from GUI/mainwindow/SaveThread.h
rename to GUI/Views/Main/SaveThread.h
index 401509fbe67..a712b6a4534 100644
--- a/GUI/mainwindow/SaveThread.h
+++ b/GUI/Views/Main/SaveThread.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/SaveThread.h
+//! @file GUI/Views/Main/SaveThread.h
//! @brief Defines SaveThread classes
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_SAVETHREAD_H
-#define BORNAGAIN_GUI_MAINWINDOW_SAVETHREAD_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
#include <QObject>
#include <QThread>
@@ -40,4 +40,4 @@ private:
QString m_projectFile;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_SAVETHREAD_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_SAVETHREAD_H
diff --git a/GUI/mainwindow/aboutapplicationdialog.cpp b/GUI/Views/Main/aboutapplicationdialog.cpp
similarity index 97%
rename from GUI/mainwindow/aboutapplicationdialog.cpp
rename to GUI/Views/Main/aboutapplicationdialog.cpp
index 746a5530edd..f518dfeffce 100644
--- a/GUI/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/Views/Main/aboutapplicationdialog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/aboutapplicationdialog.cpp
+//! @file GUI/Views/Main/aboutapplicationdialog.cpp
//! @brief Implements class AboutApplicationDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/aboutapplicationdialog.h"
+#include "GUI/Views/Main/aboutapplicationdialog.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/utils/CustomEventFilters.h"
#include "GUI/utils/Helpers.h"
diff --git a/GUI/mainwindow/aboutapplicationdialog.h b/GUI/Views/Main/aboutapplicationdialog.h
similarity index 79%
rename from GUI/mainwindow/aboutapplicationdialog.h
rename to GUI/Views/Main/aboutapplicationdialog.h
index cefa83707f0..8e0a0fbe5e3 100644
--- a/GUI/mainwindow/aboutapplicationdialog.h
+++ b/GUI/Views/Main/aboutapplicationdialog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/aboutapplicationdialog.h
+//! @file GUI/Views/Main/aboutapplicationdialog.h
//! @brief Defines class AboutApplicationDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
-#define BORNAGAIN_GUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
#include <QDialog>
@@ -32,4 +32,4 @@ private:
QBoxLayout* createButtonLayout();
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_ABOUTAPPLICATIONDIALOG_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
diff --git a/GUI/mainwindow/actionmanager.cpp b/GUI/Views/Main/actionmanager.cpp
similarity index 97%
rename from GUI/mainwindow/actionmanager.cpp
rename to GUI/Views/Main/actionmanager.cpp
index 85da1e1a462..de27bbbd259 100644
--- a/GUI/mainwindow/actionmanager.cpp
+++ b/GUI/Views/Main/actionmanager.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/actionmanager.cpp
+//! @file GUI/Views/Main/actionmanager.cpp
//! @brief Implements class ActionManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,16 +12,16 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/actionmanager.h"
+#include "GUI/Views/Main/actionmanager.h"
#include "Base/Utils/Assert.h"
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/PyImportAssistant.h"
-#include "GUI/mainwindow/aboutapplicationdialog.h"
+#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/PyImportAssistant.h"
+#include "GUI/Views/Main/aboutapplicationdialog.h"
#include "GUI/Session/SessionData.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/mainwindow/actionmanager.h b/GUI/Views/Main/actionmanager.h
similarity index 90%
rename from GUI/mainwindow/actionmanager.h
rename to GUI/Views/Main/actionmanager.h
index 8e2772a207e..56a4aabdc8f 100644
--- a/GUI/mainwindow/actionmanager.h
+++ b/GUI/Views/Main/actionmanager.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/actionmanager.h
+//! @file GUI/Views/Main/actionmanager.h
//! @brief Defines class ActionManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_ACTIONMANAGER_H
-#define BORNAGAIN_GUI_MAINWINDOW_ACTIONMANAGER_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
#include <QObject>
@@ -71,4 +71,4 @@ private:
void createGlobalShortcuts();
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_ACTIONMANAGER_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_ACTIONMANAGER_H
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/Views/Main/mainwindow.cpp
similarity index 98%
rename from GUI/mainwindow/mainwindow.cpp
rename to GUI/Views/Main/mainwindow.cpp
index e1296511e5f..81971e0b8c8 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/Views/Main/mainwindow.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/mainwindow.cpp
+//! @file GUI/Views/Main/mainwindow.cpp
//! @brief Implements class MainWindow
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
@@ -25,7 +25,7 @@
#include "GUI/Views/Toplevel/SessionModelView.h"
#include "GUI/Views/Toplevel/SimulationView.h"
#include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/mainwindow/actionmanager.h"
+#include "GUI/Views/Main/actionmanager.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/mainwindow/mainwindow.h b/GUI/Views/Main/mainwindow.h
similarity index 94%
rename from GUI/mainwindow/mainwindow.h
rename to GUI/Views/Main/mainwindow.h
index 36af64a96ed..ddff9ee845c 100644
--- a/GUI/mainwindow/mainwindow.h
+++ b/GUI/Views/Main/mainwindow.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/mainwindow.h
+//! @file GUI/Views/Main/mainwindow.h
//! @brief Defines class MainWindow
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_H
-#define BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
#include <QMainWindow>
@@ -113,4 +113,4 @@ private:
#define baWin (MainWindow::instance())
-#endif // BORNAGAIN_GUI_MAINWINDOW_MAINWINDOW_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_MAINWINDOW_H
diff --git a/GUI/mainwindow/newprojectdialog.cpp b/GUI/Views/Main/newprojectdialog.cpp
similarity index 98%
rename from GUI/mainwindow/newprojectdialog.cpp
rename to GUI/Views/Main/newprojectdialog.cpp
index 567549b836a..00680944557 100644
--- a/GUI/mainwindow/newprojectdialog.cpp
+++ b/GUI/Views/Main/newprojectdialog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/newprojectdialog.cpp
+//! @file GUI/Views/Main/newprojectdialog.cpp
//! @brief Implements class NewProjectDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/newprojectdialog.h"
+#include "GUI/Views/Main/newprojectdialog.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Models/Project/projectdocument.h"
#include <QFileDialog>
diff --git a/GUI/mainwindow/newprojectdialog.h b/GUI/Views/Main/newprojectdialog.h
similarity index 88%
rename from GUI/mainwindow/newprojectdialog.h
rename to GUI/Views/Main/newprojectdialog.h
index ea6a1b7f21e..4c2dd98ea3c 100644
--- a/GUI/mainwindow/newprojectdialog.h
+++ b/GUI/Views/Main/newprojectdialog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/newprojectdialog.h
+//! @file GUI/Views/Main/newprojectdialog.h
//! @brief Defines class NewProjectDialog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_NEWPROJECTDIALOG_H
-#define BORNAGAIN_GUI_MAINWINDOW_NEWPROJECTDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
#include <QDialog>
#include <QLineEdit>
@@ -56,4 +56,4 @@ private:
bool m_valid_projectPath;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_NEWPROJECTDIALOG_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_NEWPROJECTDIALOG_H
diff --git a/GUI/mainwindow/projectmanager.cpp b/GUI/Views/Main/projectmanager.cpp
similarity index 98%
rename from GUI/mainwindow/projectmanager.cpp
rename to GUI/Views/Main/projectmanager.cpp
index a7a824ea6b4..d5314544567 100644
--- a/GUI/mainwindow/projectmanager.cpp
+++ b/GUI/Views/Main/projectmanager.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectmanager.cpp
+//! @file GUI/Views/Main/projectmanager.cpp
//! @brief Implements class ProjectManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,17 +12,17 @@
//
// ************************************************************************************************
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "Base/Utils/Assert.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/projectdocument.h"
-#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/mainwindow/SaveService.h"
+#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/SaveService.h"
#include "GUI/Session/SessionData.h"
-#include "GUI/mainwindow/newprojectdialog.h"
+#include "GUI/Views/Main/newprojectdialog.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/MessageService.h"
diff --git a/GUI/mainwindow/projectmanager.h b/GUI/Views/Main/projectmanager.h
similarity index 93%
rename from GUI/mainwindow/projectmanager.h
rename to GUI/Views/Main/projectmanager.h
index 5fa29dfe31f..cc715f8443b 100644
--- a/GUI/mainwindow/projectmanager.h
+++ b/GUI/Views/Main/projectmanager.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/mainwindow/projectmanager.h
+//! @file GUI/Views/Main/projectmanager.h
//! @brief Defines class ProjectManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
-#define BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
#include "GUI/Models/Project/projectdocument.h"
#include <QObject>
@@ -99,4 +99,4 @@ private:
static ProjectManager* s_instance;
};
-#endif // BORNAGAIN_GUI_MAINWINDOW_PROJECTMANAGER_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index bd597bf7308..e14f478d7cc 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -15,7 +15,7 @@
#include "GUI/Views/MaskWidgets/MaskEditorCanvas.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/MaskItems.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 9ee1499121e..9cd0254f6e4 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -23,7 +23,7 @@
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/mainwindow_constants.h"
#include "ui_MaterialEditorDialog.h"
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index d5d8f2ed379..0ac51c564a2 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -20,7 +20,7 @@
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/MaskItems.h"
#include "GUI/Items/ProjectionItems.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/utils/Error.h"
#include <QFileDialog>
#include <QTextStream>
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index a225034b3f1..7c400acdf87 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -18,7 +18,7 @@
#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Session/SessionData.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/utils/CustomEventFilters.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 9da5431cd65..6a349c3a688 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -16,7 +16,7 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/SessionItemUtils.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index 9386ff6aad7..f1b1f8d5d30 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h"
#include "GUI/Items/SpecularDataItem.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
#include <qcustomplot.h>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
index d9979b713bb..bbcb5e7a97f 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
@@ -20,7 +20,7 @@
#include "GUI/Models/Data/AbstractDataLoaderResultModel.h"
#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Views/Loaders/DataLoaderUtil.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "ui_SpecularDataImportWidget.h"
#include <QAction>
#include <QBoxLayout>
diff --git a/GUI/Views/Toplevel/ImportDataView.cpp b/GUI/Views/Toplevel/ImportDataView.cpp
index 9659bf847a0..cd723d635be 100644
--- a/GUI/Views/Toplevel/ImportDataView.cpp
+++ b/GUI/Views/Toplevel/ImportDataView.cpp
@@ -17,7 +17,7 @@
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/utils/mainwindow_constants.h"
#include <QAction>
#include <QSplitter>
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index 0ac036c7a08..498d606533c 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -27,7 +27,7 @@
#include "GUI/Views/SampleDesigner/SampleToolBox.h"
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include <QBoxLayout>
#include <QDockWidget>
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index 8de65fa7014..d9568a1c718 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/Toplevel/SessionModelView.h"
#include "GUI/Widgets/Common/ModelTreeView.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Job/JobModel.h"
@@ -22,7 +22,7 @@
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Views/Toplevel/TestView.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include <QToolBar>
#include <QToolButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index cf7b38bf14f..e84d14176bf 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -30,8 +30,8 @@
#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
-#include "GUI/mainwindow/projectmanager.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "ui_SimulationView.h"
#include <QButtonGroup>
#include <QMessageBox>
diff --git a/GUI/Views/Toplevel/TestView.cpp b/GUI/Views/Toplevel/TestView.cpp
index 2b7314b68fa..8b68fef8121 100644
--- a/GUI/Views/Toplevel/TestView.cpp
+++ b/GUI/Views/Toplevel/TestView.cpp
@@ -23,7 +23,7 @@
#include "GUI/Views/PropertyEditor/TestComponentView.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceWidget.h"
#include "GUI/Views/SpecularDataWidgets/Plot1DCanvas.h"
-#include "GUI/mainwindow/mainwindow.h"
+#include "GUI/Views/Main/mainwindow.h"
#include <qAccordion/contentpane.h>
diff --git a/GUI/Views/Toplevel/WelcomeView.cpp b/GUI/Views/Toplevel/WelcomeView.cpp
index ba2e47d512d..cb180785029 100644
--- a/GUI/Views/Toplevel/WelcomeView.cpp
+++ b/GUI/Views/Toplevel/WelcomeView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/mainwindow/projectmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/utils/LayoutUtils.h"
#include "GUI/utils/qstringutils.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 4a61dbc8a68..8253a150906 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -7,8 +7,8 @@
#include "GUI/Models/Instrument/InstrumentModel.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/Views/Main/AutosaveController.h"
+#include "GUI/Views/Main/SaveService.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
--
GitLab