From 181d45d9cc25b55d0313e97c9a2b081b4a20dafa Mon Sep 17 00:00:00 2001 From: Joachim Wuttke <j.wuttke@fz-juelich.de> Date: Sat, 10 Feb 2024 09:06:50 +0100 Subject: [PATCH] rename GUI/View/Tool/LayoutUtil -> GUI/View/Layout/ --- GUI/View/FitControl/MinimizerEditor.cpp | 2 +- GUI/View/{Tool => Layout}/LayoutUtil.cpp | 4 ++-- GUI/View/{Tool => Layout}/LayoutUtil.h | 8 ++++---- GUI/View/Sample/MaterialInplaceForm.cpp | 2 +- GUI/View/Sample/SampleForm.cpp | 2 +- GUI/View/Sample/SelectionContainerForm.cpp | 2 +- GUI/View/Setup/AxesPanel.cpp | 2 +- GUI/View/Setup/AxisPanel.cpp | 2 +- GUI/View/Setup/MasksPanel.cpp | 2 +- GUI/View/Views/ProjectsView.cpp | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename GUI/View/{Tool => Layout}/LayoutUtil.cpp (92%) rename GUI/View/{Tool => Layout}/LayoutUtil.h (80%) diff --git a/GUI/View/FitControl/MinimizerEditor.cpp b/GUI/View/FitControl/MinimizerEditor.cpp index 057b7d2fa2d..ac263aeaadb 100644 --- a/GUI/View/FitControl/MinimizerEditor.cpp +++ b/GUI/View/FitControl/MinimizerEditor.cpp @@ -18,9 +18,9 @@ #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Mini/MinimizerItems.h" #include "GUI/Model/Project/ProjectDocument.h" +#include "GUI/View/Layout/LayoutUtil.h" #include "GUI/View/Numeric/ComboUtil.h" #include "GUI/View/Numeric/NumWidgetUtil.h" -#include "GUI/View/Tool/LayoutUtil.h" #include <QSpinBox> #include <QStandardItemModel> diff --git a/GUI/View/Tool/LayoutUtil.cpp b/GUI/View/Layout/LayoutUtil.cpp similarity index 92% rename from GUI/View/Tool/LayoutUtil.cpp rename to GUI/View/Layout/LayoutUtil.cpp index c99a918671a..77dbc769331 100644 --- a/GUI/View/Tool/LayoutUtil.cpp +++ b/GUI/View/Layout/LayoutUtil.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/Tool/LayoutUtil.cpp +//! @file GUI/View/Layout/LayoutUtil.cpp //! @brief Implements namespace LayoutUtils. //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "GUI/View/Tool/LayoutUtil.h" +#include "GUI/View/Layout/LayoutUtil.h" #include <QLayoutItem> #include <QWidget> diff --git a/GUI/View/Tool/LayoutUtil.h b/GUI/View/Layout/LayoutUtil.h similarity index 80% rename from GUI/View/Tool/LayoutUtil.h rename to GUI/View/Layout/LayoutUtil.h index 2e1d6ab46a4..c3f7788aadf 100644 --- a/GUI/View/Tool/LayoutUtil.h +++ b/GUI/View/Layout/LayoutUtil.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/Tool/LayoutUtil.h +//! @file GUI/View/Layout/LayoutUtil.h //! @brief Defines namespace GUI::Util::Layout. //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H -#define BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H +#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H +#define BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H #include <QLayout> @@ -24,4 +24,4 @@ void clearLayout(QLayout* layout, bool deleteWidgets = true); } // namespace GUI::Util::Layout -#endif // BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H +#endif // BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H diff --git a/GUI/View/Sample/MaterialInplaceForm.cpp b/GUI/View/Sample/MaterialInplaceForm.cpp index fadd537b0fc..dd068afceff 100644 --- a/GUI/View/Sample/MaterialInplaceForm.cpp +++ b/GUI/View/Sample/MaterialInplaceForm.cpp @@ -20,13 +20,13 @@ #include "GUI/Model/Sample/LayerItem.h" #include "GUI/Model/Sample/SampleItem.h" #include "GUI/Support/XML/Backup.h" +#include "GUI/View/Layout/LayoutUtil.h" #include "GUI/View/Material/MaterialEditorDialog.h" #include "GUI/View/Numeric/DoubleSpinBox.h" #include "GUI/View/Sample/LayerEditorUtil.h" #include "GUI/View/Sample/SampleEditorController.h" #include "GUI/View/Sample/SampleForm.h" #include "GUI/View/Tool/Globals.h" -#include "GUI/View/Tool/LayoutUtil.h" #include <QLabel> #include <QPushButton> diff --git a/GUI/View/Sample/SampleForm.cpp b/GUI/View/Sample/SampleForm.cpp index 9a96268f335..161096b982b 100644 --- a/GUI/View/Sample/SampleForm.cpp +++ b/GUI/View/Sample/SampleForm.cpp @@ -15,6 +15,7 @@ #include "GUI/View/Sample/SampleForm.h" #include "GUI/Model/Sample/SampleItem.h" #include "GUI/View/Layout/ApplicationSettings.h" +#include "GUI/View/Layout/LayoutUtil.h" #include "GUI/View/Sample/CompoundForm.h" #include "GUI/View/Sample/CoreAndShellForm.h" #include "GUI/View/Sample/HeinzFormLayout.h" @@ -24,7 +25,6 @@ #include "GUI/View/Sample/ParticleLayoutForm.h" #include "GUI/View/Sample/SampleEditorController.h" #include "GUI/View/Tool/ActionFactory.h" -#include "GUI/View/Tool/LayoutUtil.h" #include "GUI/View/Widget/GroupBoxes.h" #include <QBoxLayout> #include <QLabel> diff --git a/GUI/View/Sample/SelectionContainerForm.cpp b/GUI/View/Sample/SelectionContainerForm.cpp index 99cf3a2d386..364cc977bd2 100644 --- a/GUI/View/Sample/SelectionContainerForm.cpp +++ b/GUI/View/Sample/SelectionContainerForm.cpp @@ -17,7 +17,7 @@ #include "GUI/Model/Sample/ProfileItems.h" #include "GUI/Model/Sample/RotationItems.h" #include "GUI/Model/Sample/RoughnessItems.h" -#include "GUI/View/Tool/LayoutUtil.h" +#include "GUI/View/Layout/LayoutUtil.h" ISelectionContainerForm::ISelectionContainerForm(QWidget* parent, SampleEditorController* ec) : QWidget(parent) diff --git a/GUI/View/Setup/AxesPanel.cpp b/GUI/View/Setup/AxesPanel.cpp index 1c546a67e63..1e61c7e6e4f 100644 --- a/GUI/View/Setup/AxesPanel.cpp +++ b/GUI/View/Setup/AxesPanel.cpp @@ -20,9 +20,9 @@ #include "GUI/Model/Job/DataSource.h" #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Support/Data/ComboProperty.h" +#include "GUI/View/Layout/LayoutUtil.h" #include "GUI/View/Numeric/ComboUtil.h" #include "GUI/View/Numeric/NumWidgetUtil.h" -#include "GUI/View/Tool/LayoutUtil.h" #include "GUI/View/Widget/GroupBoxes.h" #include <QCheckBox> #include <QFormLayout> diff --git a/GUI/View/Setup/AxisPanel.cpp b/GUI/View/Setup/AxisPanel.cpp index ad504826d2e..06d90a3eb9f 100644 --- a/GUI/View/Setup/AxisPanel.cpp +++ b/GUI/View/Setup/AxisPanel.cpp @@ -24,9 +24,9 @@ #include "GUI/Model/Job/DataSource.h" #include "GUI/Model/Project/ProjectDocument.h" #include "GUI/Support/Data/ComboProperty.h" +#include "GUI/View/Layout/LayoutUtil.h" #include "GUI/View/Numeric/DoubleSpinBox.h" #include "GUI/View/Numeric/NumWidgetUtil.h" -#include "GUI/View/Tool/LayoutUtil.h" #include "GUI/View/Widget/GroupBoxes.h" #include <QAction> #include <QCheckBox> diff --git a/GUI/View/Setup/MasksPanel.cpp b/GUI/View/Setup/MasksPanel.cpp index eced7ace42c..01a789f8394 100644 --- a/GUI/View/Setup/MasksPanel.cpp +++ b/GUI/View/Setup/MasksPanel.cpp @@ -18,8 +18,8 @@ #include "GUI/Model/Mask/MasksQModel.h" #include "GUI/Model/Mask/MasksSet.h" #include "GUI/Model/Project/ProjectDocument.h" +#include "GUI/View/Layout/LayoutUtil.h" #include "GUI/View/Numeric/DoubleSpinBox.h" -#include "GUI/View/Tool/LayoutUtil.h" #include "GUI/View/Widget/GroupBoxes.h" #include <QCheckBox> #include <QLineEdit> diff --git a/GUI/View/Views/ProjectsView.cpp b/GUI/View/Views/ProjectsView.cpp index 5490696e4c3..a68d2dad786 100644 --- a/GUI/View/Views/ProjectsView.cpp +++ b/GUI/View/Views/ProjectsView.cpp @@ -14,8 +14,8 @@ #include "GUI/View/Views/ProjectsView.h" #include "GUI/Support/Util/Path.h" +#include "GUI/View/Layout/LayoutUtil.h" #include "GUI/View/Manager/ProjectManager.h" -#include "GUI/View/Tool/LayoutUtil.h" #include "GUI/View/Widget/GroupBoxes.h" #include "GUI/View/Widget/StyledToolbar.h" #include <QCommandLinkButton> -- GitLab