From 776e57c95f06aa6f1b483469c3b909308d023764 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sat, 8 Apr 2023 08:39:37 +0200
Subject: [PATCH] mv-src GUI/Model/CatDevice/MaskItemCatalog. GUI/Model/Data/
---
GUI/Model/{CatDevice => Data}/MaskItemCatalog.cpp | 4 ++--
GUI/Model/{CatDevice => Data}/MaskItemCatalog.h | 8 ++++----
GUI/Model/Data/MaskItems.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
rename GUI/Model/{CatDevice => Data}/MaskItemCatalog.cpp (96%)
rename GUI/Model/{CatDevice => Data}/MaskItemCatalog.h (85%)
diff --git a/GUI/Model/CatDevice/MaskItemCatalog.cpp b/GUI/Model/Data/MaskItemCatalog.cpp
similarity index 96%
rename from GUI/Model/CatDevice/MaskItemCatalog.cpp
rename to GUI/Model/Data/MaskItemCatalog.cpp
index 7076daa4ad4..5c725743a0e 100644
--- a/GUI/Model/CatDevice/MaskItemCatalog.cpp
+++ b/GUI/Model/Data/MaskItemCatalog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/MaskItemCatalog.cpp
+//! @file GUI/Model/Data/MaskItemCatalog.cpp
//! @brief Implements class MaskItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/CatDevice/MaskItemCatalog.h"
+#include "GUI/Model/Data/MaskItemCatalog.h"
#include "GUI/Model/Data/MaskItems.h"
MaskItem* MaskItemCatalog::create(Type type)
diff --git a/GUI/Model/CatDevice/MaskItemCatalog.h b/GUI/Model/Data/MaskItemCatalog.h
similarity index 85%
rename from GUI/Model/CatDevice/MaskItemCatalog.h
rename to GUI/Model/Data/MaskItemCatalog.h
index 95c49e0f8a5..df783ecf873 100644
--- a/GUI/Model/CatDevice/MaskItemCatalog.h
+++ b/GUI/Model/Data/MaskItemCatalog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/CatDevice/MaskItemCatalog.h
+//! @file GUI/Model/Data/MaskItemCatalog.h
//! @brief Defines class MaskItemCatalog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_CATDEVICE_MASKITEMCATALOG_H
-#define BORNAGAIN_GUI_MODEL_CATDEVICE_MASKITEMCATALOG_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
+#define BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
#include "GUI/Support/Type/UiInfo.h"
#include <QVector>
@@ -49,4 +49,4 @@ public:
static Type type(const MaskItem* item);
};
-#endif // BORNAGAIN_GUI_MODEL_CATDEVICE_MASKITEMCATALOG_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_MASKITEMCATALOG_H
diff --git a/GUI/Model/Data/MaskItems.h b/GUI/Model/Data/MaskItems.h
index d9ea091233b..dbb1d8b0003 100644
--- a/GUI/Model/Data/MaskItems.h
+++ b/GUI/Model/Data/MaskItems.h
@@ -17,7 +17,7 @@
#include "Base/Types/OwningVector.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/CatDevice/MaskItemCatalog.h"
+#include "GUI/Model/Data/MaskItemCatalog.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
#include <QAbstractListModel>
--
GitLab