From da1964c6856b2ce2d9ca1790340a1bb1c49ec563 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 2 Nov 2021 19:08:19 +0100
Subject: [PATCH] clang-format
---
App/main.cpp | 4 ++--
GUI/Application/GlobalSettings.cpp | 3 +--
GUI/Items/RealDataItem.cpp | 2 +-
GUI/Items/RectangularDetectorItem.cpp | 2 +-
GUI/Models/Instrument/InstrumentLibrary.cpp | 3 ++-
GUI/Models/Instrument/InstrumentsTreeModel.cpp | 2 +-
GUI/Project/LinkInstrumentManager.cpp | 3 +--
GUI/Project/projectdocument.cpp | 2 +-
GUI/Views/ImportDataWidgets/ImportDataUtils.cpp | 4 ++--
GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp | 7 +++----
GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp | 2 +-
GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp | 2 +-
GUI/Views/InstrumentWidgets/InstrumentListView.cpp | 2 +-
GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp | 2 +-
GUI/Views/JobWidgets/JobView.cpp | 2 +-
GUI/Views/Loaders/AutomaticDataLoader1D.cpp | 2 +-
GUI/Views/Loaders/DataLoaderUtil.cpp | 2 +-
GUI/Views/Loaders/QREDataLoader.cpp | 4 ++--
GUI/Views/Loaders/QREDataLoaderResultModel.h | 2 +-
GUI/Views/PropertyEditor/CustomEditors.cpp | 2 +-
GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp | 2 +-
GUI/Views/SampleDesigner/FormLayouter.cpp | 2 +-
GUI/Views/SampleDesigner/GroupBoxCollapser.cpp | 2 +-
GUI/Views/SampleDesigner/LayerEditorUtils.cpp | 4 ++--
GUI/Views/SampleDesigner/MaterialInplaceForm.cpp | 6 +++---
GUI/Views/SampleDesigner/MultiLayerForm.cpp | 2 +-
GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp | 2 +-
GUI/Views/SampleDesigner/SampleEditorController.cpp | 2 +-
GUI/Views/SampleDesigner/SampleListView.cpp | 2 +-
GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp | 2 +-
GUI/Views/Toplevel/SessionModelView.cpp | 2 +-
GUI/Views/Toplevel/SimulationView.cpp | 2 +-
GUI/mainwindow/PyImportAssistant.cpp | 2 +-
GUI/mainwindow/mainwindow.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 2 +-
Tests/Unit/GUI/TestSavingSpecularData.cpp | 2 +-
37 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/App/main.cpp b/App/main.cpp
index 670f7979580..ef67b107d0e 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -15,11 +15,11 @@
#include "App/MessageHandler.h"
#include "App/appoptions.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Views/Loaders/DataLoaderUtil.h"
#include "GUI/Session/SessionData.h"
+#include "GUI/Views/Loaders/DataLoaderUtil.h"
#include "GUI/mainwindow/mainwindow.h"
-#include "GUI/utils/hostosinfo.h"
#include "GUI/utils/Helpers.h"
+#include "GUI/utils/hostosinfo.h"
#include "config_build.h"
#include <QDir>
#include <QIcon>
diff --git a/GUI/Application/GlobalSettings.cpp b/GUI/Application/GlobalSettings.cpp
index 1d8013100f8..ff377009baa 100644
--- a/GUI/Application/GlobalSettings.cpp
+++ b/GUI/Application/GlobalSettings.cpp
@@ -19,8 +19,7 @@
GlobalSettings* baApp; //!< global pointer to _the_ instance
-GlobalSettings::GlobalSettings()
- : m_currentStyle(ApplicationSettings::Style::native)
+GlobalSettings::GlobalSettings() : m_currentStyle(ApplicationSettings::Style::native)
{
baApp = this;
}
diff --git a/GUI/Items/RealDataItem.cpp b/GUI/Items/RealDataItem.cpp
index 44cdba11b08..133337d637f 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/Items/projectmanager.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/Items/projectmanager.h"
#include "GUI/utils/DeserializationException.h"
#include "GUI/utils/Error.h"
#include <QtCore/QXmlStreamReader>
diff --git a/GUI/Items/RectangularDetectorItem.cpp b/GUI/Items/RectangularDetectorItem.cpp
index dc1e11a23d1..3d1bfc886c1 100644
--- a/GUI/Items/RectangularDetectorItem.cpp
+++ b/GUI/Items/RectangularDetectorItem.cpp
@@ -16,8 +16,8 @@
#include "Device/Detector/RectangularDetector.h"
#include "GUI/Items/AxesItems.h"
#include "GUI/Items/VectorItem.h"
-#include "GUI/utils/Error.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/utils/Error.h"
namespace {
const double default_detector_width = 20.0;
diff --git a/GUI/Models/Instrument/InstrumentLibrary.cpp b/GUI/Models/Instrument/InstrumentLibrary.cpp
index 2e630314759..68677b2719f 100644
--- a/GUI/Models/Instrument/InstrumentLibrary.cpp
+++ b/GUI/Models/Instrument/InstrumentLibrary.cpp
@@ -23,7 +23,8 @@ namespace {
const QString XML_ROOT_TAG = "BornAgainInstrumentLibrary";
const QString XML_VERSION_TAG = "Version";
-QString instrumentLibraryFilePath() {
+QString instrumentLibraryFilePath()
+{
return SessionData::appDataFolder() + "/BornAgainInstrumentLibrary.balib";
}
diff --git a/GUI/Models/Instrument/InstrumentsTreeModel.cpp b/GUI/Models/Instrument/InstrumentsTreeModel.cpp
index 17ac1e1edfb..b0a1a890b85 100644
--- a/GUI/Models/Instrument/InstrumentsTreeModel.cpp
+++ b/GUI/Models/Instrument/InstrumentsTreeModel.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Models/Instrument/InstrumentsTreeModel.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Items/InstrumentItems.h"
+#include "GUI/Models/Instrument/InstrumentModel.h"
#include <QApplication>
#include <QtCore>
#include <QtGui>
diff --git a/GUI/Project/LinkInstrumentManager.cpp b/GUI/Project/LinkInstrumentManager.cpp
index 8b5531f2f1e..ffd659fe21f 100644
--- a/GUI/Project/LinkInstrumentManager.cpp
+++ b/GUI/Project/LinkInstrumentManager.cpp
@@ -77,8 +77,7 @@ LinkInstrumentManager::LinkInstrumentManager(InstrumentModel* instrumentModel,
}
bool LinkInstrumentManager::canLinkDataToInstrument(const RealDataItem* realDataItem,
- const QString& identifier,
- QWidget* parent)
+ const QString& identifier, QWidget* parent)
{
auto instrumentItem = m_instrumentModel->findInstrumentById(identifier);
diff --git a/GUI/Project/projectdocument.cpp b/GUI/Project/projectdocument.cpp
index 0dd0cab21ad..21569a85554 100644
--- a/GUI/Project/projectdocument.cpp
+++ b/GUI/Project/projectdocument.cpp
@@ -15,9 +15,9 @@
#include "GUI/Project/projectdocument.h"
#include "GUI/Models/Data/DocumentModel.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Project/ProjectUtils.h"
#include "GUI/Project/LinkInstrumentManager.h"
#include "GUI/Project/OutputDataIOService.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "GUI/utils/MessageService.h"
diff --git a/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp b/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
index 22cf3640a1c..01bd78a0215 100644
--- a/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
+++ b/GUI/Views/ImportDataWidgets/ImportDataUtils.cpp
@@ -15,10 +15,10 @@
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "Device/Data/OutputData.h"
#include "Device/InputOutput/DataFormatUtils.h"
-#include "GUI/Views/Loaders/QREDataLoader.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/utils/OutputDataUtils.h"
#include "GUI/Models/Data/ImportDataInfo.h"
+#include "GUI/Views/Loaders/QREDataLoader.h"
+#include "GUI/utils/OutputDataUtils.h"
#include <QApplication>
#include <QMessageBox>
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index aa709aa0c46..dab781eeb5e 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -16,8 +16,8 @@
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/projectdocument.h"
#include "GUI/Project/LinkInstrumentManager.h"
+#include "GUI/Project/projectdocument.h"
#include "GUI/mainwindow/mainwindow.h"
#include <QComboBox>
#include <QLabel>
@@ -98,9 +98,8 @@ void RealDataPropertiesWidget::onInstrumentComboIndexChanged(int /*index*/)
if (newSelectedInstrumentId == m_currentDataItem->instrumentId())
return;
- if (m_document->linkInstrumentManager()->canLinkDataToInstrument(m_currentDataItem,
- newSelectedInstrumentId,
- this)) {
+ if (m_document->linkInstrumentManager()->canLinkDataToInstrument(
+ m_currentDataItem, newSelectedInstrumentId, this)) {
m_currentDataItem->setInstrumentId(newSelectedInstrumentId);
InstrumentItem* newSelectedInstrument =
m_document->instrumentModel()->findInstrumentById(newSelectedInstrumentId);
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index e8ce5919271..15525e2195f 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -18,10 +18,10 @@
#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
#include "GUI/CommonWidgets/StyledToolBar.h"
#include "GUI/Items/RealDataItem.h"
+#include "GUI/Items/projectmanager.h"
#include "GUI/Models/Data/AbstractDataLoader1D.h"
#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Models/Data/RealDataModel.h"
-#include "GUI/Items/projectmanager.h"
#include "GUI/Views/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
diff --git a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
index 1afa79b8571..e81c74eaaf8 100644
--- a/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.cpp
@@ -14,8 +14,8 @@
#include "GUI/Views/InstrumentWidgets/DetectorAlignmentEditor.h"
#include "GUI/Items/RectangularDetectorItem.h"
-#include "GUI/Views/InstrumentWidgets/VectorEditor.h"
#include "GUI/Models/Group/ComboProperty.h"
+#include "GUI/Views/InstrumentWidgets/VectorEditor.h"
#include <QComboBox>
#include <QDoubleSpinBox>
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
index 525bf21f5ba..a0e6829c107 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
-#include "GUI/Session/SessionData.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Project/projectdocument.h"
+#include "GUI/Session/SessionData.h"
#include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
#include "GUI/Views/InstrumentWidgets/InstrumentListModel.h"
#include "GUI/mainwindow/mainwindow.h"
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index 39ddb374583..2667a27c7c7 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/IntensityDataWidgets/IntensityDataCanvas.h"
#include "GUI/Items/IntensityDataItem.h"
#include "GUI/Items/RealDataItem.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/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"
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 9debbe6a0dd..81cd444b3ab 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -15,8 +15,8 @@
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/CommonWidgets/DocksController.h"
#include "GUI/Items/JobItem.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/projectmanager.h"
+#include "GUI/Models/Job/JobModel.h"
#include "GUI/Views/FitWidgets/FitActivityPanel.h"
#include "GUI/Views/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Views/JobWidgets/JobMessagePanel.h"
diff --git a/GUI/Views/Loaders/AutomaticDataLoader1D.cpp b/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
index 16326f7fe8d..b3191d93581 100644
--- a/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/Views/Loaders/AutomaticDataLoader1D.cpp
@@ -14,10 +14,10 @@
#include "GUI/Views/Loaders/AutomaticDataLoader1D.h"
#include "Device/InputOutput/OutputDataReadReflectometry.h"
-#include "GUI/Views/Loaders/AutomaticDataLoader1DResultModel.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SpecularDataItem.h"
#include "GUI/Models/Data/ImportDataInfo.h"
+#include "GUI/Views/Loaders/AutomaticDataLoader1DResultModel.h"
#include "GUI/utils/DeserializationException.h"
QString AutomaticDataLoader1D::name() const
diff --git a/GUI/Views/Loaders/DataLoaderUtil.cpp b/GUI/Views/Loaders/DataLoaderUtil.cpp
index 81fb41e8582..60d60616206 100644
--- a/GUI/Views/Loaders/DataLoaderUtil.cpp
+++ b/GUI/Views/Loaders/DataLoaderUtil.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Views/Loaders/DataLoaderUtil.h"
+#include "GUI/Models/Data/DataLoaders1D.h"
#include "GUI/Views/Loaders/AutomaticDataLoader1D.h"
#include "GUI/Views/Loaders/QREDataLoader.h"
#include "GUI/Views/Loaders/UserDefinedDataLoader1D.h"
-#include "GUI/Models/Data/DataLoaders1D.h"
void cloneAsUserDefinedLoader(AbstractDataLoader1D* loader, const QString& name)
{
diff --git a/GUI/Views/Loaders/QREDataLoader.cpp b/GUI/Views/Loaders/QREDataLoader.cpp
index 14bad0966a2..00ed17eea82 100644
--- a/GUI/Views/Loaders/QREDataLoader.cpp
+++ b/GUI/Views/Loaders/QREDataLoader.cpp
@@ -15,11 +15,11 @@
#include "GUI/Views/Loaders/QREDataLoader.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Coord/AxisNames.h"
-#include "GUI/Views/Loaders/QREDataLoaderProperties.h"
-#include "GUI/Views/Loaders/QREDataLoaderResultModel.h"
#include "GUI/Items/JobItemUtils.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SpecularDataItem.h"
+#include "GUI/Views/Loaders/QREDataLoaderProperties.h"
+#include "GUI/Views/Loaders/QREDataLoaderResultModel.h"
#include "GUI/utils/DeserializationException.h"
#include "ui_QREDataLoaderProperties.h"
#include <QFile>
diff --git a/GUI/Views/Loaders/QREDataLoaderResultModel.h b/GUI/Views/Loaders/QREDataLoaderResultModel.h
index fc7cf21ca3f..95471ace669 100644
--- a/GUI/Views/Loaders/QREDataLoaderResultModel.h
+++ b/GUI/Views/Loaders/QREDataLoaderResultModel.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADERRESULTMODEL_H
#define BORNAGAIN_GUI_VIEWS_LOADERS_QREDATALOADERRESULTMODEL_H
-#include "GUI/Views/Loaders/QREDataLoader.h"
#include "GUI/Models/Data/AbstractDataLoaderResultModel.h"
+#include "GUI/Views/Loaders/QREDataLoader.h"
//! The result model of a QREDataLoader (for showing the import results in a table view).
class QREDataLoaderResultModel : public AbstractDataLoaderResultModel {
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index 385fd5a20a2..1f86d0180e8 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -17,8 +17,8 @@
#include "Fit/Param/RealLimits.h"
#include "GUI/CommonWidgets/ScientificSpinBox.h"
#include "GUI/Items/MaterialItemUtils.h"
-#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Items/projectmanager.h"
+#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/utils/CustomEventFilters.h"
#include <QApplication>
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 82820ea728e..a16de0c0ea8 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -16,9 +16,9 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/InfoWidgets/CautionSign.h"
#include "GUI/Items/SessionItemUtils.h"
+#include "GUI/Items/projectmanager.h"
#include "GUI/Models/Parameter/FilterPropertyProxy.h"
#include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Items/projectmanager.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
#include "GUI/Views/RealSpaceWidgets/RealSpaceView.h"
diff --git a/GUI/Views/SampleDesigner/FormLayouter.cpp b/GUI/Views/SampleDesigner/FormLayouter.cpp
index bddbcbdf72b..0e572e79a57 100644
--- a/GUI/Views/SampleDesigner/FormLayouter.cpp
+++ b/GUI/Views/SampleDesigner/FormLayouter.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/FormLayouter.h"
-#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Models/Types/UIntDescriptor.h"
#include "GUI/Models/Types/VectorDescriptor.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/GroupBoxCollapser.cpp b/GUI/Views/SampleDesigner/GroupBoxCollapser.cpp
index 0360d1f55c8..3cc79f57bd1 100644
--- a/GUI/Views/SampleDesigner/GroupBoxCollapser.cpp
+++ b/GUI/Views/SampleDesigner/GroupBoxCollapser.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GroupBoxCollapser.h"
-#include "GUI/Application/GlobalSettings.h"
#include "GUI/Application/ApplicationSettings.h"
+#include "GUI/Application/GlobalSettings.h"
#include <QAction>
#include <QBoxLayout>
#include <QGroupBox>
diff --git a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
index d93f0eaf07f..5b05c4cc3a8 100644
--- a/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/Views/SampleDesigner/LayerEditorUtils.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
-#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Items/FTDecayFunctionItems.h"
#include "GUI/Items/FTDistributionItems.h"
#include "GUI/Items/FormFactorItems.h"
@@ -24,11 +23,12 @@
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/RotationItems.h"
#include "GUI/Models/Types/VectorDescriptor.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
+#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/MesoCrystalForm.h"
#include "GUI/Views/SampleDesigner/ParticleCompositionForm.h"
#include "GUI/Views/SampleDesigner/ParticleCoreShellForm.h"
#include "GUI/Views/SampleDesigner/ParticleForm.h"
-#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include <QLabel>
#include <QMenu>
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index a83cfede617..fca2e6a7c86 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -13,16 +13,16 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
-#include "GUI/Views/Edit/DoubleLineEdit.h"
-#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Items/ItemWithMaterial.h"
#include "GUI/Items/MaterialItemUtils.h"
#include "GUI/Items/ModelPath.h"
+#include "GUI/Items/projectmanager.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/Items/projectmanager.h"
+#include "GUI/Views/Edit/DoubleLineEdit.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Views/SampleDesigner/LayerEditorUtils.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/Views/SampleDesigner/MultiLayerForm.cpp b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
index 8f49562a4e0..23e64916b8c 100644
--- a/GUI/Views/SampleDesigner/MultiLayerForm.cpp
+++ b/GUI/Views/SampleDesigner/MultiLayerForm.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MultiLayerForm.h"
-#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Models/Types/VectorDescriptor.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
#include "GUI/Views/SampleDesigner/MesoCrystalForm.h"
diff --git a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
index f5d47955106..920e7b7df37 100644
--- a/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/Views/SampleDesigner/ParticleCoreShellForm.cpp
@@ -17,11 +17,11 @@
#include "GUI/Items/ParticleCoreShellItem.h"
#include "GUI/Items/ParticleItem.h"
#include "GUI/Models/Types/VectorDescriptor.h"
+#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
#include "GUI/Views/SampleDesigner/SelectionContainerForm.h"
#include "GUI/utils/ActionFactory.h"
-#include "GUI/Views/SampleDesigner/FormLayouter.h"
#include <QAction>
#include <QComboBox>
diff --git a/GUI/Views/SampleDesigner/SampleEditorController.cpp b/GUI/Views/SampleDesigner/SampleEditorController.cpp
index 3d37a842768..499cccd2330 100644
--- a/GUI/Views/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/Views/SampleDesigner/SampleEditorController.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/SampleEditorController.h"
-#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Items/LayerItem.h"
#include "GUI/Items/MesoCrystalItem.h"
#include "GUI/Items/MultiLayerItem.h"
@@ -22,6 +21,7 @@
#include "GUI/Items/ParticleItem.h"
#include "GUI/Items/ParticleLayoutItem.h"
#include "GUI/Models/Types/UIntDescriptor.h"
+#include "GUI/Views/Edit/DoubleSpinBox.h"
#include "GUI/Views/SampleDesigner/InterferenceForm.h"
#include "GUI/Views/SampleDesigner/LayerForm.h"
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
diff --git a/GUI/Views/SampleDesigner/SampleListView.cpp b/GUI/Views/SampleDesigner/SampleListView.cpp
index 9d701f722c9..ebdf229e6f9 100644
--- a/GUI/Views/SampleDesigner/SampleListView.cpp
+++ b/GUI/Views/SampleDesigner/SampleListView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/CommonWidgets/ItemViewOverlayButtons.h"
#include "GUI/Items/MultiLayerItem.h"
+#include "GUI/Items/projectmanager.h"
#include "GUI/Models/Sample/GUIExamplesFactory.h"
#include "GUI/Models/Sample/SampleListModel.h"
-#include "GUI/Items/projectmanager.h"
#include "GUI/utils/ItemDelegateForHTML.h"
#include <QAction>
#include <QDialog>
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
index d218a0d750a..d9979b713bb 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Views/SpecularDataWidgets/SpecularDataImportWidget.h"
-#include "GUI/Views/Loaders/DataLoaderUtil.h"
#include "GUI/Items/DataItemUtils.h"
#include "GUI/Items/InstrumentItems.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SpecularDataItem.h"
#include "GUI/Models/Data/AbstractDataLoaderResultModel.h"
#include "GUI/Models/Data/DataLoaders1D.h"
+#include "GUI/Views/Loaders/DataLoaderUtil.h"
#include "GUI/mainwindow/mainwindow.h"
#include "ui_SpecularDataImportWidget.h"
#include <QAction>
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index 614faa2d73d..4f36d778db2 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -14,12 +14,12 @@
#include "GUI/Views/Toplevel/SessionModelView.h"
#include "GUI/CommonWidgets/ModelTreeView.h"
+#include "GUI/Items/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/Items/projectmanager.h"
#include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Views/Toplevel/TestView.h"
#include "GUI/mainwindow/mainwindow.h"
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index 8b1cdee714e..6334493db45 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -18,6 +18,7 @@
#include "GUI/Items/MultiLayerItem.h"
#include "GUI/Items/RealDataItem.h"
#include "GUI/Items/SimulationOptionsItem.h"
+#include "GUI/Items/projectmanager.h"
#include "GUI/Mapper/ModelUtils.h"
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Data/DocumentModel.h"
@@ -27,7 +28,6 @@
#include "GUI/Models/Sample/SampleModel.h"
#include "GUI/Models/Sample/SampleValidator.h"
#include "GUI/Project/projectdocument.h"
-#include "GUI/Items/projectmanager.h"
#include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
#include "GUI/mainwindow/mainwindow.h"
diff --git a/GUI/mainwindow/PyImportAssistant.cpp b/GUI/mainwindow/PyImportAssistant.cpp
index b459111215e..55e9b83bd5a 100644
--- a/GUI/mainwindow/PyImportAssistant.cpp
+++ b/GUI/mainwindow/PyImportAssistant.cpp
@@ -21,10 +21,10 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/InfoWidgets/ComboSelectorDialog.h"
#include "GUI/InfoWidgets/DetailedMessageBox.h"
+#include "GUI/Items/projectmanager.h"
#include "GUI/Models/Data/GUIObjectBuilder.h"
#include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
#include "GUI/Project/ProjectUtils.h"
-#include "GUI/Items/projectmanager.h"
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/utils/GUIHelpers.h"
#include "GUI/utils/Helpers.h"
diff --git a/GUI/mainwindow/mainwindow.cpp b/GUI/mainwindow/mainwindow.cpp
index 0074f3920cd..d42d973c83c 100644
--- a/GUI/mainwindow/mainwindow.cpp
+++ b/GUI/mainwindow/mainwindow.cpp
@@ -14,8 +14,8 @@
#include "GUI/mainwindow/mainwindow.h"
#include "GUI/Application/GlobalSettings.h"
-#include "GUI/Models/Job/JobModel.h"
#include "GUI/Items/projectmanager.h"
+#include "GUI/Models/Job/JobModel.h"
#include "GUI/Views/InstrumentWidgets/InstrumentView.h"
#include "GUI/Views/JobWidgets/JobView.h"
#include "GUI/Views/Toplevel/ImportDataView.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 0259a0ebc62..5b477a67da0 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -5,8 +5,8 @@
#include "GUI/Items/RectangularDetectorItem.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Project/projectdocument.h"
#include "GUI/Project/LinkInstrumentManager.h"
+#include "GUI/Project/projectdocument.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index e87239bc5e7..18576c5d4cf 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -9,8 +9,8 @@
#include "GUI/Models/Data/ImportDataInfo.h"
#include "GUI/Models/Data/RealDataModel.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Project/ProjectUtils.h"
#include "GUI/Project/OutputDataIOService.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
#include "GUI/utils/Helpers.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index 007b73b51d2..6cb7181ec6f 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -12,8 +12,8 @@
#include "GUI/Models/Data/ApplicationModels.h"
#include "GUI/Models/Instrument/InstrumentModel.h"
#include "GUI/Models/Job/JobModel.h"
-#include "GUI/Project/ProjectUtils.h"
#include "GUI/Project/OutputDataIOService.h"
+#include "GUI/Project/ProjectUtils.h"
#include "GUI/utils/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
--
GitLab