ctd

GUI/Models/Data/GUIObjectBuilder.cpp

@@ -16,7 +16,6 @@
 #include "Base/Const/Units.h"
 #include "Base/Utils/Assert.h"
 #include "Core/Simulation/includeSimulations.h"
-#include "Device/Instrument/Instrument.h"
 #include "GUI/Items/InstrumentItems.h"
 #include "GUI/Items/SimulationOptionsItem.h"
 #include "GUI/Models/Data/DocumentModel.h"

GUI/Models/Domain/TransformFromDomain.cpp

@@ -48,7 +48,6 @@
 #include "GUI/Items/ResolutionFunctionItems.h"
 #include "GUI/Items/SphericalDetectorItem.h"
 #include "GUI/Items/VectorItem.h"
-#include "GUI/Models/Types/DoubleDescriptor.h"
 #include "GUI/Models/Types/UIntDescriptor.h"
 #include "GUI/utils/Error.h"
 #include "Param/Distrib/Distributions.h"
@@ -88,9 +87,8 @@ void setPDF1D(InterferenceRadialParaCrystalItem* item, const IFTDistribution1D*
         FTDistribution1DVoigtItem* pdfItem = item->setPDFType<FTDistribution1DVoigtItem>();
         pdfItem->omega().set(pdf->omega());
         pdfItem->eta().set(pdf->eta());
-    } else {
+    } else
         throw Error("GUI::Transform::FromDomain::setPDF1D: -> Error");
-    }
 }
 
 // note: SetterPDF(1|2)Type are needed because template template parameter must be classes
@@ -137,9 +135,8 @@ void setPDF2D(Interference2DParaCrystalItem* item, const IFTDistribution2D* pdf)
         pdfItem->setOmegaY(pdf_voigt->omegaY());
         pdfItem->setGamma(Units::rad2deg(pdf_voigt->gamma()));
         pdfItem->setEta(pdf_voigt->eta());
-    } else {
+    } else
         throw Error("GUI::Transform::FromDomain::setPDF2D: -> Error");
-    }
 }
 
 void setDecayFunction1D(Interference1DLatticeItem* item, const IFTDecayFunction1D* ipdf)
@@ -164,9 +161,8 @@ void setDecayFunction1D(Interference1DLatticeItem* item, const IFTDecayFunction1
             item->setDecayFunctionType<FTDecayFunction1DVoigtItem>();
         pdfItem->decayLength().set(pdf->decayLength());
         pdfItem->eta().set(pdf->eta());
-    } else {
+    } else
         throw Error("GUI::Transform::FromDomain::setDecayFunction1D: -> Error");
-    }
 }
 
 void setDecayFunction2D(Interference2DLatticeItem* item, const IFTDecayFunction2D* pdf)
@@ -193,9 +189,8 @@ void setDecayFunction2D(Interference2DLatticeItem* item, const IFTDecayFunction2
         pdfItem->setDecayLengthY(pdf_voigt->decayLengthY());
         pdfItem->setGamma(Units::rad2deg(pdf_voigt->gamma()));
         pdfItem->setEta(pdf_voigt->eta());
-    } else {
+    } else
         throw Error("GUI::Transform::FromDomain::setDecayFunction2D: -> Error");
-    }
 }
 
 void set2DLatticeParameters(Interference2DAbstractLatticeItem* item, const Lattice2D& lattice)
@@ -273,9 +268,8 @@ void setDistribution(BeamDistributionItem* part_distr_item, ParameterDistributio
         distr_trapez_item->setMiddleWidth(factor * distr->getMiddleWidth());
         distr_trapez_item->setRightWidth(factor * distr->getRightWidth());
         distItem = distr_trapez_item;
-    } else {
+    } else
         throw Error("GUI::Transform::FromDomain::setDistribution: -> unknown distribution");
-    }
 
     distItem->setNumberOfSamples(par_distr.getNbrSamples());
 

GUI/Models/Instrument/InstrumentsTreeModel.cpp

@@ -16,8 +16,6 @@
 #include "GUI/Application/Application.h"
 #include "GUI/Application/ApplicationSettings.h"
 #include "GUI/Items/InstrumentItems.h"
-#include "GUI/Models/Instrument/InstrumentModel.h"
-#include <QApplication>
 #include <QtCore>
 #include <QtGui>
 

GUI/Models/Sample/GUIDomainSampleVisitor.cpp

@@ -40,7 +40,6 @@
 #include "Sample/Particle/Crystal.h"
 #include "Sample/Particle/MesoCrystal.h"
 #include "Sample/Particle/Particle.h"
-#include "Sample/Particle/ParticleComposition.h"
 #include "Sample/Particle/ParticleCoreShell.h"
 #include "Sample/SoftParticle/SoftParticles.h"