diff --git a/App/AppOptions.cpp b/App/AppOptions.cpp
index 9177100cd156da64016d30105964973febaf9174..3e96eca7d0230ea8922b92b93cedc0e517ba6ff4 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 fe50c9789b1e08877737d06a2ed21658edf3c44c..da08f2e2c09cefb089ed027c9828ab5d6e458471 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 d693401a52a23f6afe8e9731dbdff57cae3fba94..50b4b701320acd39f8bab0d1f8f98d2286c0dcbc 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 d97f077286f8d4b7eebb51c2d13bdb8a4b4bffa7..b978203f7f982489628fe4c8af3d868b8672e807 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 3178fe8efeb3e81774c0f7b2faf306480d4c6162..e5db9e12d87334205f9c9ab5dfb92211d0ecc316 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 c9d489ae6a7adbc6b85f64bcf8ab2086e57b4acf..b6056c9487096bfac5de5ae5bf41ec95a369731a 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 276667a4f786e33fde36fdde390788ce5fef7c49..16dbdd658b20fc34d7cae7ed341c12e702b43585 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 01074b7a502dee19c70ab8e34b9bfa05f9066168..344cc869d5afb17cda0f0b40d58d71dcb78e3535 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 1cbce368851bd923baa422ae906fd7222a1c8c5f..b1d4d7fd3f29fc6ee5b32daf5aaee4d864060dbc 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 7a6c829ffde031d0894d38d58e34dcfdf4c8a648..5047f48a814f86f64d13bead756990ea93057a84 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 ae3122c822d5ce60f8449141a6163bfb0e178f40..b47af46ad9117333de0f2a35b196efc8a8244401 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 2ae8e9016a8a36a4264851b3a183e09651679ff4..3cefe10bb16494cd6e54a2f41a97156592329b99 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 6f1ebbbf9a03bf0d223649ca8882898bdfbc10c9..1112e6fe746ef7debbf96d96a3239a2f54c16a5b 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 3e79d436fb193940b6b946c6248c56b30038f481..fcb56d5ce2fdfa77b553e884f1dd45a7d66b46e3 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 ebfd64f182c63301c6c3b5745536437020b09ab2..125e8e7b1e913e969305a1edf2550b3006dd8875 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 913cb71aa00850c7924a124974b157bb6504e121..853aa3e9a411f1100ff639e8db459393280f9a20 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 20ef1735a4434f05e55cc7d0a39674c8a2228293..4116a582272a9ebe003fc2e47297a25881daf7f0 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 c576be2ba1a522f71fe2631084c66d17aabd0231..f442e98fe7e4837fd14de27b9cf0a7b00dc21afc 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 9383e94b991e00835cabf40a4f8a2624ee7fd6c4..920f7317e35949453042b239a77823f77e30c1f8 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 c5b6bb4304690676fa4a778100e62d8d6570fd07..ce6141531ea0df84c79509bd0897bfdeb74830e8 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 6d861457312a5979c50244d584ccdc90d2aaeb97..5ae08786a617cfcc5d4a026281374550eb56fc6e 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 033566bfcd1aab8ce984290cd7356d551ca65e02..0846d6e2aae3f620af49a061af39ce02a10980b5 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 6c1d9eeec190a56155d0a2a7d62c9d42bc8d5a1d..6414e3af644a0d00796217894ee74df4a96447f6 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 9b586e6fcd1c8a698fdca4162ed9ddfcd00879de..9682f267c7b0911ed101e31463412f4950c49e56 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 e9f8dac76b7453d2345e3098077f004e7fbd8d53..ae2bdc6adf6796ae8ca89c8041b0a36c2ef0c48d 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 be3b026d3f9199d471828eccca8635fb73b351a3..a70fab2f1bb923f0181ea344612dd430b9571df9 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 91e3fda16e90e4bdfed9ffbb27ee2c8c8579134b..d5913d942e2d0c2fdf86c87ce7ecb16d4b2154c7 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 30fdd57d9177f9e98a13fa769aabac37d7e968dd..c3791b954d7ec1cb59fbe37b9e4df30943f853cc 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 bc1892f6a4113e47163691cf2d831cb5c4f0d3cb..3207ec0f3cf0c870eb50cafc3d714a42c385cf9b 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 6de16eee90343639425c16b124b992582d200325..2d389978186a819d2e340997a141942c453b5c8d 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 fa8771718c2f747d84c6af1191f2d7cbbb43f591..d82f05a6115818abde9c310e72d9dde325ef614a 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 d98e8537463796df66a4f7edd63e99c89b91e9a3..9782800ab4ed8e8b6bb0fed0a965eb4712cd9385 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 e13ead4eb531028e04b57907176f17a93c6a60b6..8b4b467920e23bc8fecd196e5141f409bc03016c 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 6995fed8be3ac606ca16211fee90a5334bd9fe74..075d24c9395afb8010322ec364c54991935ee4f8 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 9291632ef6074a863eeca4e83064899dd9a8104f..62d00b0e315d3e655a23626ade66e1820c281c20 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 a5a7a125baea89e00216ee0a375ccf9b0df90648..1295af14885f01a6c9758edbfc9f653510fa04d8 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 b76cf9c5d27a9af6d2b2d2aeca51cc0214f687df..e1798f6ec1943225897c185f5642f1bc302e4e43 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 390faf65b3f9d76d6b4bcc0ccf3020283dd209d2..d54ab79b1a9654d69d66df55ad63adab81bb9fd1 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 02e2c46b52b9e4e1cd7eff8006501f94ee63542d..81169814df5c3018c09ce15346715769a0803958 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 167264975ffc5f8e9148410a95ebffbce14811e9..6292bf5d29d1a9d326a1c93726320b81d56f919d 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 f87373511ef25d025915bd42536ef80c56b7ddbf..d95741da2d71d8a45772658c3d5c681d94174577 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 bfcad75d3df0e3275e09d135df0a62664a302b02..ef51924ccf7655a2ea5d9955f7a6f47f7014db66 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 980e6fabd9ed487e5a9b621056359d31588d648a..9b8b88445532a926ffe7a68062e730abb6b8522b 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 5c550b081cf8fe6b758f52c26031a1d8dc0f1259..1fa4acbbbe789521618024e8bebfde7e1c105a04 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 6aff4d96b96f7fef5647de1184074fd64522bf02..2535a457a0a53336816916d820d77648c0d736c8 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 3a6ceddd828651232b50295a1b69ff7605e34b49..875cdbc5147ce1aefa37baab1dcb2734e945b0f1 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 412fed2e0b8ec27ecd23daee5960e85c329c6e6c..53ea74fa02d12e95899a35f429bcf5c58635b9d4 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 5799b86a8986418a725ff54bd9b4ce04e38c2105..1005f9f72d83c194f5cc1baae5a62ec590652a1f 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 2965773715049ff1ae8a989147d7998f1aca0077..d7801c9f9100f74da2509eaf810a19f003476ae7 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 e9dd8ac85046fd48bfd65d5035d82b14e831b737..dea0a47da53c0b0a5965d09dabd379995fb2fa6a 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 7a5b8d0c9cf37601f4f322e0f27310fe0e21203f..c0805b54fce3e5efddac1720fec5b2022f4b3b2a 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 da556881c2eb40ef6d00b0bbc809716927e98635..918779e822bdf4f9001944c5f59a451de251935e 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 b865707751f90fc52f6b29c0f3510ce8796f79bf..adf359db713b14a19c30c5d2afd64354f79fcc72 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 6d4638ea9a446f0628f9d7509b9054521c6624e6..86fef809a82bf0cc8c0d7891e520e593c0082375 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 c55b4bb0b0d2ea133258f13320e5f29b595fef38..ece5122592e94f270715e4f535f4cb2bca88b87e 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 6327a2f5dc81dd8bab954b8ee8f36acebd5bf533..65d677195dc797cfbaf18bfa03c4b59d152d537a 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 6954c6e5f7f12416eebdc6cc9966c81d4318df26..d9766489faccaa2c1a175fad60fe4719215c0852 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 9fd1ee83d0bbc9010c17da36751e3dee44e15cef..fdd7bc5f1ff629ba81a8a8d83916507a5db2b6b4 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 b77c121e573b04895625da4ea9e95732854e6d7a..9391928349b76f1b3c36bc0d531b68b449757ca4 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 cd9b475476ce7ea311fab99b6565fbdb4815fc17..7b93bfeecbf5d06fe3375519ee8c3a22cf165a48 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 ffc58e9adcf1cf5d321acd3f605e2d49831ceece..e76bc18b5e924b3afd33d84e8014249b7a06a4b3 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 5fa16795c7e62b846378cbc4a30f5455cf26ce84..7f5a2630fcac66240007038bf7af1e1b4847f4db 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 439b4fe6f485abaddd5190e20f47404f5a8db249..c5ee023ee6e9afe9aca090acf3174612479a806c 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 e25b9d86e343563fd9a9194a23ea84c11e0ad3ab..2465b8add51dd5a60367462417c2c64906f978d5 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 a933ecffcb59f80d9484ca8493838823c09a9425..12de8c0471bf50296e5fcd5934630f863ed5d55a 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 dbcebf7787b151bae4cf767d133c582384ce42b2..66fdf85c277eb0958a5ae073a0b88e0435567c87 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 984576970813d45902424166b449b233e0c96293..49902a66bc5dc2fca7af6529503a99979ceb5cd9 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 28962c6b7511a953415cbeddba536d71d872e6db..2d7e77f5d152830b40b3a7c68b155f9324890124 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 68c1ca20d13fc83b863824701b9d2646c1ac6db0..8ee5b649a8c5546fffa81e64e96874c86be69b59 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 df4046a177ec21ed7c2f19d2142e399579509798..1460c594d8e784078b8e1d21fa4bb30726377aeb 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 c6c18401414e130c5859a290cbbb7c535d02df3d..d276e0c28e9a7bd1dc3d35138ee41b2af635fed6 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 cf3575efa7bb8d57c082a84c62135a8c6866758d..bb7d4dc293748dc1ea92e73effa65f3617e9c553 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 ec8a5269f47183d6299f5deb9c831bde6c836993..1c55621921560b04a9e370fd36824b8700b65c40 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 ae6e89dab1d0323ea3654f495bc2c55809b8f74f..a9ee60edc068e8e63dc15e492d0f2afcba4cc15d 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 bea21c256930ce8dbc46d1808d7e537ef074a27a..9a64fcd6aa7360a2a7e287de71bd4e908e43c9c1 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 488a08ce41d7dcfe27e0c3b390d1210deac5291b..4d6c38adbb3242433e20d37afbed20547da776b1 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 fbb39fc706bc9b1f27311608b5b42258a11b4433..7dd9d3ad8b0db015f9df26b13faafafac589b5aa 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 f949eaf0596b7ea38cfae7e914a3e21e3cb041ac..10c9627d780824fc302f1def6e683eb8d73091b8 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 76375df995b59eb587d2c282eb0e77230f6a5db4..4bd947ff677ca091e6df7e9ac11ee0c971abbf85 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 c908bec650e0c30e6d8d26f1689b127ad2c4d2b6..6099a44803a0c33d1d056cbc8c6cd4c3c16b9361 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 92ce813cf32cb63847c257195518167b341d134e..40afae6bc815fd4807895f2e352a32c6eb80bb9c 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"