From 3ea15ea9b212234b7016652fa41d385447b5425f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Nov 2021 00:31:02 +0100
Subject: [PATCH] no more cyclic include dependences between Models/*
directories
---
GUI/Application/Application.h | 2 +-
GUI/Models/Data/GUIObjectBuilder.cpp | 2 +-
GUI/Models/Domain/TransformToDomain.cpp | 2 +-
.../Instrument}/InstrumentLibrary.cpp | 4 ++--
.../Instrument}/InstrumentLibrary.h | 8 ++++----
GUI/Models/Job/JobModel.cpp | 2 +-
GUI/Models/{Domain => Sample}/GUIDomainSampleVisitor.cpp | 4 ++--
GUI/Models/{Domain => Sample}/GUIDomainSampleVisitor.h | 8 ++++----
GUI/Models/{Domain => Sample}/GUIExamplesFactory.cpp | 6 +++---
GUI/Models/{Domain => Sample}/GUIExamplesFactory.h | 8 ++++----
GUI/Models/Sample/SampleListModel.cpp | 2 +-
GUI/Session/ItemWithMaterial.cpp | 2 +-
GUI/{Models/Job => Session}/JobModelFunctions.cpp | 4 ++--
GUI/{Models/Job => Session}/JobModelFunctions.h | 8 ++++----
GUI/Session/RealDataItem.cpp | 2 +-
GUI/Views/PropertyEditor/TestComponentView.cpp | 2 +-
GUI/Views/SampleDesigner/DesignerScene.cpp | 2 +-
GUI/Views/SampleDesigner/SampleListView.cpp | 2 +-
GUI/Views/SampleDesigner/SampleToolBox.cpp | 2 +-
GUI/mainwindow/PyImportAssistant.cpp | 2 +-
Tests/Functional/GUI/Check.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 2 +-
Tests/Unit/GUI/TestSavingSpecularData.cpp | 2 +-
23 files changed, 40 insertions(+), 40 deletions(-)
rename GUI/{Application => Models/Instrument}/InstrumentLibrary.cpp (96%)
rename GUI/{Application => Models/Instrument}/InstrumentLibrary.h (82%)
rename GUI/Models/{Domain => Sample}/GUIDomainSampleVisitor.cpp (99%)
rename GUI/Models/{Domain => Sample}/GUIDomainSampleVisitor.h (93%)
rename GUI/Models/{Domain => Sample}/GUIExamplesFactory.cpp (95%)
rename GUI/Models/{Domain => Sample}/GUIExamplesFactory.h (83%)
rename GUI/{Models/Job => Session}/JobModelFunctions.cpp (99%)
rename GUI/{Models/Job => Session}/JobModelFunctions.h (89%)
diff --git a/GUI/Application/Application.h b/GUI/Application/Application.h
index 88a9dc864d0..4d40388f6ff 100644
--- a/GUI/Application/Application.h
+++ b/GUI/Application/Application.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_APPLICATION_APPLICATION_H
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Application/InstrumentLibrary.h"
+#include "GUI/Models/Instrument/InstrumentLibrary.h"
#include <QApplication>
#include <QColor>
diff --git a/GUI/Models/Data/GUIObjectBuilder.cpp b/GUI/Models/Data/GUIObjectBuilder.cpp
index b1deb45725e..b084fcf582d 100644
--- a/GUI/Models/Data/GUIObjectBuilder.cpp
+++ b/GUI/Models/Data/GUIObjectBuilder.cpp
@@ -18,7 +18,7 @@
#include "Core/Simulation/includeSimulations.h"
#include "Device/Instrument/Instrument.h"
#include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Session/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Session/SimulationOptionsItem.h"
diff --git a/GUI/Models/Domain/TransformToDomain.cpp b/GUI/Models/Domain/TransformToDomain.cpp
index 6af86b3d171..9ba2aefa0ef 100644
--- a/GUI/Models/Domain/TransformToDomain.cpp
+++ b/GUI/Models/Domain/TransformToDomain.cpp
@@ -22,7 +22,7 @@
#include "GUI/Session/BeamWavelengthItem.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Session/JobItem.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
#include "GUI/Session/LayerItem.h"
#include "GUI/Session/LayerRoughnessItems.h"
#include "GUI/Session/MaterialItemUtils.h"
diff --git a/GUI/Application/InstrumentLibrary.cpp b/GUI/Models/Instrument/InstrumentLibrary.cpp
similarity index 96%
rename from GUI/Application/InstrumentLibrary.cpp
rename to GUI/Models/Instrument/InstrumentLibrary.cpp
index d963619cd08..7a8e93d0752 100644
--- a/GUI/Application/InstrumentLibrary.cpp
+++ b/GUI/Models/Instrument/InstrumentLibrary.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Application/InstrumentLibrary.cpp
+//! @file GUI/Models/Instrument/InstrumentLibrary.cpp
//! @brief Implements class InstrumentLibrary
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Application/InstrumentLibrary.h"
+#include "GUI/Models/Instrument/InstrumentLibrary.h"
#include "GUI/Models/Instrument/InstrumentsTreeModel.h"
#include "GUI/Session/InstrumentItems.h"
#include <QFile>
diff --git a/GUI/Application/InstrumentLibrary.h b/GUI/Models/Instrument/InstrumentLibrary.h
similarity index 82%
rename from GUI/Application/InstrumentLibrary.h
rename to GUI/Models/Instrument/InstrumentLibrary.h
index 94cea23f918..afc915c6c2a 100644
--- a/GUI/Application/InstrumentLibrary.h
+++ b/GUI/Models/Instrument/InstrumentLibrary.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Application/InstrumentLibrary.h
+//! @file GUI/Models/Instrument/InstrumentLibrary.h
//! @brief Defines class InstrumentLibrary
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_APPLICATION_INSTRUMENTLIBRARY_H
-#define BORNAGAIN_GUI_APPLICATION_INSTRUMENTLIBRARY_H
+#ifndef BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
+#define BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
#include "GUI/Models/Instrument/InstrumentModel.h"
@@ -38,4 +38,4 @@ private:
bool m_modified;
};
-#endif // BORNAGAIN_GUI_APPLICATION_INSTRUMENTLIBRARY_H
+#endif // BORNAGAIN_GUI_MODELS_INSTRUMENT_INSTRUMENTLIBRARY_H
diff --git a/GUI/Models/Job/JobModel.cpp b/GUI/Models/Job/JobModel.cpp
index a82ef898fee..6bd32e32b2f 100644
--- a/GUI/Models/Job/JobModel.cpp
+++ b/GUI/Models/Job/JobModel.cpp
@@ -17,7 +17,7 @@
#include "GUI/Session/InstrumentItems.h"
#include "GUI/Session/IntensityDataItem.h"
#include "GUI/Session/JobItem.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
#include "GUI/Models/Job/JobQueueData.h"
#include "GUI/Session/MultiLayerItem.h"
#include "GUI/Session/ParameterTreeItems.h"
diff --git a/GUI/Models/Domain/GUIDomainSampleVisitor.cpp b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
similarity index 99%
rename from GUI/Models/Domain/GUIDomainSampleVisitor.cpp
rename to GUI/Models/Sample/GUIDomainSampleVisitor.cpp
index 801e86547c7..170937f28f1 100644
--- a/GUI/Models/Domain/GUIDomainSampleVisitor.cpp
+++ b/GUI/Models/Sample/GUIDomainSampleVisitor.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Domain/GUIDomainSampleVisitor.cpp
+//! @file GUI/Models/Sample/GUIDomainSampleVisitor.cpp
//! @brief Implements class GUIDomainSampleVisitor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "Base/Const/Units.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
diff --git a/GUI/Models/Domain/GUIDomainSampleVisitor.h b/GUI/Models/Sample/GUIDomainSampleVisitor.h
similarity index 93%
rename from GUI/Models/Domain/GUIDomainSampleVisitor.h
rename to GUI/Models/Sample/GUIDomainSampleVisitor.h
index df5aa0dd3d2..d19eca4e913 100644
--- a/GUI/Models/Domain/GUIDomainSampleVisitor.h
+++ b/GUI/Models/Sample/GUIDomainSampleVisitor.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Domain/GUIDomainSampleVisitor.h
+//! @file GUI/Models/Sample/GUIDomainSampleVisitor.h
//! @brief Defines class GUIDomainSampleVisitor
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_GUIDOMAINSAMPLEVISITOR_H
-#define BORNAGAIN_GUI_MODELS_DOMAIN_GUIDOMAINSAMPLEVISITOR_H
+#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
+#define BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
#include "Param/Node/INodeVisitor.h"
#include <QMap>
@@ -106,4 +106,4 @@ private:
MaterialModel* m_materialModel;
};
-#endif // BORNAGAIN_GUI_MODELS_DOMAIN_GUIDOMAINSAMPLEVISITOR_H
+#endif // BORNAGAIN_GUI_MODELS_SAMPLE_GUIDOMAINSAMPLEVISITOR_H
diff --git a/GUI/Models/Domain/GUIExamplesFactory.cpp b/GUI/Models/Sample/GUIExamplesFactory.cpp
similarity index 95%
rename from GUI/Models/Domain/GUIExamplesFactory.cpp
rename to GUI/Models/Sample/GUIExamplesFactory.cpp
index 1197470e6a7..9cd6b338d8d 100644
--- a/GUI/Models/Domain/GUIExamplesFactory.cpp
+++ b/GUI/Models/Sample/GUIExamplesFactory.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Domain/GUIExamplesFactory.cpp
+//! @file GUI/Models/Sample/GUIExamplesFactory.cpp
//! @brief Implements class GUIExamplesFactory
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/StandardSamples/ExemplarySamples.h"
#include <QMap>
diff --git a/GUI/Models/Domain/GUIExamplesFactory.h b/GUI/Models/Sample/GUIExamplesFactory.h
similarity index 83%
rename from GUI/Models/Domain/GUIExamplesFactory.h
rename to GUI/Models/Sample/GUIExamplesFactory.h
index c23722314cf..20c97edaf36 100644
--- a/GUI/Models/Domain/GUIExamplesFactory.h
+++ b/GUI/Models/Sample/GUIExamplesFactory.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Domain/GUIExamplesFactory.h
+//! @file GUI/Models/Sample/GUIExamplesFactory.h
//! @brief Defines class GUIExamplesFactory
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_GUIEXAMPLESFACTORY_H
-#define BORNAGAIN_GUI_MODELS_DOMAIN_GUIEXAMPLESFACTORY_H
+#ifndef BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
+#define BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
#include <QString>
@@ -36,4 +36,4 @@ public:
static std::tuple<QString, QString> exampleInfo(const QString& name);
};
-#endif // BORNAGAIN_GUI_MODELS_DOMAIN_GUIEXAMPLESFACTORY_H
+#endif // BORNAGAIN_GUI_MODELS_SAMPLE_GUIEXAMPLESFACTORY_H
diff --git a/GUI/Models/Sample/SampleListModel.cpp b/GUI/Models/Sample/SampleListModel.cpp
index 0f076fc9217..5809823211d 100644
--- a/GUI/Models/Sample/SampleListModel.cpp
+++ b/GUI/Models/Sample/SampleListModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/Models/Sample/SampleListModel.h"
#include "GUI/Application/Application.h"
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Session/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
diff --git a/GUI/Session/ItemWithMaterial.cpp b/GUI/Session/ItemWithMaterial.cpp
index 1ae79638ff0..3c9f97dfdad 100644
--- a/GUI/Session/ItemWithMaterial.cpp
+++ b/GUI/Session/ItemWithMaterial.cpp
@@ -14,7 +14,7 @@
#include "GUI/Session/ItemWithMaterial.h"
#include "GUI/Session/JobItem.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
#include "GUI/Session/MaterialItemContainer.h"
#include "GUI/Session/MaterialItemUtils.h"
diff --git a/GUI/Models/Job/JobModelFunctions.cpp b/GUI/Session/JobModelFunctions.cpp
similarity index 99%
rename from GUI/Models/Job/JobModelFunctions.cpp
rename to GUI/Session/JobModelFunctions.cpp
index 03ad1148ebb..45755017e23 100644
--- a/GUI/Models/Job/JobModelFunctions.cpp
+++ b/GUI/Session/JobModelFunctions.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Job/JobModelFunctions.cpp
+//! @file GUI/Session/JobModelFunctions.cpp
//! @brief Implements auxiliary functions in JobModelFunctions namespace.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
#include "Base/Utils/Assert.h"
#include "Device/Instrument/Instrument.h"
#include "GUI/Session/Data1DViewItem.h"
diff --git a/GUI/Models/Job/JobModelFunctions.h b/GUI/Session/JobModelFunctions.h
similarity index 89%
rename from GUI/Models/Job/JobModelFunctions.h
rename to GUI/Session/JobModelFunctions.h
index 6944f850dcc..4d445b27654 100644
--- a/GUI/Models/Job/JobModelFunctions.h
+++ b/GUI/Session/JobModelFunctions.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Job/JobModelFunctions.h
+//! @file GUI/Session/JobModelFunctions.h
//! @brief Defines auxiliary functions in namespace GUI::Model::JobModelFunctions.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
-#define BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
+#ifndef BORNAGAIN_GUI_SESSION_JOBMODELFUNCTIONS_H
+#define BORNAGAIN_GUI_SESSION_JOBMODELFUNCTIONS_H
class InstrumentItem;
class JobItem;
@@ -51,4 +51,4 @@ const JobItem* findJobItem(const SessionItem* item);
} // namespace GUI::Model::JobFunctions
-#endif // BORNAGAIN_GUI_MODELS_JOB_JOBMODELFUNCTIONS_H
+#endif // BORNAGAIN_GUI_SESSION_JOBMODELFUNCTIONS_H
diff --git a/GUI/Session/RealDataItem.cpp b/GUI/Session/RealDataItem.cpp
index c1ccdb78c0f..5da139490b7 100644
--- a/GUI/Session/RealDataItem.cpp
+++ b/GUI/Session/RealDataItem.cpp
@@ -25,7 +25,7 @@
#include "GUI/Session/ItemFileNameUtils.h"
#include "GUI/Session/JobItem.h"
#include "GUI/Session/JobItemUtils.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
#include "GUI/Session/MaskItems.h"
#include "GUI/Session/ProjectionItems.h"
#include "GUI/Models/Data/RealDataModel.h"
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index d3c61b0fb19..6232354d906 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/PropertyEditor/TestComponentView.h"
#include "GUI/Session/BeamItems.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/Session/IntensityDataItem.h"
#include "GUI/Models/Material/MaterialModel.h"
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 6a985ce4bd8..e9aca1565b3 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Session/InterferenceItems.h"
#include "GUI/Session/ItemFactory.h"
#include "GUI/Session/MesoCrystalItem.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index fa7ea892095..0e28df89eaa 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -14,7 +14,7 @@
#include "GUI/Views/SampleDesigner/SampleListView.h"
#include "GUI/Application/Application.h"
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Session/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleListModel.h"
#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
diff --git a/GUI/Views/SampleDesigner/SampleToolBox.cpp b/GUI/Views/SampleDesigner/SampleToolBox.cpp
index 67b481ccfbd..0a18f1d4887 100644
--- a/GUI/Views/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/Views/SampleDesigner/SampleToolBox.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleToolBox.h"
-#include "GUI/Models/Domain/GUIExamplesFactory.h"
+#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Session/ItemCatalog.h"
#include "GUI/Session/LayerItem.h"
#include "GUI/Session/MultiLayerItem.h"
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index 71cf7aa4028..67f7407cf45 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -19,7 +19,7 @@
#include "Base/Utils/Assert.h"
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/Application.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/CommonWidgets/GUIHelpers.h"
#include "GUI/InfoWidgets/ComboSelectorDialog.h"
diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp
index 2f7019c8ac3..71a27cf11d7 100644
--- a/Tests/Functional/GUI/Check.cpp
+++ b/Tests/Functional/GUI/Check.cpp
@@ -21,7 +21,7 @@
#include "Device/Histo/SimulationResult.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Domain/DomainSimulationBuilder.h"
-#include "GUI/Models/Domain/GUIDomainSampleVisitor.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/Session/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index e1e3b2b1516..96bd8376b74 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -7,7 +7,7 @@
#include "GUI/Session/JobItem.h"
#include "GUI/Session/JobItemUtils.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
#include "GUI/Session/RealDataItem.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/mainwindow/OutputDataIOService.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 4b0f0bb4ff1..9a95a8fd860 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -10,7 +10,7 @@
#include "GUI/Session/ItemFileNameUtils.h"
#include "GUI/Session/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Models/Job/JobModelFunctions.h"
+#include "GUI/Session/JobModelFunctions.h"
#include "GUI/Session/PointwiseAxisItem.h"
#include "GUI/Session/SpecularBeamInclinationItem.h"
#include "GUI/mainwindow/OutputDataIOService.h"
--
GitLab