rm include

GUI/Model/Item/IntensityDataItem.cpp

@@ -16,7 +16,7 @@
 #include "GUI/Model/Item/AxesItems.h"
 #include "GUI/Model/Item/JobItemUtils.h"
 #include "GUI/Model/Item/MaskItems.h"
-#include "GUI/Model/Mask/MaskUnitsConverter.h"
+#include "GUI/Model/Item/MaskUnitsConverter.h"
 #include "GUI/Model/Item/ProjectionItems.h"
 #include "GUI/Model/Model/SessionModel.h"
 #include "GUI/Support/IO/ImportDataInfo.h"

GUI/Model/Model/JobModelFunctions.cpp → GUI/Model/Item/JobFunctions.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Model/JobModelFunctions.cpp
+//! @file      GUI/Model/Item/JobFunctions.cpp
 //! @brief     Implements auxiliary functions in JobModelFunctions namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Model/JobModelFunctions.h"
+#include "GUI/Model/Item/JobFunctions.h"
 #include "Base/Util/Assert.h"
 #include "Device/Instrument/Instrument.h"
 #include "GUI/Model/Item/PointwiseAxisItem.h"

GUI/Model/Model/JobModelFunctions.h → GUI/Model/Item/JobFunctions.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Model/JobModelFunctions.h
+//! @file      GUI/Model/Item/JobFunctions.h
 //! @brief     Defines auxiliary functions in namespace GUI::Model::JobModelFunctions.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_MODEL_JOBMODELFUNCTIONS_H
-#define BORNAGAIN_GUI_MODEL_MODEL_JOBMODELFUNCTIONS_H
+#ifndef BORNAGAIN_GUI_MODEL_ITEM_JOBFUNCTIONS_H
+#define BORNAGAIN_GUI_MODEL_ITEM_JOBFUNCTIONS_H
 
 class InstrumentItem;
 class JobItem;
@@ -44,4 +44,4 @@ void copyRealDataItem(JobItem* jobItem, const RealDataItem* realDataItem);
 
 } // namespace GUI::Model::JobFunctions
 
-#endif // BORNAGAIN_GUI_MODEL_MODEL_JOBMODELFUNCTIONS_H
+#endif // BORNAGAIN_GUI_MODEL_ITEM_JOBFUNCTIONS_H

GUI/Model/Mask/MaskUnitsConverter.cpp → GUI/Model/Item/MaskUnitsConverter.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Mask/MaskUnitsConverter.cpp
+//! @file      GUI/Model/Item/MaskUnitsConverter.cpp
 //! @brief     Implements class MaskUnitsConverter
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Mask/MaskUnitsConverter.h"
+#include "GUI/Model/Item/MaskUnitsConverter.h"
 #include "Device/Data/DataUtils.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
 #include "GUI/Model/Item/MaskItems.h"

GUI/Model/Mask/MaskUnitsConverter.h → GUI/Model/Item/MaskUnitsConverter.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Mask/MaskUnitsConverter.h
+//! @file      GUI/Model/Item/MaskUnitsConverter.h
 //! @brief     Defines class MaskUnitsConverter
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
-#define BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
+#ifndef BORNAGAIN_GUI_MODEL_ITEM_MASKUNITSCONVERTER_H
+#define BORNAGAIN_GUI_MODEL_ITEM_MASKUNITSCONVERTER_H
 
 class IntensityDataItem;
 class SessionItem;
@@ -51,4 +51,4 @@ private:
     EConvertionDirection m_direction;
 };
 
-#endif // BORNAGAIN_GUI_MODEL_MASK_MASKUNITSCONVERTER_H
+#endif // BORNAGAIN_GUI_MODEL_ITEM_MASKUNITSCONVERTER_H

GUI/Model/Item/RealDataItem.cpp

@@ -15,7 +15,6 @@
 #include "GUI/Model/Item/RealDataItem.h"
 #include "Device/Data/DataUtils.h"
 #include "GUI/Model/Item/IntensityDataItem.h"
-#include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Item/SpecularDataItem.h"
 #include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"

GUI/Model/Model/JobModel.cpp

@@ -18,7 +18,7 @@
 #include "GUI/Model/Item/RealDataItem.h"
 #include "GUI/Model/Item/JobItem.h"
 #include "GUI/Model/Item/InstrumentItems.h"
-#include "GUI/Model/Model/JobModelFunctions.h"
+#include "GUI/Model/Item/JobFunctions.h"
 #include "GUI/Model/Project/JobQueueData.h"
 #include "GUI/Model/Project/ParameterTreeUtils.h"
 #include "GUI/Model/Item/ItemWithMaterial.h"

Tests/Unit/GUI/TestOutputDataIOService.cpp

@@ -6,7 +6,7 @@
 #include "GUI/Model/Item/JobItemUtils.h"
 #include "GUI/Model/Model/ApplicationModels.h"
 #include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Model/JobModelFunctions.h"
+#include "GUI/Model/Item/JobFunctions.h"
 #include "GUI/Model/Project/OutputDataIOService.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
 #include "GUI/Support/IO/ProjectUtils.h"

Tests/Unit/GUI/TestSavingSpecularData.cpp

@@ -8,7 +8,7 @@
 #include "GUI/Model/Model/InstrumentModel.h"
 #include "GUI/Model/Model/ApplicationModels.h"
 #include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Model/JobModelFunctions.h"
+#include "GUI/Model/Item/JobFunctions.h"
 #include "GUI/Model/Project/OutputDataIOService.h"
 #include "GUI/Support/IO/ItemFileNameUtils.h"
 #include "GUI/Support/IO/ProjectUtils.h"