From 3d8043948830f741ef6cd29a47a95f908ab98ece Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 3 Nov 2021 09:19:11 +0100
Subject: [PATCH] clang-format
---
GUI/Items/RealDataItem.cpp | 2 +-
GUI/Session/SessionData.h | 2 +-
GUI/Views/FitWidgets/FitParameterWidget.cpp | 2 +-
.../FitWidgets/ParameterTuningDelegate.cpp | 2 +-
.../FitWidgets/ParameterTuningWidget.cpp | 2 +-
GUI/Views/FitWidgets/RunFitControlWidget.cpp | 4 ++--
.../RealDataSelectorWidget.cpp | 6 ++---
.../DepthProbeInstrumentEditor.cpp | 2 +-
.../InstrumentWidgets/DistributionForms.cpp | 2 +-
.../InstrumentWidgets/DistributionPlot.cpp | 2 +-
.../GISASInstrumentEditor.cpp | 2 +-
.../InstrumentLibraryEditor.cpp | 4 ++--
.../InstrumentWidgets/InstrumentView.cpp | 2 +-
.../OffSpecularInstrumentEditor.cpp | 2 +-
.../SpecularInstrumentEditor.cpp | 2 +-
GUI/Views/IntensityDataWidgets/ColorMap.cpp | 2 +-
.../IntensityDataWidgets/ColorMapUtils.cpp | 2 +-
.../IntensityDataCanvas.cpp | 2 +-
.../IntensityDataPropertyWidget.cpp | 2 +-
GUI/Views/IntensityDataWidgets/Plot1D.cpp | 2 +-
GUI/Views/JobWidgets/JobListView.cpp | 2 +-
GUI/Views/JobWidgets/JobMessagePanel.h | 2 +-
GUI/Views/JobWidgets/JobPropertiesWidget.cpp | 2 +-
GUI/Views/JobWidgets/JobView.cpp | 4 ++--
GUI/Views/Main/AutosaveController.cpp | 2 +-
GUI/Views/Main/PyImportAssistant.cpp | 8 +++----
GUI/Views/Main/actionmanager.cpp | 8 +++----
GUI/Views/Main/mainwindow.cpp | 4 ++--
GUI/Views/Main/projectmanager.cpp | 24 +++++++++++--------
GUI/Views/MaskWidgets/MaskEditorCanvas.cpp | 2 +-
.../MaterialEditor/MaterialEditorDialog.cpp | 6 ++---
.../ProjectionsWidgets/ProjectionsWidget.h | 2 +-
.../PropertyEditor/ComponentTreeView.cpp | 2 +-
GUI/Views/PropertyEditor/CustomEditors.cpp | 8 +++----
.../PropertyEditor/PropertyEditorFactory.cpp | 2 +-
.../PropertyEditor/TestComponentView.cpp | 2 +-
.../RealSpaceWidgets/RealSpaceCanvas.cpp | 4 ++--
GUI/Views/SampleDesigner/ConnectableView.cpp | 4 ++--
GUI/Views/SampleDesigner/DesignerScene.cpp | 4 ++--
GUI/Views/SampleDesigner/ILayerView.cpp | 2 +-
.../LayerOrientedSampleEditor.cpp | 2 +-
GUI/Views/SampleDesigner/LayerView.cpp | 2 +-
.../SampleDesigner/MaterialInplaceForm.cpp | 2 +-
GUI/Views/SampleDesigner/MesoCrystalView.cpp | 4 ++--
GUI/Views/SampleDesigner/MultiLayerView.cpp | 2 +-
GUI/Views/SampleDesigner/NodeEditorPort.cpp | 2 +-
.../ParticleCompositionView.cpp | 2 +-
.../SampleDesigner/ParticleCoreShellView.cpp | 2 +-
.../SampleDesigner/ParticleLayoutView.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleView.cpp | 4 ++--
GUI/Views/SampleDesigner/SampleListView.cpp | 4 ++--
.../SampleDesigner/SampleViewAligner.cpp | 2 +-
GUI/Views/SampleDesigner/ScriptPanel.cpp | 6 ++---
.../SimulationWidgets/PythonScriptWidget.cpp | 2 +-
.../SpecularDataCanvas.cpp | 2 +-
.../SpecularDataImportWidget.h | 2 +-
.../SpecularDataWidgets/SpecularPlot.cpp | 2 +-
GUI/Views/Toplevel/ImportDataView.h | 2 +-
GUI/Views/Toplevel/ProjectSettingsView.cpp | 2 +-
GUI/Views/Toplevel/SampleView.cpp | 4 ++--
GUI/Views/Toplevel/SessionModelView.cpp | 6 ++---
GUI/Views/Toplevel/SimulationView.cpp | 8 +++----
GUI/Views/Toplevel/TestView.cpp | 2 +-
GUI/Widgets/Common/DesignerHelper.cpp | 2 +-
GUI/Widgets/Common/ModelTreeView.cpp | 2 +-
Tests/Unit/GUI/TestSessionItemController.cpp | 2 +-
.../GUI/TestSessionItemControllerHelper.cpp | 2 +-
67 files changed, 111 insertions(+), 107 deletions(-)
diff --git a/GUI/Items/RealDataItem.cpp b/GUI/Items/RealDataItem.cpp
index c7edf40c011..3920b5e304a 100644
--- a/GUI/Items/RealDataItem.cpp
+++ b/GUI/Items/RealDataItem.cpp
@@ -23,13 +23,13 @@
#include "GUI/Items/MaskItems.h"
#include "GUI/Items/ProjectionItems.h"
#include "GUI/Items/SpecularDataItem.h"
-#include "GUI/Session/SessionData.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
+#include "GUI/Session/SessionData.h"
#include "GUI/utils/DeserializationException.h"
#include "GUI/utils/Error.h"
#include <QtCore/QXmlStreamReader>
diff --git a/GUI/Session/SessionData.h b/GUI/Session/SessionData.h
index 82df3c5f9a8..3b74da15f51 100644
--- a/GUI/Session/SessionData.h
+++ b/GUI/Session/SessionData.h
@@ -22,7 +22,7 @@ struct SessionData {
SessionData();
InstrumentLibrary instrumentLibrary;
- ProjectDocument* projectDocument {nullptr};
+ ProjectDocument* projectDocument{nullptr};
//! The folder where persistent application data shall be stored. E.g. in Windows this is the
//! AppData/Roaming location.
diff --git a/GUI/Views/FitWidgets/FitParameterWidget.cpp b/GUI/Views/FitWidgets/FitParameterWidget.cpp
index be38c9cbbf3..359b586188c 100644
--- a/GUI/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/Views/FitWidgets/FitParameterWidget.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/FitParameterWidget.h"
-#include "GUI/Widgets/Info/OverlayLabelController.h"
#include "GUI/Items/FitParameterItems.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/JobItem.h"
@@ -24,6 +23,7 @@
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
+#include "GUI/Widgets/Info/OverlayLabelController.h"
#include "GUI/utils/CustomEventFilters.h"
#include "GUI/utils/mainwindow_constants.h"
#include <QAction>
diff --git a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
index 4244535c288..db01927ed3c 100644
--- a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
-#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/ModelPath.h"
#include "GUI/Items/ParameterTreeItems.h"
#include "GUI/Items/SessionItemUtils.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Models/Parameter/ParameterTuningModel.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include <QAbstractItemModel>
#include <QApplication>
#include <QHBoxLayout>
diff --git a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
index 90bc485b16b..01a869ccf69 100644
--- a/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningWidget.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/ParameterTuningWidget.h"
-#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Items/ParameterTreeItems.h"
@@ -22,6 +21,7 @@
#include "GUI/Views/FitWidgets/JobRealTimeToolBar.h"
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
#include "GUI/Views/FitWidgets/SliderSettingsWidget.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/utils/Error.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
index 7789e1b2168..c87d33ad141 100644
--- a/GUI/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/Views/FitWidgets/RunFitControlWidget.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/RunFitControlWidget.h"
-#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/FitSuiteItem.h"
#include "GUI/Items/JobItem.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/utils/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 51ad340b7b9..3a506d27b63 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -15,10 +15,7 @@
#include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
#include "Device/Data/DataUtils.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
-#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Models/Data/RealDataModel.h"
@@ -26,6 +23,9 @@
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/GUIHelpers.h"
#include <QFileDialog>
diff --git a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
index 8f61a58fb13..edde4b11145 100644
--- a/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DepthProbeInstrumentEditor.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/BeamWavelengthItem.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
#include "GUI/Views/InstrumentWidgets/InclinationAnglesEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/Views/InstrumentWidgets/SphericalAxisEditor.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/GUI/Views/InstrumentWidgets/DistributionForms.cpp b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
index 35d7bd07e1b..97dab1e9128 100644
--- a/GUI/Views/InstrumentWidgets/DistributionForms.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionForms.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionForms.h"
-#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/DistributionItems.h"
#include "GUI/Items/ItemWithDistribution.h"
#include "GUI/Views/InstrumentWidgets/DistributionEditor.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include <QDoubleSpinBox>
#include <QFormLayout>
diff --git a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
index 856373fa745..debf6b6e432 100644
--- a/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
+++ b/GUI/Views/InstrumentWidgets/DistributionPlot.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/DistributionPlot.h"
-#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/DistributionItems.h"
#include "GUI/Items/RealLimitsItems.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include "Param/Distrib/Distributions.h"
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
index db79d5f2eb0..27805ba235d 100644
--- a/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/GISASInstrumentEditor.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/GISASInstrumentEditor.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/GISASBeamEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QVBoxLayout>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
index cca226cdc24..78e2cb89168 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -14,11 +14,11 @@
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include "ui_InstrumentLibraryEditor.h"
#include <QAction>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentView.cpp b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
index 8242e18a7c1..7e6c73513f4 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
-#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/InstrumentWidgets/InstrumentEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include <QBoxLayout>
InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document)
diff --git a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
index 171be13ee2d..b82b2d7574b 100644
--- a/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/OffSpecularInstrumentEditor.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/DetectorEditor.h"
#include "GUI/Views/InstrumentWidgets/OffSpecularBeamEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QVBoxLayout>
diff --git a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
index e45f9d6a0e7..c853b618348 100644
--- a/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/SpecularInstrumentEditor.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Views/InstrumentWidgets/EnvironmentEditor.h"
#include "GUI/Views/InstrumentWidgets/PolarizationAnalysisEditor.h"
#include "GUI/Views/InstrumentWidgets/SpecularBeamEditor.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QVBoxLayout>
diff --git a/GUI/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
index 9691311d6e4..64238b9cd08 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMap.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
-#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
namespace {
const int replot_update_interval = 10;
diff --git a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
index 40d7020cbdf..2f6eca81f0d 100644
--- a/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/IntensityDataItem.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/utils/Error.h"
using gradient_map_t = QMap<QString, QCPColorGradient::GradientPreset>;
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index f3b2e2d093b..caa8d34341e 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -15,12 +15,12 @@
#include "GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/utils/GUIHelpers.h"
#include <QAction>
#include <QMouseEvent>
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index f940a9a16e9..1de99aee99e 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QAction>
#include <QVBoxLayout>
diff --git a/GUI/Views/IntensityDataWidgets/Plot1D.cpp b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
index 4b71ecc3b86..5cfa2375129 100644
--- a/GUI/Views/IntensityDataWidgets/Plot1D.cpp
+++ b/GUI/Views/IntensityDataWidgets/Plot1D.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/IntensityDataWidgets/Plot1D.h"
-#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/Data1DViewItem.h"
#include "GUI/Items/DataItem.h"
@@ -22,6 +21,7 @@
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
namespace {
const int replot_update_interval = 10;
diff --git a/GUI/Views/JobWidgets/JobListView.cpp b/GUI/Views/JobWidgets/JobListView.cpp
index 7264fcf18df..39aee253b0e 100644
--- a/GUI/Views/JobWidgets/JobListView.cpp
+++ b/GUI/Views/JobWidgets/JobListView.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobListView.h"
-#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Views/JobWidgets/JobListModel.h"
#include "GUI/Views/JobWidgets/JobListViewDelegate.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include <QAction>
#include <QListView>
#include <QMenu>
diff --git a/GUI/Views/JobWidgets/JobMessagePanel.h b/GUI/Views/JobWidgets/JobMessagePanel.h
index 26415ac57b1..c433f18d7e1 100644
--- a/GUI/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/Views/JobWidgets/JobMessagePanel.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBMESSAGEPANEL_H
-#include "GUI/Widgets/Common/InfoPanel.h"
#include "GUI/Views/FitWidgets/FitLog.h"
+#include "GUI/Widgets/Common/InfoPanel.h"
#include <QColor>
class QTextEdit;
diff --git a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
index d6e64c267f2..4d46209d8fb 100644
--- a/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobPropertiesWidget.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/JobItem.h"
#include "GUI/Views/JobWidgets/JobPropertiesTableModel.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/utils/mainwindow_constants.h"
#include <QTabBar>
#include <QTabWidget>
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 3bc96673498..54da2b51d75 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -13,9 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/JobWidgets/JobView.h"
-#include "GUI/Widgets/Common/DocksController.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Views/FitWidgets/FitActivityPanel.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
@@ -25,6 +23,8 @@
#include "GUI/Views/JobWidgets/JobSelectorWidget.h"
#include "GUI/Views/JobWidgets/JobViewActivities.h"
#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Widgets/Common/DocksController.h"
#include <QMenu>
JobView::JobView(MainWindow* mainWindow, ProjectDocument* document)
diff --git a/GUI/Views/Main/AutosaveController.cpp b/GUI/Views/Main/AutosaveController.cpp
index ac3d2533a6e..d8d8f2ba350 100644
--- a/GUI/Views/Main/AutosaveController.cpp
+++ b/GUI/Views/Main/AutosaveController.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/Main/AutosaveController.h"
-#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
#include <QDir>
namespace {
diff --git a/GUI/Views/Main/PyImportAssistant.cpp b/GUI/Views/Main/PyImportAssistant.cpp
index a2be57f619e..5d35a529d21 100644
--- a/GUI/Views/Main/PyImportAssistant.cpp
+++ b/GUI/Views/Main/PyImportAssistant.cpp
@@ -19,12 +19,12 @@
#include "Base/Utils/Assert.h"
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Widgets/Info/ComboSelectorDialog.h"
-#include "GUI/Widgets/Info/DetailedMessageBox.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
-#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Models/Project/ProjectUtils.h"
+#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
+#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Widgets/Info/ComboSelectorDialog.h"
+#include "GUI/Widgets/Info/DetailedMessageBox.h"
#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/Helpers.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/GUI/Views/Main/actionmanager.cpp b/GUI/Views/Main/actionmanager.cpp
index de27bbbd259..eed1a429a6a 100644
--- a/GUI/Views/Main/actionmanager.cpp
+++ b/GUI/Views/Main/actionmanager.cpp
@@ -16,13 +16,13 @@
#include "Base/Utils/Assert.h"
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Session/SessionData.h"
#include "GUI/Views/JobWidgets/JobView.h"
-#include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/Views/Main/mainwindow.h"
#include "GUI/Views/Main/PyImportAssistant.h"
#include "GUI/Views/Main/aboutapplicationdialog.h"
-#include "GUI/Session/SessionData.h"
+#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Toplevel/SampleView.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/mainwindow_constants.h"
#include "GUI/utils/qstringutils.h"
diff --git a/GUI/Views/Main/mainwindow.cpp b/GUI/Views/Main/mainwindow.cpp
index 81971e0b8c8..6e0b3b10a93 100644
--- a/GUI/Views/Main/mainwindow.cpp
+++ b/GUI/Views/Main/mainwindow.cpp
@@ -14,18 +14,18 @@
#include "GUI/Views/Main/mainwindow.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
#include "GUI/Views/JobWidgets/JobView.h"
+#include "GUI/Views/Main/actionmanager.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/Toplevel/ImportDataView.h"
#include "GUI/Views/Toplevel/ProjectSettingsView.h"
#include "GUI/Views/Toplevel/SampleView.h"
#include "GUI/Views/Toplevel/SessionModelView.h"
#include "GUI/Views/Toplevel/SimulationView.h"
#include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/Views/Main/actionmanager.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/Views/Main/projectmanager.cpp b/GUI/Views/Main/projectmanager.cpp
index d5314544567..1594ffe288a 100644
--- a/GUI/Views/Main/projectmanager.cpp
+++ b/GUI/Views/Main/projectmanager.cpp
@@ -15,14 +15,14 @@
#include "GUI/Views/Main/projectmanager.h"
#include "Base/Utils/Assert.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Project/ProjectUtils.h"
#include "GUI/Models/Project/projectdocument.h"
-#include "GUI/Views/Main/mainwindow.h"
-#include "GUI/Views/Main/SaveService.h"
#include "GUI/Session/SessionData.h"
+#include "GUI/Views/Main/SaveService.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/Views/Main/newprojectdialog.h"
+#include "GUI/Widgets/Info/ProjectLoadProblemDialog.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/MessageService.h"
@@ -358,8 +358,10 @@ void ProjectManager::createNewProject()
const QVariant defFunctionalities =
baApp->settings().defaultFunctionalities(toVariant(ProjectDocument::All));
gSessionData->projectDocument->setFunctionalities(toFunctionalities(defFunctionalities));
- gSessionData->projectDocument->setSingleInstrumentMode(baApp->settings().defaultIsSingleInstrumentMode());
- gSessionData->projectDocument->setSingleSampleMode(baApp->settings().defaultIsSingleSampleMode());
+ gSessionData->projectDocument->setSingleInstrumentMode(
+ baApp->settings().defaultIsSingleInstrumentMode());
+ gSessionData->projectDocument->setSingleSampleMode(
+ baApp->settings().defaultIsSingleSampleMode());
gSessionData->projectDocument->setProjectName("Untitled");
gSessionData->projectDocument->setModified(false);
@@ -395,7 +397,8 @@ ProjectDocument::ReadResult ProjectManager::loadProject(const QString& projectFi
gSessionData->projectDocument->setModified(true);
} else {
QApplication::setOverrideCursor(Qt::WaitCursor);
- readResult = gSessionData->projectDocument->loadProjectFile(projectFileName, messageService);
+ readResult =
+ gSessionData->projectDocument->loadProjectFile(projectFileName, messageService);
}
QApplication::restoreOverrideCursor();
return readResult;
@@ -459,8 +462,8 @@ QString ProjectManager::untitledProjectName()
void ProjectManager::riseProjectLoadFailedDialog(const MessageService& messageService)
{
- QString message =
- QString("Failed to load the project '%1' \n\n").arg(gSessionData->projectDocument->projectFileName());
+ QString message = QString("Failed to load the project '%1' \n\n")
+ .arg(gSessionData->projectDocument->projectFileName());
for (auto details : messageService.errors())
message.append(details + "\n");
@@ -471,8 +474,9 @@ void ProjectManager::riseProjectLoadFailedDialog(const MessageService& messageSe
void ProjectManager::riseProjectLoadProblemDialog(const MessageService& messageService)
{
ASSERT(gSessionData->projectDocument);
- ProjectLoadProblemDialog* problemDialog = new ProjectLoadProblemDialog(
- m_mainWindow, messageService.warnings(true), gSessionData->projectDocument->documentVersion());
+ ProjectLoadProblemDialog* problemDialog =
+ new ProjectLoadProblemDialog(m_mainWindow, messageService.warnings(true),
+ gSessionData->projectDocument->documentVersion());
problemDialog->show();
problemDialog->raise();
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index e14f478d7cc..98b4b973bb5 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -15,10 +15,10 @@
#include "GUI/Views/MaskWidgets/MaskEditorCanvas.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/MaskItems.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/IntensityDataWidgets/ColorMap.h"
#include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
#include "GUI/Views/MaskWidgets/MaskGraphicsView.h"
#include "GUI/Views/MaskWidgets/MaskResultsPresenter.h"
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 9cd0254f6e4..5f58d747d4d 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,16 +14,16 @@
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/ItemWithMaterial.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Items/VectorItem.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Project/projectdocument.h"
-#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
+#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/mainwindow_constants.h"
#include "ui_MaterialEditorDialog.h"
diff --git a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
index 880421df293..a33864038dd 100644
--- a/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
+++ b/GUI/Views/ProjectionsWidgets/ProjectionsWidget.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
#define BORNAGAIN_GUI_VIEWS_PROJECTIONSWIDGETS_PROJECTIONSWIDGET_H
-#include "GUI/Widgets/Common/SessionItemWidget.h"
#include "GUI/Views/MaskWidgets/MaskEditorFlags.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
class ProjectionsPlot;
class QTabWidget;
diff --git a/GUI/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
index a5428578564..ff9d8ed0ea4 100644
--- a/GUI/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/Views/PropertyEditor/ComponentTreeView.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/ComponentTreeView.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/SessionModel.h"
#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Views/PropertyEditor/ComponentTreeActions.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QBoxLayout>
#include <QStandardItemModel>
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index 7c400acdf87..f890bb08045 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -15,12 +15,12 @@
#include "GUI/Views/PropertyEditor/CustomEditors.h"
#include "Base/Utils/Assert.h"
#include "Fit/Param/RealLimits.h"
-#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/MaterialItemUtils.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/Main/projectmanager.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QApplication>
#include <QBoxLayout>
@@ -100,8 +100,8 @@ void MaterialSelectionEditor::buttonClicked()
// temporarily installing filter to prevent loss of focus caused by too insistent dialog
installEventFilter(m_focusFilter);
const QString materialIdentifier = m_data.toString();
- const QString newMaterialIdentifier = MaterialEditorDialog::chooseMaterial(
- gSessionData->projectDocument, materialIdentifier);
+ const QString newMaterialIdentifier =
+ MaterialEditorDialog::chooseMaterial(gSessionData->projectDocument, materialIdentifier);
removeEventFilter(m_focusFilter);
diff --git a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
index 0aebf38fd15..88c5b0ce682 100644
--- a/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/PropertyEditorFactory.h"
-#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Items/SessionFlags.h"
#include "GUI/Items/SessionItem.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/PropertyEditor/MultiComboPropertyEditor.h"
+#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
diff --git a/GUI/Views/PropertyEditor/TestComponentView.cpp b/GUI/Views/PropertyEditor/TestComponentView.cpp
index 0948e848ace..d30e1baeca0 100644
--- a/GUI/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/Views/PropertyEditor/TestComponentView.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/PropertyEditor/TestComponentView.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/BeamItems.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/ParticleItem.h"
@@ -24,6 +23,7 @@
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/PropertyEditor/ComponentEditor.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/StandardSamples/ExemplarySamples.h"
#include <QBoxLayout>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 6a349c3a688..2c7859b7d08 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -14,14 +14,14 @@
#include "GUI/Views/RealSpaceWidgets/RealSpaceCanvas.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Items/SessionItemUtils.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceView.h"
+#include "GUI/Widgets/Info/CautionSign.h"
#include <QApplication>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/Views/SampleDesigner/ConnectableView.cpp b/GUI/Views/SampleDesigner/ConnectableView.cpp
index 3092e19d8be..ff69d961e72 100644
--- a/GUI/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/Views/SampleDesigner/ConnectableView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ConnectableView.h"
-#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/SessionGraphicsItem.h"
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/utils/Error.h"
#include <QObject>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index ecad516eddd..3d6003228cf 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/DesignerScene.h"
-#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/InterferenceItems.h"
#include "GUI/Items/ItemFactory.h"
#include "GUI/Items/MesoCrystalItem.h"
@@ -23,9 +22,9 @@
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Items/RotationItems.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
@@ -33,6 +32,7 @@
#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/Views/SampleDesigner/SampleViewAligner.h"
#include "GUI/Views/SampleDesigner/SampleViewFactory.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include <QGraphicsSceneMouseEvent>
#include <QItemSelection>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/ILayerView.cpp b/GUI/Views/SampleDesigner/ILayerView.cpp
index cb5d6a26fa4..2554d3c0d71 100644
--- a/GUI/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/Views/SampleDesigner/ILayerView.cpp
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/utils/Error.h"
#include <QGraphicsSceneMouseEvent>
diff --git a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
index 29298f8fc04..d366c431c99 100644
--- a/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/Views/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
-#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/MultiLayerForm.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
+#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Application/GlobalSettings.h"
#include <QBoxLayout>
diff --git a/GUI/Views/SampleDesigner/LayerView.cpp b/GUI/Views/SampleDesigner/LayerView.cpp
index 45c17ee2442..11c3c319de7 100644
--- a/GUI/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/Views/SampleDesigner/LayerView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/LayerView.h"
-#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index f8514b8bc00..c13d392332d 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -16,11 +16,11 @@
#include "GUI/Items/ItemWithMaterial.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Items/ModelPath.h"
-#include "GUI/Session/SessionData.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/VectorDescriptor.h"
+#include "GUI/Session/SessionData.h"
#include "GUI/Views/Edit/DoubleLineEdit.h"
#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
diff --git a/GUI/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
index d547b7f0683..d056def9f74 100644
--- a/GUI/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/Views/SampleDesigner/MesoCrystalView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MesoCrystalView.h"
-#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/ParticleItem.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
MesoCrystalView::MesoCrystalView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/MultiLayerView.cpp b/GUI/Views/SampleDesigner/MultiLayerView.cpp
index c44ea348b94..21c20549b33 100644
--- a/GUI/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerView.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MultiLayerView.h"
-#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/SessionGraphicsItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/SampleDesigner/DesignerMimeData.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/LayerView.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
index e00921527e9..14f8b524763 100644
--- a/GUI/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/Views/SampleDesigner/NodeEditorPort.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/NodeEditorPort.h"
+#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/Views/SampleDesigner/NodeEditorConnection.h"
#include <QGraphicsScene>
#include <QPainter>
#include <QPen>
diff --git a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
index 3d01e3f1a39..88d2fccd397 100644
--- a/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleCompositionView.h"
+#include "GUI/Items/ParticleItem.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/Items/ParticleItem.h"
ParticleCompositionView::ParticleCompositionView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
index c62e12bd872..4fa25f80b7f 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleCoreShellView.h"
+#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/StyleUtils.h"
-#include "GUI/Items/ParticleCoreShellItem.h"
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
index e551ea0fe31..9993987aab8 100644
--- a/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleLayoutView.h"
-#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Items/SessionItem.h"
#include "GUI/Views/SampleDesigner/ParticleView.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/utils/Error.h"
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
diff --git a/GUI/Views/SampleDesigner/ParticleView.cpp b/GUI/Views/SampleDesigner/ParticleView.cpp
index 9296dc85f97..2de2549b2f3 100644
--- a/GUI/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/Views/SampleDesigner/ParticleView.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/ParticleView.h"
-#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/FormFactorItems.h"
#include "GUI/Items/GroupItem.h"
#include "GUI/Items/ParticleItem.h"
+#include "GUI/Widgets/Common/DesignerHelper.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/utils/Error.h"
#include <QObject>
#include <QPainter>
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index e99d9d4968a..d748df352b5 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -14,11 +14,11 @@
#include "GUI/Views/SampleDesigner/SampleListView.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
#include "GUI/Items/MultiLayerItem.h"
-#include "GUI/Session/SessionData.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/SampleListModel.h"
+#include "GUI/Session/SessionData.h"
+#include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include <QAction>
#include <QDialog>
diff --git a/GUI/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
index 39546a3def4..ff257c987db 100644
--- a/GUI/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/Views/SampleDesigner/SampleViewAligner.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleViewAligner.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/IView.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QModelIndex>
namespace {
diff --git a/GUI/Views/SampleDesigner/ScriptPanel.cpp b/GUI/Views/SampleDesigner/ScriptPanel.cpp
index 28b8c2c4027..3afc264b6a0 100644
--- a/GUI/Views/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/Views/SampleDesigner/ScriptPanel.cpp
@@ -14,13 +14,13 @@
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
#include "Core/Export/ExportToPython.h"
+#include "GUI/Items/MultiLayerItem.h"
+#include "GUI/Models/Domain/DomainObjectBuilder.h"
+#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Widgets/Info/PythonSyntaxHighlighter.h"
-#include "GUI/Items/MultiLayerItem.h"
-#include "GUI/Models/Domain/DomainObjectBuilder.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "Sample/Multilayer/MultiLayer.h"
#include <QScrollBar>
diff --git a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
index e278e7c7cfd..c5881f3c0f6 100644
--- a/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -16,12 +16,12 @@
#include "Core/Export/ExportToPython.h"
#include "Core/Simulation/GISASSimulation.h"
#include "GUI/Application/GlobalSettings.h"
+#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include "GUI/Widgets/Common/DesignerHelper.h"
#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Widgets/Common/StyledToolBar.h"
#include "GUI/Widgets/Info/CautionSign.h"
#include "GUI/Widgets/Info/PythonSyntaxHighlighter.h"
-#include "GUI/Models/Domain/DomainSimulationBuilder.h"
#include <QFileDialog>
#include <QMessageBox>
#include <QPushButton>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index f1b1f8d5d30..20041c813c7 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h"
#include "GUI/Items/SpecularDataItem.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
#include <qcustomplot.h>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
index 4a5b3345292..6bf1bba862e 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
#define BORNAGAIN_GUI_VIEWS_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
-#include "GUI/Widgets/Common/SessionItemWidget.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
+#include "GUI/Widgets/Common/SessionItemWidget.h"
#include "qcustomplot.h"
#include <memory>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
index 57c073ab90b..729e55df073 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularPlot.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/Views/SpecularDataWidgets/SpecularPlot.h"
-#include "GUI/Widgets/Common/UpdateTimer.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/SpecularDataItem.h"
#include "GUI/Views/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Views/IntensityDataWidgets/PlotEventInfo.h"
#include "GUI/Views/IntensityDataWidgets/plot_constants.h"
+#include "GUI/Widgets/Common/UpdateTimer.h"
namespace {
const int replot_update_interval = 10;
diff --git a/GUI/Views/Toplevel/ImportDataView.h b/GUI/Views/Toplevel/ImportDataView.h
index fa5c7ec8664..f83770c6111 100644
--- a/GUI/Views/Toplevel/ImportDataView.h
+++ b/GUI/Views/Toplevel/ImportDataView.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
#define BORNAGAIN_GUI_VIEWS_TOPLEVEL_IMPORTDATAVIEW_H
-#include "GUI/Widgets/Common/ItemStackPresenter.h"
#include "GUI/Views/ImportDataWidgets/RealDataPresenter.h"
+#include "GUI/Widgets/Common/ItemStackPresenter.h"
class RealDataModel;
class RealDataSelectorWidget;
diff --git a/GUI/Views/Toplevel/ProjectSettingsView.cpp b/GUI/Views/Toplevel/ProjectSettingsView.cpp
index 88a51dbbfec..12981b31947 100644
--- a/GUI/Views/Toplevel/ProjectSettingsView.cpp
+++ b/GUI/Views/Toplevel/ProjectSettingsView.cpp
@@ -16,8 +16,8 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/utils/qstringutils.h"
#include "ui_ProjectSettingsView.h"
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index 498d606533c..adaff6169da 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SampleView.h"
-#include "GUI/Widgets/Common/DocksController.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/Views/SampleDesigner/DesignerScene.h"
#include "GUI/Views/SampleDesigner/DesignerView.h"
#include "GUI/Views/SampleDesigner/LayerOrientedSampleEditor.h"
@@ -27,7 +27,7 @@
#include "GUI/Views/SampleDesigner/SampleToolBox.h"
#include "GUI/Views/SampleDesigner/SampleTreeWidget.h"
#include "GUI/Views/SampleDesigner/ScriptPanel.h"
-#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Widgets/Common/DocksController.h"
#include <QBoxLayout>
#include <QDockWidget>
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index d9568a1c718..487a5c1c3b6 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -13,16 +13,16 @@
// ************************************************************************************************
#include "GUI/Views/Toplevel/SessionModelView.h"
-#include "GUI/Widgets/Common/ModelTreeView.h"
-#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Sample/SampleModel.h"
+#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Views/Toplevel/TestView.h"
-#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Widgets/Common/ModelTreeView.h"
#include <QToolBar>
#include <QToolButton>
#include <QVBoxLayout>
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index e84d14176bf..658a6387c98 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -18,20 +18,20 @@
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SimulationOptionsItem.h"
-#include "GUI/Session/SessionData.h"
#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Job/JobModel.h"
+#include "GUI/Models/Project/projectdocument.h"
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Sample/SampleValidator.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Session/SessionData.h"
+#include "GUI/Views/Main/mainwindow.h"
+#include "GUI/Views/Main/projectmanager.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
-#include "GUI/Views/Main/projectmanager.h"
-#include "GUI/Views/Main/mainwindow.h"
#include "ui_SimulationView.h"
#include <QButtonGroup>
#include <QMessageBox>
diff --git a/GUI/Views/Toplevel/TestView.cpp b/GUI/Views/Toplevel/TestView.cpp
index 8b68fef8121..5e6291abfd3 100644
--- a/GUI/Views/Toplevel/TestView.cpp
+++ b/GUI/Views/Toplevel/TestView.cpp
@@ -20,10 +20,10 @@
#include "GUI/Items/SpecularDataItem.h"
#include "GUI/Models/Data/DataPropertyContainer.h"
#include "GUI/Views/FitWidgets/MinimizerSettingsWidget.h"
+#include "GUI/Views/Main/mainwindow.h"
#include "GUI/Views/PropertyEditor/TestComponentView.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceWidget.h"
#include "GUI/Views/SpecularDataWidgets/Plot1DCanvas.h"
-#include "GUI/Views/Main/mainwindow.h"
#include <qAccordion/contentpane.h>
diff --git a/GUI/Widgets/Common/DesignerHelper.cpp b/GUI/Widgets/Common/DesignerHelper.cpp
index 12197cc7c51..2ee40ef28e6 100644
--- a/GUI/Widgets/Common/DesignerHelper.cpp
+++ b/GUI/Widgets/Common/DesignerHelper.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Widgets/Common/DesignerHelper.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/MaterialItemUtils.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include <QPainter>
#include <cmath>
#include <iostream>
diff --git a/GUI/Widgets/Common/ModelTreeView.cpp b/GUI/Widgets/Common/ModelTreeView.cpp
index 84e12521ec8..d4ad6a293d8 100644
--- a/GUI/Widgets/Common/ModelTreeView.cpp
+++ b/GUI/Widgets/Common/ModelTreeView.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Widgets/Common/ModelTreeView.h"
-#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/Items/SessionDecorationModel.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Widgets/Common/StyleUtils.h"
#include "GUI/utils/Error.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/Tests/Unit/GUI/TestSessionItemController.cpp b/Tests/Unit/GUI/TestSessionItemController.cpp
index 9d38c755186..435b389dee5 100644
--- a/Tests/Unit/GUI/TestSessionItemController.cpp
+++ b/Tests/Unit/GUI/TestSessionItemController.cpp
@@ -1,6 +1,6 @@
-#include "GUI/Widgets/Common/SessionItemController.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/SessionModel.h"
+#include "GUI/Widgets/Common/SessionItemController.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
#include <QObject>
diff --git a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
index 0df2993c501..efee91f2de5 100644
--- a/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
+++ b/Tests/Unit/GUI/TestSessionItemControllerHelper.cpp
@@ -1,6 +1,6 @@
#include "Tests/Unit/GUI/TestSessionItemControllerHelper.h"
-#include "GUI/Widgets/Common/SessionItemController.h"
#include "GUI/Items/SessionItem.h"
+#include "GUI/Widgets/Common/SessionItemController.h"
TestListener::TestListener()
: m_onItemDestroyedCount(0), m_onPropertyChangeCount(0), m_onWidgetDestroyed(0)
--
GitLab