diff --git a/Core/Algorithms/FitElement.cpp b/Core/Algorithms/FitElement.cpp
index b51f8a99c9f2468a21fd392cc659fc164acb538d..868d7f0fee4d5695ec457da5fae99398c9bf1250 100644
--- a/Core/Algorithms/FitElement.cpp
+++ b/Core/Algorithms/FitElement.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <algorithm>
#include "FitElement.h"
+#include <algorithm>
FitElement::FitElement()
: m_index(0)
diff --git a/Core/Algorithms/IDetectorResolution.cpp b/Core/Algorithms/IDetectorResolution.cpp
index fcb4514b31f0320e270e8d751bf036e46c4b7205..438574db8ebbb582b688fcaf0e70f48c5bda748b 100644
--- a/Core/Algorithms/IDetectorResolution.cpp
+++ b/Core/Algorithms/IDetectorResolution.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include <memory>
#include "OutputDataFunctions.h"
#include "IDetectorResolution.h"
+#include <memory>
void IDetectorResolution::applyDetectorResolutionPol(
OutputData<Eigen::Matrix2d>* p_matrix_intensity) const
diff --git a/Core/Algorithms/IIntensityFunction.cpp b/Core/Algorithms/IIntensityFunction.cpp
index 085db13b7c8159a8caff02f33c82dd400cacddb1..f3eb5d8a0c712252ab7c7e2c6e57079ac147d537 100644
--- a/Core/Algorithms/IIntensityFunction.cpp
+++ b/Core/Algorithms/IIntensityFunction.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <cmath>
#include "IIntensityFunction.h"
+#include <cmath>
double IntensityFunctionLog::evaluate(double value) const
{
diff --git a/Core/Algorithms/LayerSpecularInfo.h b/Core/Algorithms/LayerSpecularInfo.h
index b681def0099d2c3c5684a6654e6602a7c9ef6caa..5f621522de52634dd4a96ec56997f9666a219675 100644
--- a/Core/Algorithms/LayerSpecularInfo.h
+++ b/Core/Algorithms/LayerSpecularInfo.h
@@ -16,9 +16,9 @@
#ifndef LAYERSPECULARINFO_H
#define LAYERSPECULARINFO_H
-#include <memory>
#include "ICloneable.h"
#include "ISpecularInfoMap.h"
+#include <memory>
//! @class LayerSpecularInfo
diff --git a/Core/Algorithms/LayerStrategyBuilder.h b/Core/Algorithms/LayerStrategyBuilder.h
index e1ef6c7cdb95f86a1b106267a5517191f287fa8e..7d3af9497d21e12934b7d1b8ab07ecebf7ddf307 100644
--- a/Core/Algorithms/LayerStrategyBuilder.h
+++ b/Core/Algorithms/LayerStrategyBuilder.h
@@ -16,10 +16,10 @@
#ifndef LAYERSTRATEGYBUILDER_H
#define LAYERSTRATEGYBUILDER_H
-#include <memory>
#include "IMaterial.h"
#include "SafePointerVector.h"
#include "SimulationOptions.h"
+#include <memory>
class FormFactorInfo;
class IInterferenceFunctionStrategy;
diff --git a/Core/Algorithms/ProgressHandler.cpp b/Core/Algorithms/ProgressHandler.cpp
index dce8d00b846202b5a0edbccae812a982e8e412a2..78fbd89429a34279e9ddf27fdb591d41632c7794 100644
--- a/Core/Algorithms/ProgressHandler.cpp
+++ b/Core/Algorithms/ProgressHandler.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <mutex>
#include "MultiLayer.h"
+#include <mutex>
ProgressHandler::ProgressHandler()
diff --git a/Core/Algorithms/Simulation.cpp b/Core/Algorithms/Simulation.cpp
index 8933fe8d7656846dc4c85212879d10a4143dd86a..5b7a1a7ee1d333417c8b914a864d06e38024a6f8 100644
--- a/Core/Algorithms/Simulation.cpp
+++ b/Core/Algorithms/Simulation.cpp
@@ -13,11 +13,11 @@
//
// ************************************************************************** //
-#include <thread>
-#include <gsl/gsl_errno.h>
#include "DWBASimulation.h"
#include "MessageService.h"
#include "OMPISimulation.h"
+#include <thread>
+#include <gsl/gsl_errno.h>
Simulation::Simulation()
diff --git a/Core/Algorithms/SimulationElement.h b/Core/Algorithms/SimulationElement.h
index 72aa3b0450f5843a177c4e9dda1d8719431abcb3..56f03b5d71349a133897ed08e59b01bfc2aaaad0 100644
--- a/Core/Algorithms/SimulationElement.h
+++ b/Core/Algorithms/SimulationElement.h
@@ -16,11 +16,11 @@
#ifndef SIMULATIONELEMENT_H
#define SIMULATIONELEMENT_H
-#include <memory>
#include "Complex.h"
#include "EigenCore.h"
#include "IParameterized.h"
#include "IPixelMap.h"
+#include <memory>
//! @class SimulationElement
//! @ingroup simulation
diff --git a/Core/Algorithms/SimulationOptions.cpp b/Core/Algorithms/SimulationOptions.cpp
index 0d808c40f342104a60cbab77cf52a287c99379a4..2f2546c3bf5393b82998773405965378f8dbd608 100644
--- a/Core/Algorithms/SimulationOptions.cpp
+++ b/Core/Algorithms/SimulationOptions.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <thread>
#include "SimulationOptions.h"
+#include <thread>
SimulationOptions::SimulationOptions()
: m_mc_integration(false)
diff --git a/Core/Algorithms/SpecularMagnetic.cpp b/Core/Algorithms/SpecularMagnetic.cpp
index 3d63ce4a9d737208e5797cd068a3a9e25126ca91..c3bece7f5d58db4515f9271e9f02afd15cbaf04e 100644
--- a/Core/Algorithms/SpecularMagnetic.cpp
+++ b/Core/Algorithms/SpecularMagnetic.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <Eigen/LU>
#include "SpecularMagnetic.h"
+#include <Eigen/LU>
static complex_t I(0.,1.);
diff --git a/Core/FormFactors/FormFactorDecoratorMaterial.h b/Core/FormFactors/FormFactorDecoratorMaterial.h
index 7e6faa5935d0e47451cccf3438350294265521e4..204c30a0fc3985e7ae10d6d2cf7cc7e6edf6a738 100644
--- a/Core/FormFactors/FormFactorDecoratorMaterial.h
+++ b/Core/FormFactors/FormFactorDecoratorMaterial.h
@@ -16,9 +16,9 @@
#ifndef FORMFACTORDECORATORMATERIAL_H
#define FORMFACTORDECORATORMATERIAL_H
-#include <memory>
#include "FormFactorDecoratorFactor.h"
#include "HomogeneousMaterial.h"
+#include <memory>
//! @class FormFactorDecoratorMaterial
//! @ingroup formfactors_decorations
diff --git a/Core/FormFactors/FormFactorDecoratorRotation.cpp b/Core/FormFactors/FormFactorDecoratorRotation.cpp
index 55a87b24ed1cc15b2e538cb73a057b9680bcdf0d..8384e9d4b3d86e41b286adf1e53fc4d0a996a890 100644
--- a/Core/FormFactors/FormFactorDecoratorRotation.cpp
+++ b/Core/FormFactors/FormFactorDecoratorRotation.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include <memory>
#include "BornAgainNamespace.h"
#include "FormFactorDecoratorRotation.h"
+#include <memory>
FormFactorDecoratorRotation::FormFactorDecoratorRotation(
const IFormFactor& form_factor, const IRotation& transform)
diff --git a/Core/FormFactors/FormFactorFullSpheroid.h b/Core/FormFactors/FormFactorFullSpheroid.h
index 733b50592bdefad9be99d22935c33c0660d0de7a..3c7d2a8cbf638f8ff3a1778a3973977951e24d7b 100644
--- a/Core/FormFactors/FormFactorFullSpheroid.h
+++ b/Core/FormFactors/FormFactorFullSpheroid.h
@@ -16,9 +16,9 @@
#ifndef FORMFACTORFULLSPHEROID_H
#define FORMFACTORFULLSPHEROID_H
-#include <memory>
#include "IFormFactorBorn.h"
#include "IntegratorComplex.h"
+#include <memory>
//! @class FormFactorFullSpheroid
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorHemiEllipsoid.h b/Core/FormFactors/FormFactorHemiEllipsoid.h
index 6dfea43b47410e4409b011e66095bfe6830a11d1..a74013313acc9709a6ec3ca34659d93f64833256 100644
--- a/Core/FormFactors/FormFactorHemiEllipsoid.h
+++ b/Core/FormFactors/FormFactorHemiEllipsoid.h
@@ -16,9 +16,9 @@
#ifndef FORMFACTORHEMIELLIPSOID_H
#define FORMFACTORHEMIELLIPSOID_H
-#include <memory>
#include "IFormFactorBorn.h"
#include "IntegratorComplex.h"
+#include <memory>
//! @class FormFactorHemiEllipsoid
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorLongRipple1Gauss.h b/Core/FormFactors/FormFactorLongRipple1Gauss.h
index dab77800ea6a0e9b32def9bac16766a27607b908..c71d40cd79bad1d1a765e0ae73bdf508faa3969d 100644
--- a/Core/FormFactors/FormFactorLongRipple1Gauss.h
+++ b/Core/FormFactors/FormFactorLongRipple1Gauss.h
@@ -16,9 +16,9 @@
#ifndef FORMFACTORLONGRIPPLE1GAUSS_H
#define FORMFACTORLONGRIPPLE1GAUSS_H
-#include <memory>
#include "IFormFactorBorn.h"
#include "IntegratorComplex.h"
+#include <memory>
//! @class FormFactorLongRipple1Gauss
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorLongRipple1Lorentz.h b/Core/FormFactors/FormFactorLongRipple1Lorentz.h
index 06cf8da7a73341d0615ffacc0b7e950fb4c92e47..9105772701ed2f0d49ca4349943882b7ac95bea6 100644
--- a/Core/FormFactors/FormFactorLongRipple1Lorentz.h
+++ b/Core/FormFactors/FormFactorLongRipple1Lorentz.h
@@ -16,9 +16,9 @@
#ifndef FORMFACTORLONGRIPPLE1LORENTZ_H
#define FORMFACTORLONGRIPPLE1LORENTZ_H
-#include <memory>
#include "IFormFactorBorn.h"
#include "IntegratorComplex.h"
+#include <memory>
//! @class FormFactorLongRipple1Lorentz
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorPolyhedron.cpp b/Core/FormFactors/FormFactorPolyhedron.cpp
index 83d4f2a60f444209bbd1e245aae9578c73dc145d..1194964478e3bfc77307ec9f00c9122f842de60c 100644
--- a/Core/FormFactors/FormFactorPolyhedron.cpp
+++ b/Core/FormFactors/FormFactorPolyhedron.cpp
@@ -17,11 +17,11 @@
//! by Joachim Wuttke, entitled
//! "Form factor (Fourier shape transform) of polygon and polyhedron."
-#include <iomanip>
#include "BornAgainNamespace.h"
#include "MathFunctions.h"
#include "Precomputed.h"
#include "FormFactorPolyhedron.h"
+#include <iomanip>
static const complex_t I(0.,1.);
static const double eps(2e-16);
diff --git a/Core/FormFactors/FormFactorPolyhedron.h b/Core/FormFactors/FormFactorPolyhedron.h
index ec6830439195829aa16d03ee2d7e69b19fd0838f..15f7ad834b127236506832dc11c0e3562fa03c2d 100644
--- a/Core/FormFactors/FormFactorPolyhedron.h
+++ b/Core/FormFactors/FormFactorPolyhedron.h
@@ -16,8 +16,8 @@
#ifndef FORMFACTORPOLYHEDRON_H
#define FORMFACTORPOLYHEDRON_H
-#include <memory>
#include "IFormFactorBorn.h"
+#include <memory>
class PolygonalTopology {
public:
diff --git a/Core/FormFactors/FormFactorRipple1.h b/Core/FormFactors/FormFactorRipple1.h
index ee086e7b83fe2f1679e33ec904727ec6202d9cf7..8f16bc58f57803c340807f0e6669e9fbab7599d1 100644
--- a/Core/FormFactors/FormFactorRipple1.h
+++ b/Core/FormFactors/FormFactorRipple1.h
@@ -16,9 +16,9 @@
#ifndef FORMFACTORRIPPLE1_H
#define FORMFACTORRIPPLE1_H
-#include <memory>
#include "IFormFactorBorn.h"
#include "IntegratorComplex.h"
+#include <memory>
//! @class FormFactorRipple1
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorTruncatedSphere.h b/Core/FormFactors/FormFactorTruncatedSphere.h
index 2577bd59658c08715774f092ec76374113acd34e..2eff85f44d8e2fca61f38a5b01f4bd9960d4e5b8 100644
--- a/Core/FormFactors/FormFactorTruncatedSphere.h
+++ b/Core/FormFactors/FormFactorTruncatedSphere.h
@@ -16,9 +16,9 @@
#ifndef FORMFACTORTRUNCATEDSPHERE_H
#define FORMFACTORTRUNCATEDSPHERE_H
-#include <memory>
#include "IFormFactorBorn.h"
#include "IntegratorComplex.h"
+#include <memory>
//! @class FormFactorTruncatedSphere
//! @ingroup formfactors
diff --git a/Core/FormFactors/FormFactorTruncatedSpheroid.h b/Core/FormFactors/FormFactorTruncatedSpheroid.h
index 2bb3e2427dd88c14f48e7f6d1517859f6ee3b142..6f59018efbc10b03b3522cf03fdecad615c3ad75 100644
--- a/Core/FormFactors/FormFactorTruncatedSpheroid.h
+++ b/Core/FormFactors/FormFactorTruncatedSpheroid.h
@@ -16,9 +16,9 @@
#ifndef FORMFACTORTRUNCATEDSPHEROID_H
#define FORMFACTORTRUNCATEDSPHEROID_H
-#include <memory>
#include "IFormFactorBorn.h"
#include "IntegratorComplex.h"
+#include <memory>
//! @class FormFactorTruncatedSpheroid
//! @ingroup formfactors
diff --git a/Core/Geometry/BasicVector3D.h b/Core/Geometry/BasicVector3D.h
index 309acb1d03748282d25409657376e3649d6ab5a8..793161a608da6d5b61254c24cd9243f7c39edffb 100644
--- a/Core/Geometry/BasicVector3D.h
+++ b/Core/Geometry/BasicVector3D.h
@@ -20,8 +20,8 @@
#ifndef BASICVECTOR3D_H
#define BASICVECTOR3D_H
-#include <complex>
#include "Exceptions.h"
+#include <complex>
static const double PI2 = 6.28318530717958647692528676655900577;
diff --git a/Core/Geometry/IShape2D.h b/Core/Geometry/IShape2D.h
index de02441218488502beff41e3ff7cce589a7ce937..cad6e78c2f8be8d0673f7fbe23a6586e5ba9ffd6 100644
--- a/Core/Geometry/IShape2D.h
+++ b/Core/Geometry/IShape2D.h
@@ -16,8 +16,8 @@
#ifndef ISHAPE2D_H
#define ISHAPE2D_H
-#include <iostream>
#include "ICloneable.h"
+#include <iostream>
struct Bin1D;
diff --git a/Core/Geometry/Polygon.h b/Core/Geometry/Polygon.h
index 298153dd3f9881f4168acffd2cba5ec467a6ae47..7b915a3f7163bee8ce00518d38c2b021ff92c5ea 100644
--- a/Core/Geometry/Polygon.h
+++ b/Core/Geometry/Polygon.h
@@ -16,8 +16,8 @@
#ifndef POLYGON_H
#define POLYGON_H
-#include <vector>
#include "IShape2D.h"
+#include <vector>
namespace Geometry {
diff --git a/Core/Geometry/Transform3D.cpp b/Core/Geometry/Transform3D.cpp
index 6d9e0efe29e5454dfd7490ec90da971937346eff..5fa7ec23aed8445f5206044d0566f54a100c6a35 100644
--- a/Core/Geometry/Transform3D.cpp
+++ b/Core/Geometry/Transform3D.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <Eigen/LU>
#include "Transform3D.h"
+#include <Eigen/LU>
Geometry::Transform3D::Transform3D()
diff --git a/Core/InputOutput/OutputDataReader.cpp b/Core/InputOutput/OutputDataReader.cpp
index e8faabd430fdbe41a23f8641ff4c6691aa95e472..236dcc5a618779bad9d32e47ba4d59a2c27db2eb 100644
--- a/Core/InputOutput/OutputDataReader.cpp
+++ b/Core/InputOutput/OutputDataReader.cpp
@@ -12,11 +12,11 @@
//! @authors C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
//
// ************************************************************************** //
-#include <fstream>
#include "OutputData.h"
#include "OutputDataIOHelper.h"
#include "boost_streams.h"
#include "OutputDataReader.h"
+#include <fstream>
OutputDataReader::OutputDataReader(const std::string& file_name)
: m_file_name(file_name)
diff --git a/Core/InputOutput/OutputDataReader.h b/Core/InputOutput/OutputDataReader.h
index 0dc2a9cc82229f8598d76239a7d7b8e23e8d221e..ed7c69471c62923749a55c3cea248b6ea781256c 100644
--- a/Core/InputOutput/OutputDataReader.h
+++ b/Core/InputOutput/OutputDataReader.h
@@ -16,8 +16,8 @@
#ifndef OUTPUTDATAREADER_H
#define OUTPUTDATAREADER_H
-#include <memory>
#include "OutputDataReadStrategy.h"
+#include <memory>
template <class T> class OutputData;
diff --git a/Core/InputOutput/OutputDataWriteStrategy.cpp b/Core/InputOutput/OutputDataWriteStrategy.cpp
index 5569d37e29f0e84c286678f980d481fa54dee461..d9f488f827fb78d983d8b8411b462def473541b3 100644
--- a/Core/InputOutput/OutputDataWriteStrategy.cpp
+++ b/Core/InputOutput/OutputDataWriteStrategy.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "BornAgainNamespace.h"
#include "TiffHandler.h"
#include "OutputDataWriteStrategy.h"
+#include <iomanip>
static const int precision { 12 };
diff --git a/Core/InputOutput/OutputDataWriter.cpp b/Core/InputOutput/OutputDataWriter.cpp
index 52f25cbc3db7452aef2ac02da5e84cf6c62eecef..7853939ba4f35fc34deedb8cf8b19fbdac9f38cc 100644
--- a/Core/InputOutput/OutputDataWriter.cpp
+++ b/Core/InputOutput/OutputDataWriter.cpp
@@ -13,11 +13,11 @@
//
// ************************************************************************** //
-#include <fstream>
#include "OutputData.h"
#include "OutputDataIOHelper.h"
#include "boost_streams.h"
#include "OutputDataWriter.h"
+#include <fstream>
OutputDataWriter::OutputDataWriter(const std::string &file_name)
: m_file_name(file_name)
diff --git a/Core/InputOutput/OutputDataWriter.h b/Core/InputOutput/OutputDataWriter.h
index d502937beaa4802a17bdae8feaba3b8b9ed33f3b..cfa33e581e4fc35c127a9fee7f3fdcd093c91847 100644
--- a/Core/InputOutput/OutputDataWriter.h
+++ b/Core/InputOutput/OutputDataWriter.h
@@ -16,8 +16,8 @@
#ifndef OUTPUTDATAWRITER_H
#define OUTPUTDATAWRITER_H
-#include <memory>
#include "OutputDataWriteStrategy.h"
+#include <memory>
template <class T> class OutputData;
diff --git a/Core/InputOutput/TiffHandler.h b/Core/InputOutput/TiffHandler.h
index b6f4150339b003e774b0346634e9e2d97c12b321..b7f46e0c9e6c0bd68418c36f3fb8b30d25474d2d 100644
--- a/Core/InputOutput/TiffHandler.h
+++ b/Core/InputOutput/TiffHandler.h
@@ -18,10 +18,10 @@
#ifdef BORNAGAIN_TIFF_SUPPORT
+#include "OutputData.h"
#include <memory>
#include <tiffio.h>
#include <tiffio.hxx>
-#include "OutputData.h"
//! @class TiffHandler
//! @ingroup input_output_internal
diff --git a/Core/Samples/IParticle.h b/Core/Samples/IParticle.h
index 6e63be48f56e68d58569bf2640aceecaff8be983..ca1d7844f251ec5777c82a35f82dbe19b000f813 100644
--- a/Core/Samples/IParticle.h
+++ b/Core/Samples/IParticle.h
@@ -16,9 +16,9 @@
#ifndef IPARTICLE_H
#define IPARTICLE_H
-#include <memory>
#include "ICompositeSample.h"
#include "IMaterial.h"
+#include <memory>
//! @class IAbstractParticle
//! @ingroup samples
diff --git a/Core/Samples/InterferenceFunction2DParaCrystal.h b/Core/Samples/InterferenceFunction2DParaCrystal.h
index 8e6d6d507910b66870506c0a36a1992ca85b2f84..118240a80e5e985974dc1b89ae60df825aa70d9b 100644
--- a/Core/Samples/InterferenceFunction2DParaCrystal.h
+++ b/Core/Samples/InterferenceFunction2DParaCrystal.h
@@ -16,11 +16,11 @@
#ifndef INTERFERENCEFUNCTION2DPARACRYSTAL_H
#define INTERFERENCEFUNCTION2DPARACRYSTAL_H
-#include <memory>
#include "Complex.h"
#include "FTDistributions.h"
#include "IInterferenceFunction.h"
#include "Lattice2DParameters.h"
+#include <memory>
// Forward declaration to prevent IntegratorReal.h to be parsed for Python API:
template <class T> class IntegratorReal;
diff --git a/Core/Samples/InterferenceFunctionRadialParaCrystal.h b/Core/Samples/InterferenceFunctionRadialParaCrystal.h
index e77120889b7fa85d47b39ee4ea60cff3368aea8f..69eacaa48d1b980f652665e8b9a68e657935cdd9 100644
--- a/Core/Samples/InterferenceFunctionRadialParaCrystal.h
+++ b/Core/Samples/InterferenceFunctionRadialParaCrystal.h
@@ -16,10 +16,10 @@
#ifndef INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
#define INTERFERENCEFUNCTIONRADIALPARACRYSTAL_H
-#include <memory>
#include "Complex.h"
#include "FTDistributions.h"
#include "IInterferenceFunction.h"
+#include <memory>
//! @class InterferenceFunctionRadialParaCrystal
//! @ingroup interference
diff --git a/Core/Samples/Lattice.cpp b/Core/Samples/Lattice.cpp
index 66af5593c3e60344f2888db5e05fd6202d55a9a9..17b8487bd52c282e0749cf4ac677141a213f962a 100644
--- a/Core/Samples/Lattice.cpp
+++ b/Core/Samples/Lattice.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include <gsl/gsl_linalg.h>
#include "Units.h"
#include "Lattice.h"
+#include <gsl/gsl_linalg.h>
Lattice::Lattice()
: mp_selection_rule(0)
diff --git a/Core/Samples/ParticleLayout.cpp b/Core/Samples/ParticleLayout.cpp
index 1ff08d3fcd7d514cb8516b8386cbfbce77fcc75d..436f432a0c349273263e59276226e241c5e5cc83 100644
--- a/Core/Samples/ParticleLayout.cpp
+++ b/Core/Samples/ParticleLayout.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "ParticleDistribution.h"
#include "SizeSpacingCorrelationApproximationStrategy.h"
#include "ParticleLayout.h"
+#include <iomanip>
ParticleLayout::ParticleLayout()
diff --git a/Core/Samples/SampleTreeIterator.h b/Core/Samples/SampleTreeIterator.h
index 7b0623cc229ec8c047e6e3d04e99857b15133756..40a7cb1e7363ac25e9441eaed884ce58f8c6552f 100644
--- a/Core/Samples/SampleTreeIterator.h
+++ b/Core/Samples/SampleTreeIterator.h
@@ -16,8 +16,8 @@
#ifndef SAMPLETREEITERATOR_H
#define SAMPLETREEITERATOR_H
-#include <stack>
#include "ICompositeSample.h"
+#include <stack>
//! @class IteratorState
diff --git a/Core/TestMachinery/FunctionalTestRegistry.h b/Core/TestMachinery/FunctionalTestRegistry.h
index e439e7278b919560b0c089cad75c540c4a8c3031..fd9aef2f64667ceb25ed4ff6be9435bd739d051e 100644
--- a/Core/TestMachinery/FunctionalTestRegistry.h
+++ b/Core/TestMachinery/FunctionalTestRegistry.h
@@ -16,9 +16,9 @@
#ifndef FUNCTIONALTESTREGISTRY_H
#define FUNCTIONALTESTREGISTRY_H
-#include <map>
#include "FunctionalTestInfo.h"
#include "ISingleton.h"
+#include <map>
//! @class FunctionalTestRegistry
//! @ingroup standard_samples
diff --git a/Core/TestMachinery/IFunctionalTest.h b/Core/TestMachinery/IFunctionalTest.h
index 90896d71e8f2906feb8a07c997436d4842c27d22..1a4f979a9cdeb41cb21f175df72599f5aa1b276b 100644
--- a/Core/TestMachinery/IFunctionalTest.h
+++ b/Core/TestMachinery/IFunctionalTest.h
@@ -16,8 +16,8 @@
#ifndef IFUNCTIONALTEST_H
#define IFUNCTIONALTEST_H
-#include <map>
#include "INamed.h"
+#include <map>
//! @class IFunctionalTest
//! @ingroup standard_samples
diff --git a/Core/TestMachinery/PySuiteTest.cpp b/Core/TestMachinery/PySuiteTest.cpp
index 78c2021b63e955701ca3d2b4d2720e9b4866a066..9ed2fe1d1424a38fa2144b6564806125a7fd4e48 100644
--- a/Core/TestMachinery/PySuiteTest.cpp
+++ b/Core/TestMachinery/PySuiteTest.cpp
@@ -13,7 +13,6 @@
//
// ************************************************************************** //
-#include <fstream>
#include "BAPython.h"
#include "FileSystem.h"
#include "IntensityDataFunctions.h"
@@ -23,6 +22,7 @@
#include "TestConfig.h"
#include "Utils.h"
#include "PySuiteTest.h"
+#include <fstream>
PySuiteTest::PySuiteTest(
const std::string& name, const std::string& description,
diff --git a/Core/Tools/AttLimits.cpp b/Core/Tools/AttLimits.cpp
index 7e5fd75214a9ac4141eeefdb072bc81e82a3b445..7565c7dcba8a1f7917a1a7c861c736dc353ca91d 100644
--- a/Core/Tools/AttLimits.cpp
+++ b/Core/Tools/AttLimits.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "AttLimits.h"
+#include <iomanip>
//! Prints class
void AttLimits::print(std::ostream& ostr) const
diff --git a/Core/Tools/AttLimits.h b/Core/Tools/AttLimits.h
index e99221ec5201825144cc553b482078aaf11b38b3..3c01218e7cf9f2ad7e42019cecb59fd8204f30ee 100644
--- a/Core/Tools/AttLimits.h
+++ b/Core/Tools/AttLimits.h
@@ -16,8 +16,8 @@
#ifndef ATTLIMITS_H
#define ATTLIMITS_H
-#include <iostream>
#include "Numeric.h"
+#include <iostream>
//! @class AttLimits
diff --git a/Core/Tools/Bin.h b/Core/Tools/Bin.h
index 1a11690f54512ce2f4f08bb1ba72c0738086f2ee..2b95ac293c669576a73a7f6f050dca50c3f8d03c 100644
--- a/Core/Tools/Bin.h
+++ b/Core/Tools/Bin.h
@@ -16,9 +16,9 @@
#ifndef BIN_H
#define BIN_H
-#include <iostream>
#include "Numeric.h"
#include "Vectors3D.h"
+#include <iostream>
struct BA_CORE_API_ Bin1D
{
diff --git a/Core/Tools/ConstKBinAxis.cpp b/Core/Tools/ConstKBinAxis.cpp
index 17e8c7d339b51c7b4380c4be221261f52239edcc..eaeb8d618cf048d1cb422f9d0a30ba350d7ba840 100644
--- a/Core/Tools/ConstKBinAxis.cpp
+++ b/Core/Tools/ConstKBinAxis.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "ConstKBinAxis.h"
+#include <iomanip>
ConstKBinAxis::ConstKBinAxis(const std::string &name, size_t nbins)
: VariableBinAxis(name, nbins)
diff --git a/Core/Tools/Convolve.cpp b/Core/Tools/Convolve.cpp
index bd554bfb23a3390f8b925ac7586bbaf7bbe7b1c7..26860e1b23f45f208a6ff21ccb8f363764585467 100644
--- a/Core/Tools/Convolve.cpp
+++ b/Core/Tools/Convolve.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include <iostream>
-#include <sstream>
#include "Exceptions.h"
#include "Convolve.h"
+#include <iostream>
+#include <sstream>
MathFunctions::Convolve::Convolve() : m_mode(FFTW_UNDEFINED)
{
diff --git a/Core/Tools/CumulativeValue.cpp b/Core/Tools/CumulativeValue.cpp
index 929e98027288c67efc76a7d41ca000d80e698636..e335bdcbd99dbb7fb343cb804b15ba1d13d0f877 100644
--- a/Core/Tools/CumulativeValue.cpp
+++ b/Core/Tools/CumulativeValue.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <cmath>
#include "CumulativeValue.h"
+#include <cmath>
double CumulativeValue::getRMS() const
{
diff --git a/Core/Tools/CustomBinAxis.cpp b/Core/Tools/CustomBinAxis.cpp
index 44ac9c696bc8500d38843098c25515a75ab91c8c..eaec130fd91d8d31b44a020e27ab9e2d72c63c55 100644
--- a/Core/Tools/CustomBinAxis.cpp
+++ b/Core/Tools/CustomBinAxis.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "CustomBinAxis.h"
+#include <iomanip>
CustomBinAxis::CustomBinAxis(const std::string &name, size_t nbins, double start, double end)
: VariableBinAxis(name, nbins)
diff --git a/Core/Tools/Exceptions.cpp b/Core/Tools/Exceptions.cpp
index 024939cdd0dc48c77206b422b0abbd18282a8e80..1309d25262df9925f3a4048010b0ed5b6739fb6b 100644
--- a/Core/Tools/Exceptions.cpp
+++ b/Core/Tools/Exceptions.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <iostream>
#include "Exceptions.h"
+#include <iostream>
namespace Exceptions {
diff --git a/Core/Tools/FastVector.h b/Core/Tools/FastVector.h
index 6bdbbcd247fd96283ef5c734bceff3e984428ef0..5c48bea063994dceeb22ca83c8746c92b1ad8eb2 100644
--- a/Core/Tools/FastVector.h
+++ b/Core/Tools/FastVector.h
@@ -16,9 +16,9 @@
#ifndef FASTVECTOR_H
#define FASTVECTOR_H
+#include "Vectors3D.h"
#include <iostream>
#include <vector>
-#include "Vectors3D.h"
//! @class KVectorContainer
//! @ingroup tools_internal
diff --git a/Core/Tools/FileSystem.cpp b/Core/Tools/FileSystem.cpp
index 693459190ef3af9362e22521a64f5e440bd50465..acc49daed8212b80d014ec4bff2348834a83f1b2 100644
--- a/Core/Tools/FileSystem.cpp
+++ b/Core/Tools/FileSystem.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include <boost/filesystem.hpp>
#include "Exceptions.h"
#include "FileSystem.h"
+#include <boost/filesystem.hpp>
std::string Utils::FileSystem::m_argv0_path = std::string();
std::string Utils::FileSystem::m_reference_data_dir = std::string();
diff --git a/Core/Tools/FixedBinAxis.cpp b/Core/Tools/FixedBinAxis.cpp
index e450c2b70cac041aab43f628998106da35b85b34..794d88b51300d7b151f9066dd331ab19db539052 100644
--- a/Core/Tools/FixedBinAxis.cpp
+++ b/Core/Tools/FixedBinAxis.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "FixedBinAxis.h"
+#include <iomanip>
FixedBinAxis::FixedBinAxis(const std::string &name, size_t nbins, double start, double end)
diff --git a/Core/Tools/Histogram1D.cpp b/Core/Tools/Histogram1D.cpp
index 4e1369865ff0b29360addb19f4d23ef8dd3d83e0..18646b168596b07d69e593ba4e850d257ea17f6c 100644
--- a/Core/Tools/Histogram1D.cpp
+++ b/Core/Tools/Histogram1D.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include <memory>
#include "NumpyUtils.h"
#include "VariableBinAxis.h"
#include "Histogram1D.h"
+#include <memory>
Histogram1D::Histogram1D(int nbinsx, double xlow, double xup)
diff --git a/Core/Tools/Histogram2D.cpp b/Core/Tools/Histogram2D.cpp
index af84706c67957fbf0eb927efa129019a1e1b6c72..d6c64739d3c479b72f2de414c6bf74d868a5e19f 100644
--- a/Core/Tools/Histogram2D.cpp
+++ b/Core/Tools/Histogram2D.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include <memory>
#include "Histogram1D.h"
#include "VariableBinAxis.h"
#include "Histogram2D.h"
+#include <memory>
Histogram2D::Histogram2D(int nbinsx, double xlow, double xup, int nbinsy, double ylow, double yup)
{
diff --git a/Core/Tools/IAxis.h b/Core/Tools/IAxis.h
index 720cd0f103be84153f0fa47cbedc8ae5fac3bea4..20cbf898c00c15ce048c4614752b9350af47d44e 100644
--- a/Core/Tools/IAxis.h
+++ b/Core/Tools/IAxis.h
@@ -16,8 +16,8 @@
#ifndef IAXIS_H
#define IAXIS_H
-#include <vector>
#include "Bin.h"
+#include <vector>
//! @class IAxis
diff --git a/Core/Tools/IFactory.h b/Core/Tools/IFactory.h
index 0b9769ea48000ad21cd1a89298c7ee5e9c481098..fa7c08abd00021a1735b40ace80fdeda7551e627 100644
--- a/Core/Tools/IFactory.h
+++ b/Core/Tools/IFactory.h
@@ -16,9 +16,9 @@
#ifndef IFACTORY_H
#define IFACTORY_H
+#include "Exceptions.h"
#include <functional>
#include <map>
-#include "Exceptions.h"
//! @class IFactory
//! @ingroup tools_internal
diff --git a/Core/Tools/IHistogram.cpp b/Core/Tools/IHistogram.cpp
index 6d904594b41377763816622a22a14c4f5235c253..dc606496fdeb3e22582a68671096008efee412e1 100644
--- a/Core/Tools/IHistogram.cpp
+++ b/Core/Tools/IHistogram.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include <memory>
#include "Histogram1D.h"
#include "Histogram2D.h"
#include "IntensityDataIOFactory.h"
+#include <memory>
IHistogram::IHistogram()
{
diff --git a/Core/Tools/IParameterized.cpp b/Core/Tools/IParameterized.cpp
index 3c5abb5a3a8977736c1a60a37500449ccb82f64f..0ccc0a6bd9d45dac402a1ac3ea8e76b87c3e575f 100644
--- a/Core/Tools/IParameterized.cpp
+++ b/Core/Tools/IParameterized.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
+#include "IParameterized.h"
#include <memory>
#include <sstream>
-#include "IParameterized.h"
// Copies INamed, but not the parameters.
diff --git a/Core/Tools/IntensityDataFunctions.cpp b/Core/Tools/IntensityDataFunctions.cpp
index 17eec1673373b2eea0a54692b80646cddf221bb7..a3e6b4f5714bad333d59a36843cdbacb362a0e3a 100644
--- a/Core/Tools/IntensityDataFunctions.cpp
+++ b/Core/Tools/IntensityDataFunctions.cpp
@@ -13,10 +13,10 @@
//
// ************************************************************************** //
-#include <memory>
#include "ConvolutionDetectorResolution.h"
#include "IHistogram.h"
#include "IntensityDataFunctions.h"
+#include <memory>
double IntensityDataFunctions::getRelativeDifference(
const OutputData<double> &result, const OutputData<double> &reference)
diff --git a/Core/Tools/MathFunctions.cpp b/Core/Tools/MathFunctions.cpp
index e8e4a985ed9c76da60c3e23540e7521eae1da592..3c03eac0e6b5635010c9b1f0b8d092b7fa6707ec 100644
--- a/Core/Tools/MathFunctions.cpp
+++ b/Core/Tools/MathFunctions.cpp
@@ -13,6 +13,7 @@
//
// ************************************************************************** //
+#include "MathFunctions.h"
#include <chrono>
#include <cstring>
#include <fftw3.h>
@@ -21,7 +22,6 @@
#include <gsl/gsl_sf_erf.h>
#include <gsl/gsl_sf_expint.h>
#include <gsl/gsl_sf_trig.h>
-#include "MathFunctions.h"
// ************************************************************************** //
diff --git a/Core/Tools/MathFunctions.h b/Core/Tools/MathFunctions.h
index 036a00f6ee45b5a2307ce5880e46d2fb40b7ebc8..2b94133d3eb1e24a1ec7d41712299755af3b4bb7 100644
--- a/Core/Tools/MathFunctions.h
+++ b/Core/Tools/MathFunctions.h
@@ -16,10 +16,10 @@
#ifndef MATHFUNCTIONS_H
#define MATHFUNCTIONS_H
-#include <vector>
#include "Complex.h"
#include "Numeric.h"
#include "Units.h"
+#include <vector>
//! Various mathematical functions.
diff --git a/Core/Tools/MessageService.cpp b/Core/Tools/MessageService.cpp
index f47e497771ac6d07931ac9dca3885ed89bb4cbc4..747f01e388f31aab1212aa6f1ab08ebd20789034 100644
--- a/Core/Tools/MessageService.cpp
+++ b/Core/Tools/MessageService.cpp
@@ -13,9 +13,9 @@
//
// ************************************************************************** //
-#include <boost/date_time/posix_time/posix_time.hpp>
#include "Exceptions.h"
#include "MessageService.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
std::vector<std::string> MSG::Logger::m_level_names =
{"VERBOSE", "DEBUG2", "DEBUG", "INFO", "WARNING", "ERROR", "FATAL"};
diff --git a/Core/Tools/NumpyUtils.cpp b/Core/Tools/NumpyUtils.cpp
index c73b3d959f6fa96d07953270af654414520fb8bd..52b57ee732979b97a1f75dc620c2fd1db111d172 100644
--- a/Core/Tools/NumpyUtils.cpp
+++ b/Core/Tools/NumpyUtils.cpp
@@ -20,9 +20,9 @@
#define PY_ARRAY_UNIQUE_SYMBOL BORNAGAIN_PYTHONAPI_ARRAY
#define NO_IMPORT_ARRAY
-#include <numpy/arrayobject.h>
#include "Exceptions.h"
#include "NumpyUtils.h"
+#include <numpy/arrayobject.h>
PyObject* Utils::createNumpyArray(const std::vector<double>& data)
{
diff --git a/Core/Tools/NumpyUtils.h b/Core/Tools/NumpyUtils.h
index cc0f88aee5a113cf679c08d818f163e26eb7206a..fea002dc8249ca28d988c2b550d8d49ceba4d2ab 100644
--- a/Core/Tools/NumpyUtils.h
+++ b/Core/Tools/NumpyUtils.h
@@ -19,8 +19,8 @@
#define NUMPYUTILS_H
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include <vector>
#include "Python.h"
+#include <vector>
namespace Utils
{
diff --git a/Core/Tools/OutputData.cpp b/Core/Tools/OutputData.cpp
index 607d2460682058d43542ef50c3cc4ed6ad320e1a..d7f576fd38d1b3e8915e31e80e5b131c26bd44a2 100644
--- a/Core/Tools/OutputData.cpp
+++ b/Core/Tools/OutputData.cpp
@@ -19,8 +19,8 @@
#define PY_ARRAY_UNIQUE_SYMBOL BORNAGAIN_PYTHONAPI_ARRAY
#define NO_IMPORT_ARRAY
-#include <numpy/arrayobject.h>
#include "OutputData.h"
+#include <numpy/arrayobject.h>
template<>
PyObject *OutputData<double>::getArray() const
diff --git a/Core/Tools/OutputDataFunctions.cpp b/Core/Tools/OutputDataFunctions.cpp
index c4d1cb680ee388a65d15c26e82ce0e31e6c0bb11..a2f2022b334a742da95090dc7fc4891231312a9e 100644
--- a/Core/Tools/OutputDataFunctions.cpp
+++ b/Core/Tools/OutputDataFunctions.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <fftw3.h>
#include "OutputDataFunctions.h"
+#include <fftw3.h>
void toFftw3Array(complex_t *source, size_t length, fftw_complex *destination);
void fromFftw3Array(fftw_complex *source, size_t length, complex_t *destination);
diff --git a/Core/Tools/ParameterDistribution.h b/Core/Tools/ParameterDistribution.h
index d4267bb15b372791c5371a4449523dfc19b8fb1f..c56392f2ef39cca1736d6e258d8e52aa5dde45f9 100644
--- a/Core/Tools/ParameterDistribution.h
+++ b/Core/Tools/ParameterDistribution.h
@@ -16,9 +16,9 @@
#ifndef PARAMETERDISTRIBUTION_H
#define PARAMETERDISTRIBUTION_H
-#include <memory>
#include "IParameterized.h"
#include "ParameterSample.h"
+#include <memory>
class IDistribution1D;
diff --git a/Core/Tools/ParameterPool.h b/Core/Tools/ParameterPool.h
index b36898924f83e81b7a38fd81f0f1f94054fc0003..d50b7f240344792e597b8aed9544ea3704b6e3cd 100644
--- a/Core/Tools/ParameterPool.h
+++ b/Core/Tools/ParameterPool.h
@@ -16,10 +16,10 @@
#ifndef PARAMETERPOOL_H
#define PARAMETERPOOL_H
-#include <map>
-#include <vector>
#include "ICloneable.h"
#include "RealParameterWrapper.h"
+#include <map>
+#include <vector>
//! @class ParameterPool
diff --git a/Core/Tools/Precomputed.cpp b/Core/Tools/Precomputed.cpp
index fddaf0da06dd4257775e5591bc224dd0fd7a19ee..2668158387481ac47f58a1d6550aa109f059647f 100644
--- a/Core/Tools/Precomputed.cpp
+++ b/Core/Tools/Precomputed.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <cmath>
#include "Precomputed.h"
+#include <cmath>
//! Precompute things upon class instantiation.
diff --git a/Core/Tools/Precomputed.h b/Core/Tools/Precomputed.h
index 1d7944396502f273137388afa759c2ef4737cd6c..8c59d844344c881bb119b19889dd15903a46363f 100644
--- a/Core/Tools/Precomputed.h
+++ b/Core/Tools/Precomputed.h
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <vector>
#include "ISingleton.h"
+#include <vector>
//! This class contains precomputed constants.
diff --git a/Core/Tools/PyGenTools.cpp b/Core/Tools/PyGenTools.cpp
index 97fe07038e6930185cdf3a13b3f5918059baa504..43a2e2de86eb41be60c860c94e485a733516a3cc 100644
--- a/Core/Tools/PyGenTools.cpp
+++ b/Core/Tools/PyGenTools.cpp
@@ -13,7 +13,6 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "Distributions.h"
#include "Ellipse.h"
#include "InfinitePlane.h"
@@ -23,6 +22,7 @@
#include "Polygon.h"
#include "Rectangle.h"
#include "PyGenTools.h"
+#include <iomanip>
GCC_DIAG_OFF(missing-field-initializers)
GCC_DIAG_OFF(unused-parameter)
GCC_DIAG_ON(unused-parameter)
diff --git a/Core/Tools/PyGenVisitor.cpp b/Core/Tools/PyGenVisitor.cpp
index 23502197adc4beecb5b23c3437d93d7519411a1f..3d1dfd3c7fd2da9a3babda253e05320348aefb40 100644
--- a/Core/Tools/PyGenVisitor.cpp
+++ b/Core/Tools/PyGenVisitor.cpp
@@ -13,7 +13,6 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "ConvolutionDetectorResolution.h"
#include "FormFactors.h"
#include "InterferenceFunctions.h"
@@ -25,6 +24,7 @@
#include "ResolutionFunction2DGaussian.h"
#include "SampleLabelHandler.h"
#include "SphericalDetector.h"
+#include <iomanip>
PyGenVisitor::PyGenVisitor() : m_label(new SampleLabelHandler())
{
diff --git a/Core/Tools/RealParameterWrapper.cpp b/Core/Tools/RealParameterWrapper.cpp
index b642fdea82231108ca2100d58f56d476a01f3c77..9c0769bb18570d1f57bbbebdaa1ac6bce6437ab5 100644
--- a/Core/Tools/RealParameterWrapper.cpp
+++ b/Core/Tools/RealParameterWrapper.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <sstream>
#include "IParameterized.h"
+#include <sstream>
RealParameterWrapper::RealParameterWrapper(
IParameterized* parent, double* par, const AttLimits& limits)
diff --git a/Core/Tools/SamplePrintVisitor.h b/Core/Tools/SamplePrintVisitor.h
index 4e5e7661d49a7b114f84a732472ac30f5a65f957..7f1e155d14ccc2ed82942c193c4f65b68a94a053 100644
--- a/Core/Tools/SamplePrintVisitor.h
+++ b/Core/Tools/SamplePrintVisitor.h
@@ -16,8 +16,8 @@
#ifndef SAMPLEPRINTVISITOR_H
#define SAMPLEPRINTVISITOR_H
-#include <string>
#include "ISampleVisitor.h"
+#include <string>
//! @class SamplePrintVisitor
//! @ingroup samples_internal
diff --git a/Core/Tools/Utils.cpp b/Core/Tools/Utils.cpp
index e737c912e68d8fd280366e2959487d6784e9bc86..401a630d4a53cb9a5c05d6639f725764736075a5 100644
--- a/Core/Tools/Utils.cpp
+++ b/Core/Tools/Utils.cpp
@@ -13,11 +13,11 @@
//
// ************************************************************************** //
+#include "Utils.h"
#include <thread>
#include <boost/algorithm/string.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/regex.hpp>
-#include "Utils.h"
diff --git a/Core/Tools/Utils.h b/Core/Tools/Utils.h
index 8aac9950d3df42b0ab0101538c2c6072321f1982..ecb68854cde9a0741928b964d5a66bf8bf2a76d8 100644
--- a/Core/Tools/Utils.h
+++ b/Core/Tools/Utils.h
@@ -16,8 +16,8 @@
#ifndef UTILS_H
#define UTILS_H
-#include <boost/unordered_map.hpp>
#include "Exceptions.h"
+#include <boost/unordered_map.hpp>
namespace Utils {
diff --git a/Core/Tools/VariableBinAxis.cpp b/Core/Tools/VariableBinAxis.cpp
index 30e6fbd39f06a29da59ce5a8c685eae4d0ec71fa..c05035cfab2ec09aa56d3c657138faedef3d381b 100644
--- a/Core/Tools/VariableBinAxis.cpp
+++ b/Core/Tools/VariableBinAxis.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "VariableBinAxis.h"
+#include <iomanip>
VariableBinAxis::VariableBinAxis(
diff --git a/Fit/FitKernel/FitObject.h b/Fit/FitKernel/FitObject.h
index cec881cc1bbd479bc34e02d14e0216d762608801..29b5b43ed6293ac972ea51c12a43a3fb7a346a9b 100644
--- a/Fit/FitKernel/FitObject.h
+++ b/Fit/FitKernel/FitObject.h
@@ -16,10 +16,10 @@
#ifndef FITOBJECT_H
#define FITOBJECT_H
-#include <memory>
#include "FitElement.h"
#include "IParameterized.h"
#include "OutputData.h"
+#include <memory>
class GISASSimulation;
class IIntensityNormalizer;
diff --git a/Fit/FitKernel/FitParameter.cpp b/Fit/FitKernel/FitParameter.cpp
index 850ddc561312358243d9d669b5a262abf8125658..125dea23f0d09f5bb223f6ddce4fb71a1135fd27 100644
--- a/Fit/FitKernel/FitParameter.cpp
+++ b/Fit/FitKernel/FitParameter.cpp
@@ -13,8 +13,8 @@
//
// ************************************************************************** //
-#include <iomanip>
#include "FitParameter.h"
+#include <iomanip>
FitParameter::FitParameter() : m_value(0), m_step(0), m_error(0)
{ }
diff --git a/Fit/FitKernel/FitStrategyAdjustParameters.h b/Fit/FitKernel/FitStrategyAdjustParameters.h
index f9c637eb86c126e69ea13285e649c9d92f5b09cd..87850103a65cf1eefdd9a999234378d0eb782f0c 100644
--- a/Fit/FitKernel/FitStrategyAdjustParameters.h
+++ b/Fit/FitKernel/FitStrategyAdjustParameters.h
@@ -16,8 +16,8 @@
#ifndef FITSTRATEGYADJUSTPARAMETERS_H
#define FITSTRATEGYADJUSTPARAMETERS_H
-#include <vector>
#include "IFitStrategy.h"
+#include <vector>
//! @class FitStrategyAdjustParameters
//! @ingroup fitting
diff --git a/Fit/FitKernel/FitSuiteParameters.h b/Fit/FitKernel/FitSuiteParameters.h
index 4d56c5a56eca49000623e6e4f14015566ae1b596..e822cdb57e0eb6d8f538b5a8fe945bff264531df 100644
--- a/Fit/FitKernel/FitSuiteParameters.h
+++ b/Fit/FitKernel/FitSuiteParameters.h
@@ -16,8 +16,8 @@
#ifndef FITSUITEPARAMETERS_H
#define FITSUITEPARAMETERS_H
-#include <vector>
#include "FitParameter.h"
+#include <vector>
class ParameterPool;
diff --git a/Fit/FitKernel/FitSuitePrintObserver.h b/Fit/FitKernel/FitSuitePrintObserver.h
index 6d76874b9229599699294b041c14887037abe915..c8b52bc52b144ec74909d556a673a4851fe01f4c 100644
--- a/Fit/FitKernel/FitSuitePrintObserver.h
+++ b/Fit/FitKernel/FitSuitePrintObserver.h
@@ -16,8 +16,8 @@
#ifndef FITSUITEPRINTOBSERVER_H
#define FITSUITEPRINTOBSERVER_H
-#include <boost/date_time/posix_time/posix_time.hpp>
#include "IFitObserver.h"
+#include <boost/date_time/posix_time/posix_time.hpp>
//! @class FitSuitePrintObserver
//! @ingroup fitting_internal
diff --git a/Fit/FitKernel/IMinimizer.h b/Fit/FitKernel/IMinimizer.h
index 133eea8bba34a19352cc05bd610da5854e3b8f1a..4a6395eeba641091178d7408fe69e09e3805439e 100644
--- a/Fit/FitKernel/IMinimizer.h
+++ b/Fit/FitKernel/IMinimizer.h
@@ -16,9 +16,9 @@
#ifndef IMINIMIZER_H
#define IMINIMIZER_H
+#include "MinimizerOptions.h"
#include <functional>
#include <vector>
-#include "MinimizerOptions.h"
class FitParameter;
class FitSuiteParameters;
diff --git a/Fit/FitKernel/MinimizerOptions.h b/Fit/FitKernel/MinimizerOptions.h
index 8ab4b71f5dc336b0a34dd3ba8ef48b70e6fa9003..97cab79f983a5e79c977479f806d986af3d7347d 100644
--- a/Fit/FitKernel/MinimizerOptions.h
+++ b/Fit/FitKernel/MinimizerOptions.h
@@ -15,10 +15,10 @@
#ifndef MINIMIZEROPTIONS_H
#define MINIMIZEROPTIONS_H
+#include "Exceptions.h"
#include <iomanip>
#include <iostream>
#include <map>
-#include "Exceptions.h"
//! @class MinimizerOptions
//! @ingroup fitting
diff --git a/Fit/StandardFits/IMinimizerTest.cpp b/Fit/StandardFits/IMinimizerTest.cpp
index 13fc8661674cf0f391696c1efd382cab72272de7..a16669eed126ac6ec83ef6d779e4edc895372240 100644
--- a/Fit/StandardFits/IMinimizerTest.cpp
+++ b/Fit/StandardFits/IMinimizerTest.cpp
@@ -13,12 +13,12 @@
//
// ************************************************************************** //
-#include <boost/format.hpp>
#include "FitSuite.h"
#include "MinimizerFactory.h"
#include "SampleBuilderFactory.h"
#include "SimulationFactory.h"
#include "IMinimizerTest.h"
+#include <boost/format.hpp>
IMinimizerTest::TestParameter::TestParameter(const std::string &name, double real_value,
double start_value)
diff --git a/Fit/StandardFits/IMinimizerTest.h b/Fit/StandardFits/IMinimizerTest.h
index d308a527a84586e5634c9b4b60401e9d33197cb5..a864d7dacfa41e0bb60d03cc58f8dfa08550cfdf 100644
--- a/Fit/StandardFits/IMinimizerTest.h
+++ b/Fit/StandardFits/IMinimizerTest.h
@@ -16,9 +16,9 @@
#ifndef IMINIMIZERTEST_H
#define IMINIMIZERTEST_H
-#include <memory>
#include "IFunctionalTest.h"
#include "OutputData.h"
+#include <memory>
class FitSuite;
class ISample;
diff --git a/Fit/StandardFits/StandardFitsFactory.cpp b/Fit/StandardFits/StandardFitsFactory.cpp
index c100d830118a2cc9ca7cb4e8838b6a5b6c7362a4..8cff5ea05f7e67e8f8ede6a8e44557f506051923 100644
--- a/Fit/StandardFits/StandardFitsFactory.cpp
+++ b/Fit/StandardFits/StandardFitsFactory.cpp
@@ -1,8 +1,8 @@
-#include <boost/format.hpp>
#include "MinimizerTests.h"
#include "RectDetectorFitTest.h"
#include "StandardFitsFactory.h"
+#include <boost/format.hpp>
StandardFitsFactory::StandardFitsFactory()
{
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
index 3452cb752cccf26e0829541b150c0b554075ca5c..8a511491daf5d9d811a65c8e84882f34fb45d063 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
@@ -33,6 +33,9 @@
#ifndef ACCORDIONWIDGET_H
#define ACCORDIONWIDGET_H
+#include "ClickableFrame.h"
+#include "ContentPane.h"
+#include "WinDllMacros.h"
#include <QDebug>
#include <QGridLayout>
#include <QHBoxLayout>
@@ -46,9 +49,6 @@
#include <iterator>
#include <memory>
#include <vector>
-#include "ClickableFrame.h"
-#include "ContentPane.h"
-#include "WinDllMacros.h"
class ContentPane;
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
index ecb5b31f2df35cd50ab561c474bdbb8a59f36e1e..111483503e2d76a0a4369590801da48cd3e9023e 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
@@ -30,9 +30,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+#include "ClickableFrame.h"
#include <QDebug>
#include <QStyleOption>
-#include "ClickableFrame.h"
ClickableFrame::ClickableFrame(QString header, QWidget *parent,
Qt::WindowFlags f)
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
index db963ed37b8f0c79d4de44bc3a46982c2e153bf6..fe93270795d18f0bd0a9c2d0e147a8744ab998d9 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
@@ -33,13 +33,13 @@
#ifndef CLICKABLEFRAME_H
#define CLICKABLEFRAME_H
+#include "WinDllMacros.h"
#include <QFrame>
#include <QGraphicsView>
#include <QHBoxLayout>
#include <QLabel>
#include <QMouseEvent>
#include <QString>
-#include "WinDllMacros.h"
#ifdef __GNUC__
#define ATTR_UNUSED __attribute__((unused))
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.h b/GUI/coregui/Views/AccordionWidget/ContentPane.h
index 78e5205a7393605a6c2e9a7a4693b8aec0743a34..faad4ea5d7f54b830595499809b89840ed21bee2 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.h
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.h
@@ -33,6 +33,9 @@
#ifndef CONTENTPANE_H
#define CONTENTPANE_H
+#include "AccordionWidget.h"
+#include "ClickableFrame.h"
+#include "WinDllMacros.h"
#include <QFrame>
#include <QHBoxLayout>
#include <QPainter>
@@ -42,9 +45,6 @@
#include <QStyleOption>
#include <QWidget>
#include <memory>
-#include "AccordionWidget.h"
-#include "ClickableFrame.h"
-#include "WinDllMacros.h"
// TODO: Do i really need to export the ClickableFrame class?
/**
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
index e254a3fd6ecabdc6ab2671b31854afe4d380bf73..2aa5d49ad9ca26082c8a03a44ae69ce986f428be 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "InfoPanelToolBar.h"
+#include "InfoPanel.h"
#include <QBoxLayout>
#include <QDebug>
#include <QResizeEvent>
#include <QStackedWidget>
-#include "InfoPanelToolBar.h"
-#include "InfoPanel.h"
namespace {
const int minimum_widget_height = 25; // height of toolbar
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.h b/GUI/coregui/Views/CommonWidgets/InfoPanel.h
index 8dbdb88fdb35ae5f73e4731258c3c64b386dfd78..b4f52ac104daf05d14e7f2004c14494fe98ce5cb 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanel.h
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanel.h
@@ -17,8 +17,8 @@
#ifndef INFOPANEL_H
#define INFOPANEL_H
-#include <QFrame>
#include "WinDllMacros.h"
+#include <QFrame>
class QStackedWidget;
class InfoPanelToolBar;
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp
index 0c5a86de4263c212d6527fd4a496bb7471f8f54a..cd05425457a5f95b6c33ab5428acddbd322fb355 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "InfoPanelToolBar.h"
#include <QHBoxLayout>
#include <QToolButton>
-#include "InfoPanelToolBar.h"
namespace {
const int minimum_size = 25;
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp
index c500fe5594d644f9f22fa943305e31ffa55fa1e7..1d61f91aa6a7138c96d25d53ec99ab9cfc1ca540 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "ItemComboToolBar.h"
#include <QAction>
#include <QComboBox>
-#include "ItemComboToolBar.h"
ItemComboToolBar::ItemComboToolBar(QWidget *parent)
: StyledToolBar(parent)
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
index 716ddd8122b4b95cd255a20e6a8eea0dfd4ad9d8..35d927d31f1f74bcf08426649cb996115bf6ad9a 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
@@ -17,8 +17,8 @@
#ifndef ITEMCOMBOTOOLBAR_H
#define ITEMCOMBOTOOLBAR_H
-#include <QList>
#include "StyledToolBar.h"
+#include <QList>
class QAction;
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
index 7d549e75189862e7e60c6d44f7f08601fbefe028..44338981b5210b10b954c48471955ee8f7f078fc 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
+#include "ItemComboToolBar.h"
+#include "SessionItemWidget.h"
+#include "ItemComboWidget.h"
#include <QComboBox>
#include <QDebug>
#include <QEvent>
#include <QStackedWidget>
#include <QVBoxLayout>
-#include "ItemComboToolBar.h"
-#include "SessionItemWidget.h"
-#include "ItemComboWidget.h"
ItemComboWidget::ItemComboWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
index 6085fe3f8f3b8d3eb6164a0c73bf930fe4e619f3..9d9ecc72674915323a2b22aeadae323928c0bb0f 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
@@ -17,11 +17,11 @@
#ifndef ITEMCOMBOWIDGET_H
#define ITEMCOMBOWIDGET_H
+#include "IFactory.h"
+#include "WinDllMacros.h"
#include <QMap>
#include <QString>
#include <QWidget>
-#include "IFactory.h"
-#include "WinDllMacros.h"
class SessionItem;
class SessionItemWidget;
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
index 9347dc2244a990114a33acf8ffc305643d5e8a70..e21591c1860be3fd1467ad34aba00a2d4faf1d95 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QListView>
-#include <QVBoxLayout>
#include "SessionItem.h"
#include "SessionModel.h"
#include "mainwindow_constants.h"
#include "ItemSelectorWidget.h"
+#include <QDebug>
+#include <QListView>
+#include <QVBoxLayout>
ItemSelectorWidget::ItemSelectorWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
index cf919133b3f98a368ff65d080a4a5aa936731a5d..61243d24a592106cb4cd92d02d22c18567cad6f8 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
@@ -17,8 +17,8 @@
#ifndef ITEMSELECTORWIDGET_H
#define ITEMSELECTORWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class SessionModel;
class SessionItem;
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
index 0e0d803ca513da87fe40998aa3fe3a9aa10f0d6a..a30a11accbdd091d32bece9747c04a288f0e65bd 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
@@ -17,10 +17,10 @@
#ifndef ITEMSTACKPRESENTER_H
#define ITEMSTACKPRESENTER_H
+#include "ItemStackWidget.h"
#include <QDebug>
#include <QMap>
#include <QStackedWidget>
-#include "ItemStackWidget.h"
class SessionItem;
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
index 6839fef59b3f9db2ddd7a4abfa70d111fe0b5348..5498215850974f1acd0bf3a5ffd745f474ba2f1d 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QStackedWidget>
-#include <QVBoxLayout>
#include "GUIHelpers.h"
#include "SessionModel.h"
#include "ItemStackWidget.h"
+#include <QDebug>
+#include <QStackedWidget>
+#include <QVBoxLayout>
ItemStackWidget::ItemStackWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
index b99988d513db7a0a88cf2195124dd51e698f5242..f7679972c11acbb8903086a276063cad5ce2f156 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
@@ -17,8 +17,8 @@
#ifndef ITEMSTACKWIDGET_H
#define ITEMSTACKWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class SessionModel;
class SessionItem;
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h b/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
index a54c4637bdfc2407eb0c29f13115e8372762dd05..2f149f330e63fd85081f549b83f8b6fbf031006c 100644
--- a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
@@ -17,8 +17,8 @@
#ifndef SESSIONITEMWIDGET_H
#define SESSIONITEMWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
//! The SessionItemWidget class is a base for all widgets representing the content of SessionItem.
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp b/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
index 289672acd86a4f8d4ef148a6d0f4fae13a0c6b2a..bec300b9c2455482825fcfc688b5f8325f702a94 100644
--- a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "StatusLabel.h"
#include <QColor>
#include <QDebug>
#include <QFont>
#include <QPainter>
-#include "StatusLabel.h"
namespace {
const int default_label_height = 20;
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.h b/GUI/coregui/Views/CommonWidgets/StatusLabel.h
index a3e4f7973fe35cee7c9b47f46b8851288759f278..2b25a1ef8918d568adf7d929eaac87760f43dbd8 100644
--- a/GUI/coregui/Views/CommonWidgets/StatusLabel.h
+++ b/GUI/coregui/Views/CommonWidgets/StatusLabel.h
@@ -17,8 +17,8 @@
#ifndef STATUSLABEL_H
#define STATUSLABEL_H
-#include <QFrame>
#include "WinDllMacros.h"
+#include <QFrame>
class QPaintEvent;
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp b/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
index 3a7bd4670b7ba7f6384e2fc1e5dfcf37ba9262ed..d2d9d3ac97b17baf6552eadce683c8b862272859 100644
--- a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
+++ b/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "UpdateTimer.h"
#include <QDebug>
#include <QTimer>
-#include "UpdateTimer.h"
namespace {
const int default_timer_interval_in_msec = 2;
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.h b/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
index 3678848dcb31e325e900a0fb1ac6b1418e1b3517..f889f8154bb4534643ce16626d24d4ef7372ca91 100644
--- a/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
+++ b/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
@@ -17,8 +17,8 @@
#ifndef UPDATETIMER_H
#define UPDATETIMER_H
-#include <QObject>
#include "WinDllMacros.h"
+#include <QObject>
class QTimer;
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
index 0f02a64aceee1d2b0467878e4d7716dfecad5dd7..40c39b7145f732537a4090df282119289223b067 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
@@ -14,8 +14,6 @@
//
// ************************************************************************** //
-#include <QPushButton>
-#include <QVBoxLayout>
#include "FitSuiteWidget.h"
#include "JobItem.h"
#include "JobMessagePanel.h"
@@ -24,6 +22,8 @@
#include "RunFitControlWidget.h"
#include "mainwindow_constants.h"
#include "FitActivityPanel.h"
+#include <QPushButton>
+#include <QVBoxLayout>
FitActivityPanel::FitActivityPanel(JobModel *jobModel, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h b/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
index 4814e3c4b2cf19738244fb37ba0cbb9639ef5de4..172bcbc1008adc963c54548f951b18ecf18a7f42 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
@@ -17,8 +17,8 @@
#ifndef FITACTIVITYPANEL_H
#define FITACTIVITYPANEL_H
-#include <QWidget>
#include "ItemStackPresenter.h"
+#include <QWidget>
class JobModel;
class JobItem;
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
index fd64b30edc14738d15d92b1cf3564e88e3a25a44..bcbdea1a9b9651c797b80eebe8f905ead903fa0c 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
@@ -14,12 +14,6 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QDebug>
-#include <QGridLayout>
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QVBoxLayout>
#include "AxesItems.h"
#include "ColorMapCanvas.h"
#include "ColorMapLabel.h"
@@ -30,6 +24,12 @@
#include "RealDataItem.h"
#include "SessionModel.h"
#include "FitComparisonWidget.h"
+#include <QAction>
+#include <QDebug>
+#include <QGridLayout>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QVBoxLayout>
namespace {
const double relative_diff_min = 1e-05;
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
index ff0bfe6a5aa8ec6e8cd14a4ef86a7055b402962a..b2c36b7378cead35ed89c77f65208f7d8e2f3a53 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
@@ -17,8 +17,8 @@
#ifndef FITCOMPARISONWIDGET_H
#define FITCOMPARISONWIDGET_H
-#include <QMap>
#include "SessionItemWidget.h"
+#include <QMap>
class JobItem;
class IntensityDataItem;
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
index ae600e538a6568dc4e44b1ed2ebf85d168428c76..ed0bdbdee40c20cb93afcdc56a7d54ebc99b3c20 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QVBoxLayout>
#include "FitSuiteItem.h"
#include "HistogramPlot.h"
#include "FitFlowWidget.h"
+#include <QDebug>
+#include <QVBoxLayout>
FitFlowWidget::FitFlowWidget(QWidget *parent)
: QFrame(parent)
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h b/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
index ad3daf464c148de412eef4e3c73203fd936d7ce4..14b5f21ffacf5d4f8c49bde603d20aec4f1e4ac4 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
@@ -17,8 +17,8 @@
#ifndef FITFLOWWIDGET_H
#define FITFLOWWIDGET_H
-#include <QFrame>
#include "WinDllMacros.h"
+#include <QFrame>
class HistogramPlot;
class FitSuiteItem;
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
index 419cffc00eadeffc9f30343e8ffe5c5af1cc8eae..7da3b17e3605991000b43e029c8b791dc6028984 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
@@ -14,12 +14,6 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QDebug>
-#include <QMenu>
-#include <QSignalMapper>
-#include <QTreeView>
-#include <QVBoxLayout>
#include "CustomEventFilters.h"
#include "FilterPropertyProxy.h"
#include "FitParameterHelper.h"
@@ -34,6 +28,12 @@
#include "SessionModelDelegate.h"
#include "mainwindow_constants.h"
#include "FitParameterWidget.h"
+#include <QAction>
+#include <QDebug>
+#include <QMenu>
+#include <QSignalMapper>
+#include <QTreeView>
+#include <QVBoxLayout>
FitParameterWidget::FitParameterWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
index 7dec7312b32f90efc64a71784bde91b4e36030a9..a3a2aa46e7070a51cb6f91ace2e337829964b096 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
@@ -17,9 +17,9 @@
#ifndef FITPARAMETERWIDGET_H
#define FITPARAMETERWIDGET_H
+#include "WinDllMacros.h"
#include <QWidget>
#include <memory>
-#include "WinDllMacros.h"
class JobItem;
class ParameterTuningWidget;
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h b/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
index 0644519dc614861ab5d30287b5c8f5ff492d3357..fe6f726cd5a3db0090220fb200a97fb76c0eb6c7 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
+++ b/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
@@ -17,9 +17,9 @@
#ifndef FITPROGRESSINFO_H
#define FITPROGRESSINFO_H
+#include "WinDllMacros.h"
#include <QMetaType>
#include <QVector>
-#include "WinDllMacros.h"
//! The FitProgressInfo class contains all essential information about fit progress.
//! It is send from GUIFitObserver to FitSuiteWidget on every nth iteration.
diff --git a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h b/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
index aa61ebdb589460a83b407288fabd305cf879cd33..34fb532def7d1d5922948870ba136597cd64959f 100644
--- a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
@@ -17,8 +17,8 @@
#ifndef FITRESULTSWIDGET_H
#define FITRESULTSWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
//! The FitResultsWidget contains fitting summary. Part of FitSuiteWidget.
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
index dbb25a8cacb72c754e74a17b218247f90e3ef273..daa6458ecc1006adc5cafde2cd06f6535d18fa5c 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QMessageBox>
-#include <QTabWidget>
-#include <QVBoxLayout>
#include "DomainFittingBuilder.h"
#include "FitParameterItems.h"
#include "FitParameterWidget.h"
@@ -36,6 +32,10 @@
#include "RunFitManager.h"
#include "mainwindow_constants.h"
#include "FitSuiteWidget.h"
+#include <QDebug>
+#include <QMessageBox>
+#include <QTabWidget>
+#include <QVBoxLayout>
FitSuiteWidget::FitSuiteWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
index b8f1edda53e65ec2d63b9341aedd950ac790d5a3..eeb1d28ee214b23327a4923ffa3c4351423d2434 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
@@ -17,10 +17,10 @@
#ifndef FITSUITEWIDGET_H
#define FITSUITEWIDGET_H
-#include <QWidget>
-#include <memory>
#include "FitProgressInfo.h"
#include "WinDllMacros.h"
+#include <QWidget>
+#include <memory>
class QTabWidget;
class JobModel;
diff --git a/GUI/coregui/Views/FitWidgets/FittingWorker.cpp b/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
index 02c67081c218c5537d89e25741eb6114f3b89238..5766d474057a3f47c8ccd5ad0ddde43756e52e94 100644
--- a/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
+++ b/GUI/coregui/Views/FitWidgets/FittingWorker.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
-#include <QDateTime>
-#include <QDebug>
#include "FitSuite.h"
#include "FittingWorker.h"
+#include <QDateTime>
+#include <QDebug>
void FittingWorker::startFit()
{
diff --git a/GUI/coregui/Views/FitWidgets/FittingWorker.h b/GUI/coregui/Views/FitWidgets/FittingWorker.h
index 31fbb298527d0b9ad978098fb74c786b5efaa940..526066738e76649e990e29064b368fef7845000a 100644
--- a/GUI/coregui/Views/FitWidgets/FittingWorker.h
+++ b/GUI/coregui/Views/FitWidgets/FittingWorker.h
@@ -17,9 +17,9 @@
#ifndef FITTINGWORKER_H
#define FITTINGWORKER_H
+#include "WinDllMacros.h"
#include <QObject>
#include <memory>
-#include "WinDllMacros.h"
class FitSuite;
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index 06f6f6abb68517b51687983e0390369780d6a019..dcc34970d78a397571aff60ef98cd3bc8a6121f5 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -14,8 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QVector>
#include "FitParameter.h"
#include "FitProgressInfo.h"
#include "FitSuite.h"
@@ -23,6 +21,8 @@
#include "GUIHelpers.h"
#include "IntensityDataItem.h"
#include "GUIFitObserver.h"
+#include <QDebug>
+#include <QVector>
GUIFitObserver::GUIFitObserver(QObject *parent)
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
index 0f106047b7e7b211e0fd5e6ff65b73f35dfa00a2..696080c1a14f43040044dc93e4655739ab3a516a 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
@@ -17,10 +17,10 @@
#ifndef GUIFITOBSERVER_H
#define GUIFITOBSERVER_H
-#include <QObject>
-#include <atomic>
#include "FitProgressInfo.h"
#include "IFitObserver.h"
+#include <QObject>
+#include <atomic>
template <class T> class OutputData;
class FitSuite;
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.h b/GUI/coregui/Views/FitWidgets/HistogramPlot.h
index 344d5246560e11efff00d8319068874fa326e10d..5c959d39f9f986bd3684ab2460e87a92139e7cc1 100644
--- a/GUI/coregui/Views/FitWidgets/HistogramPlot.h
+++ b/GUI/coregui/Views/FitWidgets/HistogramPlot.h
@@ -17,9 +17,9 @@
#ifndef HISTOGRAMPLOT_H
#define HISTOGRAMPLOT_H
-#include <QWidget>
#include "WinDllMacros.h"
#include "qcustomplot.h"
+#include <QWidget>
class BA_CORE_API_ HistogramPlot : public QWidget
{
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
index 1c674980cfd296f4150b5914fd8f12831fe99657..4e74a0ae698f6623aff681ad87ce4a096b23a9c4 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QPushButton>
-#include <QVBoxLayout>
#include "ComponentEditor.h"
#include "FitSuiteItem.h"
#include "JobItem.h"
#include "MinimizerItem.h"
#include "MinimizerSettingsWidget.h"
+#include <QDebug>
+#include <QPushButton>
+#include <QVBoxLayout>
MinimizerSettingsWidget::MinimizerSettingsWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
index c5b831a36838e14e1440cb6731249f32dd646e93..a17b81fa72f1f783a3aacb2fe1446ed297138916 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
@@ -17,8 +17,8 @@
#ifndef MINIMIZERSETTINGSWIDGET_H
#define MINIMIZERSETTINGSWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class ComponentEditor;
class JobItem;
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
index 8d49ee7e839874bc8c208b506349fff44cd913b0..d8edb93ee2657e65c04b6975b843e688349ed9c1 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
@@ -14,12 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QFont>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QSlider>
#include "DesignerHelper.h"
#include "FitSuiteItem.h"
#include "JobItem.h"
@@ -27,6 +21,12 @@
#include "WarningSignWidget.h"
#include "mainwindow_constants.h"
#include "RunFitControlWidget.h"
+#include <QDebug>
+#include <QFont>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QSlider>
namespace {
const int warning_sign_xpos = 42;
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
index 87a448022b5c2f9c03bb8cd7de1396e5368a58d8..6b9a8190c057cb4efc73da229d44b1652b2b12ea 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
@@ -17,8 +17,8 @@
#ifndef RUNFITCONTROLWIDGET_H
#define RUNFITCONTROLWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class JobItem;
class QPushButton;
diff --git a/GUI/coregui/Views/FitWidgets/RunFitManager.cpp b/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
index a4086183f57cca35da24e47321e923bdd55763fa..0cb8b84d1f60dd50be644fe323e394d9571158f3 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitManager.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QThread>
-#include <memory>
#include "FitSuite.h"
#include "FittingWorker.h"
#include "RunFitManager.h"
+#include <QDebug>
+#include <QThread>
+#include <memory>
RunFitManager::RunFitManager(QObject *parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/FitWidgets/RunFitManager.h b/GUI/coregui/Views/FitWidgets/RunFitManager.h
index c1bb14f45fa0280d6dd97975af8fa73c3d1ec30e..066498c6a6b53fb2a1cab49a53032da1a7de8536 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitManager.h
+++ b/GUI/coregui/Views/FitWidgets/RunFitManager.h
@@ -17,10 +17,10 @@
#ifndef RUNFITMANAGER_H
#define RUNFITMANAGER_H
+#include "WinDllMacros.h"
#include <QObject>
#include <atomic>
#include <memory>
-#include "WinDllMacros.h"
class FitSuite;
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
index 5d0130b5796548a1dbfc122426d4cb8e8c104e28..3877dab23cb294d70579c1699063c1d55f412ec4 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
@@ -14,9 +14,6 @@
//
// ************************************************************************** //
-#include <QHBoxLayout>
-#include <QTreeView>
-#include <QVBoxLayout>
#include "FitParameterItems.h"
#include "FitParameterWidget.h"
#include "FitSuiteItem.h"
@@ -26,6 +23,9 @@
#include "item_constants.h"
#include "mainwindow.h"
#include "TestFitWidgets.h"
+#include <QHBoxLayout>
+#include <QTreeView>
+#include <QVBoxLayout>
TestFitWidgets::TestFitWidgets(MainWindow *mainWindow)
: QWidget(mainWindow)
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.h b/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
index d0a2300fda90725ad4e2851883ad5709d49f4ce1..0513e9a13bd37162685401f357295603b25c99b8 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
@@ -17,8 +17,8 @@
#ifndef TESTFITWIDGETS_H
#define TESTFITWIDGETS_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class MainWindow;
class ParameterTuningWidget;
diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/coregui/Views/ImportDataView.cpp
index 30dc823c802e2df3e8a51a0b9ccfa54918a4c274..ff239aef6ec316b40cabd1758c24d3e107d4ec90 100644
--- a/GUI/coregui/Views/ImportDataView.cpp
+++ b/GUI/coregui/Views/ImportDataView.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "ImportDataToolBar.h"
#include "ItemSelectorWidget.h"
#include "RealDataModel.h"
@@ -22,6 +21,7 @@
#include "mainwindow_constants.h"
#include "minisplitter.h"
#include "ImportDataView.h"
+#include <QVBoxLayout>
ImportDataView::ImportDataView(MainWindow *mainWindow)
: QWidget(mainWindow)
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
index f27228fcf4495b869a2077681581461d0236c5f3..b53e4c872491402ebf586783b5e955d4909c8120 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QMessageBox>
#include "AppSvc.h"
#include "GUIHelpers.h"
#include "IntensityDataIOFactory.h"
@@ -25,6 +21,10 @@
#include "RealDataItem.h"
#include "projectmanager.h"
#include "ImportDataAssistant.h"
+#include <QDebug>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QMessageBox>
namespace {
//const QString filter_string = "Intensity File (*.int *.int.gz *.tif *.tif.gz *.txt *.txt.gz);;"
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
index 5bc8bacb204619e51f0c841f49214a5d3f36bdc3..baff9c222e6e96b29561b2f1c771bd17eb5da072 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataToolBar.cpp
@@ -14,9 +14,6 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QDebug>
-#include <QItemSelectionModel>
#include "ComboProperty.h"
#include "DetectorItems.h"
#include "IDetector2D.h"
@@ -33,6 +30,9 @@
#include "SphericalDetectorItem.h"
#include "ImportDataToolBar.h"
#include "ImportDataToolBar.h"
+#include <QAction>
+#include <QDebug>
+#include <QItemSelectionModel>
ImportDataToolBar::ImportDataToolBar(QWidget *parent)
: StyledToolBar(parent)
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
index 806aebf288b1e3d3f77fb493add9e4247aa6fb1c..fb80f66dd0a1e4356f9461c6d1356435505decff 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataEditorWidget.cpp
@@ -14,15 +14,15 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QBoxLayout>
-#include <QDebug>
#include "IntensityDataItem.h"
#include "IntensityDataPropertyWidget.h"
#include "IntensityDataWidget.h"
#include "RealDataItem.h"
#include "SessionItem.h"
#include "RealDataEditorWidget.h"
+#include <QAction>
+#include <QBoxLayout>
+#include <QDebug>
RealDataEditorWidget::RealDataEditorWidget(QWidget *parent)
: SessionItemWidget(parent)
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index e452b192e62fa073850898ab98a8fb4ad0e3ed2d..156b482cdf71d04b9c65f031d927101febf02751 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "RealDataSelectorWidget.h"
#include <QListView>
#include <QVBoxLayout>
-#include "RealDataSelectorWidget.h"
RealDataSelectorWidget::RealDataSelectorWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
index d4a94e86b66f58383c88dbaf264637836e82975a..81dcceaf1514eb920c3cc2368b96d05b87ec5469 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
@@ -17,8 +17,8 @@
#ifndef REALDATASELECTORWIDGET_H
#define REALDATASELECTORWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
//! The RealDataSelectorWidget class holds QListView on the left side of ImportDataView to
//! switch between different RealDataItem's
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
index 64b66d44a0b156cd14154fe7906bb5ef720b509c..0600c5dca351bce86c521282ed02bc8d1ca4e2ef 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
-#include <QHBoxLayout>
-#include <QPushButton>
#include "DistributionEditor.h"
#include "SessionItem.h"
#include "DistributionDialog.h"
+#include <QHBoxLayout>
+#include <QPushButton>
DistributionDialog::DistributionDialog(QWidget *parent)
: QDialog(parent)
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
index 47f472aacfb712176dc4fe5c7049e2a8b7dd54a4..54068c53b3a6f7120ab4f82fbbe8c4b8b9ef9bcf 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
@@ -14,8 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QVBoxLayout>
#include "BeamWavelengthItem.h"
#include "ComponentBoxEditor.h"
#include "DistributionDialog.h"
@@ -26,6 +24,8 @@
#include "SessionItem.h"
#include "qcustomplot.h"
#include "DistributionEditor.h"
+#include <QDebug>
+#include <QVBoxLayout>
namespace
{
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h b/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
index a4b7250e3331e91f5f142146c64e604c154dfcba..6dc73b58dd08bd95193b72c65a91a7df12ed36bb 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
@@ -17,10 +17,10 @@
#ifndef DISTRIBUTIONEDITOR_H
#define DISTRIBUTIONEDITOR_H
-#include <QWidget>
-#include <memory>
#include "SessionItem.h"
#include "qcustomplot.h"
+#include <QWidget>
+#include <memory>
class QGroupBox;
class DistributionWidget;
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
index 24a079b7e7ff27eab7e0369ff7e8e73adca36d7c..07d6a9e3af314505f28b17929aec64aa4d9e7602 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include <QLabel>
-#include <QVBoxLayout>
-#include <sstream>
#include "DistributionItem.h"
#include "Distributions.h"
#include "qcustomplot.h"
#include "DistributionWidget.h"
+#include <QLabel>
+#include <QVBoxLayout>
+#include <sstream>
namespace
{
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h b/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
index c83d6be69b9864f4c9ee73cf0e57a631339fc56b..a0a7520fa1361da6e1d6133c781dcc473bc2260c 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
@@ -17,10 +17,10 @@
#ifndef DISTRIBUTIONWIDGET_H
#define DISTRIBUTIONWIDGET_H
-#include <QWidget>
-#include <memory>
#include "WarningSignWidget.h"
#include "qcustomplot.h"
+#include <QWidget>
+#include <memory>
class SessionItem;
class AwesomePropertyEditor;
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
index 832db094b0b2c807ebab7f89dbcac61ac4ade232..4e2e89894ef5fd8ad161de0b0060906c6102f35a 100644
--- a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
+++ b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
@@ -14,6 +14,8 @@
//
// ************************************************************************** //
+#include "hostosinfo.h"
+#include "GroupInfoBox.h"
#include <QApplication>
#include <QDebug>
#include <QMouseEvent>
@@ -24,8 +26,6 @@
#include <QStylePainter>
#include <QToolTip>
#include <iostream>
-#include "hostosinfo.h"
-#include "GroupInfoBox.h"
namespace
{
diff --git a/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp b/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
index 6c842fc8a0d6c3bd9199e9e9d4aa28553066063e..cf0cc6e1ca9c6e1936c3a89a78a37a140c840771 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
+#include "InfoToolBar.h"
#include <QHBoxLayout>
#include <QToolButton>
-#include "InfoToolBar.h"
InfoToolBar::InfoToolBar(QWidget *parent)
: StyledToolBar(parent)
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
index 3961c45dc89324da0eb9560fe6c72e44b30af4eb..88b72816499023d81366c774627a2c6faad1c8cf 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QResizeEvent>
-#include <QVBoxLayout>
#include "InfoToolBar.h"
#include "PySampleWidget.h"
#include "InfoWidget.h"
+#include <QDebug>
+#include <QResizeEvent>
+#include <QVBoxLayout>
namespace {
const int minimum_widget_height = 25; // height of toolbar
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.h b/GUI/coregui/Views/InfoWidgets/InfoWidget.h
index 895869b9bbcea9f63e1dc56d5bacb84b6b644c5b..0d73dba66ce27a46752ac0570f0a2f96e46a3f23 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.h
@@ -17,8 +17,8 @@
#ifndef INFOWIDGET_H
#define INFOWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class InfoToolBar;
class SampleModel;
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
index b2f4680815ac820e621431eb950af5b5e4e471d9..c94f539b61d628535e4a4743e2a2caf7dd2e0ed2 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "OverlayLabelWidget.h"
+#include "OverlayLabelController.h"
#include <QAbstractScrollArea>
#include <QDebug>
#include <QEvent>
#include <QRect>
-#include "OverlayLabelWidget.h"
-#include "OverlayLabelController.h"
OverlayLabelController::OverlayLabelController(QObject *parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
index fec9148300b3459d0fa3c3aa92f9a7e6e1eb3e91..b0a4f9008e9b55a10c564f1221aeca440e74d4d8 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
@@ -17,9 +17,9 @@
#ifndef OVERLAYLABELCONTROLLER_H
#define OVERLAYLABELCONTROLLER_H
+#include "WinDllMacros.h"
#include <QObject>
#include <QString>
-#include "WinDllMacros.h"
class OverlayLabelWidget;
class QAbstractScrollArea;
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
index b1541f9e655cabdb8e85ca4b8e2635387c5b31c1..2121e440e135812498e0ccd386610614c1b2dd8d 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "DesignerHelper.h"
+#include "OverlayLabelWidget.h"
#include <QColor>
#include <QFont>
#include <QPainter>
-#include "DesignerHelper.h"
-#include "OverlayLabelWidget.h"
OverlayLabelWidget::OverlayLabelWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
index 484b589a9b82a865c100216284254a1c92b4b032..b0f8295c49921cdf683642fe3e693c80057c5bc9 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
@@ -17,10 +17,10 @@
#ifndef OVERLAYLABELWIDGET
#define OVERLAYLABELWIDGET
+#include "WinDllMacros.h"
#include <QRect>
#include <QString>
#include <QWidget>
-#include "WinDllMacros.h"
//! The OverlayLabelWidget is a semi-transparent overlay label to place on top of other
//! widgets outside of any layout context.
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
index bda6af6f2d236284c7a1aba2aea4ab8d67db1be7..130ee20b6ed2ecadf757eea7a91a859bdf73cf4d 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
@@ -14,6 +14,13 @@
//
// ************************************************************************** //
+#include "DesignerHelper.h"
+#include "GUIHelpers.h"
+#include "GUIMessage.h"
+#include "MessageContainer.h"
+#include "SessionModel.h"
+#include "WarningMessageService.h"
+#include "ProjectLoadWarningDialog.h"
#include <QBoxLayout>
#include <QDebug>
#include <QFrame>
@@ -24,13 +31,6 @@
#include <QTableWidget>
#include <QTableWidgetItem>
#include <QTextEdit>
-#include "DesignerHelper.h"
-#include "GUIHelpers.h"
-#include "GUIMessage.h"
-#include "MessageContainer.h"
-#include "SessionModel.h"
-#include "WarningMessageService.h"
-#include "ProjectLoadWarningDialog.h"
namespace {
const int top_panel_height = 80;
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
index bbbe0df107874bfe4cbfaf8933a80a43b0fd81d0..18983a412560d3ee40cc27e448a48b224b7d8435 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
@@ -14,6 +14,15 @@
//
// ************************************************************************** //
+#include "DesignerHelper.h"
+#include "DomainObjectBuilder.h"
+#include "InstrumentModel.h"
+#include "MultiLayer.h"
+#include "PyGenVisitor.h"
+#include "PythonSyntaxHighlighter.h"
+#include "SampleModel.h"
+#include "WarningSignWidget.h"
+#include "PySampleWidget.h"
#include <QDebug>
#include <QFile>
#include <QModelIndex>
@@ -25,15 +34,6 @@
#include <QTextStream>
#include <QTimer>
#include <QVBoxLayout>
-#include "DesignerHelper.h"
-#include "DomainObjectBuilder.h"
-#include "InstrumentModel.h"
-#include "MultiLayer.h"
-#include "PyGenVisitor.h"
-#include "PythonSyntaxHighlighter.h"
-#include "SampleModel.h"
-#include "WarningSignWidget.h"
-#include "PySampleWidget.h"
namespace {
const int timer_interval_msec = 10;
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h b/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
index 1eda6743297a413642b2b65deb680f71fc377dbe..5c7b0c51c768e54d1513c0f21d777e6c3de75ff1 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
@@ -17,8 +17,8 @@
#ifndef PYSAMPLEWIDGET_H
#define PYSAMPLEWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class SampleModel;
class InstrumentModel;
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
index 39ee085efe8b6ab9e528e9b1d69e0d798bb3563c..e1c652b124cbd9c7c978f0525886c4a2cad722f6 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
+#include "WarningSignWidget.h"
#include <QMessageBox>
#include <QPainter>
#include <QRect>
-#include "WarningSignWidget.h"
WarningSignWidget::WarningSignWidget(QWidget * parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
index ce05bc36738249b4bf0812bfbeaf0893b4784945..21c56a41ccdf6243df6bb81ac6a323c05423cd40 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
@@ -17,10 +17,10 @@
#ifndef WARNINGSIGNWIDGET_H
#define WARNINGSIGNWIDGET_H
+#include "WinDllMacros.h"
#include <QPixmap>
#include <QString>
#include <QWidget>
-#include "WinDllMacros.h"
//! The WarningSignWidget is an transparent widget with warning sign pixmap intended to be
//! overlayed onto other widget at some arbitrary position.
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index e38c24fa961b7c9a1515ca369070616fc1faa8ea..74c7cd135a6cbc66c4571d7449f5f29669285cec 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -14,11 +14,6 @@
//
// ************************************************************************** //
-#include <QBoxLayout>
-#include <QDebug>
-#include <QListView>
-#include <QStackedWidget>
-#include <QToolButton>
#include "ExtendedDetectorDialog.h"
#include "InstrumentEditorWidget.h"
#include "InstrumentModel.h"
@@ -26,6 +21,11 @@
#include "StyledToolBar.h"
#include "mainwindow.h"
#include "InstrumentView.h"
+#include <QBoxLayout>
+#include <QDebug>
+#include <QListView>
+#include <QStackedWidget>
+#include <QToolButton>
InstrumentView::InstrumentView(MainWindow *mainWindow)
diff --git a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
index e1984f677efa19c4e937d43cf0e1376151e64ec5..c6b7556b5862ed593bb4d5dcb35714452e61526a 100644
--- a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
@@ -14,13 +14,6 @@
//
// ************************************************************************** //
-#include <QComboBox>
-#include <QDebug>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QVBoxLayout>
-#include <iostream>
#include "BeamDistributionItem.h"
#include "BeamItem.h"
#include "ComponentBoxEditor.h"
@@ -30,6 +23,13 @@
#include "GroupInfoBox.h"
#include "LayerItem.h"
#include "BeamEditorWidget.h"
+#include <QComboBox>
+#include <QDebug>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QVBoxLayout>
+#include <iostream>
namespace
{
QString name_of_groupbox_wavenlength("Wavelength [nm]");
diff --git a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
index bfe595ca72d8802fc2ab7b3988a56b65fdd3467c..6931ed609ebdab1c6bd1ca806a60290b0614f895 100644
--- a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
@@ -17,9 +17,9 @@
#ifndef BEAMEDITORWIDGET_H
#define BEAMEDITORWIDGET_H
-#include <QWidget>
#include "SessionItem.h"
#include "WinDllMacros.h"
+#include <QWidget>
class BeamItem;
class ComponentBoxEditor;
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
index 17ac2a7628d3c6de6e8d3b816004277fcb38910f..44e5b87cf5d338e4a86a26e6649733defb2284dd 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.cpp
@@ -14,6 +14,8 @@
//
// ************************************************************************** //
+#include "GUIHelpers.h"
+#include "ComboWidget.h"
#include <QBoxLayout>
#include <QComboBox>
#include <QDebug>
@@ -23,8 +25,6 @@
#include <QLabel>
#include <QPushButton>
#include <QSpinBox>
-#include "GUIHelpers.h"
-#include "ComboWidget.h"
ComboWidget::ComboWidget(QString item, QGridLayout *layout, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.h b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.h
index 4ebaebb7c13a911645788ce87cb24ddbc2a3c19f..72bed5c4db6fca71ae4f22a801ceef9e25cc8055 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComboWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ComboWidget.h
@@ -17,8 +17,8 @@
#ifndef COMBOWIDGET_H
#define COMBOWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class QComboBox;
class QLabel;
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
index d7b7789b28e1cf710db58ea4f3bc313c01a9f095..36e2e515e718ea359325f0205148f9ca1f652010 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "ComponentBoxEditor.h"
+#include "ComponentInfoBox.h"
#include <QGroupBox>
#include <QVBoxLayout>
#include <iostream>
-#include "ComponentBoxEditor.h"
-#include "ComponentInfoBox.h"
ComponentInfoBox::ComponentInfoBox(const QString &title, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
index ecb59e3915191bef943f56c5b195128ea3c7e3a1..6236bda4a2a3441c99810e2d1b31807caf7918c2 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ComponentInfoBox.h
@@ -17,9 +17,9 @@
#ifndef COMPONENTINFOBOX_H
#define COMPONENTINFOBOX_H
-#include <QWidget>
#include "GroupInfoBox.h"
#include "WinDllMacros.h"
+#include <QWidget>
class ComponentBoxEditor;
class SessionItem;
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
index 2d35156fe34ae118054cb8e368377f08344eba3a..2ca8e5fe51936ed1986bf45da9ccf2acf5e998f9 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGroupBox>
-#include <QLabel>
-#include <QVBoxLayout>
#include "ComponentBoxEditor.h"
#include "DetectorItems.h"
#include "DetectorItems.h"
@@ -28,6 +24,10 @@
#include "SphericalDetectorWidget.h"
#include "columnresizer.h"
#include "DetectorEditorWidget.h"
+#include <QDebug>
+#include <QGroupBox>
+#include <QLabel>
+#include <QVBoxLayout>
DetectorEditorWidget::DetectorEditorWidget(ColumnResizer *columnResizer, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
index 437c1e3bfac64e90579edcd4b1e81c393e55b39f..929b326350a553a878635171e1fd23cf6e40d066 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
@@ -17,9 +17,9 @@
#ifndef DETECTOREDITORWIDGET_H
#define DETECTOREDITORWIDGET_H
+#include "WinDllMacros.h"
#include <QWidget>
#include <memory>
-#include "WinDllMacros.h"
class GroupInfoBox;
class DetectorItem;
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index 9051d73e985c628c90cbbf5703fed1129c1a8bc6..a34348e07e504bfbfb82af955d76cfd88e9a2857 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "AxesItems.h"
#include "ComboProperty.h"
#include "DetectorItems.h"
@@ -26,6 +25,7 @@
#include "MaskModel.h"
#include "OutputData.h"
#include "DetectorMaskDelegate.h"
+#include <QDebug>
DetectorMaskDelegate::DetectorMaskDelegate(QObject *parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
index d73f353cff8b33bad0fb79b6a599bfb8b771f0e3..9608fdc0420d01734f706726758cc3f4bbc81fb4 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
@@ -17,9 +17,9 @@
#ifndef DETECTORMASKDELEGATE_H
#define DETECTORMASKDELEGATE_H
+#include "WinDllMacros.h"
#include <QModelIndex>
#include <QObject>
-#include "WinDllMacros.h"
template <class T> class OutputData;
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index 96999251bc65c0e6132c14d8b24a60157d673dea..83912c7dbd46a2d2a058baebd59e88c5c0d2f7dc 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -14,18 +14,18 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QKeyEvent>
-#include <QModelIndex>
-#include <QPushButton>
-#include <QSettings>
-#include <QVBoxLayout>
#include "CustomEventFilters.h"
#include "DetectorMaskDelegate.h"
#include "MaskEditor.h"
#include "MaskModel.h"
#include "mainwindow_constants.h"
#include "ExtendedDetectorDialog.h"
+#include <QDebug>
+#include <QKeyEvent>
+#include <QModelIndex>
+#include <QPushButton>
+#include <QSettings>
+#include <QVBoxLayout>
ExtendedDetectorDialog::ExtendedDetectorDialog(QWidget *parent)
: QDialog(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
index 88919acc61cf6e97df0acda0b4d475fe405beb40..f49c775e0b91e124761472d0e469381167aff695 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QVBoxLayout>
#include "BeamEditorWidget.h"
#include "DetectorEditorWidget.h"
#include "columnresizer.h"
#include "InstrumentComponentsWidget.h"
+#include <QDebug>
+#include <QVBoxLayout>
InstrumentComponentsWidget::InstrumentComponentsWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
index 9eb8e99aba9400471a84f51ff28092e1ad4d9d0e..f38d985678b36427fbf8430178a412000567f5bd 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
@@ -17,8 +17,8 @@
#ifndef INSTRUMENTCOMPONENTSWIDGET_H
#define INSTRUMENTCOMPONENTSWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class BeamItem;
class DetectorItem;
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index 064fd1d0c7be0ebf74896429dab54c1017a011aa..a41c639077a29556ad9df2a4655a319d945848f6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -14,14 +14,6 @@
//
// ************************************************************************** //
-#include <QBoxLayout>
-#include <QComboBox>
-#include <QDebug>
-#include <QEvent>
-#include <QGroupBox>
-#include <QLineEdit>
-#include <QScrollArea>
-#include <QScrollBar>
#include "BeamEditorWidget.h"
#include "BeamItem.h"
#include "DetectorEditorWidget.h"
@@ -30,6 +22,14 @@
#include "InstrumentItem.h"
#include "SessionItem.h"
#include "InstrumentEditorWidget.h"
+#include <QBoxLayout>
+#include <QComboBox>
+#include <QDebug>
+#include <QEvent>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QScrollArea>
+#include <QScrollBar>
class AdjustingScrollArea : public QScrollArea {
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
index 6d4d5873da9715b06d4e1bdb5aced439d306c7ca..03b238f4fa7e7bccf018810a9376318e3511767a 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
@@ -18,10 +18,10 @@
#define INSTRUMENTEDITORWIDGET_H
+#include "WinDllMacros.h"
#include <QLabel>
#include <QMap>
#include <QWidget>
-#include "WinDllMacros.h"
class SessionItem;
class DetectorEditorWidget;
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
index 58abb7740de3d6792408796eadeacb97dcc8aa65..9f5724481559df3962f55cdffa88ff279abddc92 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
@@ -14,15 +14,15 @@
//
// ************************************************************************** //
+#include "InstrumentModel.h"
+#include "SessionItem.h"
+#include "InstrumentSelectorWidget.h"
#include <QAction>
#include <QDebug>
#include <QListView>
#include <QMenu>
#include <QPushButton>
#include <QVBoxLayout>
-#include "InstrumentModel.h"
-#include "SessionItem.h"
-#include "InstrumentSelectorWidget.h"
InstrumentSelectorWidget::InstrumentSelectorWidget(InstrumentModel *model, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
index 4b05aae802dbf548be29f8c4cfeac4564978699f..3cd7f30f5742414257ba587f8cfc294b6b7d581b 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
@@ -17,8 +17,8 @@
#ifndef INSTRUMENTSELECTORWIDGET_H
#define INSTRUMENTSELECTORWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class InstrumentModel;
class QListView;
class QAction;
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
index cb095cb85da856e78855a76821642bfa4cbe7c9e..a737d40010b30f1e37de252f7b9cca41e137c4dd 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
@@ -14,9 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGroupBox>
-#include <QVBoxLayout>
#include "ComboProperty.h"
#include "ComponentBoxEditor.h"
#include "ComponentEditor.h"
@@ -25,6 +22,9 @@
#include "GroupInfoBox.h"
#include "columnresizer.h"
#include "RectangularDetectorWidget.h"
+#include <QDebug>
+#include <QGroupBox>
+#include <QVBoxLayout>
RectangularDetectorWidget::RectangularDetectorWidget(ColumnResizer *columnResizer,
RectangularDetectorItem *detectorItem, QWidget *parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
index e1f69b35ac71e0829a26f515fab8f92363430764..742b1390962b691826b381007143b4b59cb04501 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
@@ -17,9 +17,9 @@
#ifndef RECTANGULARDETECTORWIDGET_H
#define RECTANGULARDETECTORWIDGET_H
+#include "WinDllMacros.h"
#include <QWidget>
#include <memory>
-#include "WinDllMacros.h"
class ColumnResizer;
class GroupInfoBox;
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
index 0bc0d006d7a8ddba170883c87ebb61a24ff9f45b..30792378524b7206b70e74e952389082c7fd6684 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
@@ -14,15 +14,15 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGroupBox>
-#include <QVBoxLayout>
#include "ComponentBoxEditor.h"
#include "DetectorItems.h"
#include "ExtendedDetectorDialog.h"
#include "GroupInfoBox.h"
#include "columnresizer.h"
#include "SphericalDetectorWidget.h"
+#include <QDebug>
+#include <QGroupBox>
+#include <QVBoxLayout>
SphericalDetectorWidget::SphericalDetectorWidget(ColumnResizer *columnResizer,
DetectorItem *detectorItem, QWidget *parent)
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
index 831460058f0730093c8a6f1061b7968524080864..6e401b60915171d39b9eaec5fa64bc625f2c276c 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
@@ -17,8 +17,8 @@
#ifndef SPHERICALDETECTORWIDGET_H
#define SPHERICALDETECTORWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class DetectorItem;
class QGridLayout;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
index 22d163c251433d43a1e9c70eb9e353025f4b9c1d..c7d7be763ee8235a106a1be1fd8ad610190d0b8b 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "AxesItems.h"
#include "ColorMapEvent.h"
#include "ColorMapHelper.h"
@@ -24,6 +23,7 @@
#include "UpdateTimer.h"
#include "plot_constants.h"
#include "ColorMap.h"
+#include <QDebug>
namespace {
const int replot_update_interval = 10;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
index a1fc797ddf3bbe1c3ae51249fbd9d86fa83d6994..6a06a0b85b02cffebf12ad596129e07d6f3d557a 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
@@ -17,13 +17,13 @@
#ifndef COLORMAP_H
#define COLORMAP_H
+#include "ColorMapBin.h"
+#include "WinDllMacros.h"
+#include "qcustomplot.h"
#include <QMap>
#include <QPoint>
#include <QWidget>
#include <memory>
-#include "ColorMapBin.h"
-#include "WinDllMacros.h"
-#include "qcustomplot.h"
class IntensityDataItem;
class QCustomPlot;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapBin.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapBin.h
index 8f7640bcc25d19c56b69802678c638bf5ab03acb..5b1ab2c2515c143e8b0719522022314d5bbb18de 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapBin.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapBin.h
@@ -17,8 +17,8 @@
#ifndef COLORMAPBIN_H
#define COLORMAPBIN_H
-#include <QString>
#include "WinDllMacros.h"
+#include <QString>
//! The ColorMapBin class contains parameters of intensity data bin under current mouse position.
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
index 0c1a76ef2278a3ee096dbe26412d7d1daca9c8a1..4b9f174ac9a9c4ef436d6b799e21c84c3cf70e4e 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
@@ -14,15 +14,15 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QLabel>
-#include <QVBoxLayout>
#include "ColorMap.h"
#include "ColorMapCanvasEvent.h"
#include "ColorMapLabel.h"
#include "IntensityDataItem.h"
#include "StatusLabel.h"
#include "ColorMapCanvas.h"
+#include <QDebug>
+#include <QLabel>
+#include <QVBoxLayout>
ColorMapCanvas::ColorMapCanvas(QWidget *parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
index e161666137ea074a123edbc412a49849c8d5fc85..1584480c7c7bed28a75e8dfffb9381409a02ea05 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
@@ -17,8 +17,8 @@
#ifndef COLORMAPCANVAS_H
#define COLORMAPCANVAS_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class ColorMap;
class QCustomPlot;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
index 1b93cbd6218d466e5339ecc136a141a8c1defae5..63295ad2abcaa2995a92ec8928955f1c20d61b8b 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QLabel>
-#include <QRect>
-#include <QResizeEvent>
#include "ColorMap.h"
#include "ColorMapCanvas.h"
#include "qcustomplot.h"
#include "ColorMapCanvasEvent.h"
+#include <QDebug>
+#include <QLabel>
+#include <QRect>
+#include <QResizeEvent>
namespace {
const QString tick_font = "tick-font-key";
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.h
index 974ab04f6ab4809d462413bfe2c919cec7013d56..3751a08f0e36f4cf08b99a3f38078447d7815d00 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.h
@@ -17,10 +17,10 @@
#ifndef COLORMAPCANVASEVENT_H
#define COLORMAPCANVASEVENT_H
+#include "WinDllMacros.h"
#include <QFont>
#include <QMap>
#include <QObject>
-#include "WinDllMacros.h"
class ColorMapCanvas;
class QObject;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
index c503dd4c8c575347b9d421944e08dc731fd6dac8..160e2b28ad50cb5c16843bb40580c6dc34a6d623 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QMouseEvent>
#include "ColorMap.h"
#include "ColorMapEvent.h"
+#include <QDebug>
+#include <QMouseEvent>
ColorMapEvent::ColorMapEvent(ColorMap *colorMap)
: QObject(colorMap)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.h
index afd486a586030db6302dbb50c5eaf43a369e393a..d8eb5228d37996b0460c30de853546cb2966a184 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.h
@@ -17,9 +17,9 @@
#ifndef COLORMAPEVENT_H
#define COLORMAPEVENT_H
-#include <QObject>
#include "ColorMapBin.h"
#include "WinDllMacros.h"
+#include <QObject>
class ColorMap;
class QMouseEvent;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapHelper.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapHelper.h
index 7c4806a5a750949f5ce64313089ed31d488e3f45..eaee82ee790d3af6e0131828fa8d30baf0171e03 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapHelper.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapHelper.h
@@ -17,10 +17,10 @@
#ifndef COLORMAPHELPER_H
#define COLORMAPHELPER_H
-#include <QMap>
-#include <QString>
#include "WinDllMacros.h"
#include "qcustomplot.h"
+#include <QMap>
+#include <QString>
class IntensityDataItem;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
index 9024ac28d3b91586deb2bcdf73de3185e328b854..79e26f48e99f9c780a7ae5fc64815368e86ae3f4 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
@@ -17,8 +17,8 @@
#ifndef COLORMAPLABEL_H
#define COLORMAPLABEL_H
-#include <QList>
#include "StatusLabel.h"
+#include <QList>
class ColorMap;
class ColorMapCanvas;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
index 63e9f21f9b662dfb6ba629fbc7b8c7565f0d0f4a..f229ffed09d1ca7ee07b2af8c6575c029c925780 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "AxesItems.h"
#include "ColorMapHelper.h"
#include "GUIHelpers.h"
@@ -22,6 +21,7 @@
#include "Units.h"
#include "UpdateTimer.h"
#include "ColorMapPlot.h"
+#include <QDebug>
namespace {
const int replot_update_interval = 10;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h
index 05924b854ef1bc5f28fcbd012c7d6a5d40767228..926db550d3c15cc5ed98845865db7c23ebfd163f 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapPlot.h
@@ -17,12 +17,12 @@
#ifndef COLORMAPPLOT_H
#define COLORMAPPLOT_H
+#include "WinDllMacros.h"
+#include "qcustomplot.h"
#include <QMap>
#include <QPoint>
#include <QWidget>
#include <memory>
-#include "WinDllMacros.h"
-#include "qcustomplot.h"
class IntensityDataItem;
class QCustomPlot;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
index f82501869f87d2576ac5b2b43c05b7aaca6655ca..c129900222213419017cc8600ab35736c70d9de3 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "AxesItems.h"
#include "IntensityDataItem.h"
#include "Units.h"
#include "qcustomplot.h"
#include "HorizontalSlicePlot.h"
+#include <QVBoxLayout>
HorizontalSlicePlot::HorizontalSlicePlot(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h
index eb9ff32656568a008d25130b16370570137afd72..efe861899ac9bf79bfbfcc0a85ef648f1b7effee 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/HorizontalSlicePlot.h
@@ -17,9 +17,9 @@
#ifndef HORIZONTALSLICEPLOT_H
#define HORIZONTALSLICEPLOT_H
+#include "WinDllMacros.h"
#include <QWidget>
#include <memory>
-#include "WinDllMacros.h"
class IntensityDataItem;
class QCustomPlot;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index e164ead13406c34850be073fa321a9cc74424ac4..4b7177023f7a91275dd71d69ca452f6d8284bc6e 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QDebug>
-#include <QVBoxLayout>
#include "ComponentEditor.h"
#include "IntensityDataItem.h"
#include "JobModel.h"
#include "IntensityDataPropertyWidget.h"
+#include <QAction>
+#include <QDebug>
+#include <QVBoxLayout>
IntensityDataPropertyWidget::IntensityDataPropertyWidget(QWidget *parent)
: SessionItemWidget(parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
index 09cd21bbdf7581cf962dc593be864f9de6b68b26..c63c4df4afafbfe5cba74da378a8b4982d90c4b0 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QVBoxLayout>
#include "AppSvc.h"
#include "ColorMapCanvas.h"
#include "IntensityDataItem.h"
#include "SavePlotAssistant.h"
#include "projectmanager.h"
#include "IntensityDataWidget.h"
+#include <QAction>
+#include <QVBoxLayout>
IntensityDataWidget::IntensityDataWidget(QWidget *parent)
: SessionItemWidget(parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
index aa323b5c7929c10b057d7404529e37dc297305e3..10042b6281213c165f788f38643fd084a7b1fc1a 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QLabel>
-#include <QSplitter>
-#include <QVBoxLayout>
#include "ColorMapPlot.h"
#include "HorizontalSlicePlot.h"
#include "IntensityDataItem.h"
@@ -25,6 +21,10 @@
#include "VerticalSlicePlot.h"
#include "qcustomplot.h"
#include "ObsoleteIntensityDataPlotWidget.h"
+#include <QDebug>
+#include <QLabel>
+#include <QSplitter>
+#include <QVBoxLayout>
ObsoleteIntensityDataPlotWidget::ObsoleteIntensityDataPlotWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.h b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.h
index dc5afdbdc1d32b0c10a1742e7328d0c62407872a..0643af4190faf06614920b0bb44a075dcbea8630 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.h
@@ -17,9 +17,9 @@
#ifndef OBSOLETEINTENSITYDATAPLOTWIDGET_H
#define OBSOLETEINTENSITYDATAPLOTWIDGET_H
+#include "WinDllMacros.h"
#include <QWidget>
#include <memory>
-#include "WinDllMacros.h"
class QSplitter;
class HorizontalSlicePlot;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
index fcdd0bc17965d3cca64eb10b0afca024c5c1bde1..06bcd16122dcf99f6a931339f9c08a2a417402e8 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidget.cpp
@@ -14,8 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QVBoxLayout>
#include "AppSvc.h"
#include "IntensityDataItem.h"
#include "IntensityDataPropertyWidget.h"
@@ -25,6 +23,8 @@
#include "ObsoleteIntensityDataWidgetActions.h"
#include "projectmanager.h"
#include "ObsoleteIntensityDataWidget.h"
+#include <QDebug>
+#include <QVBoxLayout>
ObsoleteIntensityDataWidget::ObsoleteIntensityDataWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.cpp
index e7b4db926fb443741306718f7428e4f8eb719b4c..3158e4bad874f9bc1df47af6d639b04186aacb87 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include <QAction>
#include "ObsoleteIntensityDataWidgetActions.h"
+#include <QAction>
ObsoleteIntensityDataWidgetActions::ObsoleteIntensityDataWidgetActions(QObject *parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.h b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.h
index f9cfc748210823b178e92a7cd4b3e75cfb1f78b8..6da1df67fbca970792e1b858b870a3aedaa138e4 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.h
@@ -17,8 +17,8 @@
#ifndef OBSOLETEINTENSITYDATAWIDGETACTIONS_H
#define OBSOLETEINTENSITYDATAWIDGETACTIONS_H
-#include <QObject>
#include "WinDllMacros.h"
+#include <QObject>
class QAction;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index 23b9d66a1daa4ca39cc04bbac1e1d3b5b36c22a5..a6bc76abcab5553abb975b809adb28c2e2fcf267 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QFileDialog>
-#include <QMessageBox>
#include "ColorMapPlot.h"
#include "IntensityDataIOFactory.h"
#include "IntensityDataItem.h"
#include "SavePlotAssistant.h"
+#include <QDebug>
+#include <QFileDialog>
+#include <QMessageBox>
namespace {
const QString png_extension = ".png";
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
index ff3f904fb2c7e5327bb924ff51f43f7440d2db9c..13d3bb9f7a7115f4395eb10b7f77b18c59d9f136 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
@@ -17,9 +17,9 @@
#ifndef SAVEPLOTASSISTANT_H
#define SAVEPLOTASSISTANT_H
+#include "WinDllMacros.h"
#include <QString>
#include <QVector>
-#include "WinDllMacros.h"
class QCustomPlot;
class IntensityDataItem;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
index 3d0d612adbaed72b7bb237afc45715d3ca83c01a..41c31d39c92b0e52f1be713724be1b82d636f500 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "AxesItems.h"
#include "IntensityDataItem.h"
#include "Units.h"
#include "qcustomplot.h"
#include "VerticalSlicePlot.h"
+#include <QVBoxLayout>
VerticalSlicePlot::VerticalSlicePlot(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h
index 274883cb8f96d6885b793a6a9bf68d901fa84e1f..39d05a1858d5e1a067feea32a85b28c213e98796 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/VerticalSlicePlot.h
@@ -17,9 +17,9 @@
#ifndef VERTICALSLICEPLOT_H
#define VERTICALSLICEPLOT_H
+#include "WinDllMacros.h"
#include <QWidget>
#include <memory>
-#include "WinDllMacros.h"
class IntensityDataItem;
class QCustomPlot;
diff --git a/GUI/coregui/Views/JobView.cpp b/GUI/coregui/Views/JobView.cpp
index 13003a8733b659a95ec8bded156f5e8a4efaf60b..3bd68623c9fc9aa0a0cb2f8e42a75da8d046ce47 100644
--- a/GUI/coregui/Views/JobView.cpp
+++ b/GUI/coregui/Views/JobView.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QMenu>
#include "JobActivityStatusBar.h"
#include "JobItem.h"
#include "JobModel.h"
@@ -24,6 +23,7 @@
#include "JobViewDocks.h"
#include "mainwindow.h"
#include "JobView.h"
+#include <QMenu>
JobView::JobView(MainWindow *mainWindow)
: m_docks(new JobViewDocks(this))
diff --git a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
index c379336a24ad813cc5037287208b5749808a1889..c53d014de6b264ee9da65e757236edafa0245583 100644
--- a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "JobViewActivities.h"
+#include "mainwindow.h"
+#include "JobActivityStatusBar.h"
#include <QComboBox>
#include <QHBoxLayout>
#include <QStatusBar>
#include <QToolButton>
-#include "JobViewActivities.h"
-#include "mainwindow.h"
-#include "JobActivityStatusBar.h"
JobActivityStatusBar::JobActivityStatusBar(MainWindow *mainWindow)
: QWidget(mainWindow)
diff --git a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
index 4d5c4cfb31cde8b19238e103aa508368e5b0da61..413d16fa35ffffb01aa62d49cc3016498403c216 100644
--- a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
@@ -17,8 +17,8 @@
#ifndef JOBACTIVITYSTATUSBAR_H
#define JOBACTIVITYSTATUSBAR_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class MainWindow;
class QToolButton;
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
index 925375c0b6a725fd7898b4226f2331a0227bac5e..8af82aff8581b861ee193f7d77f032a7f5a56b79 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
@@ -14,6 +14,11 @@
//
// ************************************************************************** //
+#include "JobItem.h"
+#include "JobModel.h"
+#include "hostosinfo.h"
+#include "progressbar.h"
+#include "JobListViewDelegate.h"
#include <QApplication>
#include <QDebug>
#include <QMouseEvent>
@@ -21,11 +26,6 @@
#include <QPainter>
#include <QStyleOptionProgressBarV2>
#include <QWidget>
-#include "JobItem.h"
-#include "JobModel.h"
-#include "hostosinfo.h"
-#include "progressbar.h"
-#include "JobListViewDelegate.h"
JobListViewDelegate::JobListViewDelegate(QWidget *parent)
: QItemDelegate(parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
index 59bf3f257e765ef0062d875eb6f6a73d3b1727b1..1e19abd9af24461a80d9c63aad9773e526a81dfc 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
@@ -17,10 +17,10 @@
#ifndef JOBLISTVIEWDELEGATE_H
#define JOBLISTVIEWDELEGATE_H
+#include "WinDllMacros.h"
#include <QItemDelegate>
#include <QMap>
#include <QRect>
-#include "WinDllMacros.h"
class JobItem;
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
index d320e6320fb50063de45184024bff486cd47a22a..a444ab35b52dd0abc0514dde9aab204ffe934733 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QItemSelectionModel>
-#include <QListView>
-#include <QVBoxLayout>
#include "ItemSelectorWidget.h"
#include "JobItem.h"
#include "JobListViewDelegate.h"
#include "JobModel.h"
#include "JobListWidget.h"
+#include <QItemSelectionModel>
+#include <QListView>
+#include <QVBoxLayout>
JobListWidget::JobListWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.h b/GUI/coregui/Views/JobWidgets/JobListWidget.h
index b3cff49ddf4ae2830e290695cde8187815a85367..0255cf841631a04779b4d28793c7c8d4da8a44d1 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.h
@@ -17,9 +17,9 @@
#ifndef JOBLISTWIDGET_H
#define JOBLISTWIDGET_H
+#include "WinDllMacros.h"
#include <QModelIndexList>
#include <QWidget>
-#include "WinDllMacros.h"
class JobModel;
class JobListViewDelegate;
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp b/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
index 9820c1b68b0bd5846e977d8ba7e4d667b3b850d8..9020674bea74a68faf0a7e9360c1355914d0cd61 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "mainwindow_constants.h"
+#include "JobMessagePanel.h"
#include <QScrollBar>
#include <QStackedWidget>
#include <QTextEdit>
#include <QVBoxLayout>
-#include "mainwindow_constants.h"
-#include "JobMessagePanel.h"
JobMessagePanel::JobMessagePanel(QWidget *parent)
: InfoPanel(parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
index 1a84c62a10b35a26de882f2dfc850936dcad1cf8..b0d34cfc34fd94e149d56f2b5cbd57d37e68bfcf 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
@@ -17,8 +17,8 @@
#ifndef JOBMESSAGEPANEL_H
#define JOBMESSAGEPANEL_H
-#include <QColor>
#include "InfoPanel.h"
+#include <QColor>
class QTextEdit;
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
index 23eefdda8ef3ab4f6d376f576a128e93a12f68bf..68a230ff6f2ba38fd0308f641e55d41a7f635c2d 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "JobItem.h"
#include "JobModel.h"
#include "JobResultsPresenter.h"
@@ -22,6 +21,7 @@
#include "ObsoleteIntensityDataWidget.h"
#include "mainwindow_constants.h"
#include "JobOutputDataWidget.h"
+#include <QVBoxLayout>
JobOutputDataWidget::JobOutputDataWidget(JobModel *jobModel, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
index 10283e6fa97b491b7bf4ee396ee7b9224984e1d5..deaeceef173c5a84449d567ae890e21fc6849e93 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
@@ -17,8 +17,8 @@
#ifndef JOBOUTPUTDATAWIDGET_H
#define JOBOUTPUTDATAWIDGET_H
-#include <QMap>
#include "ItemStackPresenter.h"
+#include <QMap>
class ObsoleteIntensityDataWidget;
class JobResultsPresenter;
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
index 38127817ff03b312392494a01f4264e16e08e225..ca0e5f32d3b85a34b086abb878da46b36fff11ef 100644
--- a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
+++ b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
@@ -17,8 +17,8 @@
#ifndef JOBPROGRESSASSISTANT_H
#define JOBPROGRESSASSISTANT_H
-#include <QObject>
#include "WinDllMacros.h"
+#include <QObject>
class MainWindow;
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
index d94356458ce2cd619fd475c2ccedb1d49627ae04..0a6e7f0e8babc5eeb5d277ed090d6044fe1e09f4 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QTabBar>
-#include <QTabWidget>
-#include <QTextEdit>
-#include <QVBoxLayout>
#include "ComponentEditor.h"
#include "JobItem.h"
#include "mainwindow_constants.h"
#include "JobPropertiesWidget.h"
+#include <QTabBar>
+#include <QTabWidget>
+#include <QTextEdit>
+#include <QVBoxLayout>
JobPropertiesWidget::JobPropertiesWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
index aca8c1c62e37e083b9f64793f3e0114144c73d08..57ecdee79ce1224ffbf2b53601af4d83053c3c0f 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
@@ -17,8 +17,8 @@
#ifndef JOBPROPERTIESWIDGET_H
#define JOBPROPERTIESWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class JobItem;
class QTextEdit;
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
index 48d44642efeacf5217da53c21920e32efe611027..ad63aebaa1664660f7e1c93db2876283fc8b5f18 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include <QToolButton>
#include "JobRealTimeToolBar.h"
+#include <QToolButton>
//! main tool bar on top of SampleView window
JobRealTimeToolBar::JobRealTimeToolBar(QWidget *parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
index 6a2c5fe8ab4ea054417e4316224250c5ea98635d..52457c6208afeb6d866b5b4820d00e32f2df290b 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "JobItem.h"
#include "JobModel.h"
#include "JobRealTimeToolBar.h"
#include "ParameterTuningWidget.h"
#include "mainwindow_constants.h"
#include "JobRealTimeWidget.h"
+#include <QVBoxLayout>
JobRealTimeWidget::JobRealTimeWidget(JobModel *jobModel, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
index e0d248fb08d91e66ea3037b6aabd9ef011025ae7..f107a22b053359fbc0fca5f965071e80cdd4d5ef 100644
--- a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QBoxLayout>
#include "FitComparisonWidget.h"
#include "JobItem.h"
#include "ObsoleteIntensityDataWidget.h"
#include "mainwindow_constants.h"
#include "JobResultsPresenter.h"
+#include <QBoxLayout>
JobResultsPresenter::JobResultsPresenter(QWidget *parent)
: ItemComboWidget(parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
index ec7d3c28b02290c5e4c7786e30fbdf8f39a57912..8bf2bf494112ec5c515a061e4bb36c9b8ecf17dd 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QDebug>
-#include <QItemSelectionModel>
-#include <QMenu>
#include "JobItem.h"
#include "JobModel.h"
#include "StyledToolBar.h"
#include "JobSelectorActions.h"
+#include <QAction>
+#include <QDebug>
+#include <QItemSelectionModel>
+#include <QMenu>
JobSelectorActions::JobSelectorActions(JobModel *jobModel, QObject *parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h b/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
index e0347494a1b05fa23d7fcc3eb03c3de58f4ac735..39c7db65c24ecc704933edc73d6f8c166e605a95 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
@@ -17,9 +17,9 @@
#ifndef JOBSELECTORACTIONS_H
#define JOBSELECTORACTIONS_H
+#include "WinDllMacros.h"
#include <QModelIndex>
#include <QObject>
-#include "WinDllMacros.h"
class QAction;
class JobModel;
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
index f37fcb1a2be952cdb57a05d8d352fe89e12af1fd..3c9703f0524f7685b563ce15228595ef2b397b3e 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QHBoxLayout>
#include "JobItem.h"
#include "JobListWidget.h"
#include "JobModel.h"
@@ -24,6 +23,7 @@
#include "mainwindow_constants.h"
#include "minisplitter.h"
#include "JobSelectorWidget.h"
+#include <QHBoxLayout>
JobSelectorWidget::JobSelectorWidget(JobModel *jobModel, QWidget *parent)
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
index 60abcd225951623605af1a24fa803d3f334e8300..d985adf8f426e34ad54a2667f55013b7f9924268 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
@@ -17,8 +17,8 @@
#ifndef JOBSELECTORWIDGET_H
#define JOBSELECTORWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class JobModel;
class JobItem;
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.h b/GUI/coregui/Views/JobWidgets/JobViewActivities.h
index 0f0885d078263d7f8ae268a24436bab77556d414..dc865197f59eb0e7de13db20c51c8a7c51a8f60b 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewActivities.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewActivities.h
@@ -17,11 +17,11 @@
#ifndef JOBVIEWACTIVITIES_H
#define JOBVIEWACTIVITIES_H
+#include "JobViewFlags.h"
+#include "WinDllMacros.h"
#include <QMap>
#include <QStringList>
#include <QVector>
-#include "JobViewFlags.h"
-#include "WinDllMacros.h"
//! The JobViewActivities class is a helper static class to get info related to JobView activities
//! (JobViewActivity, RealTimeActivity and FittingActivity).
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
index 383aa9f2f37076c58685deb8a73ede5c31aed4f8..de30839daa56c5818281b178788afe989e821aca 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QAbstractItemView>
-#include <QAction>
-#include <QDockWidget>
-#include <QTimer>
#include "FitActivityPanel.h"
#include "JobMessagePanel.h"
#include "JobModel.h"
@@ -27,6 +23,10 @@
#include "JobView.h"
#include "JobViewActivities.h"
#include "JobViewDocks.h"
+#include <QAbstractItemView>
+#include <QAction>
+#include <QDockWidget>
+#include <QTimer>
namespace {
const JobViewFlags::Activity default_activity = JobViewFlags::JOB_VIEW_ACTIVITY;
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.h b/GUI/coregui/Views/JobWidgets/JobViewDocks.h
index 2658957e65b06a9ad6174415c9fff1e0abbab8db..951393b6737a3fcdc4b55a5692159ee94443b33a 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.h
@@ -17,10 +17,10 @@
#ifndef JOBVIEWDOCKS_H
#define JOBVIEWDOCKS_H
-#include <QObject>
-#include <QVector>
#include "JobViewFlags.h"
#include "WinDllMacros.h"
+#include <QObject>
+#include <QVector>
class QDockWidget;
class JobView;
diff --git a/GUI/coregui/Views/JobWidgets/JobViewFlags.h b/GUI/coregui/Views/JobWidgets/JobViewFlags.h
index df4ed829139d6fc2b84fcfe1cc508d8467019e94..32405ffd41428fa40fc31133cf40deb6164de6cd 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewFlags.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewFlags.h
@@ -17,8 +17,8 @@
#ifndef JOBVIEWFLAGS_H
#define JOBVIEWFLAGS_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
//! The JobViewFlags class is a namespace for various flags used in JobView.
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
index 507ae21f72b78b4d631a9ace9b209f5cf25c9b62..a7f26c0e6ee6f9f838d00435cfd6fe045485a23c 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
@@ -14,6 +14,12 @@
//
// ************************************************************************** //
+#include "GUIHelpers.h"
+#include "ModelPath.h"
+#include "ParameterTreeItems.h"
+#include "ParameterTuningModel.h"
+#include "SessionModel.h"
+#include "ParameterTuningDelegate.h"
#include <QAbstractItemModel>
#include <QApplication>
#include <QDebug>
@@ -29,12 +35,6 @@
#include <cmath>
#include <iostream>
#include <limits>
-#include "GUIHelpers.h"
-#include "ModelPath.h"
-#include "ParameterTreeItems.h"
-#include "ParameterTuningModel.h"
-#include "SessionModel.h"
-#include "ParameterTuningDelegate.h"
namespace {
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
index 25bb179972a3812c104a923b9650e56f6de70864..3c39fc4addf29df29545c91ee10f90f4e329df9a 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
@@ -17,9 +17,9 @@
#ifndef PARAMETERTUNINGDELEGATE_H
#define PARAMETERTUNINGDELEGATE_H
+#include "AttLimits.h"
#include <QItemDelegate>
#include <memory>
-#include "AttLimits.h"
class QDoubleSpinBox;
class QHBoxLayout;
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index e3d61d0364bd646ea6ea2bbac8ac735e1873454e..499c03afad250064426b7c7f11ca11ba5e13354a 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -14,16 +14,6 @@
//
// ************************************************************************** //
-#include <QApplication>
-#include <QDebug>
-#include <QItemSelectionModel>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QScrollBar>
-#include <QStandardItemModel>
-#include <QToolButton>
-#include <QTreeView>
-#include <QVBoxLayout>
#include "DesignerHelper.h"
#include "GUIHelpers.h"
#include "InstrumentModel.h"
@@ -39,6 +29,16 @@
#include "SliderSettingsWidget.h"
#include "WarningSignWidget.h"
#include "ParameterTuningWidget.h"
+#include <QApplication>
+#include <QDebug>
+#include <QItemSelectionModel>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QScrollBar>
+#include <QStandardItemModel>
+#include <QToolButton>
+#include <QTreeView>
+#include <QVBoxLayout>
namespace {
const int warning_sign_xpos = 38;
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
index 3bd9aaae40c1745648219c540f63307ccb1eb07e..e9631a6b78e836867067266c5a5a83b207f09202 100644
--- a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
@@ -14,6 +14,7 @@
//
// ************************************************************************** //
+#include "SliderSettingsWidget.h"
#include <QCheckBox>
#include <QDebug>
#include <QGroupBox>
@@ -21,7 +22,6 @@
#include <QLabel>
#include <QRadioButton>
#include <QVBoxLayout>
-#include "SliderSettingsWidget.h"
SliderSettingsWidget::SliderSettingsWidget(QWidget *parent)
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
index 751e7b15ff7dc4cbef3bc7c69b31d1246c58e4dd..252d8d189e13f7ceb3c8ff73098e238eece2e33f 100644
--- a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
+++ b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
@@ -17,8 +17,8 @@
#ifndef SLIDERSETTINGSWIDGET_H
#define SLIDERSETTINGSWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class QRadioButton;
class QCheckBox;
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
index ef428df340f82696e59d7735836b516286937d42..a4164c6d7ff5bad836c2ecaf05e1fde13a6b8673 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "ColorMapPlot.h"
#include "ColorMapSceneAdaptor.h"
+#include <QDebug>
ColorMapSceneAdaptor::ColorMapSceneAdaptor()
: m_plot(0)
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
index a3b68f069a604277b45900e0ef4cfad816d417f1..3d50056284958765d4054e489c780d4bd3b5d0ca 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
@@ -14,16 +14,16 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
-#include <QMarginsF>
-#include <QPainter>
-#include <QRegion>
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
#include "SizeHandleElement.h"
#include "EllipseView.h"
+#include <QDebug>
+#include <QGraphicsSceneMouseEvent>
+#include <QMarginsF>
+#include <QPainter>
+#include <QRegion>
namespace {
const double bbox_margins = 5; // additional margins around rectangle to form bounding box
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.h b/GUI/coregui/Views/MaskWidgets/EllipseView.h
index 5f34ed2472ee58a14bfaf74a66079161065d3df2..a62e6e842b90fb4f28c0975ed24e804e5de89a8e 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.h
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.h
@@ -17,9 +17,9 @@
#ifndef ELLIPSEVIEW_H
#define ELLIPSEVIEW_H
-#include <QMap>
#include "IMaskView.h"
#include "SizeHandleElement.h"
+#include <QMap>
//! This is a View of ellipse mask (represented by EllipseItem) on GraphicsScene.
//! Given view follows standard QGraphicsScene notations: (x,y) is top left corner.
diff --git a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
index e5271e12e60d29770d4f95b00bc2339a51708fa1..7e6e7c90d39f769aa2b1a37bb1016afc67200b97 100644
--- a/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IMaskView.cpp
@@ -14,15 +14,15 @@
//
// ************************************************************************** //
+#include "ISceneAdaptor.h"
+#include "MaskItems.h"
+#include "SessionItem.h"
+#include "IMaskView.h"
#include <QAction>
#include <QDebug>
#include <QGraphicsSceneContextMenuEvent>
#include <QMenu>
#include <QPainter>
-#include "ISceneAdaptor.h"
-#include "MaskItems.h"
-#include "SessionItem.h"
-#include "IMaskView.h"
IMaskView::IMaskView()
: m_item(0)
diff --git a/GUI/coregui/Views/MaskWidgets/IMaskView.h b/GUI/coregui/Views/MaskWidgets/IMaskView.h
index 28c46cefd41c26f245f37e625dc984c72a9bab02..456f2311e9b9e34a375314925e844e7ff6695b00 100644
--- a/GUI/coregui/Views/MaskWidgets/IMaskView.h
+++ b/GUI/coregui/Views/MaskWidgets/IMaskView.h
@@ -17,10 +17,10 @@
#ifndef IMASKVIEW_H
#define IMASKVIEW_H
-#include <QGraphicsObject>
-#include <memory>
#include "MaskEditorHelper.h"
#include "WinDllMacros.h"
+#include <QGraphicsObject>
+#include <memory>
class SessionItem;
class ISceneAdaptor;
diff --git a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h b/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
index ddc713a443623c944fa877f40283d4efe08ebc2e..246cedfba54b2f3801fdec6b0185b1adc9c3b004 100644
--- a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
+++ b/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
@@ -17,9 +17,9 @@
#ifndef ISCENEADAPTOR_H
#define ISCENEADAPTOR_H
+#include "WinDllMacros.h"
#include <QObject>
#include <QRectF>
-#include "WinDllMacros.h"
//! Interface to adapt MaskItems coordinates (expressed in units of IntensityDataItem)
//! to/from scene coordinates.
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
index ee26a767ee62919ed92ad59d79316567a5641927..ff2660d798da3b656de9c884ebd45464bc7891ab 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "ISceneAdaptor.h"
+#include "IntensityDataView.h"
#include <QBrush>
#include <QDebug>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
-#include "ISceneAdaptor.h"
-#include "IntensityDataView.h"
IntensityDataView::IntensityDataView()
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
index f024c76370686b6055b5cbf05c3cbaa2252bbd6e..c1a3d1c3536cd014733814d8662c229dc036bf6e 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
@@ -17,9 +17,9 @@
#ifndef INTENSITYDATAVIEW_H
#define INTENSITYDATAVIEW_H
-#include <QMap>
#include "IMaskView.h"
#include "SizeHandleElement.h"
+#include <QMap>
//! The IntensityDataView is nothing move than just transparent rectangle to cover axes area
//! of ColorMapPlot inside MaskGraphicsScene. The goal of this rectangle is to hide all MaskViews
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.cpp b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
index 6ae2a622eed910b0a077bedb806657ef3eac1a32..fed0a94207756469a974228695df236919da847e 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.cpp
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QCursor>
-#include <QDebug>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
#include "ColorMapSceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
#include "LineViews.h"
+#include <QCursor>
+#include <QDebug>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
namespace {
const double mask_width = 8.0;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
index 7ec50277d9fac8a509e779ab2bf503ec0b9e92b7..d32d5a0be8f6d3d07f94b83e77dfea0912b3b9dc 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QBrush>
-#include <QDebug>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
#include "ColorMapSceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
#include "MaskAllView.h"
+#include <QBrush>
+#include <QDebug>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
MaskAllView::MaskAllView()
{
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
index 5d57a8d52292bdbe25e11fe2a3c29f86a5b400c7..fcd76825f5afb78ce0164696c6c7d30a7cf42a59 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
+#include "ISceneAdaptor.h"
+#include "MaskContainerView.h"
#include <QBrush>
#include <QDebug>
#include <QPainter>
#include <QStyleOptionGraphicsItem>
-#include "ISceneAdaptor.h"
-#include "MaskContainerView.h"
MaskContainerView::MaskContainerView()
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
index b1352e92de726a96fbb69b5345cf65f36340bfa4..6cf27e5707007d4c48e9bf6177d6520335aa9344 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
@@ -17,9 +17,9 @@
#ifndef MASKCONTAINERVIEW_H
#define MASKCONTAINERVIEW_H
-#include <QMap>
#include "IMaskView.h"
#include "SizeHandleElement.h"
+#include <QMap>
//! The MaskContainerView is nothing move than just transparent rectangle to cover axes area
//! of ColorMapPlot inside MaskGraphicsScene. The goal of this rectangle is to hide all MaskViews
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
index c1b7864bb8839290154ac4f9d2e137b1ff8a067b..8a0d49848e29c61127fc5330cea864eed4fc0644 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "MaskDrawingContext.h"
+#include <QDebug>
MaskDrawingContext::MaskDrawingContext()
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
index 8f209439216969aa93309671d69c983860349873..412eb715d0f66da332e57191e83ec1de85545d4e 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
@@ -14,11 +14,6 @@
//
// ************************************************************************** //
-#include <QBoxLayout>
-#include <QContextMenuEvent>
-#include <QDebug>
-#include <QMenu>
-#include <QSplitter>
#include "GUIHelpers.h"
#include "IntensityDataItem.h"
#include "MaskEditorActions.h"
@@ -32,6 +27,11 @@
#include "SessionModel.h"
#include "SimulationFactory.h"
#include "MaskEditor.h"
+#include <QBoxLayout>
+#include <QContextMenuEvent>
+#include <QDebug>
+#include <QMenu>
+#include <QSplitter>
MaskEditor::MaskEditor(QWidget* parent)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.h b/GUI/coregui/Views/MaskWidgets/MaskEditor.h
index 21cd5a4f451cc5f503d98c85d7f7e190050d0c07..12e2926eb1b00e7f50bbf9d0399da72379634127 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.h
@@ -17,10 +17,10 @@
#ifndef MASKEDITOR_H
#define MASKEDITOR_H
+#include "WinDllMacros.h"
#include <QMainWindow>
#include <QModelIndex>
#include <QWidget>
-#include "WinDllMacros.h"
class MaskEditorPropertyPanel;
class MaskEditorActions;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
index 246df7e9a8fb16c4b859cb8a13fc429dba97ab7f..63976587d92e110e0c25d030a320aacb7493a5ca 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "MaskItems.h"
+#include "SessionModel.h"
+#include "MaskEditorActions.h"
#include <QAction>
#include <QDebug>
#include <QItemSelectionModel>
#include <QMenu>
-#include "MaskItems.h"
-#include "SessionModel.h"
-#include "MaskEditorActions.h"
MaskEditorActions::MaskEditorActions(QWidget *parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
index 53644f0c08ed721830cca1ac587b74ba653df371..2636331edc3252e9f4a9fcec72f84965fb37dda3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
@@ -17,10 +17,10 @@
#ifndef MASKEDITORACTIONS_H
#define MASKEDITORACTIONS_H
-#include <QModelIndex>
-#include <QObject>
#include "MaskEditorFlags.h"
#include "WinDllMacros.h"
+#include <QModelIndex>
+#include <QObject>
class QAction;
class SessionModel;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
index 8e0c7782f625099038f676090bf6775ce7c84453..27af8a0d0763ae7357be63f2e58d6c98eaf2f384 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -14,17 +14,17 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QDebug>
-#include <QGraphicsRectItem>
-#include <QModelIndex>
-#include <QVBoxLayout>
#include "MaskGraphicsProxy.h"
#include "MaskGraphicsScene.h"
#include "MaskGraphicsView.h"
#include "MaskResultsPresenter.h"
#include "SessionModel.h"
#include "MaskEditorCanvas.h"
+#include <QDebug>
+#include <QDebug>
+#include <QGraphicsRectItem>
+#include <QModelIndex>
+#include <QVBoxLayout>
MaskEditorCanvas::MaskEditorCanvas(QWidget *parent)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
index 272fb6aaefb291d1da1cd738930982009c76724e..a93fb3c314d0b10a8da8931efb508b00e9c156e7 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
@@ -17,8 +17,8 @@
#ifndef MASKEDITORCANVAS_H
#define MASKEDITORCANVAS_H
-#include <QWidget>
#include "MaskEditorFlags.h"
+#include <QWidget>
class MaskGraphicsScene;
class MaskGraphicsView;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h b/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
index 010cb1dbaace07b982507751cbbae8fb4b34ed23..e24a3f70f95c779c261538264877bb649aad9b97 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
@@ -17,8 +17,8 @@
#ifndef MASKEDITORFLAGS_H
#define MASKEDITORFLAGS_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
//! Help class to define various flags for MaskEditor operation
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
index 97c8cb1d954dac4e8fb82415720ab6e7e367c2c8..7f2e6431455da4d7b99caa04f693186cc4b363f9 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
+#include "MaskEditorHelper.h"
#include <QBrush>
#include <QColor>
#include <QPen>
#include <QRectF>
-#include "MaskEditorHelper.h"
QBrush MaskEditorHelper::getSelectionMarkerBrush()
{
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
index 663688ba0e6798173035042cbca922c3a5422ed9..01a2fed3633ba39d3c377079c20f8d47fbe8ed0b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
@@ -17,8 +17,8 @@
#ifndef MASKEDITORHELPER_H
#define MASKEDITORHELPER_H
-#include <QGraphicsItem>
#include "WinDllMacros.h"
+#include <QGraphicsItem>
class QBrush;
class QPen;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
index 4253e3c3333ffa6dc5af0051926b1467344f8083..dad2fde38973adcdd88eadabd809acc743f55640 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
@@ -14,6 +14,13 @@
//
// ************************************************************************** //
+#include "AccordionWidget.h"
+#include "ComponentEditor.h"
+#include "ContentPane.h"
+#include "IntensityDataItem.h"
+#include "MaskEditorFlags.h"
+#include "SessionModel.h"
+#include "MaskEditorPropertyPanel.h"
#include <QButtonGroup>
#include <QDebug>
#include <QGridLayout>
@@ -24,13 +31,6 @@
#include <QPushButton>
#include <QToolButton>
#include <QVBoxLayout>
-#include "AccordionWidget.h"
-#include "ComponentEditor.h"
-#include "ContentPane.h"
-#include "IntensityDataItem.h"
-#include "MaskEditorFlags.h"
-#include "SessionModel.h"
-#include "MaskEditorPropertyPanel.h"
MaskEditorPropertyPanel::MaskEditorPropertyPanel(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
index f2e417094c1c1a8a08bd60b53ce680cb43c266e2..94e2c9f897f062270ea93ad0a98782bb2991c1de 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
@@ -17,9 +17,9 @@
#ifndef MASKEDITORPROPERTYPANEL_H
#define MASKEDITORPROPERTYPANEL_H
+#include "MaskEditorFlags.h"
#include <QModelIndex>
#include <QWidget>
-#include "MaskEditorFlags.h"
class QListView;
class SessionModel;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
index 85b8bc53230ba93f473600f506a80f08c5b9768a..6d1e35fc2e72b9e4fdd75b0a401e3e2e41102ec3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -14,6 +14,8 @@
//
// ************************************************************************** //
+#include "MaskEditorActions.h"
+#include "MaskEditorToolBar.h"
#include <QButtonGroup>
#include <QDebug>
#include <QLabel>
@@ -21,8 +23,6 @@
#include <QStyle>
#include <QToolButton>
#include <QVariant>
-#include "MaskEditorActions.h"
-#include "MaskEditorToolBar.h"
namespace {
const int toolbar_icon_size = 32;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
index bf620626933b06c6a9b287123b6efe802a3728b4..67acb9df0aa2d56e8990285c45d96bd72199f5af 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
@@ -17,9 +17,9 @@
#ifndef MASKEDITORTOOLBAR_H
#define MASKEDITORTOOLBAR_H
-#include <QToolBar>
#include "MaskEditorFlags.h"
#include "WinDllMacros.h"
+#include <QToolBar>
class MaskEditorActions;
class QButtonGroup;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
index 39baaf113056acda01177da6315dba598b600b85..bfcf3fbdfb2451518e88f8383a9dcf3f3ff1fdc9 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
#include "ColorMapPlot.h"
#include "ColorMapSceneAdaptor.h"
#include "IntensityDataItem.h"
#include "MaskGraphicsProxy.h"
+#include <QDebug>
+#include <QGraphicsSceneMouseEvent>
MaskGraphicsProxy::MaskGraphicsProxy()
: m_colorMap(new ColorMapPlot)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
index f19ef82368154b947135686846c6f108db7a020f..667cd249df1c8dd0ea11585a3fa13e8ff13be1c2 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
@@ -17,9 +17,9 @@
#ifndef MASKGRAPHICSPROXY_H
#define MASKGRAPHICSPROXY_H
-#include <QGraphicsProxyWidget>
#include "ColorMapPlot.h"
#include "MaskEditorHelper.h"
+#include <QGraphicsProxyWidget>
class SessionItem;
class ISceneAdaptor;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index 92c742d202558b383898c8079b8c86fab480e18c..dab11edaf004f32c0ec1520dcc7b733ac51eb6cc 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGraphicsItem>
-#include <QItemSelection>
-#include <QLineF>
#include "ColorMapSceneAdaptor.h"
#include "IMaskView.h"
#include "ISceneAdaptor.h"
@@ -31,6 +27,10 @@
#include "SessionModel.h"
#include "item_constants.h"
#include "MaskGraphicsScene.h"
+#include <QDebug>
+#include <QGraphicsItem>
+#include <QItemSelection>
+#include <QLineF>
namespace {
const QRectF default_scene_rect(0, 0, 800, 600);
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
index 670e6e53cb604c24cb521fccd1bc19b2d5147732..17b9fb74a3daea4cded12342e8441cf08f426520 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
@@ -17,12 +17,12 @@
#ifndef MASKGRAPHICSSCENE_H
#define MASKGRAPHICSSCENE_H
+#include "MaskDrawingContext.h"
+#include "MaskEditorHelper.h"
#include <QGraphicsScene>
#include <QMap>
#include <QModelIndex>
#include <QSharedPointer>
-#include "MaskDrawingContext.h"
-#include "MaskEditorHelper.h"
class SessionModel;
class SessionItem;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
index 7de01aab9f03fc36839764b2349c5f9c75c63524..db57bbabfd4ca4134a70cd1637f795761a42aeff 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
+#include "MaskGraphicsProxy.h"
+#include "MaskGraphicsScene.h"
+#include "MaskGraphicsView.h"
#include <QDebug>
#include <QGraphicsScene>
#include <QScrollBar>
#include <QTransform>
#include <QWheelEvent>
-#include "MaskGraphicsProxy.h"
-#include "MaskGraphicsScene.h"
-#include "MaskGraphicsView.h"
namespace {
const double min_zoom_value = 1.0;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
index 37cbc5a1770c1feecc3cfc7c210d8532b5ef58e0..bc0c3f620abfde2d05cf3a875590159b8bf1d61a 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
@@ -17,8 +17,8 @@
#ifndef MASKGRAPHICSVIEW_H
#define MASKGRAPHICSVIEW_H
-#include <QGraphicsView>
#include "MaskEditorFlags.h"
+#include <QGraphicsView>
class QWheelEvent;
class MaskGraphicsProxy;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index efb9a71949e4094fdc230300b0ab6efa19ce20f5..ccf9f204b1b94e0c2c95781b742f8f50e03c334a 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -14,8 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QVBoxLayout>
#include "ColorMapPlot.h"
#include "DetectorMask.h"
#include "IShape2D.h"
@@ -24,6 +22,8 @@
#include "OutputData.h"
#include "SessionModel.h"
#include "MaskResultsPresenter.h"
+#include <QDebug>
+#include <QVBoxLayout>
MaskResultsPresenter::MaskResultsPresenter(QWidget *parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
index 8d2d34d5a1c76ca7dfe64dec4e42fb7a03ff35ea..c838fd917d8495b47d2e410b056ef1f2f4a4c7e0 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
@@ -17,12 +17,12 @@
#ifndef MASKRESULTSPRESENTER_H
#define MASKRESULTSPRESENTER_H
-#include <QModelIndex>
-#include <QObject>
-#include <memory>
#include "MaskEditorFlags.h"
#include "OutputData.h"
#include "WinDllMacros.h"
+#include <QModelIndex>
+#include <QObject>
+#include <memory>
class SessionModel;
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
index 6db3c0ad161fb5958de6e66002d8c7786b943af1..bf6b93cc6d9cf3721af3af02dd306824870ace16 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
@@ -17,8 +17,8 @@
#ifndef MASKVIEWFACTORY_H
#define MASKVIEWFACTORY_H
-#include <QString>
#include "WinDllMacros.h"
+#include <QString>
class IMaskView;
class SessionItem;
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
index 9191b0985a8d0fd2c3fe0efa56c125776525d7fb..0242e8f3846f09a9247dd61d9611588e52d22ebc 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QCursor>
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
#include "PolygonPointView.h"
+#include <QCursor>
+#include <QDebug>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
PolygonPointView::PolygonPointView()
: m_on_hover(false)
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
index 92388ff65412e006d3c328e09810cc0dbbf93ba8..c393384784dc8fd20193acfd9d3e4ed50b986446 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
@@ -14,6 +14,11 @@
//
// ************************************************************************** //
+#include "ISceneAdaptor.h"
+#include "MaskEditorHelper.h"
+#include "MaskItems.h"
+#include "PolygonPointView.h"
+#include "PolygonView.h"
#include <QCursor>
#include <QDebug>
#include <QGraphicsItem>
@@ -21,11 +26,6 @@
#include <QGraphicsSceneMouseEvent>
#include <QPainter>
#include <QRectF>
-#include "ISceneAdaptor.h"
-#include "MaskEditorHelper.h"
-#include "MaskItems.h"
-#include "PolygonPointView.h"
-#include "PolygonView.h"
namespace {
const double bbox_margins = 5; // additional margins around points to form bounding box
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.h b/GUI/coregui/Views/MaskWidgets/PolygonView.h
index fe9ac5817b975c62491ef677629c705d6a741d05..e27498a8422b911d981acc98ee9502fea87338d9 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.h
@@ -17,8 +17,8 @@
#ifndef POLYGONVIEW_H
#define POLYGONVIEW_H
-#include <QPolygonF>
#include "IMaskView.h"
+#include <QPolygonF>
//! This is a View of polygon mask (represented by PolygonItem) on GraphicsScene.
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
index c30c48eb4820bdd49076a7fe9b04c50cfea9540e..643817e640b417de9f686613acd328a16fdd7fa8 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
@@ -14,16 +14,16 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
-#include <QMarginsF>
-#include <QPainter>
-#include <QRegion>
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "MaskItems.h"
#include "SizeHandleElement.h"
#include "RectangleView.h"
+#include <QDebug>
+#include <QGraphicsSceneMouseEvent>
+#include <QMarginsF>
+#include <QPainter>
+#include <QRegion>
namespace {
const double bbox_margins = 5; // additional margins around rectangle to form bounding box
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.h b/GUI/coregui/Views/MaskWidgets/RectangleView.h
index 0dbc9710033b99e14fa7211af5ea55c5db2427d9..9d2494dd3dfacdab32abf2b7eb8b8e4f45db84ee 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.h
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.h
@@ -17,9 +17,9 @@
#ifndef RECTANGLEVIEW_H
#define RECTANGLEVIEW_H
-#include <QMap>
#include "IMaskView.h"
#include "SizeHandleElement.h"
+#include <QMap>
//! This is a View of rectangular mask ( represented by RectangleItem) on GraphicsScene.
//! Given view follows standard QGraphicsScene notations: (x,y) is top left corner.
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
index d2cbaeda0aeb5057c3e3a61466a3b81c75e74f28..736cc6597ea471d40a06a4b72a6c1445c8a19739 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGraphicsSceneHoverEvent>
-#include <QPainter>
#include "ISceneAdaptor.h"
#include "MaskEditorHelper.h"
#include "SizeHandleElement.h"
+#include <QDebug>
+#include <QGraphicsSceneHoverEvent>
+#include <QPainter>
namespace {
QMap<SizeHandleElement::EHandleLocation, Qt::CursorShape> create_cursors_map()
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
index 8717d2c45c5e9169ce138c875647de5261581eb9..e121c818924ce0f2d0ee44e469959ba0eb1efeaa 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
@@ -17,10 +17,10 @@
#ifndef SIZEHANDLEELEMENT_H
#define SIZEHANDLEELEMENT_H
+#include "MaskEditorHelper.h"
#include <QCursor>
#include <QGraphicsObject>
#include <QMap>
-#include "MaskEditorHelper.h"
//! Size handle on top of RectangleView represented as small circle or small rectangle.
//! Placed either in corners on in the middle of the edge.
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
index 0e4968b05c451b726449c86d3c2354c0602a4086..0b8d3d56b2988135ebad620817b6fa65d87d69c0 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include <QListView>
-#include <QSplitter>
-#include <QVBoxLayout>
#include "ComponentEditor.h"
#include "MaterialEditorToolBar.h"
#include "MaterialItem.h"
#include "MaterialModel.h"
#include "MaterialEditor.h"
+#include <QListView>
+#include <QSplitter>
+#include <QVBoxLayout>
MaterialEditor::MaterialEditor(MaterialModel *materialModel, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h b/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
index cbb4f1965a2738d361b4afaf2f513f3158c3b6de..d3c55a15793299a3b9ec8dcfd0c7e9c0eacd7b71 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
@@ -17,8 +17,8 @@
#ifndef MATERIALEDITOR_H
#define MATERIALEDITOR_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class MaterialModel;
class MaterialEditorToolBar;
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index e10ee5e1b98c5668a5cf3b668013516966f671f2..3febed09517677edf3eaac65e9c1b101b8c28047 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -14,16 +14,16 @@
//
// ************************************************************************** //
-#include <QAction>
-#include <QDebug>
-#include <QPushButton>
-#include <QSettings>
-#include <QVBoxLayout>
#include "MaterialEditor.h"
#include "MaterialModel.h"
#include "MaterialUtils.h"
#include "mainwindow_constants.h"
#include "MaterialEditorDialog.h"
+#include <QAction>
+#include <QDebug>
+#include <QPushButton>
+#include <QSettings>
+#include <QVBoxLayout>
namespace {
const QSize default_dialog_size(512, 400);
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
index c577e93b02582cee63597e65fb4bb032a3f5a5b5..9b85700967271a07b068bcc23073cba3f3cb3268 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
@@ -17,10 +17,10 @@
#ifndef MATERIALEDITORDIALOG_H
#define MATERIALEDITORDIALOG_H
-#include <QDialog>
-#include <memory>
#include "MaterialProperty.h"
#include "WinDllMacros.h"
+#include <QDialog>
+#include <memory>
class MaterialModel;
class MaterialEditor;
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
index aaf9440bceb6b5804a3971a6a66dc118db8cd7c9..65aeff11f965edb1f237d1f6ffce701c7a3b73d8 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
@@ -14,6 +14,9 @@
//
// ************************************************************************** //
+#include "MaterialItem.h"
+#include "MaterialModel.h"
+#include "MaterialEditorToolBar.h"
#include <QAction>
#include <QDebug>
#include <QItemSelectionModel>
@@ -21,9 +24,6 @@
#include <QMenu>
#include <QUuid>
#include <QVariant>
-#include "MaterialItem.h"
-#include "MaterialModel.h"
-#include "MaterialEditorToolBar.h"
namespace {
const int toolbar_icon_size = 32;
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
index c297acb0250c0e89cf2284488948aa4d2730bae1..7cdaa9c835ff2dbc7de94310f38724cc97d6a076 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
@@ -17,8 +17,8 @@
#ifndef MATERIALEDITORTOOLBAR_H
#define MATERIALEDITORTOOLBAR_H
-#include <QToolBar>
#include "WinDllMacros.h"
+#include <QToolBar>
class QAction;
class MaterialModel;
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialProperty.h b/GUI/coregui/Views/MaterialEditor/MaterialProperty.h
index b313902efc6dbe3880e1ee9e4f70356034799262..7fe13486e79e732067089ae67b7bb68c30e9cc14 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialProperty.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialProperty.h
@@ -17,12 +17,12 @@
#ifndef MATERIALPROPERTY_H
#define MATERIALPROPERTY_H
+#include "WinDllMacros.h"
#include <QColor>
#include <QMetaType>
#include <QPixmap>
#include <QString>
#include <QVariant>
-#include "WinDllMacros.h"
//! The MaterialProperty class defines unique identifier to help LayerItem, ParticleItem etc
//! to access materials from MaterialEditor;
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
index 751e9a1963447fd4cc894f796847367a0a0f8e31..563a6dc0d04b1d63f50c6de414d83256665f247e 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialSvc.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "MaterialEditorDialog.h"
#include "MaterialItem.h"
#include "MaterialModel.h"
#include "MaterialUtils.h"
#include "SessionModel.h"
#include "MaterialSvc.h"
+#include <QDebug>
MaterialSvc *MaterialSvc::m_instance = 0;
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialSvc.h b/GUI/coregui/Views/MaterialEditor/MaterialSvc.h
index 298b4fe16b5d95e8517ae7699e5e6334156bc025..bc7182b57e7fbbe2eabad29e9be0e02170849029 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialSvc.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialSvc.h
@@ -17,9 +17,9 @@
#ifndef MATERIALSVC_H
#define MATERIALSVC_H
-#include <QObject>
#include "MaterialProperty.h"
#include "WinDllMacros.h"
+#include <QObject>
class MaterialModel;
class SessionModel;
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
index edb4a19557a6e7bd0e1448eca40e01cc2b6cdde1..c31c1ed85136212ee380dbb37685ad746ac58394 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialUtils.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "ComboProperty.h"
#include "DesignerHelper.h"
#include "GUIHelpers.h"
@@ -25,6 +24,7 @@
#include "MaterialSvc.h"
#include "RefractiveIndexItem.h"
#include "MaterialUtils.h"
+#include <QDebug>
QColor MaterialUtils::suggestMaterialColor(const QString &name)
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialUtils.h b/GUI/coregui/Views/MaterialEditor/MaterialUtils.h
index ce01fc6ad26663177b7cac5fdf764ee2fe392419..d90032a5de32fa412b29d7c066c07c0fd90c79fb 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialUtils.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialUtils.h
@@ -17,12 +17,12 @@
#ifndef MATERIALUTILS_H
#define MATERIALUTILS_H
-#include <QColor>
-#include <QString>
-#include <memory>
#include "ColorProperty.h"
#include "MaterialItem.h"
#include "MaterialProperty.h"
+#include <QColor>
+#include <QString>
+#include <memory>
class IMaterial;
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
index ee973275b10586d72d3d2eed5029620c8eede624..a978b74c19d7f77372c58297f2f744079b5ea458 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentBoxEditor.cpp
@@ -13,11 +13,11 @@
//! @authors Walter Van Herck, Joachim Wuttke
//
// ************************************************************************** //
-#include <QModelIndex>
#include "ComponentEditorPrivate.h"
#include "CustomEventFilters.h"
#include "SessionModel.h"
#include "ComponentBoxEditor.h"
+#include <QModelIndex>
ComponentBoxEditor::ComponentBoxEditor(QWidget *parent)
: ComponentEditor(ComponentEditorFlags::BROWSER_GROUPBOX, parent)
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
index e2616f99ffadafb0deb00f2f164ae7736a7c8b19..1594ed23bc03210b86f06df01fbd83dd852d0efc 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
@@ -13,8 +13,6 @@
//! @authors Walter Van Herck, Joachim Wuttke
//
// ************************************************************************** //
-#include <QVBoxLayout>
-#include <QVariant>
#include "ComponentEditorPrivate.h"
#include "GUIHelpers.h"
#include "GroupItem.h"
@@ -23,6 +21,8 @@
#include "SessionModel.h"
#include "qtpropertybrowser.h"
#include "ComponentEditor.h"
+#include <QVBoxLayout>
+#include <QVariant>
ComponentEditor::ComponentEditor(ComponentEditorFlags::PresentationType flags, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
index 465e3695658fc8476d94c92d2290e6eee172fe9e..9d6d11e829938ba373105444835ca8ab6e03d8c8 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
@@ -17,10 +17,10 @@
#ifndef COMPONENTEDITOR_H
#define COMPONENTEDITOR_H
-#include <QWidget>
-#include <memory>
#include "ComponentEditorFlags.h"
#include "WinDllMacros.h"
+#include <QWidget>
+#include <memory>
class ComponentEditorPrivate;
class SessionItem;
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h b/GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h
index ad58c986a0b6b5ebc3af8a4d126886817622d593..9b3c961257c66057f856056b46b5c7d6043ebac4 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditorFlags.h
@@ -17,8 +17,8 @@
#ifndef COMPONENTEDITORFLAGS_H
#define COMPONENTEDITORFLAGS_H
-#include <QObject>
#include "WinDllMacros.h"
+#include <QObject>
class BA_CORE_API_ ComponentEditorFlags
{
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
index 59b1298a086395c9de603a2677d4fd3e7c3e407b..a516c6deb9f019dde2f1eae3c010620eda82b16d 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QComboBox>
-#include <QDebug>
-#include <QString>
#include "CustomEventFilters.h"
#include "GUIHelpers.h"
#include "ComponentEditorPrivate.h"
+#include <QComboBox>
+#include <QDebug>
+#include <QString>
ComponentEditorPrivate::ComponentEditorPrivate(ComponentEditorFlags::PresentationType flags, QWidget *parent)
: m_browser(0), m_manager(0), m_read_only_manager(0)
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h
index d147e1b03cff79dc45063ee05287ffb6d4514cbe..deda1b1ebdf6b5c986f470d65a032c3f7f12da17 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditorPrivate.h
@@ -17,8 +17,6 @@
#ifndef COMPONENTEDITORPRIVATE_H
#define COMPONENTEDITORPRIVATE_H
-#include <QMap>
-#include <memory>
#include "ComponentEditorFlags.h"
#include "PropertyAttribute.h"
#include "PropertyVariantFactory.h"
@@ -28,6 +26,8 @@
#include "qtbuttonpropertybrowser.h"
#include "qtgroupboxpropertybrowser.h"
#include "qttreepropertybrowser.h"
+#include <QMap>
+#include <memory>
class WheelEventEater;
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
index 9da55aefa945952b45f66adb31408133e464c1bf..ab2d52a943b39aab6dc68cb5537ae7b8330e064b 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyBrowserUtils.cpp
@@ -14,6 +14,9 @@
//
// ************************************************************************** //
+#include "GUIHelpers.h"
+#include "MaterialSvc.h"
+#include "PropertyBrowserUtils.h"
#include <QColorDialog>
#include <QComboBox>
#include <QDebug>
@@ -27,9 +30,6 @@
#include <QPixmap>
#include <QRgb>
#include <QToolButton>
-#include "GUIHelpers.h"
-#include "MaterialSvc.h"
-#include "PropertyBrowserUtils.h"
// -----------------------------------------------------------------------------
// MaterialPropertyEdit
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
index e2709f3382a8aa435fe69cd2f1fb5efd5736faf3..090d3cab12c3953891e306a96b4025b669c532bc 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "PropertyBrowserUtils.h"
#include "PropertyVariantManager.h"
#include "PropertyVariantFactory.h"
+#include <QDebug>
PropertyVariantFactory::~PropertyVariantFactory()
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h
index 173a3f36ffc3e2124f67347845d795393536607f..79a15cd284c77deafb7a7c7f01963ecfd904fe33 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantFactory.h
@@ -19,8 +19,8 @@
//! collection of classes extending QtPropertyBrowser functionality
-#include <QtVariantEditorFactory>
#include "GroupProperty.h"
+#include <QtVariantEditorFactory>
class MaterialPropertyEdit;
class MaterialProperty;
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
index 03b1325f3e959e94a8e4457c3fff30e539030dd0..7322996a2cba4ccd69dd17ef04a0a1c5bbebebc4 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "DesignerHelper.h"
#include "SessionItem.h"
#include "PropertyVariantManager.h"
+#include <QDebug>
PropertyVariantManager::PropertyVariantManager(QObject *parent)
: QtVariantPropertyManager(parent)
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h
index 4e54adea2e1a6d5d2cd036d31fefe6d3bb24755d..a01fdab8c4ffc7f95df5a8d6cfcf93d124ead67f 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyVariantManager.h
@@ -19,12 +19,12 @@
//! collection of classes extending QtPropertyBrowser functionality
-#include <QtVariantPropertyManager>
#include "ColorProperty.h"
#include "ComboProperty.h"
#include "GroupProperty.h"
#include "MaterialProperty.h"
#include "ScientificDoubleProperty.h"
+#include <QtVariantPropertyManager>
class QObject;
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
index 98d84b7a43a973f76ea92a254f92d8569df49c1d..a2bbaa839654d808ce03d89ddce34a68eef37e6e 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
@@ -14,17 +14,17 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QObject>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
-#include <iostream>
#include "DesignerHelper.h"
#include "GUIHelpers.h"
#include "NodeEditorConnection.h"
#include "NodeEditorPort.h"
#include "SessionItem.h"
#include "ConnectableView.h"
+#include <QDebug>
+#include <QObject>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+#include <iostream>
ConnectableView::ConnectableView(QGraphicsItem *parent, QRect rect)
: IView(parent), m_name("Unnamed"), m_color(Qt::gray), m_rect(rect), m_roundpar(3),
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
index eaa0a2ea4c31995f57a698381dbe16ae64872805..4eb09c091a81fd7b63d99274fda1b5cd6fc05516 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "item_constants.h"
+#include "DesignerHelper.h"
#include <QDebug>
#include <QPainter>
#include <QtGlobal>
#include <cmath>
#include <iostream>
-#include "item_constants.h"
-#include "DesignerHelper.h"
int DesignerHelper::m_default_layer_height = 30;
int DesignerHelper::m_default_layer_width = 200;
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h b/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
index 114b4b3922036aca4bd15c553c53c1b568bf0597..37033fa8ad879e4aa5a28db232c530d6d679e8cc 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
@@ -18,11 +18,11 @@
#define DESIGNERHELPER_H
#include "WinDllMacros.h"
-
-#include <QGradient>
#include <QColor>
-#include <QRect>
+#include <QGradient>
#include <QGraphicsItem>
+#include <QRect>
+#include <complex>
//! collection of static methods with SampleDesigner geometry settings
class BA_CORE_API_ DesignerHelper
@@ -117,9 +117,7 @@ private:
static double m_current_zoom_level;
};
-#include <complex>
typedef std::complex<double> complex_t;
Q_DECLARE_METATYPE(complex_t)
-
#endif // DESIGNERHELPER_H
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
index ad1bad88fca5ae3771a0ce0fca9584e93cd65d32..b1aa9ecd755bf3809719c75d0ca4958e6543f15f 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
@@ -14,6 +14,8 @@
//
// ************************************************************************** //
+#include "DesignerHelper.h"
+#include "DesignerMimeData.h"
#include <QBitmap>
#include <QByteArray>
#include <QDataStream>
@@ -23,8 +25,6 @@
#include <QWidget>
#include <QXmlStreamReader>
#include <iostream>
-#include "DesignerHelper.h"
-#include "DesignerMimeData.h"
#if QT_VERSION < 0x050000
#define QStringLiteral QString
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
index 383ddee46897e47610380902d85ac2f2b93bba5d..38a8658704e5cd81db43179b4aa1f436d9631661 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
@@ -17,8 +17,8 @@
#ifndef DESIGNERMIMEDATA_H
#define DESIGNERMIMEDATA_H
-#include <QMimeData>
#include "WinDllMacros.h"
+#include <QMimeData>
class QDrag;
class QXmlStreamReader;
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index fff1a3926f66818ac6868ad5efe3a26937295850..f3854ca500d857da323696590262725e7c042c0f 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
-#include <QItemSelection>
-#include <QPainter>
#include "ConnectableView.h"
#include "DesignerHelper.h"
#include "DesignerMimeData.h"
@@ -39,6 +35,10 @@
#include "SampleViewFactory.h"
#include "SessionGraphicsItem.h"
#include "DesignerScene.h"
+#include <QDebug>
+#include <QGraphicsSceneMouseEvent>
+#include <QItemSelection>
+#include <QPainter>
DesignerScene::DesignerScene(QObject *parent)
: QGraphicsScene(parent), m_sampleModel(0), m_instrumentModel(0), m_selectionModel(0), m_proxy(0),
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.h b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
index 06e107d04bd2af16f9ed2f61e97cb7a31f109732..d5b552c55424694e0ccb278a9b156fdac0402bbd 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
@@ -17,10 +17,10 @@
#ifndef DESIGNERSCENE_H
#define DESIGNERSCENE_H
+#include "WinDllMacros.h"
#include <QGraphicsScene>
#include <QMap>
#include <QModelIndex>
-#include "WinDllMacros.h"
class InstrumentModel;
class SampleModel;
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
index c78546d27e5d3dca835b0e715970fa6f899939cd..a5a46119673ce6c25f9626f70223239a6ed197aa 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
@@ -14,6 +14,11 @@
//
// ************************************************************************** //
+#include "DesignerHelper.h"
+#include "DesignerMimeData.h"
+#include "DesignerScene.h"
+#include "GUIHelpers.h"
+#include "DesignerView.h"
#include <QDebug>
#include <QDragEnterEvent>
#include <QGraphicsScene>
@@ -21,11 +26,6 @@
#include <QMimeData>
#include <QShortcut>
#include <QVBoxLayout>
-#include "DesignerHelper.h"
-#include "DesignerMimeData.h"
-#include "DesignerScene.h"
-#include "GUIHelpers.h"
-#include "DesignerView.h"
DesignerView::DesignerView(QGraphicsScene *scene, QWidget *parent) : QGraphicsView(scene, parent)
{
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index 21a778fd83e8932639df64cc344d3285065e3e37..a0d4e0560e023c0ca1069fc2486123e63f3aa439 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -14,8 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
#include "DesignerHelper.h"
#include "DesignerScene.h"
#include "GUIHelpers.h"
@@ -25,6 +23,8 @@
#include "SampleModel.h"
#include "SessionItem.h"
#include "ILayerView.h"
+#include <QDebug>
+#include <QGraphicsSceneMouseEvent>
QLineF MultiLayerCandidate::getInterfaceToScene()
{
diff --git a/GUI/coregui/Views/SampleDesigner/IView.cpp b/GUI/coregui/Views/SampleDesigner/IView.cpp
index 26581ee7fc9005504f4db460cc504069655c2e12..4167a321b50ddcfb1a1a1706a45423e9e65d9ee7 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/IView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QString>
#include "ModelMapper.h"
#include "SessionGraphicsItem.h"
#include "IView.h"
+#include <QDebug>
+#include <QString>
IView::IView(QGraphicsItem *parent) : QGraphicsObject(parent), m_item(0)
{
diff --git a/GUI/coregui/Views/SampleDesigner/IView.h b/GUI/coregui/Views/SampleDesigner/IView.h
index d1aebf5a1e974de033ced66a6b1b68ab5dd2395e..79f3a94241bbf3039a8806b8833555ed509b42e1 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.h
+++ b/GUI/coregui/Views/SampleDesigner/IView.h
@@ -17,9 +17,9 @@
#ifndef IVIEW_H
#define IVIEW_H
+#include "DesignerHelper.h"
#include <QGraphicsObject>
#include <memory>
-#include "DesignerHelper.h"
class SessionItem;
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
index 44f2d6315fb70e8037352e7b222e9d249a6d6c4d..5f48e60357dc991da4d1912af031fb995ab62c0c 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
-#include <QDragMoveEvent>
-#include <QMimeData>
#include "GUIHelpers.h"
#include "SessionModel.h"
#include "ItemTreeView.h"
+#include <QDragMoveEvent>
+#include <QMimeData>
ItemTreeView::ItemTreeView(QWidget *parent)
: QTreeView(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h b/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
index 6c0c755a8a6277fc01dab8bab5286a6dd3850dc2..6cc4f396c838006b5cdadcb72fc31210420e5b4e 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
@@ -17,8 +17,8 @@
#ifndef ITEMTREEVIEW_H
#define ITEMTREEVIEW_H
-#include <QTreeView>
#include "WinDllMacros.h"
+#include <QTreeView>
class BA_CORE_API_ ItemTreeView : public QTreeView
{
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
index d24dbcad596f8c9718c1e2092a99b8fbe4c6eae0..56852379c96953bfd35025b7ad930e24cbc77f24 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
@@ -14,9 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
#include "LayerItem.h"
#include "MaterialProperty.h"
#include "MultiLayerView.h"
@@ -24,6 +21,9 @@
#include "SessionItem.h"
#include "tooltipdatabase.h"
#include "LayerView.h"
+#include <QDebug>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
index 68ef4bc774f48073d5ea64be2145c0605b38a686..566d57c02c049983271360209420fe06b9d95070 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
#include "DesignerHelper.h"
#include "DesignerMimeData.h"
#include "DesignerScene.h"
@@ -25,6 +21,10 @@
#include "SampleModel.h"
#include "SessionItem.h"
#include "MultiLayerView.h"
+#include <QDebug>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
index 47e627ed5d851db7d3048861d7fdf4b448b2340b..76ec37a55078123e71ea0241a86636ab25093dd2 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include <QEvent>
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
#include "DesignerView.h"
#include "NodeEditorConnection.h"
#include "NodeEditorPort.h"
#include "NodeEditor.h"
+#include <QEvent>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
NodeEditor::NodeEditor(QObject *parent)
: QObject(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
index e83bd7a35460c9c1bf085c3a3c68001040016df1..b2f01138d5244e73118a83563f43bcc3f4c68927 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
+#include "ConnectableView.h"
+#include "NodeEditorPort.h"
+#include "NodeEditorConnection.h"
#include <QBrush>
#include <QDebug>
#include <QGraphicsScene>
#include <QPainter>
#include <QPen>
-#include "ConnectableView.h"
-#include "NodeEditorPort.h"
-#include "NodeEditorConnection.h"
NodeEditorConnection::NodeEditorConnection(QGraphicsItem *parent, QGraphicsScene *scene)
: QGraphicsPathItem(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
index 282859fb6d97bee3365288470210214de8a2d7a7..ff7e825efcddb676d928f5b02710f51711092e8a 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
+#include "NodeEditorConnection.h"
+#include "NodeEditorPort.h"
#include <QDebug>
#include <QFontMetrics>
#include <QGraphicsScene>
#include <QPainter>
#include <QPen>
-#include "NodeEditorConnection.h"
-#include "NodeEditorPort.h"
NodeEditorPort::NodeEditorPort(QGraphicsItem *parent, const QString &name,
NodeEditorPort::EPortDirection direction,
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index a989c168d0b21cdf1a87b4685de216b3fce97a3d..853f2895e3d88a2c8106c0df9411533b5b98d4b8 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "ParticleCompositionItem.h"
#include "ParticleItem.h"
#include "SessionItem.h"
#include "ParticleCompositionView.h"
+#include <QDebug>
ParticleCompositionView::ParticleCompositionView(QGraphicsItem *parent) : ConnectableView(parent)
{
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
index 259b2db132fb1d6c8ae88c8cbb9dd746d8476e75..388e2a3c8e625784f93e424d6ade22802d16e914 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "ParticleCoreShellItem.h"
#include "SessionItem.h"
#include "ParticleCoreShellView.h"
+#include <QDebug>
ParticleCoreShellView::ParticleCoreShellView(QGraphicsItem *parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
index 33268a86917a780834e321be5828ea77649c96ae..fa099cba0cfb0638c56d677e392e7244be0bff13 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "SessionItem.h"
#include "ParticleDistributionView.h"
+#include <QDebug>
ParticleDistributionView::ParticleDistributionView(QGraphicsItem *parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
index 54691078ba1cee0dcfe0e1ee1d04d4ea139bf8c3..330bcdaa92619eb0b5a1ce8ff54cd3752f23ac46 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "DesignerHelper.h"
#include "GUIHelpers.h"
#include "ParticleView.h"
#include "SessionItem.h"
#include "ParticleLayoutView.h"
+#include <QDebug>
ParticleLayoutView::ParticleLayoutView(QGraphicsItem *parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
index 319e12d094b921fcb12cb255ca3f85bdfdaceaf7..783f9e2b0c4f1eb3f1792c42830d7db8a89a2553 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
@@ -14,15 +14,15 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QObject>
-#include <QPainter>
-#include <QStyleOptionGraphicsItem>
#include "GUIHelpers.h"
#include "GroupItem.h"
#include "GroupProperty.h"
#include "ParticleItem.h"
#include "ParticleView.h"
+#include <QDebug>
+#include <QObject>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
ParticleView::ParticleView(QGraphicsItem *parent) : ConnectableView(parent)
{
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.h b/GUI/coregui/Views/SampleDesigner/ParticleView.h
index f2a59266880066430847c9404bbd06b82141c196..cadb09b453d772d163a4a26f90de702436bc0808 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.h
@@ -17,8 +17,8 @@
#ifndef PARTICLEVIEW_H
#define PARTICLEVIEW_H
-#include <QPixmap>
#include "ConnectableView.h"
+#include <QPixmap>
//! Class representing view of Particle item
class BA_CORE_API_ ParticleView : public ConnectableView
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index 57208498491c10614df2f0bbca72f803cc0456c3..28e08e0b05132ce0fd3997ee656aeb94298d7bbd 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "DesignerScene.h"
#include "DesignerView.h"
#include "FilterPropertyProxy.h"
#include "ISample.h"
#include "MultiLayerView.h"
#include "SampleDesigner.h"
+#include <QDebug>
SampleDesigner::SampleDesigner(QWidget *parent)
: SampleDesignerInterface(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
index c4878af9c7318ec5f1f7bc4a7628b2a26989c27a..f40fd7c8603d0f9f33a45f7a7d4fdab3461359c2 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
@@ -17,10 +17,10 @@
#ifndef SAMPLEDESIGNER_H
#define SAMPLEDESIGNER_H
-#include <QObject>
-#include <QStackedWidget>
#include "DesignerScene.h"
#include "DesignerView.h"
+#include <QObject>
+#include <QStackedWidget>
class DesignerScene;
class DesignerWidgetFactory;
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
index b23cec72cfde4ee9a16ccfda7dadf8d8ef90bff0..1f320fb7f2a739f547ccee1522e8a334320cf578 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
+#include "ComponentEditor.h"
+#include "SessionItem.h"
+#include "SamplePropertyWidget.h"
#include <QDebug>
#include <QItemSelection>
#include <QModelIndexList>
#include <QSortFilterProxyModel>
#include <QVBoxLayout>
-#include "ComponentEditor.h"
-#include "SessionItem.h"
-#include "SamplePropertyWidget.h"
SamplePropertyWidget::SamplePropertyWidget(QItemSelectionModel *selection_model, QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
index 9438f97d074f19bd5042455005226be96734afb8..036c51ef51d57326b2b8f7ae9f68ec0aba5f1bd8 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
@@ -17,8 +17,8 @@
#ifndef SAMPLEPROPERTYWIDGET_H
#define SAMPLEPROPERTYWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class QItemSelectionModel;
class QItemSelection;
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
index 58978f270a038dc514cc4185f0c655ad69563967..133da3fb3a248c42638fe82e6949ddbaf601e86f 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
@@ -14,6 +14,10 @@
//
// ************************************************************************** //
+#include "DesignerView.h"
+#include "MaterialProperty.h"
+#include "MaterialSvc.h"
+#include "SampleToolBar.h"
#include <QAction>
#include <QButtonGroup>
#include <QComboBox>
@@ -23,10 +27,6 @@
#include <QMenu>
#include <QPushButton>
#include <QToolButton>
-#include "DesignerView.h"
-#include "MaterialProperty.h"
-#include "MaterialSvc.h"
-#include "SampleToolBar.h"
//! main tool bar on top of SampleView window
SampleToolBar::SampleToolBar(QWidget *parent)
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
index 35ead6a3dba9e1dda543cf49bad14892376f1c3f..4bc6f6b02cf1fca95897eba4e47b1b982d7736bb 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QModelIndex>
#include "DesignerScene.h"
#include "IView.h"
#include "SampleModel.h"
#include "SampleViewAligner.h"
+#include <QDebug>
+#include <QModelIndex>
SampleViewAligner::SampleViewAligner(DesignerScene *scene)
: m_scene(scene)
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
index 30bad919f483abbe994e2023c6d4d7b2b238f5f3..101bda50427c3ec254edab0c45a402b6702338a3 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
@@ -17,10 +17,10 @@
#ifndef SAMPLEVIEWALIGNER_H
#define SAMPLEVIEWALIGNER_H
+#include "WinDllMacros.h"
#include <QMap>
#include <QModelIndex>
#include <QPointF>
-#include "WinDllMacros.h"
class DesignerScene;
class IView;
class SessionItem;
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
index 114a7d643f61f01971463cc862686dd1c1b86fb8..87dfe26a3ec8b5c335e9b80ab7f770708189b930 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
@@ -14,7 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
#include "GUIHelpers.h"
#include "InterferenceFunctionViews.h"
#include "LayerView.h"
@@ -27,6 +26,7 @@
#include "TransformationView.h"
#include "item_constants.h"
#include "SampleViewFactory.h"
+#include <QDebug>
QStringList SampleViewFactory::m_valid_item_names = QStringList()
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
index a66e03f39c9016b423a739d4df541ba20287141c..49d55bac96e3f1d45c8adf31b5d5f6921ce2bba7 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
@@ -17,9 +17,9 @@
#ifndef SAMPLEVIEWFACTORY_H
#define SAMPLEVIEWFACTORY_H
+#include "WinDllMacros.h"
#include <QMap>
#include <QStringList>
-#include "WinDllMacros.h"
class IView;
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
index b3b5cbdbf9b358217001320e68888424dd7a1e24..57871a546d872f08d199e7b15513955a7209d66a 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
@@ -14,10 +14,10 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "styledbar.h"
#include "widgetbox.h"
#include "SampleWidgetBox.h"
+#include <QVBoxLayout>
#if QT_VERSION < 0x050000
#define QStringLiteral QString
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
index f12bd5f9481ab511e6783c52eec2a05c515fb3bc..b6131b223cd11551c972ed9bc34f616f5d38f7f3 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
@@ -17,8 +17,8 @@
#ifndef SAMPLEWIDGETBOX_H
#define SAMPLEWIDGETBOX_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class QDesignerWidgetBoxInterface;
class SampleDesignerInterface;
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/coregui/Views/SampleView.cpp
index ec16553c58b8164e7844d4c2c880b94045bebb91..d37fd2cf5d0d3da8263a36ef5f63b1910f60d50a 100644
--- a/GUI/coregui/Views/SampleView.cpp
+++ b/GUI/coregui/Views/SampleView.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QDockWidget>
-#include <QMenu>
-#include <QTimer>
#include "FilterPropertyProxy.h"
#include "InfoWidget.h"
#include "ItemFactory.h"
@@ -27,6 +23,10 @@
#include "SampleViewComponents.h"
#include "mainwindow.h"
#include "SampleView.h"
+#include <QDebug>
+#include <QDockWidget>
+#include <QMenu>
+#include <QTimer>
SampleView::SampleView(MainWindow *mainWindow)
: Manhattan::FancyMainWindow(mainWindow)
diff --git a/GUI/coregui/Views/SampleView.h b/GUI/coregui/Views/SampleView.h
index 00d08e0023380199fd1f760aa6dddee5e1999bf4..cfdb39105c843b283f54a859fe933a9774fe4f08 100644
--- a/GUI/coregui/Views/SampleView.h
+++ b/GUI/coregui/Views/SampleView.h
@@ -17,10 +17,10 @@
#ifndef SAMPLEVIEW_H
#define SAMPLEVIEW_H
+#include "fancymainwindow.h"
#include <QAction>
#include <QSignalMapper>
#include <QTreeView>
-#include "fancymainwindow.h"
class MainWindow;
diff --git a/GUI/coregui/Views/SessionModelView.cpp b/GUI/coregui/Views/SessionModelView.cpp
index f4d05e9ec7bb3fe657533eb451398d7b0641dc9e..850090585087743592f5d0690a0b7aca6b4402ac 100644
--- a/GUI/coregui/Views/SessionModelView.cpp
+++ b/GUI/coregui/Views/SessionModelView.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QToolBar>
-#include <QToolButton>
-#include <QTreeView>
-#include <QVBoxLayout>
#include "InstrumentModel.h"
#include "JobModel.h"
#include "MaterialModel.h"
@@ -26,6 +22,10 @@
#include "SessionModelDelegate.h"
#include "mainwindow.h"
#include "SessionModelView.h"
+#include <QToolBar>
+#include <QToolButton>
+#include <QTreeView>
+#include <QVBoxLayout>
SessionModelView::ModelTree::ModelTree(SessionModel *model, QTreeView *tree)
diff --git a/GUI/coregui/Views/SimulationView.cpp b/GUI/coregui/Views/SimulationView.cpp
index bb502b97c46f1219b397c18ee54ff1a7e03f83ba..e824a1e6888ab688aba03d44f88d4e34da0b9b79 100644
--- a/GUI/coregui/Views/SimulationView.cpp
+++ b/GUI/coregui/Views/SimulationView.cpp
@@ -14,11 +14,11 @@
//
// ************************************************************************** //
-#include <QVBoxLayout>
#include "SimulationSetupWidget.h"
#include "StyledToolBar.h"
#include "mainwindow.h"
#include "SimulationView.h"
+#include <QVBoxLayout>
SimulationView::SimulationView(MainWindow *mainWindow)
: QWidget(mainWindow)
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index 956a1c21c64147006057c77f5fb8bde7510e3ab2..9d5ed6909fcf54a6346b7cfffb90f3c8f2f2b533 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -14,6 +14,18 @@
//
// ************************************************************************** //
+#include "DesignerHelper.h"
+#include "DomainSimulationBuilder.h"
+#include "GISASSimulation.h"
+#include "InstrumentModel.h"
+#include "PyGenTools.h"
+#include "PythonSyntaxHighlighter.h"
+#include "SampleModel.h"
+#include "SimulationOptionsItem.h"
+#include "WarningSignWidget.h"
+#include "projectdocument.h"
+#include "projectmanager.h"
+#include "PythonScriptWidget.h"
#include <QDebug>
#include <QDir>
#include <QFile>
@@ -28,18 +40,6 @@
#include <QToolBar>
#include <QToolButton>
#include <QVBoxLayout>
-#include "DesignerHelper.h"
-#include "DomainSimulationBuilder.h"
-#include "GISASSimulation.h"
-#include "InstrumentModel.h"
-#include "PyGenTools.h"
-#include "PythonSyntaxHighlighter.h"
-#include "SampleModel.h"
-#include "SimulationOptionsItem.h"
-#include "WarningSignWidget.h"
-#include "projectdocument.h"
-#include "projectmanager.h"
-#include "PythonScriptWidget.h"
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
index 50374f2875833da0722536f76de5ebc4f75844c9..88e5bb48d97043e515f64aa2b0e39fa16020f665 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
@@ -17,8 +17,8 @@
#ifndef PYTHONSCRIPTWIDGET_H
#define PYTHONSCRIPTWIDGET_H
-#include <QDialog>
#include "WinDllMacros.h"
+#include <QDialog>
class QToolBar;
class QTextEdit;
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
index 2c557b49ea7cbe6fbb01a63d0dc9870ae6c4748b..06f6030d677275de54a7bd02f2a641f91bd5baf8 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
@@ -14,12 +14,6 @@
//
// ************************************************************************** //
-#include <QComboBox>
-#include <QDebug>
-#include <QFileDialog>
-#include <QGroupBox>
-#include <QLabel>
-#include <QVBoxLayout>
#include "ApplicationModels.h"
#include "InstrumentItem.h"
#include "InstrumentModel.h"
@@ -28,6 +22,12 @@
#include "RealDataModel.h"
#include "SampleModel.h"
#include "SimulationDataSelectorWidget.h"
+#include <QComboBox>
+#include <QDebug>
+#include <QFileDialog>
+#include <QGroupBox>
+#include <QLabel>
+#include <QVBoxLayout>
namespace
{
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
index ee42ba487ae1d0a71c13497f68e38cc6cef618bb..e4bb1d5cc2bc6039e69e13812143f5bc5fe2927e 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
@@ -17,8 +17,8 @@
#ifndef SIMULATIONDATASELECTORWIDGET_H
#define SIMULATIONDATASELECTORWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class ApplicationModels;
class QComboBox;
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
index 40b0cf7a73b448b8312fdb4c3d480de8b970154b..9c1714ca7121a8a961cac9d875032cb4804d5941 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include <QGroupBox>
-#include <QVBoxLayout>
#include "ComponentBoxEditor.h"
#include "ComponentEditor.h"
#include "SimulationOptionsItem.h"
#include "SimulationOptionsWidget.h"
+#include <QGroupBox>
+#include <QVBoxLayout>
SimulationOptionsWidget::SimulationOptionsWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
index fd33832429b9a159243f65749ecaf3ea2a2f683d..bbac91eb814dbadaccc5af9fcc19849c3e14aa47 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
@@ -17,8 +17,8 @@
#ifndef SIMULATIONOPTIONSWIDGET_H
#define SIMULATIONOPTIONSWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class SimulationOptionsItem;
class ComponentBoxEditor;
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
index aef5383e634915c825ef7e0d4ea1b7dfe772570f..867d46cf19a1054f6ac682b06d314f9615b2b259 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
@@ -14,8 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QMessageBox>
#include "AxesItems.h"
#include "DetectorItems.h"
#include "IAxis.h"
@@ -25,6 +23,8 @@
#include "RealDataItem.h"
#include "SampleValidator.h"
#include "SimulationSetupAssistant.h"
+#include <QDebug>
+#include <QMessageBox>
//! Returns true if given setup is valid for submitting the job
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
index 3c5086753542161c1249045486a0f845b290b4f3..d177575cc6aa17e0ea63d059d6c6dc646f0fbbda 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
@@ -17,8 +17,8 @@
#ifndef SIMULATIONSETUPASSISTANT_H
#define SIMULATIONSETUPASSISTANT_H
-#include <QStringList>
#include "WinDllMacros.h"
+#include <QStringList>
class MultiLayerItem;
class InstrumentItem;
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
index 3ed9b5cd32eb59ae72e9245b781bf5145f0d2595..67cb9f452b71a50e1fd02e228f2e2c9b336a6302 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
@@ -14,10 +14,6 @@
//
// ************************************************************************** //
-#include <QDebug>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QVBoxLayout>
#include "AppSvc.h"
#include "ApplicationModels.h"
#include "DocumentModel.h"
@@ -29,6 +25,10 @@
#include "SimulationSetupAssistant.h"
#include "projectmanager.h"
#include "SimulationSetupWidget.h"
+#include <QDebug>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QVBoxLayout>
SimulationSetupWidget::SimulationSetupWidget(QWidget *parent)
: QWidget(parent)
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
index 48a5199d0a2546c20fa910e19395525aea608b10..36b9feb6dcace0a63d74d8343c4dae5c33eba480 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
@@ -17,8 +17,8 @@
#ifndef SIMULATIONSETUPWIDGET_H
#define SIMULATIONSETUPWIDGET_H
-#include <QWidget>
#include "WinDllMacros.h"
+#include <QWidget>
class QPushButton;
class MultiLayerItem;
diff --git a/GUI/coregui/Views/TestComponentView.cpp b/GUI/coregui/Views/TestComponentView.cpp
index 24dbdf810c8bb1d1ae7bf88d6973696be6f7504e..fd21c017d6fe493f0f6b634c57dd827406799cd2 100644
--- a/GUI/coregui/Views/TestComponentView.cpp
+++ b/GUI/coregui/Views/TestComponentView.cpp
@@ -13,12 +13,12 @@
//! @authors Walter Van Herck, Joachim Wuttke
//
// ************************************************************************** //
-#include <QHBoxLayout>
-#include <QTreeView>
#include "ComponentEditor.h"
#include "SampleModel.h"
#include "mainwindow.h"
#include "TestComponentView.h"
+#include <QHBoxLayout>
+#include <QTreeView>
TestComponentView::TestComponentView(MainWindow *mainWindow)
: QWidget(mainWindow)
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp
index bd86dd1dfc09bcf99c209e2944312cb311366469..f11775071bb54e7c123df2a4a35c2ebf39e639fb 100644
--- a/GUI/coregui/Views/TestView.cpp
+++ b/GUI/coregui/Views/TestView.cpp
@@ -14,8 +14,6 @@
//
// ************************************************************************** //
-#include <QCheckBox>
-#include <QLineEdit>
#include "AccordionWidget.h"
#include "JobModel.h"
#include "MaskEditor.h"
@@ -24,6 +22,8 @@
#include "MinimizerSettingsWidget.h"
#include "mainwindow.h"
#include "TestView.h"
+#include <QCheckBox>
+#include <QLineEdit>
TestView::TestView(MainWindow *mainWindow)
: QWidget(mainWindow)
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index eb061f7d046b3d3d5b7caab020c66d137629dddb..d50f13023b2ab2009a300fecab4148809e8b032d 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -14,12 +14,6 @@
//
// ************************************************************************** //
-#include <QCommandLinkButton>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QSignalMapper>
-#include <QUrl>
-#include <QVBoxLayout>
#include "DesignerHelper.h"
#include "FancyLabel.h"
#include "mainwindow.h"
@@ -28,6 +22,12 @@
#include "projectmanager.h"
#include "qstringutils.h"
#include "WelcomeView.h"
+#include <QCommandLinkButton>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QSignalMapper>
+#include <QUrl>
+#include <QVBoxLayout>
WelcomeView::WelcomeView(MainWindow *parent)
: m_mainWindow(parent)
diff --git a/GUI/coregui/mainwindow/mainwindow_constants.h b/GUI/coregui/mainwindow/mainwindow_constants.h
index 2596078a06148e873407ce856f60b368033f9ed3..2b3cb2407b7e9ee1d9a59a31ea421ec44896c2a8 100644
--- a/GUI/coregui/mainwindow/mainwindow_constants.h
+++ b/GUI/coregui/mainwindow/mainwindow_constants.h
@@ -17,6 +17,7 @@
#ifndef MAINWINDOW_CONSTANTS_H
#define MAINWINDOW_CONSTANTS_H
+#include <QString>
namespace Constants {
@@ -81,4 +82,3 @@ const QString FitComparisonWidgetName = "Fit Data";
}
#endif // MAINWINDOW_CONSTANTS_H
-
diff --git a/GUI/coregui/utils/GUIHelpers.cpp b/GUI/coregui/utils/GUIHelpers.cpp
index c5282a253070ba08b3bb45f2df3746ec7d77bd4d..0391cc1f4e00140030556770e866d1afd9d56b1e 100644
--- a/GUI/coregui/utils/GUIHelpers.cpp
+++ b/GUI/coregui/utils/GUIHelpers.cpp
@@ -18,10 +18,10 @@
#include "JobItem.h"
#include "RealDataItem.h"
#include <QApplication>
+#include <QDateTime>
#include <QDir>
#include <QMessageBox>
#include <QPushButton>
-#include <QDateTime>
namespace GUIHelpers {
diff --git a/GUI/coregui/utils/GUITest.cpp b/GUI/coregui/utils/GUITest.cpp
index 57a42319b74d8ded701cdfd940ee3df58960e109..b8ba1c99132d8c406374ffd96fb66873eb0475c2 100644
--- a/GUI/coregui/utils/GUITest.cpp
+++ b/GUI/coregui/utils/GUITest.cpp
@@ -14,16 +14,16 @@
//
// ************************************************************************** //
-#include "GUITest.h"
+#include "DocumentModel.h"
+#include "DomainSimulationBuilder.h"
#include "GUIObjectBuilder.h"
#include "InstrumentModel.h"
-#include "SampleModel.h"
-#include "MaterialSvc.h"
-#include "MaterialModel.h"
#include "IntensityDataFunctions.h"
-#include "DomainSimulationBuilder.h"
-#include "DocumentModel.h"
+#include "MaterialModel.h"
+#include "MaterialSvc.h"
+#include "SampleModel.h"
#include "Utils.h"
+#include "GUITest.h"
diff --git a/GUI/coregui/utils/ItemIDFactory.h b/GUI/coregui/utils/ItemIDFactory.h
index 2058442252396e44f72f49199dcd532135c5de31..a052d53ff38dd5f20a30167021549ec0d5148227 100644
--- a/GUI/coregui/utils/ItemIDFactory.h
+++ b/GUI/coregui/utils/ItemIDFactory.h
@@ -17,8 +17,8 @@
#ifndef ITEMIDFACTORY_H
#define ITEMIDFACTORY_H
-#include <QUuid>
#include <QMap>
+#include <QUuid>
class SessionItem;
diff --git a/GUI/coregui/utils/MessageContainer.cpp b/GUI/coregui/utils/MessageContainer.cpp
index 8c303863bffaad9154e96c6b0cfd716b414e6097..92f8358c2e48a67c4cb052ebf7fb007701efaad1 100644
--- a/GUI/coregui/utils/MessageContainer.cpp
+++ b/GUI/coregui/utils/MessageContainer.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "MessageContainer.h"
#include "GUIHelpers.h"
+#include "MessageContainer.h"
namespace {
int maximum_number_of_messages = 100;
diff --git a/GUI/coregui/utils/WarningMessageService.cpp b/GUI/coregui/utils/WarningMessageService.cpp
index 8c2e0a8402193a7c25b5a7c6cbfa6e32d518a4fa..93647959cbf9e372ebaa636bcba06dabd41484de 100644
--- a/GUI/coregui/utils/WarningMessageService.cpp
+++ b/GUI/coregui/utils/WarningMessageService.cpp
@@ -14,9 +14,9 @@
//
// ************************************************************************** //
-#include "WarningMessageService.h"
-#include "MessageContainer.h"
#include "GUIMessage.h"
+#include "MessageContainer.h"
+#include "WarningMessageService.h"
#include <QObject>
WarningMessageService::~WarningMessageService()
diff --git a/GUI/coregui/utils/hostosinfo.h b/GUI/coregui/utils/hostosinfo.h
index 1a1e5643bcf7473a51fb1fb82610929b1e465559..5115884157da7b692ea98dde627615307e57797d 100644
--- a/GUI/coregui/utils/hostosinfo.h
+++ b/GUI/coregui/utils/hostosinfo.h
@@ -17,6 +17,7 @@
#ifndef HOSTOSINFO_H
#define HOSTOSINFO_H
+#include <QString>
namespace Utils {
@@ -120,4 +121,3 @@ BA_CORE_API_ bool HostOsInfo::isAnyUnixHost()
} // namespace Utils
#endif // HOSTOSINFO_H
-
diff --git a/GUI/coregui/utils/qstringutils.cpp b/GUI/coregui/utils/qstringutils.cpp
index 4b5838ce7c5ca9e414e42299e256fee565adabe1..1e8e609b5734966b95f5316a46d699efd63078b5 100644
--- a/GUI/coregui/utils/qstringutils.cpp
+++ b/GUI/coregui/utils/qstringutils.cpp
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#include "qstringutils.h"
#include "hostosinfo.h"
+#include "qstringutils.h"
#include <QDir>
namespace Utils
diff --git a/GUI/main/appoptions.cpp b/GUI/main/appoptions.cpp
index bf5da6d6e1f831cb9a47cc16d22053d4c7faea3d..d4db0de3d40c06b71b5cd5f5124c18330439bc9c 100644
--- a/GUI/main/appoptions.cpp
+++ b/GUI/main/appoptions.cpp
@@ -14,12 +14,12 @@
//
// ************************************************************************** //
-#include "appoptions.h"
#include "GUIHelpers.h"
+#include "appoptions.h"
+#include <fstream>
+#include <iostream>
#include <boost/program_options/config.hpp>
#include <boost/program_options/parsers.hpp>
-#include <iostream>
-#include <fstream>
ApplicationOptions::ApplicationOptions(int argc, char **argv)
diff --git a/GUI/main/main.cpp b/GUI/main/main.cpp
index b87bd262bc8bf530eb575743b5d009864e53515d..2462e985b10b230ed07223c266efd4ab2add87a0 100644
--- a/GUI/main/main.cpp
+++ b/GUI/main/main.cpp
@@ -14,16 +14,16 @@
//
// ************************************************************************** //
+#include "FitProgressInfo.h"
+#include "SplashScreen.h"
#include "appoptions.h"
#include "mainwindow.h"
-#include "SplashScreen.h"
-#include "FitProgressInfo.h"
#include <QApplication>
#include <QDebug>
-#include <iostream>
-#include <QTime>
#include <QLocale>
#include <QMetaType>
+#include <QTime>
+#include <iostream>
void messageHandler(QtMsgType type, const QMessageLogContext &, const QString &msg)
{