From 0e30bcf309ca0a273abcb7f7d55d28272076479f Mon Sep 17 00:00:00 2001
From: Tobias Knopff <t.knopff@fz-juelich.de>
Date: Fri, 28 May 2021 15:26:18 +0200
Subject: [PATCH] Move MaskUnitsConverter from Views/MaskWidgets to Models
---
GUI/Models/IntensityDataItem.cpp | 2 +-
GUI/{Views/MaskWidgets => Models}/MaskUnitsConverter.cpp | 4 ++--
GUI/{Views/MaskWidgets => Models}/MaskUnitsConverter.h | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
rename GUI/{Views/MaskWidgets => Models}/MaskUnitsConverter.cpp (97%)
rename GUI/{Views/MaskWidgets => Models}/MaskUnitsConverter.h (87%)
diff --git a/GUI/Models/IntensityDataItem.cpp b/GUI/Models/IntensityDataItem.cpp
index fcd9f73094c..d7d2169143d 100644
--- a/GUI/Models/IntensityDataItem.cpp
+++ b/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()
diff --git a/GUI/Views/MaskWidgets/MaskUnitsConverter.cpp b/GUI/Models/MaskUnitsConverter.cpp
similarity index 97%
rename from GUI/Views/MaskWidgets/MaskUnitsConverter.cpp
rename to GUI/Models/MaskUnitsConverter.cpp
index b7e1e979e43..03b54faae16 100644
--- a/GUI/Views/MaskWidgets/MaskUnitsConverter.cpp
+++ b/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"
diff --git a/GUI/Views/MaskWidgets/MaskUnitsConverter.h b/GUI/Models/MaskUnitsConverter.h
similarity index 87%
rename from GUI/Views/MaskWidgets/MaskUnitsConverter.h
rename to GUI/Models/MaskUnitsConverter.h
index 7977db5af4c..63c24a2251a 100644
--- a/GUI/Views/MaskWidgets/MaskUnitsConverter.h
+++ b/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
--
GitLab