From 58aaa7eae38a1c3d6f8da2708cf9f55d9dc8d2ea Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 11 Nov 2021 20:03:05 +0100
Subject: [PATCH] avoid duplication of class name in 'new' statements

---
 Base/Axis/FixedBinAxis.cpp                    |  2 +-
 Base/Py/PyUtils.cpp                           |  2 +-
 Device/Data/OutputData.cpp                    |  2 +-
 Device/Data/OutputData.h                      |  2 +-
 Device/Histo/Histogram1D.cpp                  |  2 +-
 Device/Histo/Histogram2D.cpp                  |  6 ++--
 GUI/Model/Fit/FitParameterProxyModel.cpp      |  2 +-
 GUI/Model/Fit/MinimizerItem.cpp               | 10 +++---
 GUI/Model/Fit/ParameterTuningModel.cpp        |  2 +-
 GUI/Model/From/FromDomain.cpp                 | 16 +++++-----
 GUI/Model/Instrument/InstrumentModel.cpp      |  2 +-
 GUI/Model/Material/MaterialModel.cpp          |  2 +-
 GUI/Model/Sample/SampleModel.cpp              |  2 +-
 GUI/Model/Session/SessionModel.cpp            |  2 +-
 GUI/View/Common/ItemComboWidget.cpp           |  2 +-
 GUI/View/Common/ItemSelectorWidget.cpp        |  2 +-
 GUI/View/Common/ItemStackWidget.cpp           |  2 +-
 GUI/View/Common/ItemViewOverlayButtons.cpp    |  6 ++--
 GUI/View/Common/StyledToolBar.cpp             |  2 +-
 GUI/View/Fit/FitActivityPanel.cpp             |  2 +-
 GUI/View/Fit/FitParameterWidget.cpp           |  2 +-
 GUI/View/Fit/SliderSettingsWidget.cpp         |  4 +--
 GUI/View/Import/RealDataMaskWidget.cpp        |  4 +--
 GUI/View/Import/RealDataPropertiesWidget.cpp  |  2 +-
 GUI/View/Import/RealDataSelectorWidget.cpp    |  2 +-
 GUI/View/Import/SpecularDataImportWidget.cpp  |  4 +--
 .../Instrument/DepthProbeInstrumentEditor.cpp |  4 +--
 GUI/View/Instrument/Detail/detailsbutton.cpp  |  6 ++--
 GUI/View/Instrument/Detail/detailswidget.cpp  |  2 +-
 .../Instrument/DetectorAlignmentEditor.cpp    | 14 ++++----
 GUI/View/Instrument/DetectorEditor.cpp        |  2 +-
 GUI/View/Instrument/DistributionEditor.cpp    | 22 ++++++-------
 GUI/View/Instrument/DistributionForms.cpp     | 30 ++++++++---------
 GUI/View/Instrument/DistributionPlot.cpp      |  6 ++--
 .../Instrument/EditDistributionDialog.cpp     |  6 ++--
 GUI/View/Instrument/EnvironmentEditor.cpp     |  8 ++---
 .../Instrument/FootprintCorrectionEditor.cpp  | 10 +++---
 GUI/View/Instrument/GISASBeamEditor.cpp       |  6 ++--
 GUI/View/Instrument/GISASInstrumentEditor.cpp |  2 +-
 .../Instrument/InclinationAnglesEditor.cpp    |  6 ++--
 GUI/View/Instrument/InstrumentEditor.cpp      |  4 +--
 .../Instrument/InstrumentLibraryEditor.cpp    | 12 +++----
 GUI/View/Instrument/InstrumentListView.cpp    |  2 +-
 GUI/View/Instrument/InstrumentView.cpp        |  2 +-
 GUI/View/Instrument/OffSpecularBeamEditor.cpp |  6 ++--
 .../OffSpecularInstrumentEditor.cpp           |  2 +-
 .../Instrument/PolarizationAnalysisEditor.cpp | 10 +++---
 .../Instrument/RectangularDetectorEditor.cpp  |  8 ++---
 .../Instrument/ResolutionFunctionEditor.cpp   |  8 ++---
 GUI/View/Instrument/SpecularBeamEditor.cpp    |  6 ++--
 .../Instrument/SpecularInstrumentEditor.cpp   |  2 +-
 GUI/View/Instrument/SphericalAxisEditor.cpp   |  6 ++--
 .../Instrument/SphericalDetectorEditor.cpp    |  2 +-
 GUI/View/Instrument/VectorEditor.cpp          |  6 ++--
 GUI/View/Intensity/ColorMap.cpp               |  4 +--
 GUI/View/Intensity/ColorMapCanvas.cpp         |  2 +-
 GUI/View/Intensity/HistogramPlot.cpp          |  2 +-
 GUI/View/Intensity/Plot1D.cpp                 |  2 +-
 GUI/View/Job/JobListView.cpp                  |  2 +-
 GUI/View/Job/JobPropertiesWidget.cpp          |  2 +-
 GUI/View/Job/JobSelectorWidget.cpp            |  4 +--
 GUI/View/Job/JobView.cpp                      |  4 +--
 GUI/View/Loaders/QREDataLoader.cpp            |  2 +-
 GUI/View/Main/AboutDialog.cpp                 |  4 +--
 GUI/View/Main/ActionManager.cpp               |  4 +--
 GUI/View/Main/MainWindow.cpp                  |  8 ++---
 GUI/View/Main/NewProjectDialog.cpp            | 12 +++----
 GUI/View/Main/SaveService.cpp                 |  2 +-
 GUI/View/Mask/MaskEditorCanvas.cpp            |  2 +-
 GUI/View/Mask/MaskEditorPropertyPanel.cpp     | 10 +++---
 GUI/View/Mask/MaskEditorToolBar.cpp           | 26 +++++++--------
 GUI/View/Mask/RectangleBaseView.cpp           |  2 +-
 .../MaterialEditor/MaterialEditorDialog.cpp   |  8 ++---
 .../IntensityDataProjectionsWidget.cpp        |  2 +-
 .../Projection/ProjectionsEditorCanvas.cpp    |  2 +-
 GUI/View/Projection/ProjectionsPlot.cpp       |  2 +-
 .../Projection/ProjectionsPropertyPanel.cpp   |  2 +-
 GUI/View/Projection/ProjectionsToolBar.cpp    |  2 +-
 GUI/View/Projection/ProjectionsWidget.cpp     |  2 +-
 GUI/View/SampleDesigner/ConnectableView.cpp   |  4 +--
 GUI/View/SampleDesigner/DesignerMimeData.cpp  |  4 +--
 GUI/View/SampleDesigner/FormLayouter.cpp      |  8 ++---
 GUI/View/SampleDesigner/LayerEditorUtils.cpp  |  4 +--
 GUI/View/SampleDesigner/LayerForm.cpp         |  4 +--
 .../LayerOrientedSampleEditor.cpp             |  4 +--
 .../SampleDesigner/MaterialInplaceForm.cpp    |  2 +-
 .../SampleDesigner/ParticleCoreShellForm.cpp  |  4 +--
 GUI/View/SampleDesigner/SampleListView.cpp    | 14 ++++----
 GUI/View/SampleDesigner/SampleToolBox.cpp     |  4 +--
 .../SampleToolBoxTreeWidget.cpp               |  8 ++---
 GUI/View/SampleDesigner/SampleTreeWidget.cpp  |  2 +-
 GUI/View/SampleDesigner/SampleView.cpp        | 10 +++---
 GUI/View/SampleDesigner/ScriptPanel.cpp       |  2 +-
 GUI/View/Script/PythonScriptWidget.cpp        |  6 ++--
 GUI/View/SpecularData/Plot1DCanvas.cpp        |  2 +-
 GUI/View/SpecularData/SpecularDataCanvas.cpp  |  2 +-
 GUI/View/SpecularData/SpecularPlot.cpp        |  2 +-
 GUI/View/SpecularData/SpecularPlotCanvas.cpp  |  2 +-
 GUI/View/Tool/GroupBoxCollapser.cpp           |  4 +--
 GUI/View/Toplevel/SimulationView.cpp          |  2 +-
 GUI/View/Toplevel/TestView.cpp                | 32 +++++++++----------
 Sample/Aggregate/ParticleLayout.cpp           |  2 +-
 Sample/Interface/LayerInterface.cpp           |  2 +-
 Sample/Multilayer/Layer.cpp                   |  2 +-
 Sample/Particle/FormFactorWeighted.cpp        |  2 +-
 Sample/Particle/Particle.cpp                  |  2 +-
 Sample/Particle/ParticleComposition.cpp       |  2 +-
 Sample/Particle/ParticleCoreShell.cpp         |  2 +-
 .../StandardSamples/BoxCompositionBuilder.cpp |  2 +-
 .../BoxesSquareLatticeBuilder.cpp             |  2 +-
 .../CoreShellParticleBuilder.cpp              |  4 +--
 .../CustomMorphologyBuilder.cpp               |  2 +-
 .../CylindersAndPrismsBuilder.cpp             |  2 +-
 Sample/StandardSamples/CylindersBuilder.cpp   |  8 ++---
 .../HomogeneousMultilayerBuilder.cpp          |  2 +-
 Sample/StandardSamples/LatticeBuilder.cpp     |  2 +-
 .../LayersWithAbsorptionBuilder.cpp           |  2 +-
 .../LayersWithAbsorptionBySLDBuilder.cpp      |  2 +-
 .../StandardSamples/MagneticLayersBuilder.cpp | 10 +++---
 .../MagneticParticlesBuilder.cpp              |  6 ++--
 Sample/StandardSamples/MesoCrystalBuilder.cpp |  2 +-
 .../MultiLayerWithRoughnessBuilder.cpp        |  2 +-
 .../StandardSamples/MultipleLayoutBuilder.cpp |  2 +-
 Sample/StandardSamples/ParaCrystalBuilder.cpp |  8 ++---
 .../ParticleCompositionBuilder.cpp            |  2 +-
 .../ParticleDistributionsBuilder.cpp          | 12 +++----
 .../ParticleInVacuumBuilder.cpp               |  2 +-
 .../StandardSamples/PercusYevickBuilder.cpp   |  2 +-
 .../PlainMultiLayerBySLDBuilder.cpp           |  2 +-
 Sample/StandardSamples/RipplesBuilder.cpp     |  4 +--
 .../RotatedPyramidsBuilder.cpp                |  2 +-
 .../SizeDistributionModelsBuilder.cpp         |  8 ++---
 .../SlicedCompositionBuilder.cpp              |  2 +-
 .../SlicedCylindersBuilder.cpp                |  6 ++--
 .../ThickAbsorptiveSampleBuilder.cpp          |  2 +-
 .../TransformationsBuilder.cpp                |  2 +-
 .../StandardSamples/TwoDimLatticeBuilder.cpp  | 12 +++----
 Tests/Unit/Device/LLDataTest.cpp              | 24 +++++++-------
 Tests/Unit/Device/OutputDataIteratorTest.cpp  |  2 +-
 Tests/Unit/GUI/TestSessionItem.cpp            | 12 +++----
 Tests/Unit/GUI/TestSessionItemController.cpp  |  2 +-
 141 files changed, 349 insertions(+), 349 deletions(-)

diff --git a/Base/Axis/FixedBinAxis.cpp b/Base/Axis/FixedBinAxis.cpp
index a88ab04b373..28a46ea319d 100644
--- a/Base/Axis/FixedBinAxis.cpp
+++ b/Base/Axis/FixedBinAxis.cpp
@@ -24,7 +24,7 @@ FixedBinAxis::FixedBinAxis(const std::string& name, size_t nbins, double start,
 
 FixedBinAxis* FixedBinAxis::clone() const
 {
-    FixedBinAxis* result = new FixedBinAxis(axisName(), m_nbins, m_start, m_end);
+    auto* result = new FixedBinAxis(axisName(), m_nbins, m_start, m_end);
     return result;
 }
 
diff --git a/Base/Py/PyUtils.cpp b/Base/Py/PyUtils.cpp
index 5983984fb06..0c7b1d68fd1 100644
--- a/Base/Py/PyUtils.cpp
+++ b/Base/Py/PyUtils.cpp
@@ -174,7 +174,7 @@ PyObject* BaseUtils::Python::createNumpyArray(const std::vector<double>& data)
 {
     const size_t ndim(1);
     npy_int ndim_numpy = ndim;
-    npy_intp* ndimsizes_numpy = new npy_intp[ndim];
+    auto* ndimsizes_numpy = new npy_intp[ndim];
     ndimsizes_numpy[0] = data.size();
 
     // creating standalone numpy array
diff --git a/Device/Data/OutputData.cpp b/Device/Data/OutputData.cpp
index a2a9d6ff166..7d9233da156 100644
--- a/Device/Data/OutputData.cpp
+++ b/Device/Data/OutputData.cpp
@@ -31,7 +31,7 @@ template <> PyObject* OutputData<double>::getArray() const
 
     // creating ndarray objects describing size of dimensions
     npy_int ndim_numpy = (int)dimensions.size();
-    npy_intp* ndimsizes_numpy = new npy_intp[dimensions.size()];
+    auto* ndimsizes_numpy = new npy_intp[dimensions.size()];
     for (size_t i = 0; i < dimensions.size(); i++)
         ndimsizes_numpy[i] = dimensions[i];
 
diff --git a/Device/Data/OutputData.h b/Device/Data/OutputData.h
index 49a670dcfd4..d19f3c65cdb 100644
--- a/Device/Data/OutputData.h
+++ b/Device/Data/OutputData.h
@@ -514,7 +514,7 @@ template <class T> void OutputData<T>::allocate()
 {
     delete m_ll_data;
     size_t rank = m_axes.size();
-    int* dims = new int[rank];
+    auto* dims = new int[rank];
     for (size_t i = 0; i < rank; ++i)
         dims[i] = (int)axis(i).size();
     m_ll_data = new LLData<T>(rank, dims);
diff --git a/Device/Histo/Histogram1D.cpp b/Device/Histo/Histogram1D.cpp
index 4f6fca10ef9..45e6f0812f5 100644
--- a/Device/Histo/Histogram1D.cpp
+++ b/Device/Histo/Histogram1D.cpp
@@ -87,7 +87,7 @@ Histogram1D* Histogram1D::crop(double xmin, double xmax)
 {
     const std::unique_ptr<IAxis> xaxis{xAxis().clone()};
     xaxis->clip(xmin, xmax);
-    Histogram1D* result = new Histogram1D(*xaxis);
+    auto* result = new Histogram1D(*xaxis);
     OutputData<CumulativeValue>::const_iterator it_origin = m_data.begin();
     OutputData<CumulativeValue>::iterator it_result = result->m_data.begin();
     while (it_origin != m_data.end()) {
diff --git a/Device/Histo/Histogram2D.cpp b/Device/Histo/Histogram2D.cpp
index c36f3f44e64..ae24edf259e 100644
--- a/Device/Histo/Histogram2D.cpp
+++ b/Device/Histo/Histogram2D.cpp
@@ -117,7 +117,7 @@ Histogram2D* Histogram2D::crop(double xmin, double ymin, double xmax, double yma
     xaxis->clip(xmin, xmax);
     yaxis->clip(ymin, ymax);
 
-    Histogram2D* result = new Histogram2D(*xaxis, *yaxis);
+    auto* result = new Histogram2D(*xaxis, *yaxis);
     OutputData<CumulativeValue>::const_iterator it_origin = m_data.begin();
     OutputData<CumulativeValue>::iterator it_result = result->m_data.begin();
     while (it_origin != m_data.end()) {
@@ -163,7 +163,7 @@ void Histogram2D::addContent(const std::vector<std::vector<double>>& data)
 
 Histogram1D* Histogram2D::create_projectionX(int ybinlow, int ybinup)
 {
-    Histogram1D* result = new Histogram1D(this->xAxis());
+    auto* result = new Histogram1D(this->xAxis());
 
     for (size_t index = 0; index < getTotalNumberOfBins(); ++index) {
 
@@ -178,7 +178,7 @@ Histogram1D* Histogram2D::create_projectionX(int ybinlow, int ybinup)
 
 Histogram1D* Histogram2D::create_projectionY(int xbinlow, int xbinup)
 {
-    Histogram1D* result = new Histogram1D(this->yAxis());
+    auto* result = new Histogram1D(this->yAxis());
 
     for (size_t index = 0; index < getTotalNumberOfBins(); ++index) {
 
diff --git a/GUI/Model/Fit/FitParameterProxyModel.cpp b/GUI/Model/Fit/FitParameterProxyModel.cpp
index 5c89f237424..2fb70ebaaf2 100644
--- a/GUI/Model/Fit/FitParameterProxyModel.cpp
+++ b/GUI/Model/Fit/FitParameterProxyModel.cpp
@@ -250,7 +250,7 @@ QStringList FitParameterProxyModel::mimeTypes() const
 
 QMimeData* FitParameterProxyModel::mimeData(const QModelIndexList& indexes) const
 {
-    QMimeData* mimeData = new QMimeData();
+    auto* mimeData = new QMimeData();
     QModelIndex index = indexes.first();
     if (index.isValid()) {
         if (SessionItem* item = itemForIndex(index)) {
diff --git a/GUI/Model/Fit/MinimizerItem.cpp b/GUI/Model/Fit/MinimizerItem.cpp
index 380d7474f43..3544710a70b 100644
--- a/GUI/Model/Fit/MinimizerItem.cpp
+++ b/GUI/Model/Fit/MinimizerItem.cpp
@@ -105,7 +105,7 @@ std::unique_ptr<IMinimizer> MinuitMinimizerItem::createMinimizer() const
 {
     QString algorithmName = getItemValue(P_ALGORITHMS).value<ComboProperty>().getValue();
 
-    Minuit2Minimizer* domainMinimizer = new Minuit2Minimizer(algorithmName.toStdString());
+    auto* domainMinimizer = new Minuit2Minimizer(algorithmName.toStdString());
     domainMinimizer->setStrategy(getItemValue(P_STRATEGY).toInt());
     domainMinimizer->setErrorDefinition(getItemValue(P_ERRORDEF).toDouble());
     domainMinimizer->setTolerance(getItemValue(P_TOLERANCE).toDouble());
@@ -127,7 +127,7 @@ std::unique_ptr<IMinimizer> GSLMultiMinimizerItem::createMinimizer() const
 {
     QString algorithmName = getItemValue(P_ALGORITHMS).value<ComboProperty>().getValue();
 
-    GSLMultiMinimizer* domainMinimizer = new GSLMultiMinimizer(algorithmName.toStdString());
+    auto* domainMinimizer = new GSLMultiMinimizer(algorithmName.toStdString());
     domainMinimizer->setMaxIterations(getItemValue(P_MAXITERATIONS).toInt());
     return std::unique_ptr<IMinimizer>(domainMinimizer);
 }
@@ -144,7 +144,7 @@ GeneticMinimizerItem::GeneticMinimizerItem() : MinimizerItem(M_TYPE)
 
 std::unique_ptr<IMinimizer> GeneticMinimizerItem::createMinimizer() const
 {
-    GeneticMinimizer* domainMinimizer = new GeneticMinimizer();
+    auto* domainMinimizer = new GeneticMinimizer();
     domainMinimizer->setTolerance(getItemValue(P_TOLERANCE).toDouble());
     domainMinimizer->setMaxIterations(getItemValue(P_MAXITERATIONS).toInt());
     domainMinimizer->setPopulationSize(getItemValue(P_POPULATIONSIZE).toInt());
@@ -167,7 +167,7 @@ SimAnMinimizerItem::SimAnMinimizerItem() : MinimizerItem(M_TYPE)
 
 std::unique_ptr<IMinimizer> SimAnMinimizerItem::createMinimizer() const
 {
-    SimAnMinimizer* domainMinimizer = new SimAnMinimizer();
+    auto* domainMinimizer = new SimAnMinimizer();
     domainMinimizer->setMaxIterations(getItemValue(P_MAXITERATIONS).toInt());
     domainMinimizer->setIterationsAtEachTemp(getItemValue(P_ITERATIONSTEMP).toInt());
     domainMinimizer->setStepSize(getItemValue(P_STEPSIZE).toDouble());
@@ -188,7 +188,7 @@ GSLLMAMinimizerItem::GSLLMAMinimizerItem() : MinimizerItem(M_TYPE)
 
 std::unique_ptr<IMinimizer> GSLLMAMinimizerItem::createMinimizer() const
 {
-    GSLLevenbergMarquardtMinimizer* domainMinimizer = new GSLLevenbergMarquardtMinimizer();
+    auto* domainMinimizer = new GSLLevenbergMarquardtMinimizer();
     domainMinimizer->setTolerance(getItemValue(P_TOLERANCE).toDouble());
     domainMinimizer->setMaxIterations(getItemValue(P_MAXITERATIONS).toInt());
     return std::unique_ptr<IMinimizer>(domainMinimizer);
diff --git a/GUI/Model/Fit/ParameterTuningModel.cpp b/GUI/Model/Fit/ParameterTuningModel.cpp
index a54bca28bb1..a8401538a59 100644
--- a/GUI/Model/Fit/ParameterTuningModel.cpp
+++ b/GUI/Model/Fit/ParameterTuningModel.cpp
@@ -38,7 +38,7 @@ Qt::ItemFlags ParameterTuningModel::flags(const QModelIndex& proxyIndex) const
 
 QMimeData* ParameterTuningModel::mimeData(const QModelIndexList& proxyIndexes) const
 {
-    QMimeData* mimeData = new QMimeData();
+    auto* mimeData = new QMimeData();
 
     for (auto proxyIndex : proxyIndexes) {
         if (ParameterItem* parameterItem = getParameterItem(proxyIndex)) {
diff --git a/GUI/Model/From/FromDomain.cpp b/GUI/Model/From/FromDomain.cpp
index dacf2258e66..bff8b82c023 100644
--- a/GUI/Model/From/FromDomain.cpp
+++ b/GUI/Model/From/FromDomain.cpp
@@ -666,7 +666,7 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
         const IShape2D* shape = detectorMask->getMaskShape(i_mask, mask_value);
 
         if (const Ellipse* ellipse = dynamic_cast<const Ellipse*>(shape)) {
-            EllipseItem* ellipseItem = new EllipseItem();
+            auto* ellipseItem = new EllipseItem();
             ellipseItem->setXCenter(scale * ellipse->getCenterX());
             ellipseItem->setYCenter(scale * ellipse->getCenterY());
             ellipseItem->setXRadius(scale * ellipse->getRadiusX());
@@ -677,7 +677,7 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
         }
 
         else if (const Rectangle* rectangle = dynamic_cast<const Rectangle*>(shape)) {
-            RectangleItem* rectangleItem = new RectangleItem();
+            auto* rectangleItem = new RectangleItem();
             rectangleItem->setXLow(scale * rectangle->getXlow());
             rectangleItem->setYLow(scale * rectangle->getYlow());
             rectangleItem->setXUp(scale * rectangle->getXup());
@@ -688,11 +688,11 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
         }
 
         else if (const Polygon* polygon = dynamic_cast<const Polygon*>(shape)) {
-            PolygonItem* polygonItem = new PolygonItem();
+            auto* polygonItem = new PolygonItem();
             std::vector<double> xpos, ypos;
             polygon->getPoints(xpos, ypos);
             for (size_t i_point = 0; i_point < xpos.size(); ++i_point) {
-                PolygonPointItem* pointItem = new PolygonPointItem();
+                auto* pointItem = new PolygonPointItem();
                 pointItem->setPosX(scale * xpos[i_point]);
                 pointItem->setPosY(scale * ypos[i_point]);
                 polygonItem->insertItem(-1, pointItem);
@@ -705,14 +705,14 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
         }
 
         else if (const VerticalLine* vline = dynamic_cast<const VerticalLine*>(shape)) {
-            VerticalLineItem* lineItem = new VerticalLineItem();
+            auto* lineItem = new VerticalLineItem();
             lineItem->setPosX(scale * vline->getXpos());
             lineItem->setMaskValue(mask_value);
             container_item->insertItem(0, lineItem);
         }
 
         else if (const HorizontalLine* hline = dynamic_cast<const HorizontalLine*>(shape)) {
-            HorizontalLineItem* lineItem = new HorizontalLineItem();
+            auto* lineItem = new HorizontalLineItem();
             lineItem->setPosY(scale * hline->getYpos());
             lineItem->setMaskValue(mask_value);
             container_item->insertItem(0, lineItem);
@@ -720,7 +720,7 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
 
         else if (const InfinitePlane* plane = dynamic_cast<const InfinitePlane*>(shape)) {
             Q_UNUSED(plane);
-            MaskAllItem* planeItem = new MaskAllItem();
+            auto* planeItem = new MaskAllItem();
             planeItem->setMaskValue(mask_value);
             container_item->insertItem(-1, planeItem);
         }
@@ -735,7 +735,7 @@ void GUI::Transform::FromDomain::setMaskContainer(MaskContainerItem* container_i
         const auto xBounds = detector.regionOfInterestBounds(0);
         const auto yBounds = detector.regionOfInterestBounds(1);
 
-        RegionOfInterestItem* roiItem = new RegionOfInterestItem();
+        auto* roiItem = new RegionOfInterestItem();
         roiItem->setXLow(scale * xBounds.first);
         roiItem->setYLow(scale * yBounds.first);
         roiItem->setXUp(scale * xBounds.second);
diff --git a/GUI/Model/Instrument/InstrumentModel.cpp b/GUI/Model/Instrument/InstrumentModel.cpp
index ef6d3df7c8f..5c07e82cc8d 100644
--- a/GUI/Model/Instrument/InstrumentModel.cpp
+++ b/GUI/Model/Instrument/InstrumentModel.cpp
@@ -31,7 +31,7 @@ InstrumentModel::~InstrumentModel() = default;
 
 InstrumentModel* InstrumentModel::createCopy(SessionItem* parent)
 {
-    InstrumentModel* result = new InstrumentModel();
+    auto* result = new InstrumentModel();
     result->initFrom(this, parent);
     return result;
 }
diff --git a/GUI/Model/Material/MaterialModel.cpp b/GUI/Model/Material/MaterialModel.cpp
index a3d5bc702b1..29de7cbd8fe 100644
--- a/GUI/Model/Material/MaterialModel.cpp
+++ b/GUI/Model/Material/MaterialModel.cpp
@@ -52,7 +52,7 @@ MaterialModel::~MaterialModel()
 
 MaterialModel* MaterialModel::createCopy(SessionItem* parent)
 {
-    MaterialModel* result = new MaterialModel();
+    auto* result = new MaterialModel();
     result->initFrom(this, parent);
     return result;
 }
diff --git a/GUI/Model/Sample/SampleModel.cpp b/GUI/Model/Sample/SampleModel.cpp
index 8c9350cb040..4cbfbb03646 100644
--- a/GUI/Model/Sample/SampleModel.cpp
+++ b/GUI/Model/Sample/SampleModel.cpp
@@ -30,7 +30,7 @@ SampleModel::SampleModel(QObject* parent) : SessionModel(GUI::Session::XML::Samp
 
 SampleModel* SampleModel::createCopy(SessionItem* parent)
 {
-    SampleModel* result = new SampleModel();
+    auto* result = new SampleModel();
     result->initFrom(this, parent);
     return result;
 }
diff --git a/GUI/Model/Session/SessionModel.cpp b/GUI/Model/Session/SessionModel.cpp
index c52c1143c45..6bf084ea1ac 100644
--- a/GUI/Model/Session/SessionModel.cpp
+++ b/GUI/Model/Session/SessionModel.cpp
@@ -184,7 +184,7 @@ QMimeData* SessionModel::mimeData(const QModelIndexList& indices) const
         return 0;
 
     if (SessionItem* item = itemForIndex(indices.at(0))) {
-        QMimeData* mime_data = new QMimeData;
+        auto* mime_data = new QMimeData;
         QByteArray xml_data;
         QXmlStreamWriter writer(&xml_data);
         GUI::Session::XML::writeItemAndChildItems(&writer, item);
diff --git a/GUI/View/Common/ItemComboWidget.cpp b/GUI/View/Common/ItemComboWidget.cpp
index 4f79b8b75df..cab34ebcaed 100644
--- a/GUI/View/Common/ItemComboWidget.cpp
+++ b/GUI/View/Common/ItemComboWidget.cpp
@@ -30,7 +30,7 @@ ItemComboWidget::ItemComboWidget(QWidget* parent)
     m_blankWidget = new QWidget(m_stackedWidget);
     m_stackedWidget->addWidget(m_blankWidget);
 
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
diff --git a/GUI/View/Common/ItemSelectorWidget.cpp b/GUI/View/Common/ItemSelectorWidget.cpp
index ae2c638f2f2..2ac881edeb8 100644
--- a/GUI/View/Common/ItemSelectorWidget.cpp
+++ b/GUI/View/Common/ItemSelectorWidget.cpp
@@ -24,7 +24,7 @@ ItemSelectorWidget::ItemSelectorWidget(QWidget* parent)
 {
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
 
     layout->addWidget(m_listView);
diff --git a/GUI/View/Common/ItemStackWidget.cpp b/GUI/View/Common/ItemStackWidget.cpp
index 07a1165ea56..a5e28497728 100644
--- a/GUI/View/Common/ItemStackWidget.cpp
+++ b/GUI/View/Common/ItemStackWidget.cpp
@@ -27,7 +27,7 @@ ItemStackWidget::ItemStackWidget(QWidget* parent)
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     m_stackedWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
diff --git a/GUI/View/Common/ItemViewOverlayButtons.cpp b/GUI/View/Common/ItemViewOverlayButtons.cpp
index 16a0d55dbad..e09fd9ac0b7 100644
--- a/GUI/View/Common/ItemViewOverlayButtons.cpp
+++ b/GUI/View/Common/ItemViewOverlayButtons.cpp
@@ -109,14 +109,14 @@ void ItemViewOverlayWidget::mouseDoubleClickEvent(QMouseEvent* ev)
 
 void ItemViewOverlayWidget::create()
 {
-    QHBoxLayout* h1 = new QHBoxLayout;
+    auto* h1 = new QHBoxLayout;
 
     h1->setContentsMargins(0, 3, 5, 3);
     h1->setAlignment(m_horizontalAlignment | Qt::AlignTop);
     setLayout(h1);
 
     for (auto a : actions()) {
-        QToolButton* btn = new QToolButton(this);
+        auto* btn = new QToolButton(this);
         btn->setDefaultAction(a);
         Qt::ToolButtonStyle btnStyle = (Qt::ToolButtonStyle)a->data().toInt();
         btn->setToolButtonStyle(btnStyle);
@@ -159,7 +159,7 @@ void ItemViewOverlayWidget::setHorizontalAlignment(Qt::Alignment a)
 
 void ItemViewOverlayButtons::install(QAbstractItemView* view, FnGetActions fnGetActions)
 {
-    ItemViewOverlayButtons* h = new ItemViewOverlayButtons(view);
+    auto* h = new ItemViewOverlayButtons(view);
     h->m_getActions = fnGetActions;
     h->m_view = view;
     auto d = new ItemViewOverlayDelegate;
diff --git a/GUI/View/Common/StyledToolBar.cpp b/GUI/View/Common/StyledToolBar.cpp
index a6dc5d2a6b2..dc8ff1a161a 100644
--- a/GUI/View/Common/StyledToolBar.cpp
+++ b/GUI/View/Common/StyledToolBar.cpp
@@ -43,7 +43,7 @@ void StyledToolBar::addSpacing(int width)
 
 void StyledToolBar::addStyledExpand()
 {
-    QWidget* empty = new QWidget();
+    auto* empty = new QWidget();
     empty->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
     addWidget(empty);
 }
diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
index 2acbbab4095..033d4501213 100644
--- a/GUI/View/Fit/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -33,7 +33,7 @@ FitActivityPanel::FitActivityPanel(QWidget* parent)
     setObjectName("FitActivityPanel");
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
     m_stack = new QStackedWidget(this);
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index 32cf9e20a16..02e3f7e813b 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -46,7 +46,7 @@ FitParameterWidget::FitParameterWidget(QWidget* parent)
     , m_keyboardFilter(new DeleteEventFilter(this))
     , m_infoLabel(new OverlayLabelController(this))
 {
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->addWidget(m_treeView);
     layout->setMargin(0);
     layout->setSpacing(0);
diff --git a/GUI/View/Fit/SliderSettingsWidget.cpp b/GUI/View/Fit/SliderSettingsWidget.cpp
index c55254658b2..5c7436c65ec 100644
--- a/GUI/View/Fit/SliderSettingsWidget.cpp
+++ b/GUI/View/Fit/SliderSettingsWidget.cpp
@@ -32,7 +32,7 @@ SliderSettingsWidget::SliderSettingsWidget(QWidget* parent)
     QString tooltip("Allows to tune sample parameters within +/- of given range \nwith the help of "
                     "the slider.");
 
-    QLabel* label = new QLabel("Tuning:");
+    auto* label = new QLabel("Tuning:");
     label->setToolTip(tooltip);
 
     m_radio1 = new QRadioButton("10%");
@@ -57,7 +57,7 @@ SliderSettingsWidget::SliderSettingsWidget(QWidget* parent)
         "Preserve (min, max) range of intensity axis during parameter tuning.");
     connect(m_lockzCheckBox, &QCheckBox::stateChanged, this, &SliderSettingsWidget::onLockZChanged);
 
-    QHBoxLayout* hbox = new QHBoxLayout;
+    auto* hbox = new QHBoxLayout;
 
     hbox->addWidget(label);
     hbox->addWidget(m_radio1);
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index 7c79fc5df06..6f3498e90c8 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -25,13 +25,13 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-    QHBoxLayout* hlayout = new QHBoxLayout;
+    auto* hlayout = new QHBoxLayout;
     hlayout->setMargin(0);
     hlayout->setSpacing(0);
 
     hlayout->addWidget(m_maskEditor);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
 
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 5d6d7d6030f..5d083750667 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -32,7 +32,7 @@ RealDataPropertiesWidget::RealDataPropertiesWidget(QWidget* parent, ProjectDocum
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
     setWindowTitle("RealDataPropertiesWidget");
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->setMargin(5);
     mainLayout->setSpacing(2);
 
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index 2820f52d0b9..16503d0e63f 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -177,7 +177,7 @@ QList<QAction*> RealDataSelectorWidget::getOverlayActions(const QModelIndex& ind
     if (item == nullptr)
         return {};
 
-    QAction* removeAction = new QAction(this);
+    auto* removeAction = new QAction(this);
     removeAction->setText("Remove");
     removeAction->setIcon(QIcon(":/images/delete.svg"));
     removeAction->setIconText("Remove");
diff --git a/GUI/View/Import/SpecularDataImportWidget.cpp b/GUI/View/Import/SpecularDataImportWidget.cpp
index a1965fc1441..fdd068d9e62 100644
--- a/GUI/View/Import/SpecularDataImportWidget.cpp
+++ b/GUI/View/Import/SpecularDataImportWidget.cpp
@@ -110,12 +110,12 @@ void SpecularDataImportWidget::onPlotAxisClicked(QCPAxis* axis, QCPAxis::Selecta
     if (event->button() == Qt::RightButton && axis->axisType() == QCPAxis::atLeft) {
         QMenu menu;
 
-        QAction* lin = new QAction("Linear");
+        auto* lin = new QAction("Linear");
         connect(lin, &QAction::triggered, [=]() { specularDataItem()->setLog(false); });
         lin->setCheckable(true);
         lin->setChecked(!specularDataItem()->isLog());
 
-        QAction* log = new QAction("Logarithmic");
+        auto* log = new QAction("Logarithmic");
         connect(log, &QAction::triggered, [=]() { specularDataItem()->setLog(true); });
         log->setCheckable(true);
         log->setChecked(specularDataItem()->isLog());
diff --git a/GUI/View/Instrument/DepthProbeInstrumentEditor.cpp b/GUI/View/Instrument/DepthProbeInstrumentEditor.cpp
index c861c7b96f1..de8b2529454 100644
--- a/GUI/View/Instrument/DepthProbeInstrumentEditor.cpp
+++ b/GUI/View/Instrument/DepthProbeInstrumentEditor.cpp
@@ -27,9 +27,9 @@
 DepthProbeInstrumentEditor::DepthProbeInstrumentEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
-    QGridLayout* grid = new QGridLayout();
+    auto* grid = new QGridLayout();
     grid->setColumnStretch(0, 1);
     grid->setColumnStretch(1, 1);
     grid->setColumnStretch(2, 1);
diff --git a/GUI/View/Instrument/Detail/detailsbutton.cpp b/GUI/View/Instrument/Detail/detailsbutton.cpp
index 012cf13d860..c224e98dfe4 100644
--- a/GUI/View/Instrument/Detail/detailsbutton.cpp
+++ b/GUI/View/Instrument/Detail/detailsbutton.cpp
@@ -60,7 +60,7 @@ void FadingWidget::setOpacity(qreal value)
 
 void FadingWidget::fadeTo(qreal value)
 {
-    QPropertyAnimation* animation = new QPropertyAnimation(m_opacityEffect, "opacity");
+    auto* animation = new QPropertyAnimation(m_opacityEffect, "opacity");
     animation->setDuration(200);
     animation->setEndValue(value);
     animation->start(QAbstractAnimation::DeleteWhenStopped);
@@ -96,13 +96,13 @@ bool DetailsButton::event(QEvent* e)
 {
     switch (e->type()) {
     case QEvent::Enter: {
-        QPropertyAnimation* animation = new QPropertyAnimation(this, "fader");
+        auto* animation = new QPropertyAnimation(this, "fader");
         animation->setDuration(200);
         animation->setEndValue(1.0);
         animation->start(QAbstractAnimation::DeleteWhenStopped);
     } break;
     case QEvent::Leave: {
-        QPropertyAnimation* animation = new QPropertyAnimation(this, "fader");
+        auto* animation = new QPropertyAnimation(this, "fader");
         animation->setDuration(200);
         animation->setEndValue(0.0);
         animation->start(QAbstractAnimation::DeleteWhenStopped);
diff --git a/GUI/View/Instrument/Detail/detailswidget.cpp b/GUI/View/Instrument/Detail/detailswidget.cpp
index ae2c83a5d14..6af93923faa 100644
--- a/GUI/View/Instrument/Detail/detailswidget.cpp
+++ b/GUI/View/Instrument/Detail/detailswidget.cpp
@@ -102,7 +102,7 @@ DetailsWidgetPrivate::DetailsWidgetPrivate(QWidget* parent)
     , m_hovered(false)
     , m_useCheckBox(false)
 {
-    QHBoxLayout* summaryLayout = new QHBoxLayout;
+    auto* summaryLayout = new QHBoxLayout;
     summaryLayout->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
     summaryLayout->setSpacing(0);
 
diff --git a/GUI/View/Instrument/DetectorAlignmentEditor.cpp b/GUI/View/Instrument/DetectorAlignmentEditor.cpp
index 079028eb048..b209a46e136 100644
--- a/GUI/View/Instrument/DetectorAlignmentEditor.cpp
+++ b/GUI/View/Instrument/DetectorAlignmentEditor.cpp
@@ -75,10 +75,10 @@ private:
 GenericDetectorAlignmentForm::GenericDetectorAlignmentForm(QWidget* parent, Qt::WindowFlags f)
     : DetectorAlignmentForm(parent, f), m_item(nullptr)
 {
-    QHBoxLayout* layout = new QHBoxLayout(this);
+    auto* layout = new QHBoxLayout(this);
 
-    QGroupBox* gbox = new QGroupBox("Intersection of normal and detector", this);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* gbox = new QGroupBox("Intersection of normal and detector", this);
+    auto* form = new QFormLayout(gbox);
     layout->addWidget(gbox);
 
     m_u0SpinBox = new QDoubleSpinBox(gbox);
@@ -194,10 +194,10 @@ PerpendicularDetectorAlignmentForm::PerpendicularDetectorAlignmentForm(const QSt
                                                                        Qt::WindowFlags f)
     : DetectorAlignmentForm(parent, f), m_item(nullptr)
 {
-    QHBoxLayout* layout = new QHBoxLayout(this);
+    auto* layout = new QHBoxLayout(this);
 
-    QGroupBox* gbox = new QGroupBox(title, this);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* gbox = new QGroupBox(title, this);
+    auto* form = new QFormLayout(gbox);
     layout->addWidget(gbox);
 
     m_u0SpinBox = new QDoubleSpinBox(gbox);
@@ -379,7 +379,7 @@ void DirectBeamDetectorAlignmentForm::setV0(double v0)
 DetectorAlignmentEditor::DetectorAlignmentEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
 
     m_combo = new QComboBox(this);
     layout->addRow("Alignment:", m_combo);
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index 913d4f1dd53..e4d642b51ab 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -35,7 +35,7 @@
 DetectorEditor::DetectorEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
 
     m_combo = new QComboBox(this);
     m_combo->addItem("Rectangular", RectangularDetectorItem::M_TYPE);
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 8336a0f1f0c..0f9f352297e 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -133,7 +133,7 @@ DistributionSelector::DistributionSelector(const std::optional<MeanConfig>& mean
                                            Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr), m_meanConfig(mean_config), m_distributions(distributions)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     m_combo = new QComboBox(this);
@@ -143,7 +143,7 @@ DistributionSelector::DistributionSelector(const std::optional<MeanConfig>& mean
     layout->addRow(m_stack);
 
     m_combo->addItem("Cosine", DistributionCosineItem::M_TYPE);
-    CosineDistributionForm* cosform = new CosineDistributionForm(m_meanConfig, this);
+    auto* cosform = new CosineDistributionForm(m_meanConfig, this);
     connect(cosform, &CosineDistributionForm::distributionChanged, this,
             &DistributionSelector::distributionChanged);
     m_stack->addWidget(cosform);
@@ -151,7 +151,7 @@ DistributionSelector::DistributionSelector(const std::optional<MeanConfig>& mean
 
     if (m_distributions == GUI::ID::Distributions::All) {
         m_combo->addItem("Gate", DistributionGateItem::M_TYPE);
-        GateDistributionForm* gateform = new GateDistributionForm(this);
+        auto* gateform = new GateDistributionForm(this);
         connect(gateform, &GateDistributionForm::distributionChanged, this,
                 &DistributionSelector::distributionChanged);
         m_stack->addWidget(gateform);
@@ -159,7 +159,7 @@ DistributionSelector::DistributionSelector(const std::optional<MeanConfig>& mean
     }
 
     m_combo->addItem("Gaussian", DistributionGaussianItem::M_TYPE);
-    GaussDistributionForm* gaussform = new GaussDistributionForm(m_meanConfig, this);
+    auto* gaussform = new GaussDistributionForm(m_meanConfig, this);
     connect(gaussform, &GaussDistributionForm::distributionChanged, this,
             &DistributionSelector::distributionChanged);
     m_stack->addWidget(gaussform);
@@ -167,7 +167,7 @@ DistributionSelector::DistributionSelector(const std::optional<MeanConfig>& mean
 
     if (m_distributions == GUI::ID::Distributions::All) {
         m_combo->addItem("Log normal", DistributionLogNormalItem::M_TYPE);
-        LogNormalDistributionForm* lognormform = new LogNormalDistributionForm(this);
+        auto* lognormform = new LogNormalDistributionForm(this);
         connect(lognormform, &LogNormalDistributionForm::distributionChanged, this,
                 &DistributionSelector::distributionChanged);
         m_stack->addWidget(lognormform);
@@ -175,14 +175,14 @@ DistributionSelector::DistributionSelector(const std::optional<MeanConfig>& mean
     }
 
     m_combo->addItem("Lorentz", DistributionLorentzItem::M_TYPE);
-    LorentzDistributionForm* lorentzform = new LorentzDistributionForm(m_meanConfig, this);
+    auto* lorentzform = new LorentzDistributionForm(m_meanConfig, this);
     connect(lorentzform, &LorentzDistributionForm::distributionChanged, this,
             &DistributionSelector::distributionChanged);
     m_stack->addWidget(lorentzform);
     m_forms.emplace(DistributionLorentzItem::M_TYPE, lorentzform);
 
     m_combo->addItem("None", DistributionNoneItem::M_TYPE);
-    NoneDistributionForm* noneform = new NoneDistributionForm(m_meanConfig, this);
+    auto* noneform = new NoneDistributionForm(m_meanConfig, this);
     connect(noneform, &NoneDistributionForm::distributionChanged, this,
             &DistributionSelector::distributionChanged);
     m_stack->addWidget(noneform);
@@ -190,7 +190,7 @@ DistributionSelector::DistributionSelector(const std::optional<MeanConfig>& mean
 
     if (m_distributions == GUI::ID::Distributions::All) {
         m_combo->addItem("Trapezoid", DistributionTrapezoidItem::M_TYPE);
-        TrapezoidDistributionForm* trapezoidform = new TrapezoidDistributionForm(this);
+        auto* trapezoidform = new TrapezoidDistributionForm(this);
         connect(trapezoidform, &TrapezoidDistributionForm::distributionChanged, this,
                 &DistributionSelector::distributionChanged);
         m_stack->addWidget(trapezoidform);
@@ -266,10 +266,10 @@ DistributionEditor::DistributionEditor(const QString& title,
                                        Qt::WindowFlags f)
     : QWidget(parent, f), m_title(title)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
-    GroupInfoBox* gbox = new GroupInfoBox(title, this);
-    QVBoxLayout* glayout = new QVBoxLayout(gbox);
+    auto* gbox = new GroupInfoBox(title, this);
+    auto* glayout = new QVBoxLayout(gbox);
     m_selector = new DistributionSelector(mean_config, distributions, gbox);
     glayout->addWidget(m_selector);
     layout->addWidget(gbox);
diff --git a/GUI/View/Instrument/DistributionForms.cpp b/GUI/View/Instrument/DistributionForms.cpp
index 9ec5443f3fa..5c77ade0e3f 100644
--- a/GUI/View/Instrument/DistributionForms.cpp
+++ b/GUI/View/Instrument/DistributionForms.cpp
@@ -114,17 +114,17 @@ CosineDistributionForm::CosineDistributionForm(const std::optional<MeanConfig>&
                                                QWidget* parent, Qt::WindowFlags f)
     : DistributionForm(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     if (mean_config) {
         if (mean_config->scientific) {
-            ScientificSpinBox* spinbox = new ScientificSpinBox(this);
+            auto* spinbox = new ScientificSpinBox(this);
             connect(spinbox, &ScientificSpinBox::valueChanged, this,
                     &CosineDistributionForm::onMeanChanged);
             m_meanSpinBox = spinbox;
         } else {
-            QDoubleSpinBox* spinbox = new QDoubleSpinBox(this);
+            auto* spinbox = new QDoubleSpinBox(this);
             connect(spinbox, qOverload<double>(&QDoubleSpinBox::valueChanged), this,
                     &CosineDistributionForm::onMeanChanged);
             m_meanSpinBox = spinbox;
@@ -205,7 +205,7 @@ void CosineDistributionForm::onSigmaFactorChanged(double value)
 GateDistributionForm::GateDistributionForm(QWidget* parent, Qt::WindowFlags f)
     : DistributionForm(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     m_minimumSpinBox = new QDoubleSpinBox(this);
@@ -284,17 +284,17 @@ GaussDistributionForm::GaussDistributionForm(const std::optional<MeanConfig>& me
                                              QWidget* parent, Qt::WindowFlags f)
     : DistributionForm(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     if (mean_config) {
         if (mean_config->scientific) {
-            ScientificSpinBox* spinbox = new ScientificSpinBox(this);
+            auto* spinbox = new ScientificSpinBox(this);
             connect(spinbox, &ScientificSpinBox::valueChanged, this,
                     &GaussDistributionForm::onMeanChanged);
             m_meanSpinBox = spinbox;
         } else {
-            QDoubleSpinBox* spinbox = new QDoubleSpinBox(this);
+            auto* spinbox = new QDoubleSpinBox(this);
             connect(spinbox, qOverload<double>(&QDoubleSpinBox::valueChanged), this,
                     &GaussDistributionForm::onMeanChanged);
 
@@ -375,7 +375,7 @@ void GaussDistributionForm::onSigmaFactorChanged(double value)
 LogNormalDistributionForm::LogNormalDistributionForm(QWidget* parent, Qt::WindowFlags f)
     : DistributionForm(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     m_medianSpinBox = new QDoubleSpinBox(this);
@@ -455,17 +455,17 @@ LorentzDistributionForm::LorentzDistributionForm(const std::optional<MeanConfig>
                                                  QWidget* parent, Qt::WindowFlags f)
     : DistributionForm(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     if (mean_config) {
         if (mean_config->scientific) {
-            ScientificSpinBox* spinbox = new ScientificSpinBox(this);
+            auto* spinbox = new ScientificSpinBox(this);
             connect(spinbox, &ScientificSpinBox::valueChanged, this,
                     &LorentzDistributionForm::onMeanChanged);
             m_meanSpinBox = spinbox;
         } else {
-            QDoubleSpinBox* spinbox = new QDoubleSpinBox(this);
+            auto* spinbox = new QDoubleSpinBox(this);
             connect(spinbox, qOverload<double>(&QDoubleSpinBox::valueChanged), this,
                     &LorentzDistributionForm::onMeanChanged);
             m_meanSpinBox = spinbox;
@@ -546,17 +546,17 @@ NoneDistributionForm::NoneDistributionForm(const std::optional<MeanConfig>& mean
                                            QWidget* parent, Qt::WindowFlags f)
     : DistributionForm(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     if (mean_config) {
         if (mean_config->scientific) {
-            ScientificSpinBox* spinbox = new ScientificSpinBox(this);
+            auto* spinbox = new ScientificSpinBox(this);
             connect(spinbox, &ScientificSpinBox::valueChanged, this,
                     &NoneDistributionForm::onValueChanged);
             m_spinBox = spinbox;
         } else {
-            QDoubleSpinBox* spinbox = new QDoubleSpinBox(this);
+            auto* spinbox = new QDoubleSpinBox(this);
             connect(spinbox, qOverload<double>(&QDoubleSpinBox::valueChanged), this,
                     &NoneDistributionForm::onValueChanged);
             m_spinBox = spinbox;
@@ -596,7 +596,7 @@ void NoneDistributionForm::onValueChanged(double value)
 TrapezoidDistributionForm::TrapezoidDistributionForm(QWidget* parent, Qt::WindowFlags f)
     : DistributionForm(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     m_centerSpinBox = new QDoubleSpinBox(this);
diff --git a/GUI/View/Instrument/DistributionPlot.cpp b/GUI/View/Instrument/DistributionPlot.cpp
index 5229d5d8461..9ee437cfddc 100644
--- a/GUI/View/Instrument/DistributionPlot.cpp
+++ b/GUI/View/Instrument/DistributionPlot.cpp
@@ -51,7 +51,7 @@ DistributionPlot::DistributionPlot(QWidget* parent)
     m_label->setStyleSheet("background-color:white;");
     m_label->setMargin(3);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
     mainLayout->addWidget(m_plot, 1);
@@ -265,7 +265,7 @@ void DistributionPlot::plotBars(const QVector<double>& xbars, const QVector<doub
     else
         barWidth = optimalBarWidth(xbars.front(), xbars.back(), xbars.size());
 
-    QCPBars* bars = new QCPBars(m_plot->xAxis, m_plot->yAxis);
+    auto* bars = new QCPBars(m_plot->xAxis, m_plot->yAxis);
 
     bars->setWidth(barWidth);
     bars->setData(xbars, ybars);
@@ -284,7 +284,7 @@ void DistributionPlot::plotFunction(const QVector<double>& xFunc, const QVector<
 void DistributionPlot::plotVerticalLine(double xMin, double yMin, double xMax, double yMax,
                                         const QColor& color)
 {
-    QCPItemLine* line = new QCPItemLine(m_plot);
+    auto* line = new QCPItemLine(m_plot);
 
     QPen pen(color, 1, Qt::DashLine);
     line->setPen(pen);
diff --git a/GUI/View/Instrument/EditDistributionDialog.cpp b/GUI/View/Instrument/EditDistributionDialog.cpp
index 822f0dcb4ce..e421326c960 100644
--- a/GUI/View/Instrument/EditDistributionDialog.cpp
+++ b/GUI/View/Instrument/EditDistributionDialog.cpp
@@ -32,9 +32,9 @@ EditDistributionDialog::EditDistributionDialog(ItemWithDistribution* item, const
     resize(800, 480);
     setWindowTitle(title);
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
-    QSplitter* splitter = new QSplitter(this);
+    auto* splitter = new QSplitter(this);
     layout->addWidget(splitter);
 
     m_plot = new DistributionPlot(this);
@@ -47,7 +47,7 @@ EditDistributionDialog::EditDistributionDialog(ItemWithDistribution* item, const
 
     splitter->setSizes({500, 300});
 
-    QDialogButtonBox* bbox = new QDialogButtonBox(this);
+    auto* bbox = new QDialogButtonBox(this);
     bbox->addButton(QDialogButtonBox::Ok);
     bbox->addButton(QDialogButtonBox::Cancel);
     connect(bbox, &QDialogButtonBox::accepted, this, &QDialog::accept);
diff --git a/GUI/View/Instrument/EnvironmentEditor.cpp b/GUI/View/Instrument/EnvironmentEditor.cpp
index 65eacdd2099..d265c5d5089 100644
--- a/GUI/View/Instrument/EnvironmentEditor.cpp
+++ b/GUI/View/Instrument/EnvironmentEditor.cpp
@@ -47,7 +47,7 @@ private:
 ConstantBackgroundForm::ConstantBackgroundForm(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     m_spinbox = new QDoubleSpinBox(this);
@@ -91,11 +91,11 @@ void ConstantBackgroundForm::onValueChanged(double value)
 EnvironmentEditor::EnvironmentEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
-    QGroupBox* gbox = new QGroupBox("Background", this);
+    auto* gbox = new QGroupBox("Background", this);
     layout->addWidget(gbox);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* form = new QFormLayout(gbox);
 
     m_combo = new QComboBox(gbox);
     form->addRow("Type:", m_combo);
diff --git a/GUI/View/Instrument/FootprintCorrectionEditor.cpp b/GUI/View/Instrument/FootprintCorrectionEditor.cpp
index cc2ec901091..652597ffc68 100644
--- a/GUI/View/Instrument/FootprintCorrectionEditor.cpp
+++ b/GUI/View/Instrument/FootprintCorrectionEditor.cpp
@@ -47,7 +47,7 @@ private:
 SquareFootprintForm::SquareFootprintForm(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     m_spinbox = new QDoubleSpinBox(this);
@@ -105,7 +105,7 @@ private:
 GaussFootprintForm::GaussFootprintForm(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     m_spinbox = new QDoubleSpinBox(this);
@@ -149,11 +149,11 @@ void GaussFootprintForm::onValueChanged(double value)
 FootprintCorrectionEditor::FootprintCorrectionEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
-    QGroupBox* gbox = new QGroupBox("Footprint correction", this);
+    auto* gbox = new QGroupBox("Footprint correction", this);
     layout->addWidget(gbox);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* form = new QFormLayout(gbox);
 
     m_combo = new QComboBox(gbox);
     form->addRow("Type:", m_combo);
diff --git a/GUI/View/Instrument/GISASBeamEditor.cpp b/GUI/View/Instrument/GISASBeamEditor.cpp
index 559c7c0db8a..0fad4120c4c 100644
--- a/GUI/View/Instrument/GISASBeamEditor.cpp
+++ b/GUI/View/Instrument/GISASBeamEditor.cpp
@@ -27,13 +27,13 @@
 GISASBeamEditor::GISASBeamEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QGridLayout* grid = new QGridLayout(this);
+    auto* grid = new QGridLayout(this);
 
-    QFormLayout* form = new QFormLayout();
+    auto* form = new QFormLayout();
     grid->addLayout(form, 0, 0);
     m_intensityEditor = new QLineEdit(this);
     m_intensityEditor->setToolTip("Beam intensity in neutrons (or gammas per second.");
-    QDoubleValidator* validator = new QDoubleValidator(m_intensityEditor);
+    auto* validator = new QDoubleValidator(m_intensityEditor);
     validator->setNotation(QDoubleValidator::ScientificNotation);
     validator->setRange(0.0, 1e+32, 1000);
     m_intensityEditor->setValidator(validator);
diff --git a/GUI/View/Instrument/GISASInstrumentEditor.cpp b/GUI/View/Instrument/GISASInstrumentEditor.cpp
index 228ac03c0a8..e78a5df0531 100644
--- a/GUI/View/Instrument/GISASInstrumentEditor.cpp
+++ b/GUI/View/Instrument/GISASInstrumentEditor.cpp
@@ -25,7 +25,7 @@
 GISASInstrumentEditor::GISASInstrumentEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
     m_beamEditor = new GISASBeamEditor(this);
     layout->addWidget(GUI::Detail::createDetailsWidget(m_beamEditor, "Beam parameters"));
diff --git a/GUI/View/Instrument/InclinationAnglesEditor.cpp b/GUI/View/Instrument/InclinationAnglesEditor.cpp
index e660b493d95..f9aa0b44008 100644
--- a/GUI/View/Instrument/InclinationAnglesEditor.cpp
+++ b/GUI/View/Instrument/InclinationAnglesEditor.cpp
@@ -40,10 +40,10 @@ const QString InclinationAnglesEditor::m_title = "Inclination angles [deg]";
 InclinationAnglesEditor::InclinationAnglesEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
-    GroupInfoBox* gbox = new GroupInfoBox(m_title, this);
-    QFormLayout* gform = new QFormLayout(gbox);
+    auto* gbox = new GroupInfoBox(m_title, this);
+    auto* gform = new QFormLayout(gbox);
     connect(gbox, &GroupInfoBox::clicked, this, &InclinationAnglesEditor::showDialog);
     layout->addWidget(gbox);
 
diff --git a/GUI/View/Instrument/InstrumentEditor.cpp b/GUI/View/Instrument/InstrumentEditor.cpp
index 437530a62d9..bd9d3553779 100644
--- a/GUI/View/Instrument/InstrumentEditor.cpp
+++ b/GUI/View/Instrument/InstrumentEditor.cpp
@@ -47,10 +47,10 @@ QString instrumentTypeName(InstrumentItem* instrument)
 InstrumentEditor::InstrumentEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 20, 0, 20);
 
-    QFormLayout* form = new QFormLayout();
+    auto* form = new QFormLayout();
     form->setMargin(17);
     layout->addLayout(form);
 
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.cpp b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
index 2e8dc3bb6c2..677e8480591 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
@@ -163,14 +163,14 @@ QList<QAction*> InstrumentLibraryEditor::getOverlayActions(const QModelIndex& in
     if (item == nullptr)
         return {};
 
-    QAction* editAction = new QAction(this);
+    auto* editAction = new QAction(this);
     editAction->setText("Edit name and description");
     editAction->setIcon(QIcon(":/images/edit.svg"));
     editAction->setIconText("Edit");
     editAction->setToolTip("Edit name and description");
     connect(editAction, &QAction::triggered, [=]() { editNameAndDescription(item); });
 
-    QAction* removeAction = new QAction(this);
+    auto* removeAction = new QAction(this);
     removeAction->setText("Remove");
     removeAction->setIcon(QIcon(":/images/delete.svg"));
     removeAction->setIconText("Remove");
@@ -189,18 +189,18 @@ void InstrumentLibraryEditor::editNameAndDescription(InstrumentItem* item)
     dlg.setWindowFlag(Qt::WindowContextHelpButtonHint, false);
     dlg.setProperty("stylable", true); // for stylesheet addressing
 
-    QFormLayout* layout = new QFormLayout(&dlg);
-    QLineEdit* nameEdit = new QLineEdit(&dlg);
+    auto* layout = new QFormLayout(&dlg);
+    auto* nameEdit = new QLineEdit(&dlg);
     nameEdit->setText(item->instrumentName());
     nameEdit->selectAll();
 
-    QTextEdit* descriptionEdit = new QTextEdit(&dlg);
+    auto* descriptionEdit = new QTextEdit(&dlg);
     descriptionEdit->setMinimumWidth(200);
     descriptionEdit->setAcceptRichText(false);
     descriptionEdit->setTabChangesFocus(true);
     descriptionEdit->setPlainText(item->description());
 
-    QDialogButtonBox* buttonBox = new QDialogButtonBox(&dlg);
+    auto* buttonBox = new QDialogButtonBox(&dlg);
     buttonBox->addButton(QDialogButtonBox::Ok);
     buttonBox->addButton(QDialogButtonBox::Cancel);
     buttonBox->button(QDialogButtonBox::Ok)->setAutoDefault(true);
diff --git a/GUI/View/Instrument/InstrumentListView.cpp b/GUI/View/Instrument/InstrumentListView.cpp
index d7c7f64a084..3746f77d89e 100644
--- a/GUI/View/Instrument/InstrumentListView.cpp
+++ b/GUI/View/Instrument/InstrumentListView.cpp
@@ -31,7 +31,7 @@ InstrumentListView::InstrumentListView(ProjectDocument* document, QWidget* paren
 {
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
     layout->setMargin(10);
 
     m_listView = new QListView(this);
diff --git a/GUI/View/Instrument/InstrumentView.cpp b/GUI/View/Instrument/InstrumentView.cpp
index ec718d8e2c1..31ff50199bd 100644
--- a/GUI/View/Instrument/InstrumentView.cpp
+++ b/GUI/View/Instrument/InstrumentView.cpp
@@ -30,7 +30,7 @@ InstrumentView::InstrumentView(QWidget* parent, ProjectDocument* document)
     m_instrumentEditor = new InstrumentEditor(this);
     horizontalLayout->addWidget(m_instrumentEditor, 1);
 
-    StyledToolBar* toolbar = new StyledToolBar(this);
+    auto* toolbar = new StyledToolBar(this);
     toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     toolbar->addActions(m_instrumentListView->toolbarActions());
 
diff --git a/GUI/View/Instrument/OffSpecularBeamEditor.cpp b/GUI/View/Instrument/OffSpecularBeamEditor.cpp
index 365922f283f..6240318a5d1 100644
--- a/GUI/View/Instrument/OffSpecularBeamEditor.cpp
+++ b/GUI/View/Instrument/OffSpecularBeamEditor.cpp
@@ -28,16 +28,16 @@
 OffSpecularBeamEditor::OffSpecularBeamEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QGridLayout* grid = new QGridLayout(this);
+    auto* grid = new QGridLayout(this);
     grid->setColumnStretch(0, 1);
     grid->setColumnStretch(1, 1);
     grid->setColumnStretch(2, 1);
 
-    QFormLayout* form = new QFormLayout();
+    auto* form = new QFormLayout();
     grid->addLayout(form, 0, 0);
     m_intensityEditor = new QLineEdit(this);
     m_intensityEditor->setToolTip("Beam intensity in neutrons (or gammas per second.");
-    QDoubleValidator* validator = new QDoubleValidator(m_intensityEditor);
+    auto* validator = new QDoubleValidator(m_intensityEditor);
     validator->setNotation(QDoubleValidator::ScientificNotation);
     validator->setRange(0.0, 1e+32, 1000);
     m_intensityEditor->setValidator(validator);
diff --git a/GUI/View/Instrument/OffSpecularInstrumentEditor.cpp b/GUI/View/Instrument/OffSpecularInstrumentEditor.cpp
index 025b9b6b8d2..55917bcfe86 100644
--- a/GUI/View/Instrument/OffSpecularInstrumentEditor.cpp
+++ b/GUI/View/Instrument/OffSpecularInstrumentEditor.cpp
@@ -24,7 +24,7 @@
 OffSpecularInstrumentEditor::OffSpecularInstrumentEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
     m_beamEditor = new OffSpecularBeamEditor(this);
     layout->addWidget(GUI::Detail::createDetailsWidget(m_beamEditor, "Beam parameters"));
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
index ca34e86e745..f84240bfe6a 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
@@ -53,11 +53,11 @@ private:
 AnalyzerPropertiesEditor::AnalyzerPropertiesEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
-    QGroupBox* gbox = new QGroupBox("Analyzer properties", this);
+    auto* gbox = new QGroupBox("Analyzer properties", this);
     layout->addWidget(gbox);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* form = new QFormLayout(gbox);
 
     m_efficiencySpinbox = new QDoubleSpinBox(gbox);
     m_efficiencySpinbox->setToolTip("Efficiency of the polarization analysis");
@@ -125,14 +125,14 @@ void AnalyzerPropertiesEditor::onTransmissionValueChanged(double transmission)
 PolarizationAnalysisEditor::PolarizationAnalysisEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
     m_checkbox = new QCheckBox("add polarizer and analyzer to instrument");
     connect(m_checkbox, &QCheckBox::toggled, this, &PolarizationAnalysisEditor::onCheckBoxToggled);
     layout->addWidget(m_checkbox);
 
     m_polarizerAnalyzerWidget = new QWidget(this);
-    QGridLayout* grid = new QGridLayout(m_polarizerAnalyzerWidget);
+    auto* grid = new QGridLayout(m_polarizerAnalyzerWidget);
     grid->setMargin(0);
 
     m_polarizerEditor = new VectorEditor("Polarizer (Bloch vector)",
diff --git a/GUI/View/Instrument/RectangularDetectorEditor.cpp b/GUI/View/Instrument/RectangularDetectorEditor.cpp
index 699f62220cf..90c914612d1 100644
--- a/GUI/View/Instrument/RectangularDetectorEditor.cpp
+++ b/GUI/View/Instrument/RectangularDetectorEditor.cpp
@@ -62,9 +62,9 @@ RectangularAxisEditor::RectangularAxisEditor(const Orientation& orientation, QWi
     static const std::array<QString, 2> titles = {"X axis", "Y axis"};
     static const std::array<QString, 2> length_labels = {"Width [mm]", "Height [mm]"};
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    QGroupBox* gbox = new QGroupBox(titles[orientation], this);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* layout = new QVBoxLayout(this);
+    auto* gbox = new QGroupBox(titles[orientation], this);
+    auto* form = new QFormLayout(gbox);
     layout->addWidget(gbox);
 
     m_nbinsSpinBox = new QSpinBox(gbox);
@@ -124,7 +124,7 @@ void RectangularAxisEditor::onLengthValueChanged(double value)
 RectangularDetectorEditor::RectangularDetectorEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f)
 {
-    QGridLayout* grid = new QGridLayout(this);
+    auto* grid = new QGridLayout(this);
     grid->setColumnStretch(0, 1);
     grid->setColumnStretch(1, 1);
     grid->setColumnStretch(2, 1);
diff --git a/GUI/View/Instrument/ResolutionFunctionEditor.cpp b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
index 0e9fddfd0bb..4726e00949e 100644
--- a/GUI/View/Instrument/ResolutionFunctionEditor.cpp
+++ b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
@@ -66,7 +66,7 @@ GaussResolutionFunctionForm::GaussResolutionFunctionForm(const ResolutionFunctio
                                                          QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QFormLayout* layout = new QFormLayout(this);
+    auto* layout = new QFormLayout(this);
     layout->setMargin(0);
 
     m_sigmaXSpinBox = new QDoubleSpinBox(this);
@@ -122,9 +122,9 @@ void GaussResolutionFunctionForm::onSigmaYValueChanged(double sigma_y)
 ResolutionFunctionEditor::ResolutionFunctionEditor(Unit unit, QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    QGroupBox* gbox = new QGroupBox("Resolution function", this);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* layout = new QHBoxLayout(this);
+    auto* gbox = new QGroupBox("Resolution function", this);
+    auto* form = new QFormLayout(gbox);
     layout->addWidget(gbox);
 
     m_combo = new QComboBox(this);
diff --git a/GUI/View/Instrument/SpecularBeamEditor.cpp b/GUI/View/Instrument/SpecularBeamEditor.cpp
index 490582b4139..e3fb92ff3f2 100644
--- a/GUI/View/Instrument/SpecularBeamEditor.cpp
+++ b/GUI/View/Instrument/SpecularBeamEditor.cpp
@@ -36,16 +36,16 @@ SpecularBeamEditor::SpecularBeamEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 
 {
-    QGridLayout* grid = new QGridLayout(this);
+    auto* grid = new QGridLayout(this);
     grid->setColumnStretch(0, 1);
     grid->setColumnStretch(1, 1);
     grid->setColumnStretch(2, 1);
 
-    QFormLayout* form = new QFormLayout();
+    auto* form = new QFormLayout();
     grid->addLayout(form, 0, 0);
     m_intensityLineEdit = new QLineEdit(this);
     m_intensityLineEdit->setToolTip("Beam intensity in neutrons (or gammas per second.");
-    QDoubleValidator* validator = new QDoubleValidator(m_intensityLineEdit);
+    auto* validator = new QDoubleValidator(m_intensityLineEdit);
     validator->setNotation(QDoubleValidator::ScientificNotation);
     validator->setRange(0.0, 1e+32, 1000);
     m_intensityLineEdit->setValidator(validator);
diff --git a/GUI/View/Instrument/SpecularInstrumentEditor.cpp b/GUI/View/Instrument/SpecularInstrumentEditor.cpp
index 1fe9805ab58..52f9030953c 100644
--- a/GUI/View/Instrument/SpecularInstrumentEditor.cpp
+++ b/GUI/View/Instrument/SpecularInstrumentEditor.cpp
@@ -25,7 +25,7 @@ SpecularInstrumentEditor::SpecularInstrumentEditor(QWidget* parent, Qt::WindowFl
     : QWidget(parent, f)
 
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
     m_beamEditor = new SpecularBeamEditor(this);
     layout->addWidget(GUI::Detail::createDetailsWidget(m_beamEditor, "Beam parameters"));
diff --git a/GUI/View/Instrument/SphericalAxisEditor.cpp b/GUI/View/Instrument/SphericalAxisEditor.cpp
index f790b84d58f..b19d8d9ad76 100644
--- a/GUI/View/Instrument/SphericalAxisEditor.cpp
+++ b/GUI/View/Instrument/SphericalAxisEditor.cpp
@@ -123,9 +123,9 @@ void SphericalAxisForm::onMaximumValueChanged(double value)
 SphericalAxisEditor::SphericalAxisEditor(const QString& title, QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    QGroupBox* gbox = new QGroupBox(title, this);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* layout = new QVBoxLayout(this);
+    auto* gbox = new QGroupBox(title, this);
+    auto* form = new QFormLayout(gbox);
     layout->addWidget(gbox);
 
     m_form = new SphericalAxisForm(form, gbox);
diff --git a/GUI/View/Instrument/SphericalDetectorEditor.cpp b/GUI/View/Instrument/SphericalDetectorEditor.cpp
index 366f3c7394c..944002c945e 100644
--- a/GUI/View/Instrument/SphericalDetectorEditor.cpp
+++ b/GUI/View/Instrument/SphericalDetectorEditor.cpp
@@ -27,7 +27,7 @@
 SphericalDetectorEditor::SphericalDetectorEditor(QWidget* parent, Qt::WindowFlags f)
     : QWidget(parent, f)
 {
-    QGridLayout* grid = new QGridLayout(this);
+    auto* grid = new QGridLayout(this);
     grid->setColumnStretch(0, 1);
     grid->setColumnStretch(1, 1);
     grid->setColumnStretch(2, 1);
diff --git a/GUI/View/Instrument/VectorEditor.cpp b/GUI/View/Instrument/VectorEditor.cpp
index 3b5f5fd790f..c00fe73b094 100644
--- a/GUI/View/Instrument/VectorEditor.cpp
+++ b/GUI/View/Instrument/VectorEditor.cpp
@@ -33,11 +33,11 @@ VectorEditor::VectorEditor(const QString& title, const QString& tooltip, QWidget
                            Qt::WindowFlags f)
     : QWidget(parent, f), m_item(nullptr)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
 
-    QGroupBox* gbox = new QGroupBox(title, this);
+    auto* gbox = new QGroupBox(title, this);
     layout->addWidget(gbox);
-    QFormLayout* form = new QFormLayout(gbox);
+    auto* form = new QFormLayout(gbox);
 
     m_xSpinBox = new QDoubleSpinBox(gbox);
     m_xSpinBox->setToolTip(tooltip.arg("x coordinate"));
diff --git a/GUI/View/Intensity/ColorMap.cpp b/GUI/View/Intensity/ColorMap.cpp
index 9dfe0dd4d3d..54a3b706dde 100644
--- a/GUI/View/Intensity/ColorMap.cpp
+++ b/GUI/View/Intensity/ColorMap.cpp
@@ -37,7 +37,7 @@ ColorMap::ColorMap(QWidget* parent)
 {
     initColorMap();
 
-    QVBoxLayout* vlayout = new QVBoxLayout(this);
+    auto* vlayout = new QVBoxLayout(this);
     vlayout->setMargin(0);
     vlayout->setSpacing(0);
     vlayout->addWidget(m_customPlot);
@@ -396,7 +396,7 @@ void ColorMap::setColorScaleAppearanceFromItem(IntensityDataItem* item)
     m_colorMap->setInterpolate(intensityItem()->isInterpolated());
     // make sure the axis rect and color scale synchronize their bottom and top margins (so they
     // line up):
-    QCPMarginGroup* marginGroup = new QCPMarginGroup(m_customPlot);
+    auto* marginGroup = new QCPMarginGroup(m_customPlot);
     m_customPlot->axisRect()->setMarginGroup(QCP::msBottom | QCP::msTop, marginGroup);
     m_colorScale->setMarginGroup(QCP::msBottom | QCP::msTop, marginGroup);
 }
diff --git a/GUI/View/Intensity/ColorMapCanvas.cpp b/GUI/View/Intensity/ColorMapCanvas.cpp
index cf70c570ffe..b00f341d592 100644
--- a/GUI/View/Intensity/ColorMapCanvas.cpp
+++ b/GUI/View/Intensity/ColorMapCanvas.cpp
@@ -27,7 +27,7 @@ ColorMapCanvas::ColorMapCanvas(QWidget* parent)
     , m_statusLabel(new PlotStatusLabel(m_colorMap, this))
 {
     this->installEventFilter(m_canvasEvent);
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
 
diff --git a/GUI/View/Intensity/HistogramPlot.cpp b/GUI/View/Intensity/HistogramPlot.cpp
index fdc888e8ae2..9cf4d3acfeb 100644
--- a/GUI/View/Intensity/HistogramPlot.cpp
+++ b/GUI/View/Intensity/HistogramPlot.cpp
@@ -18,7 +18,7 @@
 HistogramPlot::HistogramPlot(QWidget* parent) : QWidget(parent), m_customPlot(new QCustomPlot)
 
 {
-    QVBoxLayout* vlayout = new QVBoxLayout(this);
+    auto* vlayout = new QVBoxLayout(this);
     vlayout->setMargin(0);
     vlayout->setSpacing(0);
     vlayout->setContentsMargins(0, 0, 0, 0);
diff --git a/GUI/View/Intensity/Plot1D.cpp b/GUI/View/Intensity/Plot1D.cpp
index 2c18c928607..3c02dbbf06b 100644
--- a/GUI/View/Intensity/Plot1D.cpp
+++ b/GUI/View/Intensity/Plot1D.cpp
@@ -35,7 +35,7 @@ Plot1D::Plot1D(QWidget* parent)
     , m_update_timer(new UpdateTimer(replot_update_interval, this))
     , m_block_update(false)
 {
-    QVBoxLayout* vlayout = new QVBoxLayout(this);
+    auto* vlayout = new QVBoxLayout(this);
     vlayout->setContentsMargins(0, 0, 0, 0);
     vlayout->setSpacing(0);
     vlayout->addWidget(m_custom_plot);
diff --git a/GUI/View/Job/JobListView.cpp b/GUI/View/Job/JobListView.cpp
index f6f3c797b10..4ad5bd0b433 100644
--- a/GUI/View/Job/JobListView.cpp
+++ b/GUI/View/Job/JobListView.cpp
@@ -50,7 +50,7 @@ JobListView::JobListView(JobModel* jobs, QWidget* parent, Qt::WindowFlags f) : Q
 {
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
     layout->setMargin(0);
 
     m_runAction = new QAction("Run", this);
diff --git a/GUI/View/Job/JobPropertiesWidget.cpp b/GUI/View/Job/JobPropertiesWidget.cpp
index 0c003b92623..b84b172a871 100644
--- a/GUI/View/Job/JobPropertiesWidget.cpp
+++ b/GUI/View/Job/JobPropertiesWidget.cpp
@@ -41,7 +41,7 @@ JobPropertiesWidget::JobPropertiesWidget(QWidget* parent, Qt::WindowFlags f)
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
     setWindowTitle(GUI::Constants::JobPropertiesWidgetName);
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
diff --git a/GUI/View/Job/JobSelectorWidget.cpp b/GUI/View/Job/JobSelectorWidget.cpp
index 6c96b118a0e..cf91763bfea 100644
--- a/GUI/View/Job/JobSelectorWidget.cpp
+++ b/GUI/View/Job/JobSelectorWidget.cpp
@@ -29,12 +29,12 @@ JobSelectorWidget::JobSelectorWidget(JobModel* jobModel, QWidget* parent)
 
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
 
-    QSplitter* splitter = new QSplitter(Qt::Vertical, this);
+    auto* splitter = new QSplitter(Qt::Vertical, this);
     splitter->setChildrenCollapsible(true);
     layout->addWidget(splitter);
 
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index aef625d1dc6..8f5a2e72509 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -49,7 +49,7 @@ void JobView::fillViewMenu(QMenu* menu)
 
     menu->addSeparator();
 
-    QAction* action = new QAction(menu);
+    auto* action = new QAction(menu);
     action->setText("Reset to default layout");
     connect(action, &QAction::triggered, this, &JobView::resetLayout);
     menu->addAction(action);
@@ -122,7 +122,7 @@ void JobView::createSubWindows()
 void JobView::createActions()
 {
     for (JobViewActivity activity : JobViewActivities::all()) {
-        QAction* action = new QAction(this);
+        auto* action = new QAction(this);
         action->setText(JobViewActivities::name(activity));
         action->setCheckable(true);
         connect(action, &QAction::triggered, [=]() { setActivity(activity); });
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index 8b4b467920e..9735e93ec03 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -90,7 +90,7 @@ void QREDataLoader::populateImportSettingsWidget(QWidget* parent)
     if (m_propertiesWidget == nullptr)
         m_propertiesWidget = new QREDataLoaderProperties;
 
-    QHBoxLayout* l = new QHBoxLayout(parent);
+    auto* l = new QHBoxLayout(parent);
     l->setContentsMargins(0, 0, 0, 0);
     parent->setLayout(l);
     l->addWidget(m_propertiesWidget);
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 369ad774eb7..55faa116216 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -54,11 +54,11 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
     setWindowTitle("About BornAgain");
     setWindowFlags(Qt::Dialog);
 
-    QHBoxLayout* detailsLayout = new QHBoxLayout;
+    auto* detailsLayout = new QHBoxLayout;
     detailsLayout->addLayout(createLogoLayout());
     detailsLayout->addLayout(createTextLayout());
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->addLayout(detailsLayout);
     mainLayout->addLayout(createButtonLayout());
 
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 37ec27ff6c8..c1f7e148216 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -255,7 +255,7 @@ void ActionManager::onAboutToShowSettingsMenu()
 
     m_settingsMenu->addSeparator();
 
-    QActionGroup* unitActions = new QActionGroup(this);
+    auto* unitActions = new QActionGroup(this);
     const auto addUnitAction = [=](const QString& text, bool isAngstrom) {
         auto action = m_settingsMenu->addAction(
             text, [=]() { appSettings->setDefaultUnitIsAngstrom(isAngstrom); });
@@ -269,7 +269,7 @@ void ActionManager::onAboutToShowSettingsMenu()
 
     m_settingsMenu->addSeparator();
 
-    QActionGroup* styleActions = new QActionGroup(this);
+    auto* styleActions = new QActionGroup(this);
     const auto addStyleAction = [=](const QString& text, ApplicationSettings::Style style) {
         auto action = m_settingsMenu->addAction(text, [=]() {
             appSettings->setStyleToUse(style);
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index f5883aa3d50..eb2ca45f072 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -64,8 +64,8 @@ MainWindow::MainWindow()
 
     s_instance = this;
 
-    QWidget* centralWidget = new QWidget(this);
-    QHBoxLayout* mainLayout = new QHBoxLayout(centralWidget);
+    auto* centralWidget = new QWidget(this);
+    auto* mainLayout = new QHBoxLayout(centralWidget);
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
 
@@ -85,7 +85,7 @@ MainWindow::MainWindow()
             &MainWindow::raiseView);
 #endif
 
-    QVBoxLayout* vlayout = new QVBoxLayout;
+    auto* vlayout = new QVBoxLayout;
     vlayout->setMargin(0);
     vlayout->setSpacing(0);
     vlayout->addLayout(m_viewsStack);
@@ -400,7 +400,7 @@ void MainWindow::onAboutToCloseDocument()
 
 QToolButton* MainWindow::createViewSelectionButton() const
 {
-    QToolButton* btn = new QToolButton;
+    auto* btn = new QToolButton;
     btn->setObjectName("ViewSelectionButton"); // for addressing in style sheet
     btn->setCheckable(true);
     btn->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
diff --git a/GUI/View/Main/NewProjectDialog.cpp b/GUI/View/Main/NewProjectDialog.cpp
index b782372d97c..50f90964f5b 100644
--- a/GUI/View/Main/NewProjectDialog.cpp
+++ b/GUI/View/Main/NewProjectDialog.cpp
@@ -38,14 +38,14 @@ NewProjectDialog::NewProjectDialog(QWidget* parent, const QString& workingDirect
     setMinimumSize(480, 280);
     setWindowTitle("Save project");
 
-    QLabel* nameLabel = new QLabel("Project name:");
+    auto* nameLabel = new QLabel("Project name:");
     m_projectNameEdit = new QLineEdit;
     m_projectNameEdit->setText(projectName);
     connect(m_projectNameEdit, &QLineEdit::textEdited, this,
             &NewProjectDialog::checkIfProjectNameIsValid);
     nameLabel->setBuddy(m_projectNameEdit);
 
-    QLabel* parentDirLabel = new QLabel("Save in:");
+    auto* parentDirLabel = new QLabel("Save in:");
     m_workDirEdit = new QLineEdit;
     m_workDirEdit->setText(QDir::toNativeSeparators(QDir::homePath()));
     connect(m_workDirEdit, &QLineEdit::textEdited, this,
@@ -63,9 +63,9 @@ NewProjectDialog::NewProjectDialog(QWidget* parent, const QString& workingDirect
     m_cancelButton = new QPushButton("Cancel");
     connect(m_cancelButton, &QPushButton::clicked, this, &NewProjectDialog::reject);
 
-    QGroupBox* projectGroup = new QGroupBox("Project name and location");
+    auto* projectGroup = new QGroupBox("Project name and location");
 
-    QGridLayout* layout = new QGridLayout;
+    auto* layout = new QGridLayout;
     layout->addWidget(nameLabel, 0, 0);
     layout->addWidget(m_projectNameEdit, 0, 1);
     layout->addWidget(parentDirLabel, 1, 0);
@@ -74,12 +74,12 @@ NewProjectDialog::NewProjectDialog(QWidget* parent, const QString& workingDirect
 
     projectGroup->setLayout(layout);
 
-    QHBoxLayout* buttonsLayout = new QHBoxLayout;
+    auto* buttonsLayout = new QHBoxLayout;
     buttonsLayout->addStretch(1);
     buttonsLayout->addWidget(m_createButton);
     buttonsLayout->addWidget(m_cancelButton);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->addWidget(projectGroup);
     mainLayout->addWidget(m_warningLabel);
     mainLayout->addStretch();
diff --git a/GUI/View/Main/SaveService.cpp b/GUI/View/Main/SaveService.cpp
index e0c3c30e24a..a67b1688922 100644
--- a/GUI/View/Main/SaveService.cpp
+++ b/GUI/View/Main/SaveService.cpp
@@ -151,7 +151,7 @@ void SaveService::process_queue()
 
         if (m_document->hasData()) {
             // saving heavy data in separate thread
-            SaveThread* saveThread = new SaveThread(this);
+            auto* saveThread = new SaveThread(this);
             saveThread->setSaveContext(m_document, project_file_name);
 
             connect(saveThread, &SaveThread::saveReady, this, &SaveService::onProjectSaved);
diff --git a/GUI/View/Mask/MaskEditorCanvas.cpp b/GUI/View/Mask/MaskEditorCanvas.cpp
index fbc4267fb1a..ad2659ae34c 100644
--- a/GUI/View/Mask/MaskEditorCanvas.cpp
+++ b/GUI/View/Mask/MaskEditorCanvas.cpp
@@ -35,7 +35,7 @@ MaskEditorCanvas::MaskEditorCanvas(QWidget* parent)
     setObjectName("MaskEditorCanvas");
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->addWidget(m_view);
     mainLayout->addWidget(m_statusLabel);
     mainLayout->setMargin(0);
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index 6cb4c203af0..646754c6466 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -27,7 +27,7 @@ class EnvelopWidget : public QWidget {
 public:
     EnvelopWidget(QWidget* content)
     {
-        QVBoxLayout* mainLayout = new QVBoxLayout;
+        auto* mainLayout = new QVBoxLayout;
         mainLayout->setContentsMargins(0, 0, 0, 0);
         mainLayout->setSpacing(0);
         setSizePolicy(QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
@@ -54,7 +54,7 @@ MaskEditorPropertyPanel::MaskEditorPropertyPanel(QWidget* parent)
     connect(m_listView, &QListView::customContextMenuRequested, this,
             &MaskEditorPropertyPanel::onCustomContextMenuRequested);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setSpacing(0);
 
@@ -155,7 +155,7 @@ void MaskEditorPropertyPanel::setup_PlotProperties(QAccordion* accordion)
     cp->setContainerFrameStyle(QFrame::Plain);
     QFrame* contentFrame = cp->getContentFrame();
 
-    QVBoxLayout* layout = new QVBoxLayout();
+    auto* layout = new QVBoxLayout();
     layout->setContentsMargins(0, 0, 0, 0);
     m_plotPropertyEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layout->addWidget(new EnvelopWidget(m_plotPropertyEditor));
@@ -170,7 +170,7 @@ void MaskEditorPropertyPanel::setup_MaskStack(QAccordion* accordion)
     cp->setContainerFrameStyle(QFrame::Plain);
     QFrame* contentFrame = cp->getContentFrame();
 
-    QVBoxLayout* layout = new QVBoxLayout();
+    auto* layout = new QVBoxLayout();
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_listView);
     layout->addWidget(new EnvelopWidget(m_listView));
@@ -185,7 +185,7 @@ void MaskEditorPropertyPanel::setup_MaskProperties(QAccordion* accordion)
     cp->setContainerFrameStyle(QFrame::Plain);
     QFrame* contentFrame = cp->getContentFrame();
 
-    QVBoxLayout* layout = new QVBoxLayout();
+    auto* layout = new QVBoxLayout();
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(new EnvelopWidget(m_maskPropertyEditor));
     contentFrame->setLayout(layout);
diff --git a/GUI/View/Mask/MaskEditorToolBar.cpp b/GUI/View/Mask/MaskEditorToolBar.cpp
index 02c230e254f..582f5ca1e1d 100644
--- a/GUI/View/Mask/MaskEditorToolBar.cpp
+++ b/GUI/View/Mask/MaskEditorToolBar.cpp
@@ -92,14 +92,14 @@ void MaskEditorToolBar::onPresentationTypeReleased()
 
 void MaskEditorToolBar::setup_selection_group()
 {
-    QToolButton* panButton = new QToolButton(this);
+    auto* panButton = new QToolButton(this);
     panButton->setIcon(QIcon(":/images/hand-right.svg"));
     panButton->setToolTip("Pan/zoom mode (space)");
     panButton->setCheckable(true);
     panButton->setChecked(true);
     addWidget(panButton);
 
-    QToolButton* resetViewButton = new QToolButton(this);
+    auto* resetViewButton = new QToolButton(this);
     resetViewButton->setIcon(QIcon(":/images/camera-metering-center.svg"));
     resetViewButton->setToolTip("Reset pan/zoom to initial state");
     addWidget(resetViewButton);
@@ -108,7 +108,7 @@ void MaskEditorToolBar::setup_selection_group()
 
     add_separator();
 
-    QToolButton* selectionButton = new QToolButton(this);
+    auto* selectionButton = new QToolButton(this);
     selectionButton->setIcon(QIcon(":/Mask/img/maskeditor_arrow.svg"));
     selectionButton->setToolTip("Select/modify mask");
     selectionButton->setCheckable(true);
@@ -122,7 +122,7 @@ void MaskEditorToolBar::setup_maskvalue_group()
 {
     addWidget(new QLabel(" "));
 
-    QRadioButton* maskTrueButton = new QRadioButton(this);
+    auto* maskTrueButton = new QRadioButton(this);
     maskTrueButton->setText("masked");
     maskTrueButton->setToolTip("Set mask to True (area is excluded from the simulation)");
     maskTrueButton->setCheckable(true);
@@ -131,7 +131,7 @@ void MaskEditorToolBar::setup_maskvalue_group()
 
     addWidget(new QLabel(" "));
 
-    QRadioButton* maskFalseButton = new QRadioButton(this);
+    auto* maskFalseButton = new QRadioButton(this);
     maskFalseButton->setToolTip("Set mask to False (area stays in the simulation)");
     maskFalseButton->setCheckable(true);
     maskFalseButton->setText("active");
@@ -143,37 +143,37 @@ void MaskEditorToolBar::setup_maskvalue_group()
 
 void MaskEditorToolBar::setup_shapes_group()
 {
-    QToolButton* roiButton = new QToolButton(this);
+    auto* roiButton = new QToolButton(this);
     roiButton->setIcon(QIcon(":/Mask/img/maskeditor_roi.svg"));
     roiButton->setToolTip("Create region of interest");
     roiButton->setCheckable(true);
     addWidget(roiButton);
 
-    QToolButton* rectangleButton = new QToolButton(this);
+    auto* rectangleButton = new QToolButton(this);
     rectangleButton->setIcon(QIcon(":/Mask/img/maskeditor_rectangle.svg"));
     rectangleButton->setToolTip("Create rectangle mask");
     rectangleButton->setCheckable(true);
     addWidget(rectangleButton);
 
-    QToolButton* polygonButton = new QToolButton(this);
+    auto* polygonButton = new QToolButton(this);
     polygonButton->setIcon(QIcon(":/Mask/img/maskeditor_polygon.svg"));
     polygonButton->setToolTip("Create polygon mask");
     polygonButton->setCheckable(true);
     addWidget(polygonButton);
 
-    QToolButton* verticalLineButton = new QToolButton(this);
+    auto* verticalLineButton = new QToolButton(this);
     verticalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_verticalline.svg"));
     verticalLineButton->setToolTip("Create vertical line mask");
     verticalLineButton->setCheckable(true);
     addWidget(verticalLineButton);
 
-    QToolButton* horizontalLineButton = new QToolButton(this);
+    auto* horizontalLineButton = new QToolButton(this);
     horizontalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_horizontalline.svg"));
     horizontalLineButton->setToolTip("Create horizontal line mask");
     horizontalLineButton->setCheckable(true);
     addWidget(horizontalLineButton);
 
-    QToolButton* ellipseButton = new QToolButton(this);
+    auto* ellipseButton = new QToolButton(this);
     ellipseButton->setIcon(QIcon(":/Mask/img/maskeditor_ellipse.svg"));
     ellipseButton->setToolTip("Create ellipse mask");
     ellipseButton->setCheckable(true);
@@ -207,7 +207,7 @@ void MaskEditorToolBar::setup_maskmodify_group()
 
 void MaskEditorToolBar::setup_extratools_group()
 {
-    QToolButton* presentationButton = new QToolButton(this);
+    auto* presentationButton = new QToolButton(this);
     presentationButton->setIcon(QIcon(":/Mask/img/maskeditor_lightbulb.svg"));
     presentationButton->setToolTip("Press and hold to see mask results.");
     addWidget(presentationButton);
@@ -217,7 +217,7 @@ void MaskEditorToolBar::setup_extratools_group()
     connect(presentationButton, &QToolButton::released, this,
             &MaskEditorToolBar::onPresentationTypeReleased);
 
-    QToolButton* propertyPanelButton = new QToolButton(this);
+    auto* propertyPanelButton = new QToolButton(this);
     propertyPanelButton->setIcon(QIcon(":/Mask/img/maskeditor_toolpanel.svg"));
     propertyPanelButton->setToolTip("Open panel with additional properties");
     addWidget(propertyPanelButton);
diff --git a/GUI/View/Mask/RectangleBaseView.cpp b/GUI/View/Mask/RectangleBaseView.cpp
index 38a36566878..f0619235cf6 100644
--- a/GUI/View/Mask/RectangleBaseView.cpp
+++ b/GUI/View/Mask/RectangleBaseView.cpp
@@ -108,7 +108,7 @@ void RectangleBaseView::create_size_handle_elements()
            << SizeHandleElement::BOTTOMLEFT << SizeHandleElement::MIDDLELEFT;
 
     for (SizeHandleElement::EHandleLocation point_type : points) {
-        SizeHandleElement* el = new SizeHandleElement(point_type, this);
+        auto* el = new SizeHandleElement(point_type, this);
         connect(el, &SizeHandleElement::resize_request, this,
                 &RectangleBaseView::onSizeHandleElementRequest);
         el->setVisible(false);
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index b4ab351241a..7df021d517f 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -56,13 +56,13 @@ MaterialEditorDialog::MaterialEditorDialog(ProjectDocument* document, QWidget* p
     configSpinbox(m_ui->ySpinBox, 3, RealLimits::limitless());
     configSpinbox(m_ui->zSpinBox, 3, RealLimits::limitless());
 
-    QAction* addRefractiveMaterialAction = new QAction("Add material (refractive index)", parent);
+    auto* addRefractiveMaterialAction = new QAction("Add material (refractive index)", parent);
     addRefractiveMaterialAction->setIcon(QIcon(":/images/shape-square-plus.svg"));
     addRefractiveMaterialAction->setToolTip("Add new material");
     connect(addRefractiveMaterialAction, &QAction::triggered, this,
             &MaterialEditorDialog::addRefractiveMaterial);
 
-    QAction* addSldMaterialAction = new QAction("Add material (SLD)", parent);
+    auto* addSldMaterialAction = new QAction("Add material (SLD)", parent);
     addSldMaterialAction->setIcon(QIcon(":/images/shape-square-plus.svg"));
     addSldMaterialAction->setToolTip("Add new material");
     connect(addSldMaterialAction, &QAction::triggered, this, &MaterialEditorDialog::addSldMaterial);
@@ -82,14 +82,14 @@ MaterialEditorDialog::MaterialEditorDialog(ProjectDocument* document, QWidget* p
     m_ui->treeView->addAction(addRefractiveMaterialAction);
     m_ui->treeView->addAction(addSldMaterialAction);
     m_ui->treeView->addAction(m_cloneMaterialAction);
-    QAction* separator = new QAction(this);
+    auto* separator = new QAction(this);
     separator->setSeparator(true);
     m_ui->treeView->addAction(separator);
     m_ui->treeView->addAction(m_removeMaterialAction);
     m_ui->treeView->setModel(m_model);
     m_ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
 
-    QToolBar* toolbar = new QToolBar(this);
+    auto* toolbar = new QToolBar(this);
     toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     toolbar->addAction(addRefractiveMaterialAction);
     toolbar->addAction(addSldMaterialAction);
diff --git a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
index a121c3dbdbb..10cc4a5d52a 100644
--- a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
@@ -22,7 +22,7 @@
 IntensityDataProjectionsWidget::IntensityDataProjectionsWidget(QWidget* parent)
     : SessionItemWidget(parent), m_projectionsEditor(new ProjectionsEditor)
 {
-    QVBoxLayout* vlayout = new QVBoxLayout(this);
+    auto* vlayout = new QVBoxLayout(this);
     vlayout->setMargin(0);
     vlayout->setSpacing(0);
     vlayout->addWidget(m_projectionsEditor);
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.cpp b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
index 09015c50bab..6743a507d65 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
@@ -42,7 +42,7 @@ ProjectionsEditorCanvas::ProjectionsEditorCanvas(QWidget* parent)
     setObjectName("MaskEditorCanvas");
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->addWidget(m_view);
     mainLayout->addWidget(m_statusLabel);
     mainLayout->setMargin(0);
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index 1eff59fb15e..cbd782d4deb 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -32,7 +32,7 @@ ProjectionsPlot::ProjectionsPlot(const QString& projectionType, QWidget* parent)
     , m_customPlot(new QCustomPlot)
     , m_block_plot_update(false)
 {
-    QVBoxLayout* vlayout = new QVBoxLayout(this);
+    auto* vlayout = new QVBoxLayout(this);
     vlayout->setMargin(0);
     vlayout->setSpacing(0);
     vlayout->addWidget(m_customPlot);
diff --git a/GUI/View/Projection/ProjectionsPropertyPanel.cpp b/GUI/View/Projection/ProjectionsPropertyPanel.cpp
index 62d6867ac7c..c6490b702ff 100644
--- a/GUI/View/Projection/ProjectionsPropertyPanel.cpp
+++ b/GUI/View/Projection/ProjectionsPropertyPanel.cpp
@@ -21,7 +21,7 @@ ProjectionsPropertyPanel::ProjectionsPropertyPanel(QWidget* parent)
 {
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
 
diff --git a/GUI/View/Projection/ProjectionsToolBar.cpp b/GUI/View/Projection/ProjectionsToolBar.cpp
index f8c5836a41e..9723e9e0223 100644
--- a/GUI/View/Projection/ProjectionsToolBar.cpp
+++ b/GUI/View/Projection/ProjectionsToolBar.cpp
@@ -103,7 +103,7 @@ void ProjectionsToolBar::setup_selection_group()
 
     add_separator();
 
-    QToolButton* selectionButton = new QToolButton(this);
+    auto* selectionButton = new QToolButton(this);
     selectionButton->setIcon(QIcon(":/Mask/img/maskeditor_arrow.svg"));
     selectionButton->setToolTip(selection_mode_tooltip);
     selectionButton->setCheckable(true);
diff --git a/GUI/View/Projection/ProjectionsWidget.cpp b/GUI/View/Projection/ProjectionsWidget.cpp
index 61eb7caad4b..91c87e19400 100644
--- a/GUI/View/Projection/ProjectionsWidget.cpp
+++ b/GUI/View/Projection/ProjectionsWidget.cpp
@@ -29,7 +29,7 @@ ProjectionsWidget::ProjectionsWidget(QWidget* parent)
     , m_yProjection(new ProjectionsPlot(VerticalLineItem::M_TYPE))
     , m_tabWidget(new QTabWidget)
 {
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
 
diff --git a/GUI/View/SampleDesigner/ConnectableView.cpp b/GUI/View/SampleDesigner/ConnectableView.cpp
index c4516764c6c..2c20fba43dc 100644
--- a/GUI/View/SampleDesigner/ConnectableView.cpp
+++ b/GUI/View/SampleDesigner/ConnectableView.cpp
@@ -64,7 +64,7 @@ NodeEditorPort* ConnectableView::addPort(const QString& name,
                                          NodeEditorPort::EPortDirection direction,
                                          NodeEditorPort::EPortType port_type)
 {
-    NodeEditorPort* port = new NodeEditorPort(this, name, direction, port_type);
+    auto* port = new NodeEditorPort(this, name, direction, port_type);
     if (direction == NodeEditorPort::INPUT) {
         m_input_ports.append(port);
     } else if (direction == NodeEditorPort::OUTPUT) {
@@ -99,7 +99,7 @@ void ConnectableView::connectInputPort(ConnectableView* other, int port_number)
     NodeEditorPort* output = other->getOutputPorts().at(0);
 
     if (!input->isConnected(output)) {
-        NodeEditorConnection* conn = new NodeEditorConnection(0, scene());
+        auto* conn = new NodeEditorConnection(0, scene());
         conn->setPort2(input);
         conn->setPort1(output);
         conn->updatePath();
diff --git a/GUI/View/SampleDesigner/DesignerMimeData.cpp b/GUI/View/SampleDesigner/DesignerMimeData.cpp
index 4b90e87bc44..875e1f51834 100644
--- a/GUI/View/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/View/SampleDesigner/DesignerMimeData.cpp
@@ -37,8 +37,8 @@ Qt::DropAction DesignerMimeData::execDrag(const QString& className, QWidget* dra
     if (className.isEmpty())
         return Qt::IgnoreAction;
 
-    QDrag* drag = new QDrag(dragSource);
-    DesignerMimeData* mimeData = new DesignerMimeData(className, drag);
+    auto* drag = new QDrag(dragSource);
+    auto* mimeData = new DesignerMimeData(className, drag);
     Q_UNUSED(mimeData);
 
     const Qt::DropAction executedAction = drag->exec(Qt::CopyAction);
diff --git a/GUI/View/SampleDesigner/FormLayouter.cpp b/GUI/View/SampleDesigner/FormLayouter.cpp
index 425f9d56844..b9dc532c6c1 100644
--- a/GUI/View/SampleDesigner/FormLayouter.cpp
+++ b/GUI/View/SampleDesigner/FormLayouter.cpp
@@ -29,7 +29,7 @@ namespace {
 
 QWidget* createSpinBox(QWidget* parentWidget, const UIntDescriptor& d, SampleEditorController* ec)
 {
-    QSpinBox* spinBox = new QSpinBox(parentWidget);
+    auto* spinBox = new QSpinBox(parentWidget);
     spinBox->setFocusPolicy(Qt::StrongFocus);
     spinBox->setKeyboardTracking(false);
     spinBox->setToolTip(d.tooltip);
@@ -94,7 +94,7 @@ void FormLayouter::insertRow(int row, QString label, QWidget* w)
 
 int FormLayouter::addGroupOfValues(const QString& labelText, const DoubleDescriptors& values)
 {
-    QWidget* w = new QWidget(m_formLayout->parentWidget());
+    auto* w = new QWidget(m_formLayout->parentWidget());
     w->setObjectName("PropertyBaseWidget");
     w->setAttribute(Qt::WA_StyledBackground, true);
     w->setStyleSheet("#PropertyBaseWidget {background-color: transparent}");
@@ -110,7 +110,7 @@ int FormLayouter::addGroupOfValues(const QString& labelText, const DoubleDescrip
 
 int FormLayouter::addVector(const VectorDescriptor& d, bool vertically /*= true*/)
 {
-    QWidget* w = new QWidget(m_formLayout->parentWidget());
+    auto* w = new QWidget(m_formLayout->parentWidget());
     w->setObjectName("PropertyBaseWidget");
     w->setAttribute(Qt::WA_StyledBackground, true);
     w->setStyleSheet("#PropertyBaseWidget {background-color: transparent}");
@@ -138,7 +138,7 @@ void FormLayouter::removeRow(int row)
 
 void FormLayouter::addStructureEditingRow(QPushButton* button)
 {
-    QWidget* w = new QWidget(m_formLayout->parentWidget());
+    auto* w = new QWidget(m_formLayout->parentWidget());
     auto l = new QHBoxLayout(w);
     l->setContentsMargins(0, 0, 0, 0);
     l->setAlignment(Qt::AlignLeft);
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.cpp b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
index 3a40d9879a4..56314a60bd9 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
@@ -136,7 +136,7 @@ void LayerEditorUtils::addVectorToGrid(QGridLayout* m_gridLayout, int firstCol,
 
 QLabel* LayerEditorUtils::createBoldLabel(const QString& text)
 {
-    QLabel* l = new QLabel(text);
+    auto* l = new QLabel(text);
     QFont f = l->font();
     f.setBold(true);
     l->setFont(f);
@@ -211,7 +211,7 @@ QPushButton* LayerEditorUtils::createAddParticleButton(QWidget* parentWidget,
 {
     auto* btn = new QPushButton("Add particle", parentWidget);
 
-    QMenu* menu = new QMenu(btn);
+    auto* menu = new QMenu(btn);
     QMenu* menuForEntries = menu;
 
     const auto group = [&](const QString& title) { menuForEntries = menu->addMenu(title); };
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index 740eb4f4e33..8913b75f00f 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -37,12 +37,12 @@ LayerForm::LayerForm(QWidget* parent, LayerItem* layer, SampleEditorController*
     m_removeAction =
         ActionFactory::createRemoveAction(this, "layer", [=] { ec->removeLayer(layer); });
 
-    QAction* chooseColorAction = new QAction(this);
+    auto* chooseColorAction = new QAction(this);
     chooseColorAction->setText("Choose color");
     chooseColorAction->setIcon(QIcon(":/images/palette.svg"));
     chooseColorAction->setIconText("Choose color");
     chooseColorAction->setToolTip("Choose a color for this layer");
-    QMenu* menu = new QMenu(this);
+    auto* menu = new QMenu(this);
     chooseColorAction->setMenu(menu);
 
     for (auto col : LayerEditorUtils::predefinedLayerColors()) {
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index 42973039edb..a38b3755432 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -43,7 +43,7 @@ LayerOrientedSampleEditor::LayerOrientedSampleEditor(QWidget* parent)
     m_toolbar = new StyledToolBar(this);
     m_toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout(this);
+    auto* mainLayout = new QVBoxLayout(this);
     mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setSpacing(0);
     mainLayout->addWidget(m_toolbar);
@@ -170,7 +170,7 @@ void LayerOrientedSampleEditor::createLayerColors() // #baLayerEditor move to be
 
 QWidget* LayerOrientedSampleEditor::createEmptyWidget()
 {
-    QWidget* emptyWidget = new QWidget(this);
+    auto* emptyWidget = new QWidget(this);
     emptyWidget->setStyleSheet("background-color: white");
     return emptyWidget;
 }
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index d650a4c1361..0ef6ff59ab4 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -153,7 +153,7 @@ void MaterialInplaceForm::createWidgets()
     LayerEditorUtils::addVectorToGrid(m_layout, col, mag, setNewValue, true, false);
 
     // -- Create UI for material selection button
-    QPushButton* btn = new QPushButton("...", this);
+    auto* btn = new QPushButton("...", this);
     btn->setToolTip("Select material");
     m_layout->addWidget(btn, 1, m_layout->columnCount());
     connect(btn, &QPushButton::clicked, this, &MaterialInplaceForm::selectMaterial);
diff --git a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
index 0a0c73b1eea..ddc0c08e2f6 100644
--- a/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleCoreShellForm.cpp
@@ -65,7 +65,7 @@ ParticleCoreShellForm::ParticleCoreShellForm(QWidget* parent, ParticleCoreShellI
 
     // - core
     {
-        QGroupBox* coreParticleGroup = new QGroupBox(this);
+        auto* coreParticleGroup = new QGroupBox(this);
         coreParticleGroup->setObjectName("Particle");
 
         core.layouter.reset(new FormLayouter(coreParticleGroup, ec));
@@ -90,7 +90,7 @@ ParticleCoreShellForm::ParticleCoreShellForm(QWidget* parent, ParticleCoreShellI
 
     // - shell
     {
-        QGroupBox* shellParticleGroup = new QGroupBox(this);
+        auto* shellParticleGroup = new QGroupBox(this);
         shellParticleGroup->setObjectName("Particle");
         shell.layouter.reset(new FormLayouter(shellParticleGroup, ec));
         shell.formFactorCombo = createFormFactorCombo(
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index 312acbbdc0c..dcd5f56a7c7 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -93,7 +93,7 @@ SampleListView::SampleListView(QWidget* parent, SampleModel* sampleModel) : QLis
     m_chooseFromLibraryAction->setIconText("Library");
     m_chooseFromLibraryAction->setToolTip("Choose from sample library");
 
-    QMenu* menu = new QMenu(this);
+    auto* menu = new QMenu(this);
     m_chooseFromLibraryAction->setMenu(menu);
 
     for (auto exampleName : GUIExamplesFactory::exampleNames()) {
@@ -168,18 +168,18 @@ void SampleListView::editNameAndDescription(MultiLayerItem* item)
     dlg.setWindowFlag(Qt::WindowContextHelpButtonHint, false);
     dlg.setProperty("stylable", true); // for stylesheet addressing
 
-    QFormLayout* layout = new QFormLayout(&dlg);
-    QLineEdit* nameEdit = new QLineEdit(&dlg);
+    auto* layout = new QFormLayout(&dlg);
+    auto* nameEdit = new QLineEdit(&dlg);
     nameEdit->setText(item->itemName());
     nameEdit->selectAll();
 
-    QTextEdit* descriptionEdit = new QTextEdit(&dlg);
+    auto* descriptionEdit = new QTextEdit(&dlg);
     descriptionEdit->setMinimumWidth(200);
     descriptionEdit->setAcceptRichText(false);
     descriptionEdit->setTabChangesFocus(true);
     descriptionEdit->setPlainText(item->description());
 
-    QDialogButtonBox* buttonBox = new QDialogButtonBox(&dlg);
+    auto* buttonBox = new QDialogButtonBox(&dlg);
     buttonBox->addButton(QDialogButtonBox::Ok);
     buttonBox->addButton(QDialogButtonBox::Cancel);
     buttonBox->button(QDialogButtonBox::Ok)->setAutoDefault(true);
@@ -212,7 +212,7 @@ void SampleListView::onCurrentChanged(const QModelIndex& index)
 
 QAction* SampleListView::createEditAction(QObject* parent, MultiLayerItem* item)
 {
-    QAction* editAction = new QAction(parent);
+    auto* editAction = new QAction(parent);
     editAction->setText("Edit name and description");
     editAction->setIcon(QIcon(":/images/edit.svg"));
     editAction->setIconText("Edit");
@@ -224,7 +224,7 @@ QAction* SampleListView::createEditAction(QObject* parent, MultiLayerItem* item)
 
 QAction* SampleListView::createRemoveAction(QObject* parent, MultiLayerItem* item)
 {
-    QAction* removeAction = new QAction(parent);
+    auto* removeAction = new QAction(parent);
     removeAction->setText("Remove");
     removeAction->setIcon(QIcon(":/images/delete.svg"));
     removeAction->setIconText("Remove");
diff --git a/GUI/View/SampleDesigner/SampleToolBox.cpp b/GUI/View/SampleDesigner/SampleToolBox.cpp
index c3b54023a74..0bbc46ba2f0 100644
--- a/GUI/View/SampleDesigner/SampleToolBox.cpp
+++ b/GUI/View/SampleDesigner/SampleToolBox.cpp
@@ -69,14 +69,14 @@ SampleToolBox::SampleToolBox(QWidget* parent) : QWidget(parent), m_view(new Samp
     setWindowTitle("Items Toolbox");
 
     // Prevent the filter from grabbing focus since Our view has Qt::NoFocus
-    QToolBar* toolBar = new QToolBar(this);
+    auto* toolBar = new QToolBar(this);
     QLineEdit* filterEdit = new FilterEdit(toolBar);
     filterEdit->setPlaceholderText("Filter");
     filterEdit->setClearButtonEnabled(true);
     connect(filterEdit, &QLineEdit::textChanged, m_view, &SampleToolBoxTreeWidget::filter);
     toolBar->addWidget(filterEdit);
 
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
     layout->addWidget(toolBar);
diff --git a/GUI/View/SampleDesigner/SampleToolBoxTreeWidget.cpp b/GUI/View/SampleDesigner/SampleToolBoxTreeWidget.cpp
index c1daf75f3da..d5f6c876a79 100644
--- a/GUI/View/SampleDesigner/SampleToolBoxTreeWidget.cpp
+++ b/GUI/View/SampleDesigner/SampleToolBoxTreeWidget.cpp
@@ -156,9 +156,9 @@ void SampleToolBoxTreeWidget::handleMousePress(QTreeWidgetItem* item)
 
 void SampleToolBoxTreeWidget::addGroupView(QTreeWidgetItem* parent, bool iconMode)
 {
-    QTreeWidgetItem* embed_item = new QTreeWidgetItem(parent);
+    auto* embed_item = new QTreeWidgetItem(parent);
     embed_item->setFlags(Qt::ItemIsEnabled);
-    SampleToolBoxGroupView* view = new SampleToolBoxGroupView(this);
+    auto* view = new SampleToolBoxGroupView(this);
     view->setViewMode(iconMode ? QListView::IconMode : QListView::ListMode);
     connect(view, &SampleToolBoxGroupView::pressed, this, &SampleToolBoxTreeWidget::pressed);
     setItemWidget(embed_item, 0, view);
@@ -227,7 +227,7 @@ void SampleToolBoxTreeWidget::contextMenuEvent(QContextMenuEvent* e)
     QAction* iconModeAction = menu.addAction("Icon View");
     listModeAction->setCheckable(true);
     iconModeAction->setCheckable(true);
-    QActionGroup* viewModeGroup = new QActionGroup(&menu);
+    auto* viewModeGroup = new QActionGroup(&menu);
     viewModeGroup->addAction(listModeAction);
     viewModeGroup->addAction(iconModeAction);
     if (m_iconMode)
@@ -270,7 +270,7 @@ void SampleToolBoxTreeWidget::filter(const QString& f)
 
 void SampleToolBoxTreeWidget::addGroup(const QString& title)
 {
-    QTreeWidgetItem* groupItem = new QTreeWidgetItem();
+    auto* groupItem = new QTreeWidgetItem();
     groupItem->setText(0, title);
     addTopLevelItem(groupItem);
 #if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
diff --git a/GUI/View/SampleDesigner/SampleTreeWidget.cpp b/GUI/View/SampleDesigner/SampleTreeWidget.cpp
index 83ee0b20561..d49671f3096 100644
--- a/GUI/View/SampleDesigner/SampleTreeWidget.cpp
+++ b/GUI/View/SampleDesigner/SampleTreeWidget.cpp
@@ -34,7 +34,7 @@ SampleTreeWidget::SampleTreeWidget(QWidget* parent, SampleModel* model)
     mainLayout->addWidget(m_treeView);
     setLayout(mainLayout);
 
-    FilterPropertyProxy* proxy = new FilterPropertyProxy(1, parent);
+    auto* proxy = new FilterPropertyProxy(1, parent);
     proxy->setSourceModel(m_sampleModel);
     m_treeView->setModel(proxy);
     m_treeView->setAttribute(Qt::WA_MacShowFocusRect, false);
diff --git a/GUI/View/SampleDesigner/SampleView.cpp b/GUI/View/SampleDesigner/SampleView.cpp
index dd49087c508..082920dbf9b 100644
--- a/GUI/View/SampleDesigner/SampleView.cpp
+++ b/GUI/View/SampleDesigner/SampleView.cpp
@@ -56,8 +56,8 @@ void SampleView::initNetOrientedEditor()
 
     m_docks = new DocksController(this);
 
-    DesignerScene* designerScene = new DesignerScene(this, m_document);
-    DesignerView* designerView = new DesignerView(designerScene, this);
+    auto* designerScene = new DesignerScene(this, m_document);
+    auto* designerView = new DesignerView(designerScene, this);
 
     auto* toolBox = new SampleToolBox(this);
     auto* treeWidget = new SampleTreeWidget(this, m_document->sampleModel());
@@ -114,8 +114,8 @@ void SampleView::initLayerOrientedEditor()
 
     auto editor = new LayerOrientedSampleEditor(this);
 
-    QWidget* sampleSelectionPane = new QWidget(this);
-    QVBoxLayout* sampleSelectionLayout = new QVBoxLayout(sampleSelectionPane);
+    auto* sampleSelectionPane = new QWidget(this);
+    auto* sampleSelectionLayout = new QVBoxLayout(sampleSelectionPane);
     sampleSelectionLayout->setContentsMargins(0, 0, 0, 0);
     sampleSelectionLayout->setSpacing(0);
 
@@ -229,7 +229,7 @@ void SampleView::toggleRealSpaceView()
 
 void SampleView::fillViewMenu(QMenu* menu)
 {
-    QActionGroup* editorSelectionActions = new QActionGroup(this);
+    auto* editorSelectionActions = new QActionGroup(this);
 
     auto action = menu->addAction("Layer oriented sample editor");
     action->setCheckable(true);
diff --git a/GUI/View/SampleDesigner/ScriptPanel.cpp b/GUI/View/SampleDesigner/ScriptPanel.cpp
index 77315180519..660c19b833c 100644
--- a/GUI/View/SampleDesigner/ScriptPanel.cpp
+++ b/GUI/View/SampleDesigner/ScriptPanel.cpp
@@ -49,7 +49,7 @@ ScriptPanel::ScriptPanel(SampleModel* sampleModel, QWidget* parent)
     mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->addWidget(m_textEdit);
 
-    QWidget* mainWidget = new QWidget(this);
+    auto* mainWidget = new QWidget(this);
     mainWidget->setLayout(mainLayout);
 
     m_textEdit->setReadOnly(true);
diff --git a/GUI/View/Script/PythonScriptWidget.cpp b/GUI/View/Script/PythonScriptWidget.cpp
index d34f5ea4555..7f6cca816e1 100644
--- a/GUI/View/Script/PythonScriptWidget.cpp
+++ b/GUI/View/Script/PythonScriptWidget.cpp
@@ -45,7 +45,7 @@ PythonScriptWidget::PythonScriptWidget(QWidget* parent)
     auto toolBar = new StyledToolBar;
     toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
-    QAction* exportAction = new QAction(this);
+    auto* exportAction = new QAction(this);
     exportAction->setIcon(QIcon(":/images/content-save-outline.svg"));
     exportAction->setText("Save to file");
     exportAction->setToolTip("Opens dialog to save given script into the file");
@@ -58,10 +58,10 @@ PythonScriptWidget::PythonScriptWidget(QWidget* parent)
     m_textEdit->setFont(textFont);
     m_textEdit->setFontPointSize(DesignerHelper::getPythonEditorFontSize());
     m_textEdit->setLineWrapMode(QTextEdit::NoWrap);
-    PythonSyntaxHighlighter* highlighter = new PythonSyntaxHighlighter(m_textEdit->document());
+    auto* highlighter = new PythonSyntaxHighlighter(m_textEdit->document());
     Q_UNUSED(highlighter);
 
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
diff --git a/GUI/View/SpecularData/Plot1DCanvas.cpp b/GUI/View/SpecularData/Plot1DCanvas.cpp
index 70e06d8d8c5..5aed16a5a53 100644
--- a/GUI/View/SpecularData/Plot1DCanvas.cpp
+++ b/GUI/View/SpecularData/Plot1DCanvas.cpp
@@ -25,7 +25,7 @@ Plot1DCanvas::Plot1DCanvas(QWidget* parent)
     , m_statusLabel(new PlotStatusLabel(m_plot, this))
 {
     this->installEventFilter(m_canvasEvent);
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
 
diff --git a/GUI/View/SpecularData/SpecularDataCanvas.cpp b/GUI/View/SpecularData/SpecularDataCanvas.cpp
index 1f1407298c4..405d1d3fa97 100644
--- a/GUI/View/SpecularData/SpecularDataCanvas.cpp
+++ b/GUI/View/SpecularData/SpecularDataCanvas.cpp
@@ -26,7 +26,7 @@ SpecularDataCanvas::SpecularDataCanvas(QWidget* parent)
     , m_save_plot_action(nullptr)
 
 {
-    QVBoxLayout* vlayout = new QVBoxLayout(this);
+    auto* vlayout = new QVBoxLayout(this);
     vlayout->setSpacing(0);
     vlayout->setContentsMargins(0, 0, 0, 0);
     vlayout->addWidget(m_plot_canvas);
diff --git a/GUI/View/SpecularData/SpecularPlot.cpp b/GUI/View/SpecularData/SpecularPlot.cpp
index 32881fbf783..95729c6d35a 100644
--- a/GUI/View/SpecularData/SpecularPlot.cpp
+++ b/GUI/View/SpecularData/SpecularPlot.cpp
@@ -34,7 +34,7 @@ SpecularPlot::SpecularPlot(QWidget* parent)
 {
     initPlot();
 
-    QVBoxLayout* vlayout = new QVBoxLayout(this);
+    auto* vlayout = new QVBoxLayout(this);
     vlayout->setContentsMargins(0, 0, 0, 0);
     vlayout->setSpacing(0);
     vlayout->addWidget(m_custom_plot);
diff --git a/GUI/View/SpecularData/SpecularPlotCanvas.cpp b/GUI/View/SpecularData/SpecularPlotCanvas.cpp
index 7649e298e7f..be9ffc522af 100644
--- a/GUI/View/SpecularData/SpecularPlotCanvas.cpp
+++ b/GUI/View/SpecularData/SpecularPlotCanvas.cpp
@@ -26,7 +26,7 @@ SpecularPlotCanvas::SpecularPlotCanvas(QWidget* parent)
     , m_statusLabel(new PlotStatusLabel(m_plot, this))
 {
     this->installEventFilter(m_canvasEvent);
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
 
diff --git a/GUI/View/Tool/GroupBoxCollapser.cpp b/GUI/View/Tool/GroupBoxCollapser.cpp
index da06f1af307..5d3e398f91e 100644
--- a/GUI/View/Tool/GroupBoxCollapser.cpp
+++ b/GUI/View/Tool/GroupBoxCollapser.cpp
@@ -22,7 +22,7 @@
 
 GroupBoxCollapser* GroupBoxCollapser::installIntoGroupBox(QGroupBox* groupBox, bool expanded)
 {
-    GroupBoxCollapser* p = new GroupBoxCollapser(groupBox);
+    auto* p = new GroupBoxCollapser(groupBox);
 
     if (!expanded) {
         QSignalBlocker b(p->m_toggleButton);
@@ -71,7 +71,7 @@ QWidget* GroupBoxCollapser::contentArea() const
 
 GroupBoxCollapser::GroupBoxCollapser(QGroupBox* groupBox) : QObject(groupBox)
 {
-    QVBoxLayout* mainLayout = new QVBoxLayout;
+    auto* mainLayout = new QVBoxLayout;
     mainLayout->setSpacing(0);
     mainLayout->setContentsMargins(0, 0, 0, 0);
 
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index 8c5ce4f3e3a..af6181e6575 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -165,7 +165,7 @@ void SimulationView::exportPythonScript()
                              "Can't export to Python with current settings\n\n" + msg);
         return;
     }
-    PythonScriptWidget* pythonWidget = new PythonScriptWidget(baWin);
+    auto* pythonWidget = new PythonScriptWidget(baWin);
     pythonWidget->show();
     pythonWidget->raise();
     pythonWidget->generatePythonScript(selectedSample(), selectedInstrument(), optionsItem(),
diff --git a/GUI/View/Toplevel/TestView.cpp b/GUI/View/Toplevel/TestView.cpp
index ea873794824..96f3f78f018 100644
--- a/GUI/View/Toplevel/TestView.cpp
+++ b/GUI/View/Toplevel/TestView.cpp
@@ -61,24 +61,24 @@ void TestView::test_ComponentProxyModel()
 
 void TestView::test_MinimizerSettings()
 {
-    MinimizerSettingsWidget* widget = new MinimizerSettingsWidget;
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* widget = new MinimizerSettingsWidget;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
     layout->addWidget(widget);
     setLayout(layout);
 
-    SessionModel* model = new SessionModel("TempModel", this);
+    auto* model = new SessionModel("TempModel", this);
     auto minimizerItem = model->insertItem<MinimizerContainerItem>();
     widget->setItem(minimizerItem);
 }
 
 void TestView::test_AccordionWidget()
 {
-    QAccordion* myAccordion = new QAccordion();
+    auto* myAccordion = new QAccordion();
     myAccordion->setMultiActive(true);
     // add the Accordion to your layout
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->addWidget(myAccordion);
     setLayout(layout);
 
@@ -103,8 +103,8 @@ void TestView::test_AccordionWidget()
         // give the QFrame a QLayout
         contentFrame->setLayout(new QVBoxLayout());
         // add a simpel QLabel to the frame
-        QLineEdit* led = new QLineEdit();
-        QLineEdit* led2 = new QLineEdit();
+        auto* led = new QLineEdit();
+        auto* led2 = new QLineEdit();
         contentFrame->layout()->addWidget(new QLabel("Name:"));
         contentFrame->layout()->addWidget(led);
         contentFrame->layout()->addWidget(new QLabel("Living place:"));
@@ -122,19 +122,19 @@ void TestView::test_AccordionWidget()
         // give the QFrame a QLayout
         contentFrame->setLayout(new QVBoxLayout());
         // add a simpel QLabel to the frame
-        QCheckBox* cb = new QCheckBox();
+        auto* cb = new QCheckBox();
         cb->setText("Option 1");
-        QCheckBox* cb2 = new QCheckBox();
+        auto* cb2 = new QCheckBox();
         cb2->setText("Option 2");
-        QCheckBox* cb3 = new QCheckBox();
+        auto* cb3 = new QCheckBox();
         cb3->setText("Option 3");
-        QCheckBox* cb4 = new QCheckBox();
+        auto* cb4 = new QCheckBox();
         cb4->setText("Option 4");
-        QCheckBox* cb5 = new QCheckBox();
+        auto* cb5 = new QCheckBox();
         cb5->setText("Option 5");
-        QCheckBox* cb6 = new QCheckBox();
+        auto* cb6 = new QCheckBox();
         cb6->setText("Option 6");
-        QCheckBox* cb7 = new QCheckBox();
+        auto* cb7 = new QCheckBox();
         cb7->setText("Option 7");
         contentFrame->layout()->addWidget(cb);
         contentFrame->layout()->addWidget(cb2);
@@ -148,7 +148,7 @@ void TestView::test_AccordionWidget()
 
 void TestView::test_specular_data_widget()
 {
-    SessionModel* tempModel = new SessionModel("Test", this);
+    auto* tempModel = new SessionModel("Test", this);
 
     // creating job item
     auto job_item = tempModel->insertItem<JobItem>();
@@ -172,7 +172,7 @@ void TestView::test_specular_data_widget()
     container->addItem(job_item->realDataItem()->dataItem());
     container->addItem(job_item->dataItem());
 
-    QVBoxLayout* layout = new QVBoxLayout;
+    auto* layout = new QVBoxLayout;
     layout->setMargin(0);
     layout->setSpacing(0);
     auto widget = new Plot1DCanvas(this);
diff --git a/Sample/Aggregate/ParticleLayout.cpp b/Sample/Aggregate/ParticleLayout.cpp
index 3b56dc2ae33..71da246bf87 100644
--- a/Sample/Aggregate/ParticleLayout.cpp
+++ b/Sample/Aggregate/ParticleLayout.cpp
@@ -31,7 +31,7 @@ ParticleLayout::~ParticleLayout() = default; // needs member class definitions =
 
 ParticleLayout* ParticleLayout::clone() const
 {
-    ParticleLayout* result = new ParticleLayout();
+    auto* result = new ParticleLayout();
 
     for (const auto* particle : m_particles)
         result->addAndRegisterAbstractParticle(particle->clone());
diff --git a/Sample/Interface/LayerInterface.cpp b/Sample/Interface/LayerInterface.cpp
index d88c457c5c4..3443ed50ba3 100644
--- a/Sample/Interface/LayerInterface.cpp
+++ b/Sample/Interface/LayerInterface.cpp
@@ -27,7 +27,7 @@ LayerInterface* LayerInterface::clone() const
 LayerInterface* LayerInterface::createSmoothInterface(const Layer* top_layer,
                                                       const Layer* bottom_layer)
 {
-    LayerInterface* result = new LayerInterface();
+    auto* result = new LayerInterface();
     result->setLayersTopBottom(top_layer, bottom_layer);
     return result;
 }
diff --git a/Sample/Multilayer/Layer.cpp b/Sample/Multilayer/Layer.cpp
index ca25a5a9971..628b4969fa3 100644
--- a/Sample/Multilayer/Layer.cpp
+++ b/Sample/Multilayer/Layer.cpp
@@ -29,7 +29,7 @@ Layer::~Layer() = default;
 
 Layer* Layer::clone() const
 {
-    Layer* result = new Layer(m_material, m_thickness);
+    auto* result = new Layer(m_material, m_thickness);
     result->m_B_field = m_B_field;
     result->m_n_slices = m_n_slices;
     for (const auto* layout : layouts())
diff --git a/Sample/Particle/FormFactorWeighted.cpp b/Sample/Particle/FormFactorWeighted.cpp
index a1fa02271e2..48b1ab22409 100644
--- a/Sample/Particle/FormFactorWeighted.cpp
+++ b/Sample/Particle/FormFactorWeighted.cpp
@@ -25,7 +25,7 @@ FormFactorWeighted::~FormFactorWeighted()
 
 FormFactorWeighted* FormFactorWeighted::clone() const
 {
-    FormFactorWeighted* result = new FormFactorWeighted();
+    auto* result = new FormFactorWeighted();
     for (size_t index = 0; index < m_form_factors.size(); ++index)
         result->addFormFactor(*m_form_factors[index], m_weights[index]);
     return result;
diff --git a/Sample/Particle/Particle.cpp b/Sample/Particle/Particle.cpp
index 551a2811455..023c0430933 100644
--- a/Sample/Particle/Particle.cpp
+++ b/Sample/Particle/Particle.cpp
@@ -43,7 +43,7 @@ Particle::Particle(Material material, const IFormFactor& form_factor, const IRot
 
 Particle* Particle::clone() const
 {
-    Particle* p_result = new Particle(m_material);
+    auto* p_result = new Particle(m_material);
     p_result->setAbundance(m_abundance);
     if (m_form_factor)
         p_result->setFormFactor(*m_form_factor);
diff --git a/Sample/Particle/ParticleComposition.cpp b/Sample/Particle/ParticleComposition.cpp
index c766a3c874c..6b6eb83dca0 100644
--- a/Sample/Particle/ParticleComposition.cpp
+++ b/Sample/Particle/ParticleComposition.cpp
@@ -31,7 +31,7 @@ ParticleComposition::~ParticleComposition() = default;
 
 ParticleComposition* ParticleComposition::clone() const
 {
-    ParticleComposition* result = new ParticleComposition();
+    auto* result = new ParticleComposition();
     result->setAbundance(m_abundance);
     for (size_t index = 0; index < m_particles.size(); ++index)
         result->addParticle(*m_particles[index]);
diff --git a/Sample/Particle/ParticleCoreShell.cpp b/Sample/Particle/ParticleCoreShell.cpp
index 6f09d78559e..48bf38a49da 100644
--- a/Sample/Particle/ParticleCoreShell.cpp
+++ b/Sample/Particle/ParticleCoreShell.cpp
@@ -30,7 +30,7 @@ ParticleCoreShell::~ParticleCoreShell() = default;
 
 ParticleCoreShell* ParticleCoreShell::clone() const
 {
-    ParticleCoreShell* p_result = new ParticleCoreShell(*m_shell, *m_core);
+    auto* p_result = new ParticleCoreShell(*m_shell, *m_core);
     p_result->setAbundance(m_abundance);
     if (m_rotation)
         p_result->setRotation(*m_rotation);
diff --git a/Sample/StandardSamples/BoxCompositionBuilder.cpp b/Sample/StandardSamples/BoxCompositionBuilder.cpp
index a9b065ff130..16b4e8f6624 100644
--- a/Sample/StandardSamples/BoxCompositionBuilder.cpp
+++ b/Sample/StandardSamples/BoxCompositionBuilder.cpp
@@ -42,7 +42,7 @@ MultiLayer* finalizeMultiLayer(const ParticleComposition& composition)
     middle_layer.addLayout(layout);
     Layer substrate(refMat::Substrate2);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(middle_layer);
     sample->addLayer(substrate);
diff --git a/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp b/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
index 5dd975631b4..2c50be4fe98 100644
--- a/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
+++ b/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
@@ -44,7 +44,7 @@ MultiLayer* ExemplarySamples::createBoxesSquareLattice2D()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/CoreShellParticleBuilder.cpp b/Sample/StandardSamples/CoreShellParticleBuilder.cpp
index 64ec226dcd4..420cbd96a7e 100644
--- a/Sample/StandardSamples/CoreShellParticleBuilder.cpp
+++ b/Sample/StandardSamples/CoreShellParticleBuilder.cpp
@@ -48,7 +48,7 @@ MultiLayer* ExemplarySamples::createCoreShellParticle()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     return sample;
 }
@@ -82,7 +82,7 @@ MultiLayer* ExemplarySamples::createCoreShellBoxRotateZandY()
     middle_layer.addLayout(layout);
     Layer substrate(refMat::Substrate2);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(middle_layer);
     sample->addLayer(substrate);
diff --git a/Sample/StandardSamples/CustomMorphologyBuilder.cpp b/Sample/StandardSamples/CustomMorphologyBuilder.cpp
index df00b75a735..a402dedd082 100644
--- a/Sample/StandardSamples/CustomMorphologyBuilder.cpp
+++ b/Sample/StandardSamples/CustomMorphologyBuilder.cpp
@@ -103,7 +103,7 @@ MultiLayer* ExemplarySamples::createCustomMorphology()
     particle_layout.addParticle(p10, 0.5);
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     return sample;
 }
diff --git a/Sample/StandardSamples/CylindersAndPrismsBuilder.cpp b/Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
index 515bbcd3226..4f6701dc050 100644
--- a/Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
+++ b/Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
@@ -23,7 +23,7 @@
 
 MultiLayer* ExemplarySamples::createCylindersAndPrisms()
 {
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
 
     Layer vacuum_layer(refMat::Vacuum);
     Layer substrate_layer(refMat::Substrate);
diff --git a/Sample/StandardSamples/CylindersBuilder.cpp b/Sample/StandardSamples/CylindersBuilder.cpp
index 747be12b46a..2e053c7492d 100644
--- a/Sample/StandardSamples/CylindersBuilder.cpp
+++ b/Sample/StandardSamples/CylindersBuilder.cpp
@@ -37,7 +37,7 @@ MultiLayer* ExemplarySamples::createCylindersInDWBA()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -54,7 +54,7 @@ MultiLayer* ExemplarySamples::createCylindersInBA(double height, double radius)
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     return sample;
 }
@@ -71,7 +71,7 @@ MultiLayer* ExemplarySamples::createLargeCylindersInDWBA(double height, double r
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -92,7 +92,7 @@ MultiLayer* ExemplarySamples::createRotatedCylinders()
     Layer substrate_layer(refMat::Substrate);
     substrate_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp b/Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
index b1abc198b0c..9ecbfa953a6 100644
--- a/Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
+++ b/Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
@@ -36,7 +36,7 @@ MultiLayer* ExemplarySamples::createHomogeneousMultilayer()
     Layer ti_layer(ti_material, thick_ti);
     Layer substrate_layer(substrate_material, 0);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuulayer);
     for (size_t i = 0; i < number_of_layers; ++i) {
         sample->addLayer(ti_layer);
diff --git a/Sample/StandardSamples/LatticeBuilder.cpp b/Sample/StandardSamples/LatticeBuilder.cpp
index e3770a1c2c7..df7080c5ed5 100644
--- a/Sample/StandardSamples/LatticeBuilder.cpp
+++ b/Sample/StandardSamples/LatticeBuilder.cpp
@@ -49,7 +49,7 @@ MultiLayer* ExemplarySamples::createLattice1D()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
index 4a5af4165c8..bc0804af19e 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
@@ -42,7 +42,7 @@ MultiLayer* ExemplarySamples::createLayersWithAbsorptionWithFF(const IFormFactor
 
     middle_layer.addLayout(layout);
 
-    MultiLayer* sample = new MultiLayer(ff->shapeName());
+    auto* sample = new MultiLayer(ff->shapeName());
     sample->addLayer(vacuum_layer);
     sample->addLayer(middle_layer);
     sample->addLayer(substrate);
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp b/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
index bda6eb8c585..4ed5ba2adea 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
+++ b/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
@@ -49,7 +49,7 @@ MultiLayer* ExemplarySamples::createLayersWithAbsorptionBySLD()
 
     middle_layer.addLayout(layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(middle_layer);
     sample->addLayer(substrate);
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.cpp b/Sample/StandardSamples/MagneticLayersBuilder.cpp
index 2f7739515f9..cac352d9c4b 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Sample/StandardSamples/MagneticLayersBuilder.cpp
@@ -58,7 +58,7 @@ MultiLayer* ExemplarySamples::createMagneticSubstrateZeroField()
     Layer substrate_layer(substrate_material);
     substrate_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -68,7 +68,7 @@ MultiLayer* ExemplarySamples::createMagneticSubstrateZeroField()
 
 MultiLayer* ExemplarySamples::createSimpleMagneticLayer()
 {
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
 
     R3 layer_field = R3(0.0, 1e8, 0.0);
     Material vacuum_material = MaterialBySLD("Vacuum", 0.0, 0.0);
@@ -89,7 +89,7 @@ MultiLayer* ExemplarySamples::createSimpleMagneticLayer()
 
 MultiLayer* ExemplarySamples::createMagneticLayer()
 {
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
 
     R3 layer_field = R3(0.0, 0.0, 1e6);
     R3 particle_field(1e6, 0.0, 0.0);
@@ -118,7 +118,7 @@ MultiLayer*
 ExemplarySamples::createSimpleMagneticRotationWithRoughness(const std::string& roughnessKey)
 {
     const auto& [sigmaRoughness, roughnessModel] = RoughnessCases.at(roughnessKey);
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
 
     R3 substr_field = R3(0.0, 1e6, 0.0);
     R3 layer_field = R3(1e6, 1e6, 0.0);
@@ -143,7 +143,7 @@ ExemplarySamples::createSimpleMagneticRotationWithRoughness(const std::string& r
 
 MultiLayer* ExemplarySamples::createMagneticRotation()
 {
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
 
     R3 substr_field = R3(0.0, 1e6, 0.0);
     R3 particle_field(1e6, 0.0, 0.0);
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.cpp b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
index 27948d2f7b7..4e09b5ae6f9 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Sample/StandardSamples/MagneticParticlesBuilder.cpp
@@ -47,7 +47,7 @@ MultiLayer* ExemplarySamples::createMagneticParticleZeroField()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -77,7 +77,7 @@ MultiLayer* ExemplarySamples::createMagneticCylinders()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -107,7 +107,7 @@ MultiLayer* ExemplarySamples::createMagneticSpheres()
     Layer substrate_layer(substrate_material);
     substrate_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/MesoCrystalBuilder.cpp b/Sample/StandardSamples/MesoCrystalBuilder.cpp
index 4a85ec6ac5f..75c06813653 100644
--- a/Sample/StandardSamples/MesoCrystalBuilder.cpp
+++ b/Sample/StandardSamples/MesoCrystalBuilder.cpp
@@ -49,7 +49,7 @@ MultiLayer* ExemplarySamples::createMesoCrystal()
     vacuum_layer.addLayout(particle_layout);
     Layer substrate_layer(refMat::Substrate);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
index c26809d96da..8287632be50 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
@@ -39,7 +39,7 @@ MultiLayer* ExemplarySamples::createMultiLayerWithRoughness()
 
     LayerRoughness roughness(sigma, hurst, lateralCorrLength);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     for (int i = 0; i < 5; ++i) {
         sample->addLayerWithTopRoughness(partA_layer, roughness);
diff --git a/Sample/StandardSamples/MultipleLayoutBuilder.cpp b/Sample/StandardSamples/MultipleLayoutBuilder.cpp
index 7b4aa733c2e..5045e003dda 100644
--- a/Sample/StandardSamples/MultipleLayoutBuilder.cpp
+++ b/Sample/StandardSamples/MultipleLayoutBuilder.cpp
@@ -47,7 +47,7 @@ MultiLayer* ExemplarySamples::createMultipleLayout()
     vacuum_layer.addLayout(particle_layout_1);
     vacuum_layer.addLayout(particle_layout_2);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/ParaCrystalBuilder.cpp b/Sample/StandardSamples/ParaCrystalBuilder.cpp
index c9105dc5306..ba4423b9361 100644
--- a/Sample/StandardSamples/ParaCrystalBuilder.cpp
+++ b/Sample/StandardSamples/ParaCrystalBuilder.cpp
@@ -48,7 +48,7 @@ MultiLayer* ExemplarySamples::createRadialParaCrystal()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -78,7 +78,7 @@ MultiLayer* ExemplarySamples::createBasic2DParaCrystalWithFTDis(const IFTDistrib
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer("Basic2DParaCrystal_" + pdf2->className());
+    auto* sample = new MultiLayer("Basic2DParaCrystal_" + pdf2->className());
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -114,7 +114,7 @@ MultiLayer* ExemplarySamples::createHexParaCrystal()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -144,7 +144,7 @@ MultiLayer* ExemplarySamples::createRectParaCrystal()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/ParticleCompositionBuilder.cpp b/Sample/StandardSamples/ParticleCompositionBuilder.cpp
index 7e2b27169e8..a9b556cdaed 100644
--- a/Sample/StandardSamples/ParticleCompositionBuilder.cpp
+++ b/Sample/StandardSamples/ParticleCompositionBuilder.cpp
@@ -50,7 +50,7 @@ MultiLayer* ExemplarySamples::createParticleComposition()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/ParticleDistributionsBuilder.cpp b/Sample/StandardSamples/ParticleDistributionsBuilder.cpp
index 837db296eb2..98982afe752 100644
--- a/Sample/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Sample/StandardSamples/ParticleDistributionsBuilder.cpp
@@ -57,7 +57,7 @@ MultiLayer* ExemplarySamples::createCylindersWithSizeDistribution()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     return sample;
     */
@@ -118,7 +118,7 @@ MultiLayer* ExemplarySamples::createTwoTypesCylindersDistribution()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     return sample;
     */
@@ -159,7 +159,7 @@ MultiLayer* ExemplarySamples::createRotatedPyramidsDistribution()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -196,7 +196,7 @@ MultiLayer* ExemplarySamples::createSpheresWithLimitsDistribution()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
 
@@ -235,7 +235,7 @@ MultiLayer* ExemplarySamples::createConesWithLimitsDistribution()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -272,7 +272,7 @@ MultiLayer* ExemplarySamples::createLinkedBoxDistribution()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/ParticleInVacuumBuilder.cpp b/Sample/StandardSamples/ParticleInVacuumBuilder.cpp
index 5d41f911680..877b32990b4 100644
--- a/Sample/StandardSamples/ParticleInVacuumBuilder.cpp
+++ b/Sample/StandardSamples/ParticleInVacuumBuilder.cpp
@@ -30,7 +30,7 @@ MultiLayer* ExemplarySamples::createParticleInVacuumWithFF(const IFormFactor* ff
     ParticleLayout particle_layout(particle);
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* result = new MultiLayer("ParticleInVacuum_" + ff->shapeName());
+    auto* result = new MultiLayer("ParticleInVacuum_" + ff->shapeName());
     result->addLayer(vacuum_layer);
     return result;
 }
diff --git a/Sample/StandardSamples/PercusYevickBuilder.cpp b/Sample/StandardSamples/PercusYevickBuilder.cpp
index abc8bef07da..1087c41d990 100644
--- a/Sample/StandardSamples/PercusYevickBuilder.cpp
+++ b/Sample/StandardSamples/PercusYevickBuilder.cpp
@@ -40,7 +40,7 @@ MultiLayer* ExemplarySamples::createHardDisk()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp b/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
index 78d0437eb7c..599cde05017 100644
--- a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
+++ b/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
@@ -45,7 +45,7 @@ MultiLayer* ExemplarySamples::createPlainMultiLayerBySLD(int n_layers, double th
     Layer ti_layer(ti_material, thick_ti);
     Layer substrate_layer(substrate_material);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     for (int i = 0; i < n_layers; ++i) {
         sample->addLayer(ti_layer);
diff --git a/Sample/StandardSamples/RipplesBuilder.cpp b/Sample/StandardSamples/RipplesBuilder.cpp
index 61bfbb72dd1..ee38017ff1f 100644
--- a/Sample/StandardSamples/RipplesBuilder.cpp
+++ b/Sample/StandardSamples/RipplesBuilder.cpp
@@ -40,7 +40,7 @@ MultiLayer* ExemplarySamples::createCosineRipple()
 
     Layer substrate_layer(refMat::Substrate);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -62,7 +62,7 @@ MultiLayer* ExemplarySamples::createTriangularRipple(double d)
     vacuum_layer.addLayout(particle_layout);
     Layer substrate_layer(refMat::Substrate);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/RotatedPyramidsBuilder.cpp b/Sample/StandardSamples/RotatedPyramidsBuilder.cpp
index 6d8364234da..59f52145fed 100644
--- a/Sample/StandardSamples/RotatedPyramidsBuilder.cpp
+++ b/Sample/StandardSamples/RotatedPyramidsBuilder.cpp
@@ -44,7 +44,7 @@ MultiLayer* ExemplarySamples::createRotatedPyramids()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp b/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
index 0629af16686..2625f3e40eb 100644
--- a/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
@@ -51,7 +51,7 @@ MultiLayer* ExemplarySamples::createSizeDistributionDAModel()
     vacuum_layer.addLayout(particle_layout);
     Layer substrate_layer(refMat::Substrate);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -96,7 +96,7 @@ MultiLayer* ExemplarySamples::createSizeDistributionLMAModel()
     vacuum_layer.addLayout(particle_layout2);
     Layer substrate_layer(refMat::Substrate);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -134,7 +134,7 @@ MultiLayer* ExemplarySamples::createSizeDistributionSSCAModel()
     vacuum_layer.addLayout(particle_layout);
     Layer substrate_layer(refMat::Substrate);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -175,7 +175,7 @@ MultiLayer* ExemplarySamples::createCylindersInSSCA()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     return sample;
     */
diff --git a/Sample/StandardSamples/SlicedCompositionBuilder.cpp b/Sample/StandardSamples/SlicedCompositionBuilder.cpp
index 5718964daec..1fa2b7b989f 100644
--- a/Sample/StandardSamples/SlicedCompositionBuilder.cpp
+++ b/Sample/StandardSamples/SlicedCompositionBuilder.cpp
@@ -49,7 +49,7 @@ MultiLayer* ExemplarySamples::createSlicedComposition()
 
     Layer substrate_layer(refMat::Substrate2);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Sample/StandardSamples/SlicedCylindersBuilder.cpp b/Sample/StandardSamples/SlicedCylindersBuilder.cpp
index fda47fde3c0..dfae7d9da17 100644
--- a/Sample/StandardSamples/SlicedCylindersBuilder.cpp
+++ b/Sample/StandardSamples/SlicedCylindersBuilder.cpp
@@ -59,7 +59,7 @@ MultiLayer* ExemplarySamples::createSlicedCylinders()
     vacuum_layer.addLayout(particle_layout);
     vacuum_layer.setNumberOfSlices(n_slices);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -84,7 +84,7 @@ MultiLayer* ExemplarySamples::createSLDSlicedCylinders()
     vacuum_layer.addLayout(particle_layout);
     vacuum_layer.setNumberOfSlices(n_slices);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -108,7 +108,7 @@ MultiLayer* ExemplarySamples::createAveragedSlicedCylinders()
     Layer avr_layer(avr_material, height / n_slices);
     Layer substrate_layer(substrate_material);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     for (size_t i = 0; i < n_slices; ++i)
         sample->addLayer(avr_layer);
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
index b8b860f0e37..eb3116d9f8d 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+++ b/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
@@ -31,7 +31,7 @@ MultiLayer* ExemplarySamples::createThickAbsorptiveSample()
 
     LayerRoughness rough(5.0, 0.5, 10.0);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(au_layer);
     sample->addLayer(vacuum_layer_2);
diff --git a/Sample/StandardSamples/TransformationsBuilder.cpp b/Sample/StandardSamples/TransformationsBuilder.cpp
index daed34806db..d8a66f78b96 100644
--- a/Sample/StandardSamples/TransformationsBuilder.cpp
+++ b/Sample/StandardSamples/TransformationsBuilder.cpp
@@ -43,7 +43,7 @@ MultiLayer* ExemplarySamples::createTransformBox()
     middle_layer.addLayout(layout);
     Layer substrate(refMat::Substrate2);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(middle_layer);
     sample->addLayer(substrate);
diff --git a/Sample/StandardSamples/TwoDimLatticeBuilder.cpp b/Sample/StandardSamples/TwoDimLatticeBuilder.cpp
index a9e675accc6..430e23f8be6 100644
--- a/Sample/StandardSamples/TwoDimLatticeBuilder.cpp
+++ b/Sample/StandardSamples/TwoDimLatticeBuilder.cpp
@@ -47,7 +47,7 @@ MultiLayer* ExemplarySamples::createBasic2DLattice()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -75,7 +75,7 @@ MultiLayer* ExemplarySamples::createSquareLattice2D()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -108,7 +108,7 @@ MultiLayer* ExemplarySamples::createCenteredSquareLattice2D()
     particle_layout.setInterference(interparticle);
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -137,7 +137,7 @@ MultiLayer* ExemplarySamples::createRotatedSquareLattice2D()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -164,7 +164,7 @@ MultiLayer* ExemplarySamples::createFiniteSquareLattice2D()
 
     vacuum_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
@@ -194,7 +194,7 @@ MultiLayer* ExemplarySamples::createSuperLattice()
 
     substrate_layer.addLayout(particle_layout);
 
-    MultiLayer* sample = new MultiLayer();
+    auto* sample = new MultiLayer();
     sample->addLayer(vacuum_layer);
     sample->addLayer(substrate_layer);
     return sample;
diff --git a/Tests/Unit/Device/LLDataTest.cpp b/Tests/Unit/Device/LLDataTest.cpp
index 708314ca96a..dbe3d9c930a 100644
--- a/Tests/Unit/Device/LLDataTest.cpp
+++ b/Tests/Unit/Device/LLDataTest.cpp
@@ -17,17 +17,17 @@ protected:
 
 LLDataTest::LLDataTest()
 {
-    int* dim0 = new int[0];
+    auto* dim0 = new int[0];
 
-    int* dim1 = new int[1];
+    auto* dim1 = new int[1];
     dim1[0] = 10;
 
-    int* dim3 = new int[3];
+    auto* dim3 = new int[3];
     dim3[0] = 10;
     dim3[1] = 15;
     dim3[2] = 20;
 
-    int* dim2 = new int[2];
+    auto* dim2 = new int[2];
     dim2[0] = 20;
     dim2[1] = 30;
 
@@ -175,7 +175,7 @@ TEST_F(LLDataTest, Addition)
     EXPECT_DOUBLE_EQ((*other_db_data_3d)[11], 2.0);
     EXPECT_DOUBLE_EQ(other_db_data_3d->getTotalSum(), 6000.0);
 
-    int* odim1 = new int[1];
+    auto* odim1 = new int[1];
     odim1[0] = 12;
     LLData<float>* fl_data_1d2 = new LLData<float>(1u, odim1);
     fl_data_1d2->setAll(10.0);
@@ -214,7 +214,7 @@ TEST_F(LLDataTest, Substraction)
     EXPECT_DOUBLE_EQ((*other_db_data_3d)[11], 0.5);
     EXPECT_DOUBLE_EQ(other_db_data_3d->getTotalSum(), 1500.0);
 
-    int* odim1 = new int[1];
+    auto* odim1 = new int[1];
     odim1[0] = 12;
     LLData<float>* fl_data_1d2 = new LLData<float>(1u, odim1);
     fl_data_1d2->setAll(10.0);
@@ -252,7 +252,7 @@ TEST_F(LLDataTest, Multiplication)
     EXPECT_DOUBLE_EQ((*other_db_data_3d)[11], 2.5);
     EXPECT_DOUBLE_EQ(other_db_data_3d->getTotalSum(), 7500.0);
 
-    int* odim1 = new int[1];
+    auto* odim1 = new int[1];
     odim1[0] = 12;
     LLData<float>* fl_data_1d2 = new LLData<float>(1u, odim1);
     fl_data_1d2->setAll(10.0);
@@ -290,7 +290,7 @@ TEST_F(LLDataTest, Division)
     EXPECT_DOUBLE_EQ((*other_db_data_3d)[11], 2.0);
     EXPECT_DOUBLE_EQ(other_db_data_3d->getTotalSum(), 6000.0);
 
-    int* odim1 = new int[1];
+    auto* odim1 = new int[1];
     odim1[0] = 12;
     LLData<float>* fl_data_1d2 = new LLData<float>(1u, odim1);
     fl_data_1d2->setAll(10.0);
@@ -305,17 +305,17 @@ TEST_F(LLDataTest, Division)
 
 TEST_F(LLDataTest, HaveSameDimensions)
 {
-    int* odim0 = new int[0];
+    auto* odim0 = new int[0];
 
-    int* odim1 = new int[1];
+    auto* odim1 = new int[1];
     odim1[0] = 10;
 
-    int* odim3 = new int[3];
+    auto* odim3 = new int[3];
     odim3[0] = 10;
     odim3[1] = 15;
     odim3[2] = 20;
 
-    int* odim2 = new int[2];
+    auto* odim2 = new int[2];
     odim2[0] = 20;
     odim2[1] = 30;
 
diff --git a/Tests/Unit/Device/OutputDataIteratorTest.cpp b/Tests/Unit/Device/OutputDataIteratorTest.cpp
index 9790dac9d87..0c4d1046673 100644
--- a/Tests/Unit/Device/OutputDataIteratorTest.cpp
+++ b/Tests/Unit/Device/OutputDataIteratorTest.cpp
@@ -10,7 +10,7 @@ protected:
 
 OutputDataIteratorTest::OutputDataIteratorTest()
 {
-    int* dims = new int[2];
+    auto* dims = new int[2];
     dims[0] = 3;
     dims[1] = 5;
     _data.setAxisSizes(2, dims);
diff --git a/Tests/Unit/GUI/TestSessionItem.cpp b/Tests/Unit/GUI/TestSessionItem.cpp
index 619f581e803..0ce5e860e73 100644
--- a/Tests/Unit/GUI/TestSessionItem.cpp
+++ b/Tests/Unit/GUI/TestSessionItem.cpp
@@ -24,7 +24,7 @@ TEST_F(TestSessionItem, defaultTag)
     EXPECT_TRUE(item->defaultTag().isEmpty());
 
     // insertion without tag is forbidden
-    SessionItem* child = new SessionItem(modelType);
+    auto* child = new SessionItem(modelType);
     EXPECT_ASSERT_TRIGGERED(item->insertItem(0, child));
     delete child;
     EXPECT_EQ(item->numberOfChildren(), 0);
@@ -52,7 +52,7 @@ TEST_F(TestSessionItem, singleTagAndItems)
     EXPECT_TRUE(item->getItems(tag1) == QVector<SessionItem*>());
 
     // inserting single item
-    SessionItem* child = new SessionItem(modelType);
+    auto* child = new SessionItem(modelType);
     EXPECT_TRUE(item->insertItem(0, child, tag1));
     // double insertion is forbidden
     EXPECT_ASSERT_TRIGGERED(item->insertItem(0, child, tag1));
@@ -71,7 +71,7 @@ TEST_F(TestSessionItem, singleTagAndItems)
     EXPECT_EQ(item->getItem(tag1), child);
 
     // adding second child at the beginning
-    SessionItem* child1 = new SessionItem(modelType);
+    auto* child1 = new SessionItem(modelType);
     EXPECT_TRUE(item->insertItem(0, child1, tag1));
 
     expected = QVector<SessionItem*>() << child1 << child;
@@ -83,7 +83,7 @@ TEST_F(TestSessionItem, singleTagAndItems)
     EXPECT_EQ(item->getItem(tag1, 2), nullptr);
 
     // adding third item at the end
-    SessionItem* child2 = new SessionItem(modelType);
+    auto* child2 = new SessionItem(modelType);
     EXPECT_TRUE(item->insertItem(-1, child2, tag1));
     expected = QVector<SessionItem*>() << child1 << child << child2;
     EXPECT_EQ(item->children(), expected);
@@ -103,9 +103,9 @@ TEST_F(TestSessionItem, insertAndTake)
     EXPECT_TRUE(item->registerTag(tag1));
 
     // inserting two children
-    SessionItem* child1 = new SessionItem(modelType);
+    auto* child1 = new SessionItem(modelType);
     EXPECT_TRUE(item->insertItem(-1, child1, tag1));
-    SessionItem* child2 = new SessionItem(modelType);
+    auto* child2 = new SessionItem(modelType);
     EXPECT_TRUE(item->insertItem(-1, child2, tag1));
     auto expected = QVector<SessionItem*>() << child1 << child2;
     EXPECT_EQ(item->getItems(tag1), expected);
diff --git a/Tests/Unit/GUI/TestSessionItemController.cpp b/Tests/Unit/GUI/TestSessionItemController.cpp
index 3bfae4e13f2..cc1672094e3 100644
--- a/Tests/Unit/GUI/TestSessionItemController.cpp
+++ b/Tests/Unit/GUI/TestSessionItemController.cpp
@@ -243,7 +243,7 @@ TEST_F(TestSessionItemController, test_onTwoItemsWhenHidden)
 TEST_F(TestSessionItemController, test_deleteWidget)
 {
     TestListener listener;
-    TestObject* object = new TestObject(&listener);
+    auto* object = new TestObject(&listener);
     SessionModel model("TestModel");
     auto item = model.insertItem<BasicAxisItem>();
 
-- 
GitLab