From 4fee2f12fe0c20475847e8df34936a8db60fc6cf Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <svechnikovmv@gmail.com> Date: Mon, 13 Feb 2023 16:17:42 +0100 Subject: [PATCH] clang-format --- GUI/Model/Data/DataItem.h | 2 +- GUI/Model/Model/ParameterTuningModel.cpp | 2 +- GUI/View/Common/ItemStackPresenter.h | 2 +- GUI/View/Fit/JobRealTimeWidget.cpp | 2 +- GUI/View/Fit/ParameterTuningWidget.cpp | 2 +- GUI/View/Fit/ParameterTuningWidget.h | 2 +- GUI/View/Mask/MaskEditorPropertyPanel.h | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/GUI/Model/Data/DataItem.h b/GUI/Model/Data/DataItem.h index 7f23dd4e5f5..7091b176715 100644 --- a/GUI/Model/Data/DataItem.h +++ b/GUI/Model/Data/DataItem.h @@ -15,8 +15,8 @@ #ifndef BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H #define BORNAGAIN_GUI_MODEL_DATA_DATAITEM_H -#include "Device/Data/Datafield.h" #include "Base/Util/Assert.h" +#include "Device/Data/Datafield.h" #include "GUI/Model/Device/AxesItems.h" #include "GUI/Util/ComboProperty.h" #include "Wrap/WinDllMacros.h" diff --git a/GUI/Model/Model/ParameterTuningModel.cpp b/GUI/Model/Model/ParameterTuningModel.cpp index 7f4c33111e9..e6f7a846f87 100644 --- a/GUI/Model/Model/ParameterTuningModel.cpp +++ b/GUI/Model/Model/ParameterTuningModel.cpp @@ -12,9 +12,9 @@ // // ************************************************************************************************ +#include "GUI/Model/Model/ParameterTuningModel.h" #include "GUI/Model/Job/ParameterTreeItems.h" #include "GUI/Model/Model/FitParameterHelper.h" -#include "GUI/Model/Model/ParameterTuningModel.h" #include "GUI/Support/XML/UtilXML.h" #include <QMimeData> diff --git a/GUI/View/Common/ItemStackPresenter.h b/GUI/View/Common/ItemStackPresenter.h index 75af26baccf..5b7775929f1 100644 --- a/GUI/View/Common/ItemStackPresenter.h +++ b/GUI/View/Common/ItemStackPresenter.h @@ -33,7 +33,7 @@ public: //! Shows the widget for given item (and hides previous one). //! If no widget yet exists, it will be created. - void setItem(QObject *item, QObject* model = nullptr); + void setItem(QObject* item, QObject* model = nullptr); T* currentWidget(); T* itemWidget(QObject* item); diff --git a/GUI/View/Fit/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp index d77262b1bd5..ae10bafdbfc 100644 --- a/GUI/View/Fit/JobRealTimeWidget.cpp +++ b/GUI/View/Fit/JobRealTimeWidget.cpp @@ -24,7 +24,7 @@ namespace { const bool reuse_widget = true; } -JobRealTimeWidget::JobRealTimeWidget(JobModel *jobModel, QWidget* parent) +JobRealTimeWidget::JobRealTimeWidget(JobModel* jobModel, QWidget* parent) : QWidget(parent) , m_stackedWidget(new ItemStackPresenter<ParameterTuningWidget>(reuse_widget)) , m_jobModel(jobModel) diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp index 2eb0769c346..695186f845f 100644 --- a/GUI/View/Fit/ParameterTuningWidget.cpp +++ b/GUI/View/Fit/ParameterTuningWidget.cpp @@ -84,7 +84,7 @@ void ParameterTuningWidget::setJobOrRealItem(QObject* job_item) updateJobStatus(); } -void ParameterTuningWidget::setModel(QObject *jobModel) +void ParameterTuningWidget::setModel(QObject* jobModel) { m_jobModel = dynamic_cast<JobModel*>(jobModel); ASSERT(m_jobModel); diff --git a/GUI/View/Fit/ParameterTuningWidget.h b/GUI/View/Fit/ParameterTuningWidget.h index 2d98764f967..a7ba09092a8 100644 --- a/GUI/View/Fit/ParameterTuningWidget.h +++ b/GUI/View/Fit/ParameterTuningWidget.h @@ -36,7 +36,7 @@ public: explicit ParameterTuningWidget(QWidget* parent = nullptr); void setJobOrRealItem(QObject* job_item) override; - void setModel(QObject *jobModel); + void setModel(QObject* jobModel); QItemSelectionModel* selectionModel(); QVector<ParameterItem*> selectedParameterItems(); diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.h b/GUI/View/Mask/MaskEditorPropertyPanel.h index 61e40846d7a..575c12c1a0a 100644 --- a/GUI/View/Mask/MaskEditorPropertyPanel.h +++ b/GUI/View/Mask/MaskEditorPropertyPanel.h @@ -17,10 +17,10 @@ #include "GUI/View/Common/DataAccessWidget.h" #include "GUI/View/Mask/MaskEditorFlags.h" +#include <QFormLayout> +#include <QListView> #include <QModelIndex> #include <functional> -#include <QListView> -#include <QFormLayout> class IntensityDataItem; class IntensityDataPropertyWidget; -- GitLab