From 3d5844e339d67526267f2ef97712eca981f8cfab Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 9 Nov 2021 09:10:57 +0100
Subject: [PATCH] mv from GUI/Util to GUI/View/Tool unless also used by
GUI/Model
---
App/main.cpp | 2 +-
GUI/Util/Path.cpp | 2 +-
GUI/Util/String.cpp | 2 +-
GUI/View/Common/ItemSelectorWidget.cpp | 2 +-
GUI/View/Fit/FitActivityPanel.cpp | 2 +-
GUI/View/Fit/FitParameterWidget.cpp | 2 +-
GUI/View/Fit/FitSessionWidget.cpp | 2 +-
GUI/View/Fit/JobMessagePanel.cpp | 2 +-
GUI/View/Fit/JobRealTimeWidget.cpp | 2 +-
GUI/View/Fit/RunFitControlWidget.cpp | 2 +-
GUI/View/Import/ImportDataView.cpp | 2 +-
GUI/View/Instrument/Detail/detailsbutton.cpp | 2 +-
GUI/View/Instrument/Detail/detailswidget.cpp | 2 +-
GUI/View/Instrument/InstrumentLibraryEditor.cpp | 2 +-
GUI/View/Job/JobPropertiesWidget.cpp | 2 +-
GUI/View/Job/JobSelectorWidget.cpp | 2 +-
GUI/View/Job/JobViewActivities.cpp | 2 +-
GUI/View/Main/ActionManager.cpp | 4 ++--
GUI/View/Main/MainWindow.cpp | 4 ++--
GUI/View/Main/ProjectManager.cpp | 2 +-
GUI/View/Mask/MaskEditorToolBar.cpp | 2 +-
GUI/View/MaterialEditor/MaterialEditorDialog.cpp | 2 +-
GUI/View/Projection/ProjectionsToolBar.cpp | 2 +-
GUI/View/PropertyEditor/ComponentFlatView.cpp | 2 +-
GUI/View/PropertyEditor/GroupInfoBox.cpp | 2 +-
GUI/View/SampleDesigner/MaterialInplaceForm.cpp | 2 +-
GUI/View/SampleDesigner/SampleListView.cpp | 2 +-
GUI/View/SampleDesigner/SelectionContainerForm.h | 2 +-
GUI/{Util => View/Tool}/ItemDelegateForHTML.cpp | 4 ++--
GUI/{Util => View/Tool}/ItemDelegateForHTML.h | 8 ++++----
GUI/{Util => View/Tool}/LayoutUtils.cpp | 4 ++--
GUI/{Util => View/Tool}/LayoutUtils.h | 8 ++++----
GUI/{Util => View/Tool}/OSInfo.h | 8 ++++----
GUI/View/Tool/StyleUtils.cpp | 2 +-
GUI/{Util => View/Tool}/mainwindow_constants.h | 8 ++++----
GUI/View/Toplevel/WelcomeView.cpp | 2 +-
36 files changed, 52 insertions(+), 52 deletions(-)
rename GUI/{Util => View/Tool}/ItemDelegateForHTML.cpp (97%)
rename GUI/{Util => View/Tool}/ItemDelegateForHTML.h (84%)
rename GUI/{Util => View/Tool}/LayoutUtils.cpp (98%)
rename GUI/{Util => View/Tool}/LayoutUtils.h (88%)
rename GUI/{Util => View/Tool}/OSInfo.h (94%)
rename GUI/{Util => View/Tool}/mainwindow_constants.h (90%)
diff --git a/App/main.cpp b/App/main.cpp
index 42a80b9cbdf..e316ce0c60c 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -16,7 +16,7 @@
#include "App/MessageHandler.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include "GUI/Util/Path.h"
#include "GUI/View/Loaders/DataLoaderUtil.h"
#include "GUI/View/Main/MainWindow.h"
diff --git a/GUI/Util/Path.cpp b/GUI/Util/Path.cpp
index 4a6359147ef..c37423d0ac4 100644
--- a/GUI/Util/Path.cpp
+++ b/GUI/Util/Path.cpp
@@ -14,7 +14,7 @@
#include "GUI/Util/Path.h"
#include "BAVersion.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include <QDateTime>
#include <QDir>
#include <QFileInfo>
diff --git a/GUI/Util/String.cpp b/GUI/Util/String.cpp
index 278c4e8a09f..c0609ad4ff7 100644
--- a/GUI/Util/String.cpp
+++ b/GUI/Util/String.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Util/String.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include <QDir>
QStringList GUI::Util::String::fromStdStrings(const std::vector<std::string>& container)
diff --git a/GUI/View/Common/ItemSelectorWidget.cpp b/GUI/View/Common/ItemSelectorWidget.cpp
index a9bd7a3ea44..ae2c638f2f2 100644
--- a/GUI/View/Common/ItemSelectorWidget.cpp
+++ b/GUI/View/Common/ItemSelectorWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Common/ItemSelectorWidget.h"
#include "GUI/Model/Session/SessionDecorationModel.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include <QListView>
#include <QVBoxLayout>
diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
index 45e65e9eeec..2acbbab4095 100644
--- a/GUI/View/Fit/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Fit/FitActivityPanel.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/View/Fit/FitSessionManager.h"
#include "GUI/View/Fit/FitSessionWidget.h"
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index 7662e1b5a97..32cf9e20a16 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -21,7 +21,7 @@
#include "GUI/Model/Group/FilterPropertyProxy.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Fit/ParameterTuningWidget.h"
#include "GUI/View/Info/OverlayLabelController.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index e68f3691484..b5916024e1b 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Fit/FitSessionWidget.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Fit/FitParameterWidget.h"
#include "GUI/View/Fit/FitResultsWidget.h"
#include "GUI/View/Fit/FitSessionController.h"
diff --git a/GUI/View/Fit/JobMessagePanel.cpp b/GUI/View/Fit/JobMessagePanel.cpp
index 7d2f5c9a069..3780bd99ead 100644
--- a/GUI/View/Fit/JobMessagePanel.cpp
+++ b/GUI/View/Fit/JobMessagePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Fit/JobMessagePanel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include <QScrollBar>
#include <QStackedWidget>
#include <QTextEdit>
diff --git a/GUI/View/Fit/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp
index fab732a7d0b..940d2b2e355 100644
--- a/GUI/View/Fit/JobRealTimeWidget.cpp
+++ b/GUI/View/Fit/JobRealTimeWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Fit/JobRealTimeWidget.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Fit/ParameterTuningWidget.h"
#include <QVBoxLayout>
diff --git a/GUI/View/Fit/RunFitControlWidget.cpp b/GUI/View/Fit/RunFitControlWidget.cpp
index 06ff242acfb..ddabdf21d83 100644
--- a/GUI/View/Fit/RunFitControlWidget.cpp
+++ b/GUI/View/Fit/RunFitControlWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Fit/RunFitControlWidget.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Tool/DesignerHelper.h"
#include <QFont>
diff --git a/GUI/View/Import/ImportDataView.cpp b/GUI/View/Import/ImportDataView.cpp
index 2f8b0085c0e..62169e3659b 100644
--- a/GUI/View/Import/ImportDataView.cpp
+++ b/GUI/View/Import/ImportDataView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Import/RealDataSelectorWidget.h"
#include <QAction>
#include <QSplitter>
diff --git a/GUI/View/Instrument/Detail/detailsbutton.cpp b/GUI/View/Instrument/Detail/detailsbutton.cpp
index 012cf13d860..9b245e5adad 100644
--- a/GUI/View/Instrument/Detail/detailsbutton.cpp
+++ b/GUI/View/Instrument/Detail/detailsbutton.cpp
@@ -24,7 +24,7 @@
****************************************************************************/
#include "GUI/View/Instrument/Detail/detailsbutton.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include <QGraphicsOpacityEffect>
#include <QPaintEvent>
diff --git a/GUI/View/Instrument/Detail/detailswidget.cpp b/GUI/View/Instrument/Detail/detailswidget.cpp
index ae2c83a5d14..8ecd1338c48 100644
--- a/GUI/View/Instrument/Detail/detailswidget.cpp
+++ b/GUI/View/Instrument/Detail/detailswidget.cpp
@@ -24,7 +24,7 @@
****************************************************************************/
#include "GUI/View/Instrument/Detail/detailswidget.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include "GUI/View/Instrument/Detail/detailsbutton.h"
#include <QApplication>
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.cpp b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
index 3a9ac22cbc5..9ca14059f8e 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
@@ -16,7 +16,7 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/ItemDelegateForHTML.h"
+#include "GUI/View/Tool/ItemDelegateForHTML.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include "GUI/View/Tool/StyleUtils.h"
diff --git a/GUI/View/Job/JobPropertiesWidget.cpp b/GUI/View/Job/JobPropertiesWidget.cpp
index e0555271737..0c003b92623 100644
--- a/GUI/View/Job/JobPropertiesWidget.cpp
+++ b/GUI/View/Job/JobPropertiesWidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Job/JobPropertiesWidget.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Job/JobPropertiesTableModel.h"
#include "GUI/View/Tool/StyleUtils.h"
#include <QTabBar>
diff --git a/GUI/View/Job/JobSelectorWidget.cpp b/GUI/View/Job/JobSelectorWidget.cpp
index a1f1ed522fc..2b1b6eb8fb6 100644
--- a/GUI/View/Job/JobSelectorWidget.cpp
+++ b/GUI/View/Job/JobSelectorWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Job/JobSelectorWidget.h"
#include "Base/Utils/Assert.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Job/JobListView.h"
#include "GUI/View/Job/JobPropertiesWidget.h"
#include <QSplitter>
diff --git a/GUI/View/Job/JobViewActivities.cpp b/GUI/View/Job/JobViewActivities.cpp
index ffc4fc46de7..769eea7fcb9 100644
--- a/GUI/View/Job/JobViewActivities.cpp
+++ b/GUI/View/Job/JobViewActivities.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Job/JobViewActivities.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
namespace {
QMap<JobViewActivity, QVector<JobViewFlags::Dock>> createActivityMap()
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 6c95c166dbe..7bea79deb62 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -17,9 +17,9 @@
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include "GUI/Util/Path.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Job/JobView.h"
#include "GUI/View/Main/AboutDialog.h"
#include "GUI/View/Main/MainWindow.h"
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index 52265bd3fd7..94f2867f026 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -16,9 +16,9 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include "GUI/Util/Path.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Import/ImportDataView.h"
#include "GUI/View/Instrument/InstrumentView.h"
#include "GUI/View/Job/JobView.h"
diff --git a/GUI/View/Main/ProjectManager.cpp b/GUI/View/Main/ProjectManager.cpp
index 7326942bee1..77c97e8a980 100644
--- a/GUI/View/Main/ProjectManager.cpp
+++ b/GUI/View/Main/ProjectManager.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/MessageService.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Info/ProjectLoadProblemDialog.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/NewProjectDialog.h"
diff --git a/GUI/View/Mask/MaskEditorToolBar.cpp b/GUI/View/Mask/MaskEditorToolBar.cpp
index dee68f3614d..8945717bd48 100644
--- a/GUI/View/Mask/MaskEditorToolBar.cpp
+++ b/GUI/View/Mask/MaskEditorToolBar.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Mask/MaskEditorToolBar.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Mask/MaskEditorActions.h"
#include <QButtonGroup>
#include <QLabel>
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 39b001ca111..e4fc16cd5f3 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Types/VectorItem.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
#include "GUI/View/Tool/EditUtil.h"
#include "GUI/View/Tool/StyleUtils.h"
diff --git a/GUI/View/Projection/ProjectionsToolBar.cpp b/GUI/View/Projection/ProjectionsToolBar.cpp
index e494144af1f..f8c5836a41e 100644
--- a/GUI/View/Projection/ProjectionsToolBar.cpp
+++ b/GUI/View/Projection/ProjectionsToolBar.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Projection/ProjectionsToolBar.h"
-#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Tool/mainwindow_constants.h"
#include "GUI/View/Projection/ProjectionsEditorActions.h"
#include <QButtonGroup>
#include <QLabel>
diff --git a/GUI/View/PropertyEditor/ComponentFlatView.cpp b/GUI/View/PropertyEditor/ComponentFlatView.cpp
index 58e8b6ec639..49305e695af 100644
--- a/GUI/View/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/View/PropertyEditor/ComponentFlatView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Component/ComponentUtils.h"
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
#include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
#include "GUI/View/PropertyEditor/PropertyWidgetItem.h"
#include <QBoxLayout>
diff --git a/GUI/View/PropertyEditor/GroupInfoBox.cpp b/GUI/View/PropertyEditor/GroupInfoBox.cpp
index 45b72cc999a..234592e2ed4 100644
--- a/GUI/View/PropertyEditor/GroupInfoBox.cpp
+++ b/GUI/View/PropertyEditor/GroupInfoBox.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/PropertyEditor/GroupInfoBox.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include <QApplication>
#include <QMouseEvent>
#include <QPainter>
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 95f1ceb2d7e..a719bff604c 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/State/SessionData.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/VectorDescriptor.h"
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
#include "GUI/View/SampleDesigner/DoubleLineEdit.h"
#include "GUI/View/SampleDesigner/DoubleSpinBox.h"
#include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index 8cbb43df354..782be800525 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleListModel.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Util/ItemDelegateForHTML.h"
+#include "GUI/View/Tool/ItemDelegateForHTML.h"
#include "GUI/View/Common/ItemViewOverlayButtons.h"
#include <QAction>
#include <QDialog>
diff --git a/GUI/View/SampleDesigner/SelectionContainerForm.h b/GUI/View/SampleDesigner/SelectionContainerForm.h
index a694c1c9a54..56597e3a760 100644
--- a/GUI/View/SampleDesigner/SelectionContainerForm.h
+++ b/GUI/View/SampleDesigner/SelectionContainerForm.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Util/ItemDelegateForHTML.cpp b/GUI/View/Tool/ItemDelegateForHTML.cpp
similarity index 97%
rename from GUI/Util/ItemDelegateForHTML.cpp
rename to GUI/View/Tool/ItemDelegateForHTML.cpp
index 665ce54fad7..40f14e8d72e 100644
--- a/GUI/Util/ItemDelegateForHTML.cpp
+++ b/GUI/View/Tool/ItemDelegateForHTML.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Util/ItemDelegateForHTML.cpp
+//! @file GUI/View/Tool/ItemDelegateForHTML.cpp
//! @brief Implements class ItemDelegateForHTML
//!
//! @homepage http://www.bornagainproject.org
@@ -13,7 +13,7 @@
// ************************************************************************************************
-#include "GUI/Util/ItemDelegateForHTML.h"
+#include "GUI/View/Tool/ItemDelegateForHTML.h"
#include <QAbstractItemView>
#include <QAbstractTextDocumentLayout>
#include <QApplication>
diff --git a/GUI/Util/ItemDelegateForHTML.h b/GUI/View/Tool/ItemDelegateForHTML.h
similarity index 84%
rename from GUI/Util/ItemDelegateForHTML.h
rename to GUI/View/Tool/ItemDelegateForHTML.h
index 33355ccab5c..d200575dcc3 100644
--- a/GUI/Util/ItemDelegateForHTML.h
+++ b/GUI/View/Tool/ItemDelegateForHTML.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Util/ItemDelegateForHTML.h
+//! @file GUI/View/Tool/ItemDelegateForHTML.h
//! @brief Defines class ItemDelegateForHTML
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
-#define BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_ITEMDELEGATEFORHTML_H
+#define BORNAGAIN_GUI_VIEW_TOOL_ITEMDELEGATEFORHTML_H
#include <QStyledItemDelegate>
@@ -35,4 +35,4 @@ private:
};
-#endif // BORNAGAIN_GUI_UTIL_ITEMDELEGATEFORHTML_H
\ No newline at end of file
+#endif // BORNAGAIN_GUI_VIEW_TOOL_ITEMDELEGATEFORHTML_H
\ No newline at end of file
diff --git a/GUI/Util/LayoutUtils.cpp b/GUI/View/Tool/LayoutUtils.cpp
similarity index 98%
rename from GUI/Util/LayoutUtils.cpp
rename to GUI/View/Tool/LayoutUtils.cpp
index b1bcbe2f580..4f2db938fac 100644
--- a/GUI/Util/LayoutUtils.cpp
+++ b/GUI/View/Tool/LayoutUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Util/LayoutUtils.cpp
+//! @file GUI/View/Tool/LayoutUtils.cpp
//! @brief Implements LayoutUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
#include <QBoxLayout>
#include <QGridLayout>
#include <QLayoutItem>
diff --git a/GUI/Util/LayoutUtils.h b/GUI/View/Tool/LayoutUtils.h
similarity index 88%
rename from GUI/Util/LayoutUtils.h
rename to GUI/View/Tool/LayoutUtils.h
index 343ea025cf0..d771f1198ed 100644
--- a/GUI/Util/LayoutUtils.h
+++ b/GUI/View/Tool/LayoutUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Util/LayoutUtils.h
+//! @file GUI/View/Tool/LayoutUtils.h
//! @brief Defines namespace GUI::Util::Layout
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
-#define BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
+#define BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
class QLayout;
class QGridLayout;
@@ -41,4 +41,4 @@ QWidget* placeHolder();
} // namespace GUI::Util::Layout
-#endif // BORNAGAIN_GUI_UTIL_LAYOUTUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
diff --git a/GUI/Util/OSInfo.h b/GUI/View/Tool/OSInfo.h
similarity index 94%
rename from GUI/Util/OSInfo.h
rename to GUI/View/Tool/OSInfo.h
index cf3add26990..52cf45e03fb 100644
--- a/GUI/Util/OSInfo.h
+++ b/GUI/View/Tool/OSInfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Util/OSInfo.h
+//! @file GUI/View/Tool/OSInfo.h
//! @brief Defines namespace GUI::Util::OS
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTIL_OSINFO_H
-#define BORNAGAIN_GUI_UTIL_OSINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_OSINFO_H
+#define BORNAGAIN_GUI_VIEW_TOOL_OSINFO_H
#include <QString>
@@ -113,4 +113,4 @@ bool HostOsInfo::isAnyUnixHost()
} // namespace GUI::Util::OS
-#endif // BORNAGAIN_GUI_UTIL_OSINFO_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_OSINFO_H
diff --git a/GUI/View/Tool/StyleUtils.cpp b/GUI/View/Tool/StyleUtils.cpp
index 5d4d1b9132d..088af7e6853 100644
--- a/GUI/View/Tool/StyleUtils.cpp
+++ b/GUI/View/Tool/StyleUtils.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Tool/StyleUtils.h"
#include "Base/Utils/Assert.h"
-#include "GUI/Util/OSInfo.h"
+#include "GUI/View/Tool/OSInfo.h"
#include "GUI/View/Tool/DesignerHelper.h"
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/Util/mainwindow_constants.h b/GUI/View/Tool/mainwindow_constants.h
similarity index 90%
rename from GUI/Util/mainwindow_constants.h
rename to GUI/View/Tool/mainwindow_constants.h
index 0e6bc68e786..b278003ba7e 100644
--- a/GUI/Util/mainwindow_constants.h
+++ b/GUI/View/Tool/mainwindow_constants.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Util/mainwindow_constants.h
+//! @file GUI/View/Tool/mainwindow_constants.h
//! @brief Defines namespace GUI::Constants
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
-#define BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H
#include <QString>
@@ -65,4 +65,4 @@ const int styled_toolbar_height = 25;
} // namespace GUI::Constants
-#endif // BORNAGAIN_GUI_UTIL_MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_MAINWINDOW_CONSTANTS_H
diff --git a/GUI/View/Toplevel/WelcomeView.cpp b/GUI/View/Toplevel/WelcomeView.cpp
index 12781b03193..4acf14c8d5c 100644
--- a/GUI/View/Toplevel/WelcomeView.cpp
+++ b/GUI/View/Toplevel/WelcomeView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/WelcomeView.h"
-#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtils.h"
#include "GUI/Util/Path.h"
#include "GUI/View/Main/ProjectManager.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
--
GitLab