Merge branch 'reorg_dirs' into 'develop'

Reorg dirs: disentangle Models from Views (cont.)

See merge request !95

GUI/Models/IntensityDataItem.cpp

@@ -17,10 +17,10 @@
 #include "GUI/Models/Error.h"
 #include "GUI/Models/JobItemUtils.h"
 #include "GUI/Models/MaskItems.h"
+#include "GUI/Models/MaskUnitsConverter.h"
 #include "GUI/Models/ProjectionItems.h"
 #include "GUI/Models/SessionModel.h"
 #include "GUI/utils/ImportDataInfo.h"
-#include "GUI/Views/MaskWidgets/MaskUnitsConverter.h"
 
 namespace {
 ComboProperty gradientCombo()

GUI/Models/JobItem.cpp

@@ -25,7 +25,6 @@
 #include "GUI/Models/RealDataItem.h"
 #include "GUI/Models/SimulationOptionsItem.h"
 #include "GUI/Models/SpecularDataItem.h"
-#include "GUI/Views/MaskWidgets/MaskUnitsConverter.h"
 #include "GUI/utils/GUIHelpers.h"
 
 const QString JobItem::P_IDENTIFIER = "Identifier";

GUI/Models/JobModelFunctions.cpp

@@ -38,7 +38,6 @@
 #include "GUI/Models/PointwiseAxisItem.h"
 #include "GUI/Models/RealDataItem.h"
 #include "GUI/Models/SpecularDataItem.h"
-#include "GUI/Views/MaskWidgets/MaskUnitsConverter.h"
 #include "GUI/utils/GUIHelpers.h"
 #include <map>
 

GUI/Views/MaskWidgets/MaskUnitsConverter.cpp → GUI/Models/MaskUnitsConverter.cpp

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

GUI/Views/MaskWidgets/MaskUnitsConverter.h → GUI/Models/MaskUnitsConverter.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/MaskWidgets/MaskUnitsConverter.h
+//! @file      GUI/Models/MaskUnitsConverter.h
 //! @brief     Defines class MaskUnitsConverter
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKUNITSCONVERTER_H
-#define BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKUNITSCONVERTER_H
+#ifndef BORNAGAIN_GUI_MODELS_MASKUNITSCONVERTER_H
+#define BORNAGAIN_GUI_MODELS_MASKUNITSCONVERTER_H
 
 class IntensityDataItem;
 class SessionItem;
@@ -49,4 +49,4 @@ private:
     EConvertionDirection m_direction;
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_MASKWIDGETS_MASKUNITSCONVERTER_H
+#endif // BORNAGAIN_GUI_MODELS_MASKUNITSCONVERTER_H