Data no longer depends on Domain

GUI/Models/Data/GUIObjectBuilder.cpp → GUI/Models/Domain/GUIObjectBuilder.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Data/GUIObjectBuilder.cpp
+//! @file      GUI/Models/Domain/GUIObjectBuilder.cpp
 //! @brief     Implements GUI::Model::ObjectBuilder namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Data/GUIObjectBuilder.h"
+#include "GUI/Models/Domain/GUIObjectBuilder.h"
 #include "Base/Const/Units.h"
 #include "Base/Utils/Assert.h"
 #include "Core/Simulation/includeSimulations.h"

GUI/Models/Data/GUIObjectBuilder.h → GUI/Models/Domain/GUIObjectBuilder.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Data/GUIObjectBuilder.h
+//! @file      GUI/Models/Domain/GUIObjectBuilder.h
 //! @brief     Defines namespace GUI::Model::ObjectBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_DATA_GUIOBJECTBUILDER_H
-#define BORNAGAIN_GUI_MODELS_DATA_GUIOBJECTBUILDER_H
+#ifndef BORNAGAIN_GUI_MODELS_DOMAIN_GUIOBJECTBUILDER_H
+#define BORNAGAIN_GUI_MODELS_DOMAIN_GUIOBJECTBUILDER_H
 
 #include <QString>
 
@@ -37,4 +37,4 @@ SessionItem* populateDocumentModel(DocumentModel* p_documentModel, const ISimula
 
 } // namespace GUI::Model::ObjectBuilder
 
-#endif // BORNAGAIN_GUI_MODELS_DATA_GUIOBJECTBUILDER_H
+#endif // BORNAGAIN_GUI_MODELS_DOMAIN_GUIOBJECTBUILDER_H

GUI/Views/Main/PyImportAssistant.cpp

@@ -19,7 +19,7 @@
 #include "Base/Utils/Assert.h"
 #include "Base/Utils/SysUtils.h"
 #include "GUI/Application/GlobalSettings.h"
-#include "GUI/Models/Data/GUIObjectBuilder.h"
+#include "GUI/Models/Domain/GUIObjectBuilder.h"
 #include "GUI/Models/Project/ProjectUtils.h"
 #include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
 #include "GUI/Views/Main/ProjectManager.h"

GUI/Views/PropertyEditor/TestComponentView.cpp

@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/PropertyEditor/TestComponentView.h"
-#include "GUI/Models/Data/GUIObjectBuilder.h"
 #include "GUI/Models/Data/IntensityDataItem.h"
+#include "GUI/Models/Domain/GUIObjectBuilder.h"
 #include "GUI/Models/Instrument/BeamItems.h"
 #include "GUI/Models/Material/MaterialModel.h"
 #include "GUI/Models/Sample/GUIDomainSampleVisitor.h"

Tests/Functional/GUI/Check.cpp

@@ -20,8 +20,8 @@
 #include "Device/Histo/IntensityDataIOFactory.h"
 #include "Device/Histo/SimulationResult.h"
 #include "GUI/Models/Data/DocumentModel.h"
-#include "GUI/Models/Data/GUIObjectBuilder.h"
 #include "GUI/Models/Domain/DomainSimulationBuilder.h"
+#include "GUI/Models/Domain/GUIObjectBuilder.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Material/MaterialModel.h"