From 86ac8f581899eec3c03f3c1c6dfd2002f5b6091b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 27 Oct 2023 13:39:12 +0200
Subject: [PATCH] new dir GUI/View/Combo
---
GUI/View/{Data => Combo}/ItemComboToolbar.cpp | 4 ++--
GUI/View/{Data => Combo}/ItemComboToolbar.h | 8 ++++----
GUI/View/{Data => Combo}/ItemComboWidget.cpp | 6 +++---
GUI/View/{Data => Combo}/ItemComboWidget.h | 8 ++++----
GUI/View/Import/RealDataPresenter.h | 2 +-
GUI/View/Job/JobResultsPresenter.h | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
rename GUI/View/{Data => Combo}/ItemComboToolbar.cpp (97%)
rename GUI/View/{Data => Combo}/ItemComboToolbar.h (88%)
rename GUI/View/{Data => Combo}/ItemComboWidget.cpp (97%)
rename GUI/View/{Data => Combo}/ItemComboWidget.h (92%)
diff --git a/GUI/View/Data/ItemComboToolbar.cpp b/GUI/View/Combo/ItemComboToolbar.cpp
similarity index 97%
rename from GUI/View/Data/ItemComboToolbar.cpp
rename to GUI/View/Combo/ItemComboToolbar.cpp
index 75e01e1918b..6b2c05b0077 100644
--- a/GUI/View/Data/ItemComboToolbar.cpp
+++ b/GUI/View/Combo/ItemComboToolbar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Data/ItemComboToolbar.cpp
+//! @file GUI/View/Combo/ItemComboToolbar.cpp
//! @brief Implements class ItemComboToolbar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Data/ItemComboToolbar.h"
+#include "GUI/View/Combo/ItemComboToolbar.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include <QComboBox>
diff --git a/GUI/View/Data/ItemComboToolbar.h b/GUI/View/Combo/ItemComboToolbar.h
similarity index 88%
rename from GUI/View/Data/ItemComboToolbar.h
rename to GUI/View/Combo/ItemComboToolbar.h
index 508641445f2..7b0c4a5290c 100644
--- a/GUI/View/Data/ItemComboToolbar.h
+++ b/GUI/View/Combo/ItemComboToolbar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Data/ItemComboToolbar.h
+//! @file GUI/View/Combo/ItemComboToolbar.h
//! @brief Defines class ItemComboToolbar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOTOOLBAR_H
-#define BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOTOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOTOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOTOOLBAR_H
#include "GUI/View/Widget/StyledToolbar.h"
#include <QList>
@@ -51,4 +51,4 @@ private:
QAction* m_comboBoxAction;
};
-#endif // BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOTOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOTOOLBAR_H
diff --git a/GUI/View/Data/ItemComboWidget.cpp b/GUI/View/Combo/ItemComboWidget.cpp
similarity index 97%
rename from GUI/View/Data/ItemComboWidget.cpp
rename to GUI/View/Combo/ItemComboWidget.cpp
index 030d2a3181c..d20b78aa459 100644
--- a/GUI/View/Data/ItemComboWidget.cpp
+++ b/GUI/View/Combo/ItemComboWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Data/ItemComboWidget.cpp
+//! @file GUI/View/Combo/ItemComboWidget.cpp
//! @brief Implements class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/View/Data/ItemComboWidget.h"
+#include "GUI/View/Combo/ItemComboWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Device/RealItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/View/Data/DataAccessWidget.h"
-#include "GUI/View/Data/ItemComboToolbar.h"
+#include "GUI/View/Combo/ItemComboToolbar.h"
#include <QVBoxLayout>
ItemComboWidget::ItemComboWidget(QWidget* parent)
diff --git a/GUI/View/Data/ItemComboWidget.h b/GUI/View/Combo/ItemComboWidget.h
similarity index 92%
rename from GUI/View/Data/ItemComboWidget.h
rename to GUI/View/Combo/ItemComboWidget.h
index bfad59b08cf..62efada54ac 100644
--- a/GUI/View/Data/ItemComboWidget.h
+++ b/GUI/View/Combo/ItemComboWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Data/ItemComboWidget.h
+//! @file GUI/View/Combo/ItemComboWidget.h
//! @brief Defines class ItemComboWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOWIDGET_H
-#define BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOWIDGET_H
+#define BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOWIDGET_H
#include "Base/Util/IFactory.h"
#include <QMap>
@@ -73,4 +73,4 @@ private:
QObject* m_item;
};
-#endif // BORNAGAIN_GUI_VIEW_DATA_ITEMCOMBOWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_COMBO_ITEMCOMBOWIDGET_H
diff --git a/GUI/View/Import/RealDataPresenter.h b/GUI/View/Import/RealDataPresenter.h
index b1bd533aaa8..f97b4cb1978 100644
--- a/GUI/View/Import/RealDataPresenter.h
+++ b/GUI/View/Import/RealDataPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
#define BORNAGAIN_GUI_VIEW_IMPORT_REALDATAPRESENTER_H
-#include "GUI/View/Data/ItemComboWidget.h"
+#include "GUI/View/Combo/ItemComboWidget.h"
//! Presents imported data (RealItem) using stack of different widgets and combo box in the
//! right top corner of ImportDataView, to switch between widgets.
diff --git a/GUI/View/Job/JobResultsPresenter.h b/GUI/View/Job/JobResultsPresenter.h
index 7591b554928..134492dc325 100644
--- a/GUI/View/Job/JobResultsPresenter.h
+++ b/GUI/View/Job/JobResultsPresenter.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_H
#define BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_H
-#include "GUI/View/Data/ItemComboWidget.h"
+#include "GUI/View/Combo/ItemComboWidget.h"
class InstrumentItem;
enum class JobViewActivity;
--
GitLab