From 0c2ef6f6c88a68942db96dcf64cf7beb4aeb3892 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Nov 2021 18:55:24 +0100
Subject: [PATCH] repairs
---
App/AppOptions.cpp | 3 ++-
App/main.cpp | 4 ++--
GUI/Model/Instrument/InstrumentItems.cpp | 2 +-
GUI/Model/Job/JobModelFunctions.cpp | 2 +-
GUI/Model/Material/MaterialItem.cpp | 6 ++++--
GUI/Model/Material/MaterialItemContainer.cpp | 2 +-
GUI/Model/Material/MaterialModel.cpp | 2 +-
GUI/Model/Project/ProjectDocument.cpp | 4 ++--
GUI/Util/ItemFileNameUtils.h | 2 +-
GUI/Util/Path.cpp | 7 +++----
GUI/View/FitWidgets/FitActivityPanel.cpp | 2 +-
GUI/View/FitWidgets/FitObjectiveBuilder.cpp | 2 +-
GUI/View/FitWidgets/FitParameterWidget.cpp | 4 ++--
GUI/View/FitWidgets/FitSessionController.cpp | 4 ++--
GUI/View/FitWidgets/FitSessionManager.cpp | 2 +-
GUI/View/FitWidgets/FitSessionWidget.cpp | 2 +-
GUI/View/FitWidgets/JobRealTimeWidget.cpp | 2 +-
GUI/View/FitWidgets/ParameterTuningWidget.cpp | 2 +-
GUI/View/FitWidgets/RunFitControlWidget.cpp | 2 +-
GUI/View/ImportDataWidgets/ImportDataUtils.cpp | 2 +-
GUI/View/ImportDataWidgets/RealDataPresenter.cpp | 2 +-
GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp | 4 ++--
GUI/View/InstrumentWidgets/DetectorAlignmentEditor.cpp | 2 +-
GUI/View/InstrumentWidgets/GISASInstrumentEditor.cpp | 2 +-
GUI/View/InstrumentWidgets/InstrumentLibraryEditor.cpp | 2 +-
GUI/View/InstrumentWidgets/SpecularInstrumentEditor.cpp | 2 +-
GUI/View/IntensityDataWidgets/ColorMapUtils.cpp | 2 +-
GUI/View/IntensityDataWidgets/IntensityDataCanvas.cpp | 4 ++--
GUI/View/JobWidgets/FitComparisonViewController.cpp | 2 +-
GUI/View/JobWidgets/JobPropertiesWidget.cpp | 2 +-
GUI/View/JobWidgets/JobSelectorWidget.cpp | 2 +-
GUI/View/Loaders/AutomaticDataLoader1D.cpp | 2 +-
GUI/View/Loaders/QREDataLoader.cpp | 2 +-
GUI/View/Main/AboutDialog.cpp | 2 +-
GUI/View/Main/ActionManager.cpp | 6 +++---
GUI/View/Main/MainWindow.cpp | 6 +++---
GUI/View/Main/ProjectManager.cpp | 8 ++++----
GUI/View/Main/PyImportAssistant.cpp | 6 +++---
GUI/View/Main/SaveService.cpp | 2 +-
GUI/View/MaskWidgets/MaskEditorToolBar.cpp | 2 +-
GUI/View/MaskWidgets/MaskGraphicsScene.cpp | 2 +-
GUI/View/MaskWidgets/MaskViewFactory.cpp | 2 +-
GUI/View/MaterialEditor/MaterialEditorDialog.cpp | 4 ++--
GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp | 2 +-
GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp | 2 +-
GUI/View/PropertyEditor/ComponentFlatView.cpp | 2 +-
GUI/View/PropertyEditor/ComponentTreeView.cpp | 2 +-
GUI/View/PropertyEditor/CustomEditors.cpp | 4 ++--
GUI/View/PropertyEditor/PropertyEditorFactory.cpp | 2 +-
GUI/View/PropertyEditor/SessionModelDelegate.cpp | 2 +-
GUI/View/SampleDesigner/ConnectableView.cpp | 2 +-
GUI/View/SampleDesigner/ILayerView.cpp | 2 +-
GUI/View/SampleDesigner/InterferenceForm.cpp | 2 +-
GUI/View/SampleDesigner/LayerForm.cpp | 2 +-
GUI/View/SampleDesigner/MaterialInplaceForm.cpp | 2 +-
GUI/View/SampleDesigner/MesoCrystalForm.cpp | 2 +-
GUI/View/SampleDesigner/ParticleCompositionForm.cpp | 2 +-
GUI/View/SampleDesigner/ParticleCoreShellForm.cpp | 2 +-
GUI/View/SampleDesigner/ParticleForm.cpp | 2 +-
GUI/View/SampleDesigner/ParticleLayoutForm.cpp | 2 +-
GUI/View/SampleDesigner/ParticleLayoutView.cpp | 2 +-
GUI/View/SampleDesigner/ParticleView.cpp | 2 +-
GUI/View/SampleDesigner/SampleListView.cpp | 2 +-
GUI/View/SampleDesigner/SelectionContainerForm.h | 4 ++--
GUI/View/Toplevel/ImportDataView.cpp | 2 +-
GUI/View/Toplevel/ProjectSettingsView.cpp | 7 +++----
GUI/View/Toplevel/WelcomeView.cpp | 7 +++----
GUI/Widget/Common/ModelTreeView.cpp | 2 +-
GUI/Widget/Common/StyleUtils.cpp | 5 ++---
GUI/Widget/Common/detailswidget.cpp | 2 +-
GUI/Widget/Info/ProjectLoadProblemDialog.cpp | 2 +-
Tests/Unit/GUI/TestComboProperty.cpp | 2 +-
Tests/Unit/GUI/TestComponentProxyModel.cpp | 2 +-
Tests/Unit/GUI/TestDataItemViews.cpp | 2 +-
Tests/Unit/GUI/TestGroupItem.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
Tests/Unit/GUI/TestOutputDataIOService.cpp | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 2 +-
Tests/Unit/GUI/TestSaveService.cpp | 6 +++---
Tests/Unit/GUI/TestSavingSpecularData.cpp | 2 +-
Tests/Unit/GUI/Utils.cpp | 2 +-
81 files changed, 112 insertions(+), 113 deletions(-)
diff --git a/App/AppOptions.cpp b/App/AppOptions.cpp
index 9177100cd15..3e96eca7d02 100644
--- a/App/AppOptions.cpp
+++ b/App/AppOptions.cpp
@@ -15,6 +15,7 @@
#include "App/AppOptions.h"
#include "GUI/Util/Path.h"
#include <QSize>
+#include <QStringList>
#include <boost/program_options/config.hpp>
#include <boost/program_options/parsers.hpp>
#include <fstream>
@@ -27,7 +28,7 @@ const char* nohighdpi = "nohighdpi";
//! Converts string "1600x1000" to QSize(1600, 1000)
QSize windowSize(const QString& size_string)
{
- auto list = size_string.split("x");
+ QStringList list = size_string.split("x");
if (list.size() != 2)
return QSize();
diff --git a/App/main.cpp b/App/main.cpp
index fe50c9789b1..da08f2e2c09 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -16,10 +16,10 @@
#include "App/MessageHandler.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/View/Loaders/DataLoaderUtil.h"
-#include "GUI/View/Main/MainWindow.h"
#include "GUI/Util/Path.h"
#include "GUI/Util/hostosinfo.h"
+#include "GUI/View/Loaders/DataLoaderUtil.h"
+#include "GUI/View/Main/MainWindow.h"
#include "config_build.h"
#include <QDir>
#include <QIcon>
diff --git a/GUI/Model/Instrument/InstrumentItems.cpp b/GUI/Model/Instrument/InstrumentItems.cpp
index d693401a52a..50b4b701320 100644
--- a/GUI/Model/Instrument/InstrumentItems.cpp
+++ b/GUI/Model/Instrument/InstrumentItems.cpp
@@ -33,8 +33,8 @@
#include "GUI/Model/Job/JobItemUtils.h"
#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/Util/Path.h"
#include "GUI/Util/ItemFileNameUtils.h"
+#include "GUI/Util/Path.h"
namespace {
diff --git a/GUI/Model/Job/JobModelFunctions.cpp b/GUI/Model/Job/JobModelFunctions.cpp
index d97f077286f..b978203f7f9 100644
--- a/GUI/Model/Job/JobModelFunctions.cpp
+++ b/GUI/Model/Job/JobModelFunctions.cpp
@@ -33,8 +33,8 @@
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/Util/Path.h"
#include "GUI/Util/ItemFileNameUtils.h"
+#include "GUI/Util/Path.h"
#include <map>
namespace {
diff --git a/GUI/Model/Material/MaterialItem.cpp b/GUI/Model/Material/MaterialItem.cpp
index 3178fe8efeb..e5db9e12d87 100644
--- a/GUI/Model/Material/MaterialItem.cpp
+++ b/GUI/Model/Material/MaterialItem.cpp
@@ -17,15 +17,17 @@
#include "GUI/Model/Group/GroupInfo.h"
#include "GUI/Model/Material/MaterialDataItems.h"
#include "GUI/Model/Types/VectorDescriptor.h"
-#include "GUI/Util/Path.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
-
#include <QColor>
+#include <QUuid>
namespace {
+
const QString magnetization_tooltip = "Magnetization (A/m)";
+
}
+
MaterialItem::MaterialItem() : SessionItem(M_TYPE)
{
setItemName("Material");
diff --git a/GUI/Model/Material/MaterialItemContainer.cpp b/GUI/Model/Material/MaterialItemContainer.cpp
index c9d489ae6a7..b6056c94870 100644
--- a/GUI/Model/Material/MaterialItemContainer.cpp
+++ b/GUI/Model/Material/MaterialItemContainer.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Material/MaterialItemContainer.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/Util/Path.h"
+#include <QUuid>
MaterialItemContainer::MaterialItemContainer() : SessionItem(M_TYPE)
{
diff --git a/GUI/Model/Material/MaterialModel.cpp b/GUI/Model/Material/MaterialModel.cpp
index 276667a4f78..16dbdd658b2 100644
--- a/GUI/Model/Material/MaterialModel.cpp
+++ b/GUI/Model/Material/MaterialModel.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/Material/MaterialModel.h"
#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/Material/MaterialModelStore.h"
-#include "GUI/Util/Path.h"
+#include <QUuid>
MaterialModel::MaterialModel(QObject* parent)
: SessionModel(GUI::Session::XML::MaterialModelTag, parent)
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 01074b7a502..344cc869d5a 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -19,8 +19,8 @@
#include "GUI/Model/Project/OutputDataIOService.h"
#include "GUI/Model/Project/ProjectUtils.h"
#include "GUI/Util/Error.h"
-#include "GUI/Util/Path.h"
#include "GUI/Util/MessageService.h"
+#include "GUI/Util/Path.h"
#include <QDir>
#include <QElapsedTimer>
#include <QXmlStreamReader>
@@ -290,7 +290,7 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
m_currentVersion = reader.attributes().value(BornAgainVersionAttribute).toString();
if (!GUI::Util::Path::isVersionMatchMinimal(m_currentVersion,
- minimal_supported_version)) {
+ minimal_supported_version)) {
QString message = QString("Can't open document version '%1', "
"minimal supported version '%2'")
.arg(m_currentVersion)
diff --git a/GUI/Util/ItemFileNameUtils.h b/GUI/Util/ItemFileNameUtils.h
index 1cbce368851..b1d4d7fd3f2 100644
--- a/GUI/Util/ItemFileNameUtils.h
+++ b/GUI/Util/ItemFileNameUtils.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_UTILS_ITEMFILENAMEUTILS_H
#define BORNAGAIN_GUI_UTILS_ITEMFILENAMEUTILS_H
-#include <QString>
+#include <QStringList>
//! Contains set of convenience methods for JobItem and its children.
diff --git a/GUI/Util/Path.cpp b/GUI/Util/Path.cpp
index 7a6c829ffde..5047f48a814 100644
--- a/GUI/Util/Path.cpp
+++ b/GUI/Util/Path.cpp
@@ -13,13 +13,12 @@
// ************************************************************************************************
#include "GUI/Util/Path.h"
-#include "GUI/Util/hostosinfo.h"
#include "BAVersion.h"
+#include "GUI/Util/hostosinfo.h"
#include <QDateTime>
#include <QDir>
#include <QFileInfo>
#include <QMap>
-#include <QUuid>
#include <QVector>
namespace {
@@ -79,8 +78,8 @@ QString GUI::Util::Path::getValidFileName(const QString& proposed_name)
}
//! parses version string into 3 numbers, returns true in the case of success
-bool GUI::Util::Path::parseVersion(
- const QString& version, int& major_num, int& minor_num, int& patch_num)
+bool GUI::Util::Path::parseVersion(const QString& version, int& major_num, int& minor_num,
+ int& patch_num)
{
major_num = minor_num = patch_num = 0;
bool success(true);
diff --git a/GUI/View/FitWidgets/FitActivityPanel.cpp b/GUI/View/FitWidgets/FitActivityPanel.cpp
index ae3122c822d..b47af46ad91 100644
--- a/GUI/View/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/View/FitWidgets/FitActivityPanel.cpp
@@ -15,12 +15,12 @@
#include "GUI/View/FitWidgets/FitActivityPanel.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/FitWidgets/FitSessionController.h"
#include "GUI/View/FitWidgets/FitSessionManager.h"
#include "GUI/View/FitWidgets/FitSessionWidget.h"
#include "GUI/View/FitWidgets/JobRealTimeWidget.h"
#include "GUI/View/FitWidgets/RunFitControlWidget.h"
-#include "GUI/Util/mainwindow_constants.h"
#include <QLabel>
#include <QPushButton>
#include <QStackedWidget>
diff --git a/GUI/View/FitWidgets/FitObjectiveBuilder.cpp b/GUI/View/FitWidgets/FitObjectiveBuilder.cpp
index 2ae8e9016a8..3cefe10bb16 100644
--- a/GUI/View/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/View/FitWidgets/FitObjectiveBuilder.cpp
@@ -25,9 +25,9 @@
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/View/FitWidgets/GUIFitObserver.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
+#include "GUI/View/FitWidgets/GUIFitObserver.h"
FitObjectiveBuilder::FitObjectiveBuilder(JobItem* jobItem) : m_jobItem(jobItem)
{
diff --git a/GUI/View/FitWidgets/FitParameterWidget.cpp b/GUI/View/FitWidgets/FitParameterWidget.cpp
index 6f1ebbbf9a0..1112e6fe746 100644
--- a/GUI/View/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/View/FitWidgets/FitParameterWidget.cpp
@@ -21,11 +21,11 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/Parameter/FilterPropertyProxy.h"
+#include "GUI/Util/CustomEventFilters.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widget/Info/OverlayLabelController.h"
-#include "GUI/Util/CustomEventFilters.h"
-#include "GUI/Util/mainwindow_constants.h"
#include <QAction>
#include <QMenu>
#include <QTreeView>
diff --git a/GUI/View/FitWidgets/FitSessionController.cpp b/GUI/View/FitWidgets/FitSessionController.cpp
index 3e79d436fb1..fcb56d5ce2f 100644
--- a/GUI/View/FitWidgets/FitSessionController.cpp
+++ b/GUI/View/FitWidgets/FitSessionController.cpp
@@ -17,12 +17,12 @@
#include "GUI/Model/Fit/FitParameterItems.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Util/Error.h"
+#include "GUI/Util/Path.h"
#include "GUI/View/FitWidgets/FitLog.h"
#include "GUI/View/FitWidgets/FitObjectiveBuilder.h"
#include "GUI/View/FitWidgets/FitWorkerLauncher.h"
#include "GUI/View/FitWidgets/GUIFitObserver.h"
-#include "GUI/Util/Error.h"
-#include "GUI/Util/Path.h"
namespace {
const bool use_fit_objective = true;
diff --git a/GUI/View/FitWidgets/FitSessionManager.cpp b/GUI/View/FitWidgets/FitSessionManager.cpp
index ebfd64f182c..125e8e7b1e9 100644
--- a/GUI/View/FitWidgets/FitSessionManager.cpp
+++ b/GUI/View/FitWidgets/FitSessionManager.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/FitWidgets/FitSessionManager.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/FitWidgets/FitLog.h"
#include "GUI/View/FitWidgets/FitSessionController.h"
-#include "GUI/Util/Error.h"
FitSessionManager::FitSessionManager(QObject* parent) : QObject(parent), m_activeController(nullptr)
{
diff --git a/GUI/View/FitWidgets/FitSessionWidget.cpp b/GUI/View/FitWidgets/FitSessionWidget.cpp
index 913cb71aa00..853aa3e9a41 100644
--- a/GUI/View/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/View/FitWidgets/FitSessionWidget.cpp
@@ -14,12 +14,12 @@
#include "GUI/View/FitWidgets/FitSessionWidget.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/FitWidgets/FitParameterWidget.h"
#include "GUI/View/FitWidgets/FitResultsWidget.h"
#include "GUI/View/FitWidgets/FitSessionController.h"
#include "GUI/View/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/View/FitWidgets/RunFitControlWidget.h"
-#include "GUI/Util/mainwindow_constants.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/View/FitWidgets/JobRealTimeWidget.cpp b/GUI/View/FitWidgets/JobRealTimeWidget.cpp
index 20ef1735a44..4116a582272 100644
--- a/GUI/View/FitWidgets/JobRealTimeWidget.cpp
+++ b/GUI/View/FitWidgets/JobRealTimeWidget.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/FitWidgets/JobRealTimeWidget.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
-#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
#include <QVBoxLayout>
namespace {
diff --git a/GUI/View/FitWidgets/ParameterTuningWidget.cpp b/GUI/View/FitWidgets/ParameterTuningWidget.cpp
index c576be2ba1a..f442e98fe7e 100644
--- a/GUI/View/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/View/FitWidgets/ParameterTuningWidget.cpp
@@ -18,11 +18,11 @@
#include "GUI/Model/Fit/ParameterTuningModel.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/FitWidgets/JobRealTimeToolBar.h"
#include "GUI/View/FitWidgets/ParameterTuningDelegate.h"
#include "GUI/View/FitWidgets/SliderSettingsWidget.h"
#include "GUI/Widget/Info/CautionSign.h"
-#include "GUI/Util/Error.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/View/FitWidgets/RunFitControlWidget.cpp b/GUI/View/FitWidgets/RunFitControlWidget.cpp
index 9383e94b991..920f7317e35 100644
--- a/GUI/View/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/View/FitWidgets/RunFitControlWidget.cpp
@@ -15,9 +15,9 @@
#include "GUI/View/FitWidgets/RunFitControlWidget.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/Widget/Common/DesignerHelper.h"
#include "GUI/Widget/Info/CautionSign.h"
-#include "GUI/Util/mainwindow_constants.h"
#include <QFont>
#include <QHBoxLayout>
#include <QLabel>
diff --git a/GUI/View/ImportDataWidgets/ImportDataUtils.cpp b/GUI/View/ImportDataWidgets/ImportDataUtils.cpp
index c5b6bb43046..ce6141531ea 100644
--- a/GUI/View/ImportDataWidgets/ImportDataUtils.cpp
+++ b/GUI/View/ImportDataWidgets/ImportDataUtils.cpp
@@ -17,8 +17,8 @@
#include "Device/InputOutput/DataFormatUtils.h"
#include "GUI/Model/Data/ImportDataInfo.h"
#include "GUI/Model/Data/RealDataItem.h"
-#include "GUI/View/Loaders/QREDataLoader.h"
#include "GUI/Util/OutputDataUtils.h"
+#include "GUI/View/Loaders/QREDataLoader.h"
#include <QApplication>
#include <QMessageBox>
diff --git a/GUI/View/ImportDataWidgets/RealDataPresenter.cpp b/GUI/View/ImportDataWidgets/RealDataPresenter.cpp
index 6d861457312..5ae08786a61 100644
--- a/GUI/View/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/View/ImportDataWidgets/RealDataPresenter.cpp
@@ -14,12 +14,12 @@
#include "GUI/View/ImportDataWidgets/RealDataPresenter.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/ImportDataWidgets/RealDataMaskWidget.h"
#include "GUI/View/IntensityDataWidgets/IntensityDataWidget.h"
#include "GUI/View/ProjectionsWidgets/IntensityDataProjectionsWidget.h"
#include "GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h"
#include "GUI/View/SpecularDataWidgets/SpecularDataWidget.h"
-#include "GUI/Util/Error.h"
#include <QAction>
RealDataPresenter::RealDataPresenter(QWidget* parent) : ItemComboWidget(parent)
diff --git a/GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp
index 033566bfcd1..0846d6e2aae 100644
--- a/GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/View/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -19,6 +19,8 @@
#include "GUI/Model/Data/DataLoaders1D.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
+#include "GUI/Util/Error.h"
+#include "GUI/Util/GUIHelpers.h"
#include "GUI/View/ImportDataWidgets/ImportDataUtils.h"
#include "GUI/View/ImportDataWidgets/RealDataPropertiesWidget.h"
#include "GUI/View/ImportDataWidgets/RealDataTreeModel.h"
@@ -26,8 +28,6 @@
#include "GUI/View/Main/ProjectManager.h"
#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
#include "GUI/Widget/Common/StyledToolBar.h"
-#include "GUI/Util/Error.h"
-#include "GUI/Util/GUIHelpers.h"
#include <QFileDialog>
#include <QItemSelectionModel>
#include <QLineEdit>
diff --git a/GUI/View/InstrumentWidgets/DetectorAlignmentEditor.cpp b/GUI/View/InstrumentWidgets/DetectorAlignmentEditor.cpp
index 6c1d9eeec19..6414e3af644 100644
--- a/GUI/View/InstrumentWidgets/DetectorAlignmentEditor.cpp
+++ b/GUI/View/InstrumentWidgets/DetectorAlignmentEditor.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/InstrumentWidgets/DetectorAlignmentEditor.h"
#include "GUI/Model/Instrument/RectangularDetectorItem.h"
-#include "GUI/View/InstrumentWidgets/VectorEditor.h"
#include "GUI/Util/ComboProperty.h"
+#include "GUI/View/InstrumentWidgets/VectorEditor.h"
#include <QComboBox>
#include <QDoubleSpinBox>
diff --git a/GUI/View/InstrumentWidgets/GISASInstrumentEditor.cpp b/GUI/View/InstrumentWidgets/GISASInstrumentEditor.cpp
index 9b586e6fcd1..9682f267c7b 100644
--- a/GUI/View/InstrumentWidgets/GISASInstrumentEditor.cpp
+++ b/GUI/View/InstrumentWidgets/GISASInstrumentEditor.cpp
@@ -40,7 +40,7 @@ GISASInstrumentEditor::GISASInstrumentEditor(QWidget* parent, Qt::WindowFlags f)
m_environmentEditor = new EnvironmentEditor(this);
layout->addWidget(GUI::Util::Style::createDetailsWidget(m_environmentEditor, "Environment",
- /*expanded*/ false));
+ /*expanded*/ false));
layout->addStretch();
}
diff --git a/GUI/View/InstrumentWidgets/InstrumentLibraryEditor.cpp b/GUI/View/InstrumentWidgets/InstrumentLibraryEditor.cpp
index e9f8dac76b7..ae2bdc6adf6 100644
--- a/GUI/View/InstrumentWidgets/InstrumentLibraryEditor.cpp
+++ b/GUI/View/InstrumentWidgets/InstrumentLibraryEditor.cpp
@@ -16,10 +16,10 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/State/SessionData.h"
+#include "GUI/Util/ItemDelegateForHTML.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
#include "GUI/Widget/Common/StyleUtils.h"
-#include "GUI/Util/ItemDelegateForHTML.h"
#include "ui_InstrumentLibraryEditor.h"
#include <QAction>
#include <QFormLayout>
diff --git a/GUI/View/InstrumentWidgets/SpecularInstrumentEditor.cpp b/GUI/View/InstrumentWidgets/SpecularInstrumentEditor.cpp
index be3b026d3f9..a70fab2f1bb 100644
--- a/GUI/View/InstrumentWidgets/SpecularInstrumentEditor.cpp
+++ b/GUI/View/InstrumentWidgets/SpecularInstrumentEditor.cpp
@@ -36,7 +36,7 @@ SpecularInstrumentEditor::SpecularInstrumentEditor(QWidget* parent, Qt::WindowFl
m_environmentEditor = new EnvironmentEditor(this);
layout->addWidget(GUI::Util::Style::createDetailsWidget(m_environmentEditor, "Environment",
- /*expanded*/ false));
+ /*expanded*/ false));
layout->addStretch();
}
diff --git a/GUI/View/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/View/IntensityDataWidgets/ColorMapUtils.cpp
index 91e3fda16e9..d5913d942e2 100644
--- a/GUI/View/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/View/IntensityDataWidgets/ColorMapUtils.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/IntensityDataWidgets/ColorMapUtils.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Widget/Common/StyleUtils.h"
#include "GUI/Util/Error.h"
+#include "GUI/Widget/Common/StyleUtils.h"
using gradient_map_t = QMap<QString, QCPColorGradient::GradientPreset>;
diff --git a/GUI/View/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/View/IntensityDataWidgets/IntensityDataCanvas.cpp
index 30fdd57d917..c3791b954d7 100644
--- a/GUI/View/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/View/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -15,13 +15,13 @@
#include "GUI/View/IntensityDataWidgets/IntensityDataCanvas.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Util/ComboProperty.h"
+#include "GUI/Util/GUIHelpers.h"
#include "GUI/View/IntensityDataWidgets/ColorMap.h"
#include "GUI/View/IntensityDataWidgets/ColorMapCanvas.h"
#include "GUI/View/IntensityDataWidgets/SavePlotAssistant.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/ProjectManager.h"
-#include "GUI/Util/ComboProperty.h"
-#include "GUI/Util/GUIHelpers.h"
#include <QAction>
#include <QMouseEvent>
#include <QSettings>
diff --git a/GUI/View/JobWidgets/FitComparisonViewController.cpp b/GUI/View/JobWidgets/FitComparisonViewController.cpp
index bc1892f6a41..3207ec0f3cf 100644
--- a/GUI/View/JobWidgets/FitComparisonViewController.cpp
+++ b/GUI/View/JobWidgets/FitComparisonViewController.cpp
@@ -22,8 +22,8 @@
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/View/IntensityDataWidgets/PropertyRepeater.h"
#include "GUI/Util/ComboProperty.h"
+#include "GUI/View/IntensityDataWidgets/PropertyRepeater.h"
namespace {
const double relative_diff_min_1d = 1e-05;
diff --git a/GUI/View/JobWidgets/JobPropertiesWidget.cpp b/GUI/View/JobWidgets/JobPropertiesWidget.cpp
index 6de16eee903..2d389978186 100644
--- a/GUI/View/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/View/JobWidgets/JobPropertiesWidget.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/JobWidgets/JobPropertiesWidget.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/JobWidgets/JobPropertiesTableModel.h"
#include "GUI/Widget/Common/StyleUtils.h"
-#include "GUI/Util/mainwindow_constants.h"
#include <QTabBar>
#include <QTabWidget>
#include <QTextEdit>
diff --git a/GUI/View/JobWidgets/JobSelectorWidget.cpp b/GUI/View/JobWidgets/JobSelectorWidget.cpp
index fa8771718c2..d82f05a6115 100644
--- a/GUI/View/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/View/JobWidgets/JobSelectorWidget.cpp
@@ -15,9 +15,9 @@
#include "GUI/View/JobWidgets/JobSelectorWidget.h"
#include "Base/Utils/Assert.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/JobWidgets/JobListView.h"
#include "GUI/View/JobWidgets/JobPropertiesWidget.h"
-#include "GUI/Util/mainwindow_constants.h"
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/View/Loaders/AutomaticDataLoader1D.cpp b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
index d98e8537463..9782800ab4e 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
@@ -17,8 +17,8 @@
#include "GUI/Model/Data/ImportDataInfo.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
#include "GUI/Util/DeserializationException.h"
+#include "GUI/View/Loaders/AutomaticDataLoader1DResultModel.h"
QString AutomaticDataLoader1D::name() const
{
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index e13ead4eb53..8b4b467920e 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -18,9 +18,9 @@
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Job/JobItemUtils.h"
+#include "GUI/Util/DeserializationException.h"
#include "GUI/View/Loaders/QREDataLoaderProperties.h"
#include "GUI/View/Loaders/QREDataLoaderResultModel.h"
-#include "GUI/Util/DeserializationException.h"
#include "ui_QREDataLoaderProperties.h"
#include <QFile>
#include <QString>
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 6995fed8be3..075d24c9395 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Main/AboutDialog.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
#include "GUI/Util/CustomEventFilters.h"
#include "GUI/Util/Path.h"
+#include "GUI/Widget/Common/DesignerHelper.h"
#include <QDate>
#include <QLabel>
#include <QPushButton>
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 9291632ef60..62d00b0e315 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -17,15 +17,15 @@
#include "Base/Utils/SysUtils.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/State/SessionData.h"
+#include "GUI/Util/Path.h"
+#include "GUI/Util/hostosinfo.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/JobWidgets/JobView.h"
#include "GUI/View/Main/AboutDialog.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Main/ProjectManager.h"
#include "GUI/View/Main/PyImportAssistant.h"
#include "GUI/View/Toplevel/SampleView.h"
-#include "GUI/Util/hostosinfo.h"
-#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/Util/Path.h"
#include <QDesktopServices>
#include <QDir>
#include <QMenuBar>
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index a5a7a125bae..1295af14885 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -16,6 +16,9 @@
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Model/State/SessionData.h"
+#include "GUI/Util/Path.h"
+#include "GUI/Util/hostosinfo.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/InstrumentWidgets/InstrumentView.h"
#include "GUI/View/JobWidgets/JobView.h"
#include "GUI/View/Main/ActionManager.h"
@@ -26,9 +29,6 @@
#include "GUI/View/Toplevel/SessionModelView.h"
#include "GUI/View/Toplevel/SimulationView.h"
#include "GUI/View/Toplevel/WelcomeView.h"
-#include "GUI/Util/Path.h"
-#include "GUI/Util/hostosinfo.h"
-#include "GUI/Util/mainwindow_constants.h"
#include <QAction>
#include <QApplication>
#include <QBoxLayout>
diff --git a/GUI/View/Main/ProjectManager.cpp b/GUI/View/Main/ProjectManager.cpp
index b76cf9c5d27..e1798f6ec19 100644
--- a/GUI/View/Main/ProjectManager.cpp
+++ b/GUI/View/Main/ProjectManager.cpp
@@ -19,14 +19,14 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Project/ProjectUtils.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/View/Main/MainWindow.h"
-#include "GUI/View/Main/NewProjectDialog.h"
-#include "GUI/View/Main/SaveService.h"
-#include "GUI/Widget/Info/ProjectLoadProblemDialog.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/GUIHelpers.h"
#include "GUI/Util/MessageService.h"
#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/Main/MainWindow.h"
+#include "GUI/View/Main/NewProjectDialog.h"
+#include "GUI/View/Main/SaveService.h"
+#include "GUI/Widget/Info/ProjectLoadProblemDialog.h"
#include <QApplication>
#include <QDateTime>
#include <QFileDialog>
diff --git a/GUI/View/Main/PyImportAssistant.cpp b/GUI/View/Main/PyImportAssistant.cpp
index 390faf65b3f..d54ab79b1a9 100644
--- a/GUI/View/Main/PyImportAssistant.cpp
+++ b/GUI/View/Main/PyImportAssistant.cpp
@@ -22,12 +22,12 @@
#include "GUI/Model/Domain/GUIObjectBuilder.h"
#include "GUI/Model/Project/ProjectUtils.h"
#include "GUI/Model/Sample/GUIDomainSampleVisitor.h"
-#include "GUI/View/Main/ProjectManager.h"
-#include "GUI/Widget/Info/ComboSelectorDialog.h"
-#include "GUI/Widget/Info/DetailedMessageBox.h"
#include "GUI/Util/GUIHelpers.h"
#include "GUI/Util/Path.h"
#include "GUI/Util/String.h"
+#include "GUI/View/Main/ProjectManager.h"
+#include "GUI/Widget/Info/ComboSelectorDialog.h"
+#include "GUI/Widget/Info/DetailedMessageBox.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Multilayer/PyImport.h"
#include <QApplication>
diff --git a/GUI/View/Main/SaveService.cpp b/GUI/View/Main/SaveService.cpp
index 02e2c46b52b..81169814df5 100644
--- a/GUI/View/Main/SaveService.cpp
+++ b/GUI/View/Main/SaveService.cpp
@@ -16,9 +16,9 @@
#include "Base/Utils/Assert.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Project/ProjectUtils.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/Main/AutosaveController.h"
#include "GUI/View/Main/SaveThread.h"
-#include "GUI/Util/Error.h"
#include <QApplication>
#include <QCoreApplication>
#include <QTime>
diff --git a/GUI/View/MaskWidgets/MaskEditorToolBar.cpp b/GUI/View/MaskWidgets/MaskEditorToolBar.cpp
index 167264975ff..6292bf5d29d 100644
--- a/GUI/View/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/View/MaskWidgets/MaskEditorToolBar.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/MaskWidgets/MaskEditorToolBar.h"
#include "Base/Utils/Assert.h"
-#include "GUI/View/MaskWidgets/MaskEditorActions.h"
#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/MaskWidgets/MaskEditorActions.h"
#include <QButtonGroup>
#include <QLabel>
#include <QRadioButton>
diff --git a/GUI/View/MaskWidgets/MaskGraphicsScene.cpp b/GUI/View/MaskWidgets/MaskGraphicsScene.cpp
index f87373511ef..d95741da2d7 100644
--- a/GUI/View/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/View/MaskWidgets/MaskGraphicsScene.cpp
@@ -18,11 +18,11 @@
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Parameter/PropertyItem.h"
#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/MaskWidgets/ColorMapSceneAdaptor.h"
#include "GUI/View/MaskWidgets/MaskGraphicsProxy.h"
#include "GUI/View/MaskWidgets/MaskViewFactory.h"
#include "GUI/View/MaskWidgets/PolygonView.h"
-#include "GUI/Util/Error.h"
#include <QGraphicsItem>
#include <QGraphicsSceneMoveEvent>
#include <QItemSelection>
diff --git a/GUI/View/MaskWidgets/MaskViewFactory.cpp b/GUI/View/MaskWidgets/MaskViewFactory.cpp
index bfcad75d3df..ef51924ccf7 100644
--- a/GUI/View/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/View/MaskWidgets/MaskViewFactory.cpp
@@ -16,6 +16,7 @@
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Session/SessionItem.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/MaskWidgets/EllipseView.h"
#include "GUI/View/MaskWidgets/LineViews.h"
#include "GUI/View/MaskWidgets/MaskAllView.h"
@@ -23,7 +24,6 @@
#include "GUI/View/MaskWidgets/PolygonPointView.h"
#include "GUI/View/MaskWidgets/PolygonView.h"
#include "GUI/View/MaskWidgets/RegionOfInterestView.h"
-#include "GUI/Util/Error.h"
#include <boost/polymorphic_cast.hpp>
using boost::polymorphic_downcast;
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 980e6fabd9e..9b8b8844553 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -21,11 +21,11 @@
#include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Types/VectorItem.h"
+#include "GUI/Util/GUIHelpers.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
#include "GUI/Widget/Common/StyleUtils.h"
-#include "GUI/Util/GUIHelpers.h"
-#include "GUI/Util/mainwindow_constants.h"
#include "ui_MaterialEditorDialog.h"
#include <QAction>
diff --git a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp b/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
index 5c550b081cf..1fa4acbbbe7 100644
--- a/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
+++ b/GUI/View/ProjectionsWidgets/ProjectionsToolBar.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/ProjectionsWidgets/ProjectionsToolBar.h"
-#include "GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h"
#include "GUI/Util/mainwindow_constants.h"
+#include "GUI/View/ProjectionsWidgets/ProjectionsEditorActions.h"
#include <QButtonGroup>
#include <QLabel>
#include <QToolButton>
diff --git a/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index 6aff4d96b96..2535a457a0a 100644
--- a/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/View/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -20,8 +20,8 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/MaskItems.h"
#include "GUI/Model/Data/ProjectionItems.h"
-#include "GUI/View/Main/ProjectManager.h"
#include "GUI/Util/Error.h"
+#include "GUI/View/Main/ProjectManager.h"
#include <QFileDialog>
#include <QTextStream>
diff --git a/GUI/View/PropertyEditor/ComponentFlatView.cpp b/GUI/View/PropertyEditor/ComponentFlatView.cpp
index 3a6ceddd828..875cdbc5147 100644
--- a/GUI/View/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/View/PropertyEditor/ComponentFlatView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Mapper/ComponentUtils.h"
#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/Util/LayoutUtils.h"
#include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
#include "GUI/View/PropertyEditor/PropertyWidgetItem.h"
-#include "GUI/Util/LayoutUtils.h"
#include <QBoxLayout>
#include <QComboBox>
#include <QDataWidgetMapper>
diff --git a/GUI/View/PropertyEditor/ComponentTreeView.cpp b/GUI/View/PropertyEditor/ComponentTreeView.cpp
index 412fed2e0b8..53ea74fa02d 100644
--- a/GUI/View/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/View/PropertyEditor/ComponentTreeView.cpp
@@ -15,10 +15,10 @@
#include "GUI/View/PropertyEditor/ComponentTreeView.h"
#include "GUI/Model/Mapper/ComponentProxyModel.h"
#include "GUI/Model/Session/SessionModel.h"
+#include "GUI/Util/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/ComponentTreeActions.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Widget/Common/StyleUtils.h"
-#include "GUI/Util/CustomEventFilters.h"
#include <QBoxLayout>
#include <QStandardItemModel>
#include <QTreeView>
diff --git a/GUI/View/PropertyEditor/CustomEditors.cpp b/GUI/View/PropertyEditor/CustomEditors.cpp
index 5799b86a898..1005f9f72d8 100644
--- a/GUI/View/PropertyEditor/CustomEditors.cpp
+++ b/GUI/View/PropertyEditor/CustomEditors.cpp
@@ -17,11 +17,11 @@
#include "Fit/Param/RealLimits.h"
#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/State/SessionData.h"
+#include "GUI/Util/ComboProperty.h"
+#include "GUI/Util/CustomEventFilters.h"
#include "GUI/View/Main/ProjectManager.h"
#include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/Widget/Common/ScientificSpinBox.h"
-#include "GUI/Util/ComboProperty.h"
-#include "GUI/Util/CustomEventFilters.h"
#include <QApplication>
#include <QBoxLayout>
#include <QCheckBox>
diff --git a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
index 29657737150..d7801c9f910 100644
--- a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
@@ -16,9 +16,9 @@
#include "GUI/Model/Material/MaterialItemUtils.h"
#include "GUI/Model/Session/SessionFlags.h"
#include "GUI/Model/Session/SessionItem.h"
+#include "GUI/Util/ComboProperty.h"
#include "GUI/View/PropertyEditor/MultiComboPropertyEditor.h"
#include "GUI/Widget/Common/ScientificSpinBox.h"
-#include "GUI/Util/ComboProperty.h"
#include <QLabel>
#include <QLineEdit>
#include <QSpinBox>
diff --git a/GUI/View/PropertyEditor/SessionModelDelegate.cpp b/GUI/View/PropertyEditor/SessionModelDelegate.cpp
index e9dd8ac8504..dea0a47da53 100644
--- a/GUI/View/PropertyEditor/SessionModelDelegate.cpp
+++ b/GUI/View/PropertyEditor/SessionModelDelegate.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
#include "GUI/Model/Session/SessionItem.h"
+#include "GUI/Util/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/CustomEditors.h"
#include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
-#include "GUI/Util/CustomEventFilters.h"
#include <QApplication>
SessionModelDelegate::SessionModelDelegate(QObject* parent) : QStyledItemDelegate(parent) {}
diff --git a/GUI/View/SampleDesigner/ConnectableView.cpp b/GUI/View/SampleDesigner/ConnectableView.cpp
index 7a5b8d0c9cf..c0805b54fce 100644
--- a/GUI/View/SampleDesigner/ConnectableView.cpp
+++ b/GUI/View/SampleDesigner/ConnectableView.cpp
@@ -14,10 +14,10 @@
#include "GUI/View/SampleDesigner/ConnectableView.h"
#include "GUI/Model/Session/SessionGraphicsItem.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/SampleDesigner/NodeEditorConnection.h"
#include "GUI/Widget/Common/DesignerHelper.h"
#include "GUI/Widget/Common/StyleUtils.h"
-#include "GUI/Util/Error.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/SampleDesigner/ILayerView.cpp b/GUI/View/SampleDesigner/ILayerView.cpp
index da556881c2e..918779e822b 100644
--- a/GUI/View/SampleDesigner/ILayerView.cpp
+++ b/GUI/View/SampleDesigner/ILayerView.cpp
@@ -15,10 +15,10 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/SampleDesigner/DesignerScene.h"
#include "GUI/View/SampleDesigner/MultiLayerView.h"
#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Util/Error.h"
#include <QGraphicsSceneMouseEvent>
QLineF MultiLayerCandidate::getInterfaceToScene()
diff --git a/GUI/View/SampleDesigner/InterferenceForm.cpp b/GUI/View/SampleDesigner/InterferenceForm.cpp
index b865707751f..adf359db713 100644
--- a/GUI/View/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/View/SampleDesigner/InterferenceForm.cpp
@@ -15,11 +15,11 @@
#include "GUI/View/SampleDesigner/InterferenceForm.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
+#include "GUI/Util/CustomEventFilters.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "GUI/View/SampleDesigner/SelectionContainerForm.h"
-#include "GUI/Util/CustomEventFilters.h"
InterferenceForm::InterferenceForm(QWidget* parent, ParticleLayoutItem* layoutItem,
SampleEditorController* ec)
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index 6d4638ea9a4..86fef809a82 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -16,11 +16,11 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Types/UIntDescriptor.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/View/SampleDesigner/WidgetMoverButton.h"
-#include "GUI/Util/ActionFactory.h"
#include <QLineEdit>
#include <QMenu>
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index c55b4bb0b0d..ece5122592e 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -21,12 +21,12 @@
#include "GUI/Model/State/SessionData.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
#include "GUI/Model/Types/VectorDescriptor.h"
+#include "GUI/Util/LayoutUtils.h"
#include "GUI/View/Edit/DoubleLineEdit.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
-#include "GUI/Util/LayoutUtils.h"
#include <QGridLayout>
#include <QLabel>
diff --git a/GUI/View/SampleDesigner/MesoCrystalForm.cpp b/GUI/View/SampleDesigner/MesoCrystalForm.cpp
index 6327a2f5dc8..65d677195dc 100644
--- a/GUI/View/SampleDesigner/MesoCrystalForm.cpp
+++ b/GUI/View/SampleDesigner/MesoCrystalForm.cpp
@@ -17,9 +17,9 @@
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Types/VectorDescriptor.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
-#include "GUI/Util/ActionFactory.h"
#include <QAction>
diff --git a/GUI/View/SampleDesigner/ParticleCompositionForm.cpp b/GUI/View/SampleDesigner/ParticleCompositionForm.cpp
index 6954c6e5f7f..d9766489fac 100644
--- a/GUI/View/SampleDesigner/ParticleCompositionForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleCompositionForm.cpp
@@ -15,10 +15,10 @@
#include "GUI/View/SampleDesigner/ParticleCompositionForm.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
#include "GUI/Model/Types/VectorDescriptor.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
-#include "GUI/Util/ActionFactory.h"
#include <QAction>
#include <QPushButton>
diff --git a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
index 9fd1ee83d0b..fdd7bc5f1ff 100644
--- a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
@@ -17,11 +17,11 @@
#include "GUI/Model/Sample/ParticleCoreShellItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Types/VectorDescriptor.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "GUI/View/SampleDesigner/SelectionContainerForm.h"
-#include "GUI/Util/ActionFactory.h"
#include <QAction>
#include <QComboBox>
diff --git a/GUI/View/SampleDesigner/ParticleForm.cpp b/GUI/View/SampleDesigner/ParticleForm.cpp
index b77c121e573..9391928349b 100644
--- a/GUI/View/SampleDesigner/ParticleForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleForm.cpp
@@ -16,10 +16,10 @@
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Types/VectorDescriptor.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
-#include "GUI/Util/ActionFactory.h"
#include <QAction>
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
index cd9b475476c..7b93bfeecbf 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
@@ -15,12 +15,12 @@
#include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/View/SampleDesigner/InterferenceForm.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/LayerForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
-#include "GUI/Util/ActionFactory.h"
#include <QAction>
#include <QPushButton>
diff --git a/GUI/View/SampleDesigner/ParticleLayoutView.cpp b/GUI/View/SampleDesigner/ParticleLayoutView.cpp
index ffc58e9adcf..e76bc18b5e9 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/View/SampleDesigner/ParticleLayoutView.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/SampleDesigner/ParticleLayoutView.h"
#include "GUI/Model/Session/SessionItem.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/SampleDesigner/ParticleView.h"
#include "GUI/Widget/Common/DesignerHelper.h"
-#include "GUI/Util/Error.h"
ParticleLayoutView::ParticleLayoutView(QGraphicsItem* parent) : ConnectableView(parent)
{
diff --git a/GUI/View/SampleDesigner/ParticleView.cpp b/GUI/View/SampleDesigner/ParticleView.cpp
index 5fa16795c7e..7f5a2630fca 100644
--- a/GUI/View/SampleDesigner/ParticleView.cpp
+++ b/GUI/View/SampleDesigner/ParticleView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/Util/Error.h"
#include "GUI/Widget/Common/DesignerHelper.h"
#include "GUI/Widget/Common/StyleUtils.h"
-#include "GUI/Util/Error.h"
#include <QObject>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index 439b4fe6f48..c5ee023ee6e 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -18,8 +18,8 @@
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/SampleListModel.h"
#include "GUI/Model/State/SessionData.h"
-#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
#include "GUI/Util/ItemDelegateForHTML.h"
+#include "GUI/Widget/Common/ItemViewOverlayButtons.h"
#include <QAction>
#include <QDialog>
#include <QDialogButtonBox>
diff --git a/GUI/View/SampleDesigner/SelectionContainerForm.h b/GUI/View/SampleDesigner/SelectionContainerForm.h
index e25b9d86e34..2465b8add51 100644
--- a/GUI/View/SampleDesigner/SelectionContainerForm.h
+++ b/GUI/View/SampleDesigner/SelectionContainerForm.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
#define BORNAGAIN_GUI_VIEWS_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
-#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
-#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "GUI/Util/CustomEventFilters.h"
#include "GUI/Util/LayoutUtils.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include <QComboBox>
#include <QGridLayout>
diff --git a/GUI/View/Toplevel/ImportDataView.cpp b/GUI/View/Toplevel/ImportDataView.cpp
index a933ecffcb5..12de8c0471b 100644
--- a/GUI/View/Toplevel/ImportDataView.cpp
+++ b/GUI/View/Toplevel/ImportDataView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/RealDataModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/ImportDataWidgets/RealDataSelectorWidget.h"
#include "GUI/View/Main/MainWindow.h"
-#include "GUI/Util/mainwindow_constants.h"
#include <QAction>
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/View/Toplevel/ProjectSettingsView.cpp b/GUI/View/Toplevel/ProjectSettingsView.cpp
index dbcebf7787b..66fdf85c277 100644
--- a/GUI/View/Toplevel/ProjectSettingsView.cpp
+++ b/GUI/View/Toplevel/ProjectSettingsView.cpp
@@ -18,8 +18,8 @@
#include "GUI/Model/Instrument/InstrumentModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Util/Path.h"
+#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "ui_ProjectSettingsView.h"
#include <QDir>
#include <QMessageBox>
@@ -101,9 +101,8 @@ void ProjectSettingsView::updateInformation()
QString name = m_document->projectName();
if (m_document->hasValidNameAndPath())
- location =
- GUI::Util::Path::withTildeHomePath(
- QDir::toNativeSeparators(m_document->projectFileName()));
+ location = GUI::Util::Path::withTildeHomePath(
+ QDir::toNativeSeparators(m_document->projectFileName()));
m_ui->currentProjectName->setText(name);
m_ui->currentProjectLocation->setText(location);
diff --git a/GUI/View/Toplevel/WelcomeView.cpp b/GUI/View/Toplevel/WelcomeView.cpp
index 98457697081..49902a66bc5 100644
--- a/GUI/View/Toplevel/WelcomeView.cpp
+++ b/GUI/View/Toplevel/WelcomeView.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Toplevel/WelcomeView.h"
-#include "GUI/View/Main/ProjectManager.h"
-#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "GUI/Util/LayoutUtils.h"
#include "GUI/Util/Path.h"
+#include "GUI/View/Main/ProjectManager.h"
+#include "GUI/View/SampleDesigner/GroupBoxCollapser.h"
#include "ui_WelcomeView.h"
#include <QCommandLinkButton>
@@ -59,8 +59,7 @@ void WelcomeView::updateRecentProjectPanel()
for (const auto& file : projectManager()->recentProjects()) {
auto button = new QCommandLinkButton;
button->setText(QFileInfo(file).baseName());
- button->setDescription(
- GUI::Util::Path::withTildeHomePath(QDir::toNativeSeparators(file)));
+ button->setDescription(GUI::Util::Path::withTildeHomePath(QDir::toNativeSeparators(file)));
button->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
connect(button, &QCommandLinkButton::clicked, [=] { projectManager()->openProject(file); });
diff --git a/GUI/Widget/Common/ModelTreeView.cpp b/GUI/Widget/Common/ModelTreeView.cpp
index 28962c6b751..2d7e77f5d15 100644
--- a/GUI/Widget/Common/ModelTreeView.cpp
+++ b/GUI/Widget/Common/ModelTreeView.cpp
@@ -15,8 +15,8 @@
#include "GUI/Widget/Common/ModelTreeView.h"
#include "GUI/Model/Session/SessionDecorationModel.h"
#include "GUI/Model/Session/SessionModel.h"
-#include "GUI/Widget/Common/StyleUtils.h"
#include "GUI/Util/Error.h"
+#include "GUI/Widget/Common/StyleUtils.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/Widget/Common/StyleUtils.cpp b/GUI/Widget/Common/StyleUtils.cpp
index 68c1ca20d13..8ee5b649a8c 100644
--- a/GUI/Widget/Common/StyleUtils.cpp
+++ b/GUI/Widget/Common/StyleUtils.cpp
@@ -14,9 +14,9 @@
#include "GUI/Widget/Common/StyleUtils.h"
#include "Base/Utils/Assert.h"
+#include "GUI/Util/hostosinfo.h"
#include "GUI/Widget/Common/DesignerHelper.h"
#include "GUI/Widget/Common/detailswidget.h"
-#include "GUI/Util/hostosinfo.h"
#include <QApplication>
#include <QBoxLayout>
#include <QDialog>
@@ -118,8 +118,7 @@ void GUI::Util::Style::setResizable(QDialog* dialog)
}
}
-QWidget* GUI::Util::Style::createDetailsWidget(QWidget* content, const QString& name,
- bool expanded)
+QWidget* GUI::Util::Style::createDetailsWidget(QWidget* content, const QString& name, bool expanded)
{
auto result = createEmptyDetailsWidget(name, expanded);
result->setWidget(content);
diff --git a/GUI/Widget/Common/detailswidget.cpp b/GUI/Widget/Common/detailswidget.cpp
index df4046a177e..1460c594d8e 100644
--- a/GUI/Widget/Common/detailswidget.cpp
+++ b/GUI/Widget/Common/detailswidget.cpp
@@ -24,8 +24,8 @@
****************************************************************************/
#include "GUI/Widget/Common/detailswidget.h"
-#include "GUI/Widget/Common/detailsbutton.h"
#include "GUI/Util/hostosinfo.h"
+#include "GUI/Widget/Common/detailsbutton.h"
#include <QApplication>
#include <QCheckBox>
diff --git a/GUI/Widget/Info/ProjectLoadProblemDialog.cpp b/GUI/Widget/Info/ProjectLoadProblemDialog.cpp
index c6c18401414..d276e0c28e9 100644
--- a/GUI/Widget/Info/ProjectLoadProblemDialog.cpp
+++ b/GUI/Widget/Info/ProjectLoadProblemDialog.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Widget/Info/ProjectLoadProblemDialog.h"
-#include "GUI/Widget/Common/DesignerHelper.h"
#include "GUI/Util/Path.h"
+#include "GUI/Widget/Common/DesignerHelper.h"
#include <QBoxLayout>
#include <QGridLayout>
#include <QLabel>
diff --git a/Tests/Unit/GUI/TestComboProperty.cpp b/Tests/Unit/GUI/TestComboProperty.cpp
index cf3575efa7b..bb7d4dc2937 100644
--- a/Tests/Unit/GUI/TestComboProperty.cpp
+++ b/Tests/Unit/GUI/TestComboProperty.cpp
@@ -1,7 +1,7 @@
#include "GUI/Util/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Comparators.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
class TestComboProperty : public ::testing::Test {
public:
diff --git a/Tests/Unit/GUI/TestComponentProxyModel.cpp b/Tests/Unit/GUI/TestComponentProxyModel.cpp
index ec8a5269f47..1c556219215 100644
--- a/Tests/Unit/GUI/TestComponentProxyModel.cpp
+++ b/Tests/Unit/GUI/TestComponentProxyModel.cpp
@@ -11,7 +11,7 @@
#include "GUI/Model/Types/VectorItem.h"
#include "GUI/Util/ComboProperty.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
class TestComponentProxyModel : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index ae6e89dab1d..a9ee60edc06 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -9,7 +9,7 @@
#include "GUI/Util/Error.h"
#include "GUI/Util/MessageService.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
class TestDataItemViews : public ::testing::Test {
public:
diff --git a/Tests/Unit/GUI/TestGroupItem.cpp b/Tests/Unit/GUI/TestGroupItem.cpp
index bea21c25693..9a64fcd6aa7 100644
--- a/Tests/Unit/GUI/TestGroupItem.cpp
+++ b/Tests/Unit/GUI/TestGroupItem.cpp
@@ -6,7 +6,7 @@
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
class TestGroupItem : public ::testing::Test {
};
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 488a08ce41d..4d6c38adbb3 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -8,7 +8,7 @@
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
#include <QTest>
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index fbb39fc706b..7dd9d3ad8b0 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -14,7 +14,7 @@
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
#include <memory>
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index f949eaf0596..10c9627d780 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -9,7 +9,7 @@
#include "GUI/Model/Project/ProjectUtils.h"
#include "GUI/Util/Path.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
#include <QFileInfo>
#include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 76375df995b..4bd947ff677 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -7,12 +7,12 @@
#include "GUI/Model/Job/JobItemUtils.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Project/ProjectUtils.h"
-#include "GUI/View/Main/AutosaveController.h"
-#include "GUI/View/Main/SaveService.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
+#include "GUI/View/Main/AutosaveController.h"
+#include "GUI/View/Main/SaveService.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
#include <QSignalSpy>
class TestSaveService : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSavingSpecularData.cpp b/Tests/Unit/GUI/TestSavingSpecularData.cpp
index c908bec650e..6099a44803a 100644
--- a/Tests/Unit/GUI/TestSavingSpecularData.cpp
+++ b/Tests/Unit/GUI/TestSavingSpecularData.cpp
@@ -16,7 +16,7 @@
#include "GUI/Util/Error.h"
#include "GUI/Util/ItemFileNameUtils.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
class TestSavingSpecularData : public ::testing::Test {
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 92ce813cf32..40afae6bc81 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -13,7 +13,7 @@
//
// ************************************************************************************************
-#include "Tests/Unit/GUI/Util.h"
+#include "Tests/Unit/GUI/Utils.h"
#include "Device/Data/DataUtils.h"
#include "Device/Histo/IntensityDataIOFactory.h"
#include "GUI/Model/Data/RealDataItem.h"
--
GitLab