From 7f0588b2d5d861c8acefe202bc0d1395b6bffed5 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Fri, 7 Apr 2023 15:52:49 +0200
Subject: [PATCH] clang-format
---
Base/Py/PyUtils.cpp | 2 +-
Base/Util/FileSystemUtils.cpp | 2 +-
Device/Data/ArrayUtils.cpp | 2 +-
Device/Data/DataUtils.cpp | 2 +-
Device/IO/DataFormatUtils.cpp | 2 +-
GUI/Model/Data/JobItemUtils.cpp | 2 +-
GUI/Model/Model/ParameterTreeUtils.cpp | 2 +-
GUI/Support/Util/StyleUtils.cpp | 2 +-
GUI/View/Import/ImportDataUtils.cpp | 2 +-
GUI/View/Numeric/NumWidgetUtils.cpp | 2 +-
GUI/View/PlotUtil/RangeUtils.cpp | 2 +-
GUI/View/SampleDesigner/LayerEditorUtils.cpp | 2 +-
Img3D/Build/BuilderUtils.cpp | 2 +-
Sample/Material/MaterialUtils.cpp | 2 +-
Sample/Multilayer/MultilayerUtils.cpp | 2 +-
Sim/Fitting/ObjectiveMetricUtils.cpp | 2 +-
Tests/Unit/Base/FileSystemUtilsTest.cpp | 2 +-
Tests/Unit/Base/StringUtilsTest.cpp | 2 +-
Tests/Unit/Device/ArrayUtilsTest.cpp | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Base/Py/PyUtils.cpp b/Base/Py/PyUtils.cpp
index 94a803ad6be..4c5749041c1 100644
--- a/Base/Py/PyUtils.cpp
+++ b/Base/Py/PyUtils.cpp
@@ -14,8 +14,8 @@
#ifdef BORNAGAIN_PYTHON
-#include "Base/Py/PyUtil.h"
#include "Base/Py/PyCore.h"
+#include "Base/Py/PyUtil.h"
#include "Base/Util/Assert.h"
#include "Base/Util/SysUtil.h"
#include <iostream>
diff --git a/Base/Util/FileSystemUtils.cpp b/Base/Util/FileSystemUtils.cpp
index b4424f62846..00580225a41 100644
--- a/Base/Util/FileSystemUtils.cpp
+++ b/Base/Util/FileSystemUtils.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Base/Util/FileSystemUtil.h"
#include "Base/Util/Assert.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Base/Util/StringUtil.h"
#include <codecvt> //
#include <filesystem>
diff --git a/Device/Data/ArrayUtils.cpp b/Device/Data/ArrayUtils.cpp
index beca06cc878..cef60ee7d2c 100644
--- a/Device/Data/ArrayUtils.cpp
+++ b/Device/Data/ArrayUtils.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "Device/Data/ArrayUtil.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Util/Assert.h"
+#include "Device/Data/ArrayUtil.h"
#include "Device/Data/Datafield.h"
#include <stdexcept>
diff --git a/Device/Data/DataUtils.cpp b/Device/Data/DataUtils.cpp
index f41c14a8173..0a1cfe68578 100644
--- a/Device/Data/DataUtils.cpp
+++ b/Device/Data/DataUtils.cpp
@@ -12,13 +12,13 @@
//
// ************************************************************************************************
-#include "Device/Data/DataUtil.h"
#include "Base/Axis/Bin.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/Frame.h"
#include "Base/Math/FourierTransform.h"
#include "Base/Util/Assert.h"
#include "Device/Data/ArrayUtil.h"
+#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
#include <algorithm>
#include <cmath>
diff --git a/Device/IO/DataFormatUtils.cpp b/Device/IO/DataFormatUtils.cpp
index 76df5216d8c..7592f68ebaa 100644
--- a/Device/IO/DataFormatUtils.cpp
+++ b/Device/IO/DataFormatUtils.cpp
@@ -12,13 +12,13 @@
//
// ************************************************************************************************
-#include "Device/IO/DataFormatUtil.h"
#include "Base/Axis/DiscreteAxis.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/HistoAxis.h"
#include "Base/Util/FileSystemUtil.h"
#include "Base/Util/StringUtil.h"
#include "Device/Data/Datafield.h"
+#include "Device/IO/DataFormatUtil.h"
#include <functional>
#include <iostream>
#include <iterator>
diff --git a/GUI/Model/Data/JobItemUtils.cpp b/GUI/Model/Data/JobItemUtils.cpp
index c4517a21747..f06b395efda 100644
--- a/GUI/Model/Data/JobItemUtils.cpp
+++ b/GUI/Model/Data/JobItemUtils.cpp
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/JobItemUtil.h"
#include "Device/Coord/ICoordSystem.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/SimulationResult.h"
#include "GUI/Model/Data/DataItem.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Support/Util/CoordName.h"
diff --git a/GUI/Model/Model/ParameterTreeUtils.cpp b/GUI/Model/Model/ParameterTreeUtils.cpp
index 1b2f32b9313..252e4dee55a 100644
--- a/GUI/Model/Model/ParameterTreeUtils.cpp
+++ b/GUI/Model/Model/ParameterTreeUtils.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************************************
-#include "GUI/Model/Model/ParameterTreeUtil.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamAngleItems.h"
@@ -25,6 +24,7 @@
#include "GUI/Model/Device/SphericalDetectorItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
+#include "GUI/Model/Model/ParameterTreeUtil.h"
#include "GUI/Model/Sample/CompoundItem.h"
#include "GUI/Model/Sample/CoreAndShellItem.h"
#include "GUI/Model/Sample/LayerItem.h"
diff --git a/GUI/Support/Util/StyleUtils.cpp b/GUI/Support/Util/StyleUtils.cpp
index 3704443769a..de210adf670 100644
--- a/GUI/Support/Util/StyleUtils.cpp
+++ b/GUI/Support/Util/StyleUtils.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/Support/Util/StyleUtil.h"
#include "Base/Util/Assert.h"
#include "GUI/Support/Util/DesignerHelper.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include <QApplication>
#include <QBoxLayout>
#include <QDialog>
diff --git a/GUI/View/Import/ImportDataUtils.cpp b/GUI/View/Import/ImportDataUtils.cpp
index 40d30cd031f..ad2ef9e185c 100644
--- a/GUI/View/Import/ImportDataUtils.cpp
+++ b/GUI/View/Import/ImportDataUtils.cpp
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/Import/ImportDataUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DataFormatUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
+#include "GUI/View/Import/ImportDataUtil.h"
#include "GUI/View/Loaders/QREDataLoader.h"
#include <QApplication>
#include <QMessageBox>
diff --git a/GUI/View/Numeric/NumWidgetUtils.cpp b/GUI/View/Numeric/NumWidgetUtils.cpp
index a4e3838c6b3..b4b063106a6 100644
--- a/GUI/View/Numeric/NumWidgetUtils.cpp
+++ b/GUI/View/Numeric/NumWidgetUtils.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/Model/Data/ComboProperty.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Numeric/NumberUtil.h"
#include "GUI/View/Numeric/ScientificSpinBox.h"
#include <QCheckBox>
diff --git a/GUI/View/PlotUtil/RangeUtils.cpp b/GUI/View/PlotUtil/RangeUtils.cpp
index 6c285a3f8b8..9d4310fa04f 100644
--- a/GUI/View/PlotUtil/RangeUtils.cpp
+++ b/GUI/View/PlotUtil/RangeUtils.cpp
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/View/PlotUtil/RangeUtil.h"
#include "GUI/Model/Axis/AxisItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/Util/StyleUtil.h"
+#include "GUI/View/PlotUtil/RangeUtil.h"
#include <qcustomplot.h>
namespace {
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.cpp b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
index 902366960c6..85011fb73be 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
@@ -12,7 +12,6 @@
//
// ************************************************************************************************
-#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/CompoundItem.h"
#include "GUI/Model/Sample/CoreAndShellItem.h"
@@ -25,6 +24,7 @@
#include "GUI/View/SampleDesigner/CompoundForm.h"
#include "GUI/View/SampleDesigner/CoreAndShellForm.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "GUI/View/SampleDesigner/MesocrystalForm.h"
#include "GUI/View/SampleDesigner/ParticleForm.h"
#include <QLabel>
diff --git a/Img3D/Build/BuilderUtils.cpp b/Img3D/Build/BuilderUtils.cpp
index c290f062942..d76959e9533 100644
--- a/Img3D/Build/BuilderUtils.cpp
+++ b/Img3D/Build/BuilderUtils.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "Img3D/Build/BuilderUtil.h"
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
+#include "Img3D/Build/BuilderUtil.h"
#include "Img3D/Build/Particle3DContainer.h"
#include "Img3D/Model/ParticleFromFF.h"
#include "Img3D/Model/Particles.h"
diff --git a/Sample/Material/MaterialUtils.cpp b/Sample/Material/MaterialUtils.cpp
index bf922b59891..f0c6806f707 100644
--- a/Sample/Material/MaterialUtils.cpp
+++ b/Sample/Material/MaterialUtils.cpp
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "Sample/Material/MaterialUtil.h"
#include "Base/Const/PhysicalConstants.h"
#include "Base/Spin/SpinMatrix.h"
#include "Base/Util/Assert.h"
#include "Sample/Material/IMaterialImpl.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
+#include "Sample/Material/MaterialUtil.h"
using PhysConsts::g_factor_n;
using PhysConsts::h_bar;
diff --git a/Sample/Multilayer/MultilayerUtils.cpp b/Sample/Multilayer/MultilayerUtils.cpp
index b67640b6023..f49b73b1d99 100644
--- a/Sample/Multilayer/MultilayerUtils.cpp
+++ b/Sample/Multilayer/MultilayerUtils.cpp
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "Sample/Multilayer/MultilayerUtil.h"
#include "Base/Util/Assert.h"
#include "Sample/Interface/LayerInterface.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
+#include "Sample/Multilayer/MultilayerUtil.h"
const LayerRoughness* SampleUtils::Multilayer::LayerTopRoughness(const MultiLayer& sample, size_t i)
{
diff --git a/Sim/Fitting/ObjectiveMetricUtils.cpp b/Sim/Fitting/ObjectiveMetricUtils.cpp
index 806ad5ff0f2..538fbebaa4b 100644
--- a/Sim/Fitting/ObjectiveMetricUtils.cpp
+++ b/Sim/Fitting/ObjectiveMetricUtils.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Sim/Fitting/ObjectiveMetricUtil.h"
#include "Sim/Fitting/ObjectiveMetric.h"
+#include "Sim/Fitting/ObjectiveMetricUtil.h"
#include <algorithm>
#include <cmath>
#include <map>
diff --git a/Tests/Unit/Base/FileSystemUtilsTest.cpp b/Tests/Unit/Base/FileSystemUtilsTest.cpp
index 2c9b3b6bf21..e67e67b30c1 100644
--- a/Tests/Unit/Base/FileSystemUtilsTest.cpp
+++ b/Tests/Unit/Base/FileSystemUtilsTest.cpp
@@ -1,5 +1,5 @@
-#include "Base/Util/FileSystemUtil.h"
#include "BATesting.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <filesystem>
#include <fstream>
diff --git a/Tests/Unit/Base/StringUtilsTest.cpp b/Tests/Unit/Base/StringUtilsTest.cpp
index d841fc06754..ec60f3ce8b7 100644
--- a/Tests/Unit/Base/StringUtilsTest.cpp
+++ b/Tests/Unit/Base/StringUtilsTest.cpp
@@ -1,5 +1,5 @@
-#include "Base/Util/StringUtil.h"
#include "BATesting.h"
+#include "Base/Util/StringUtil.h"
#include "Tests/GTestWrapper/google_test.h"
TEST(StringUtilsTest, toInt)
diff --git a/Tests/Unit/Device/ArrayUtilsTest.cpp b/Tests/Unit/Device/ArrayUtilsTest.cpp
index 7eaeccea207..7ef8f9005aa 100644
--- a/Tests/Unit/Device/ArrayUtilsTest.cpp
+++ b/Tests/Unit/Device/ArrayUtilsTest.cpp
@@ -1,5 +1,5 @@
-#include "Device/Data/ArrayUtil.h"
#include "Base/Axis/FixedBinAxis.h"
+#include "Device/Data/ArrayUtil.h"
#include "Device/Data/Datafield.h"
#include "Tests/GTestWrapper/google_test.h"
#include <vector>
--
GitLab