From 230f8a5d92fee84b2c693bfa20576b543b76b370 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 19 Dec 2021 10:06:01 +0100
Subject: [PATCH] clang-format
---
App/main.cpp | 2 +-
GUI/Model/Sample/MesoCrystalItem.cpp | 2 +-
GUI/View/Intensity/IntensityDataCanvas.cpp | 5 +++--
GUI/View/Main/PyImportAssistant.cpp | 4 +++-
Sample/Particle/Particle.h | 2 +-
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/App/main.cpp b/App/main.cpp
index 55a1a67d82f..b19d25779b7 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -15,10 +15,10 @@
#include "App/AppOptions.h"
#include "App/MessageHandler.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/View/Global/Globals.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/Util/OSInfo.h"
#include "GUI/Util/Path.h"
+#include "GUI/View/Global/Globals.h"
#include "GUI/View/Loaders/DataLoaderUtil.h"
#include "GUI/View/Main/MainWindow.h"
#include "config_build.h"
diff --git a/GUI/Model/Sample/MesoCrystalItem.cpp b/GUI/Model/Sample/MesoCrystalItem.cpp
index 42644df778a..0af934fe6b1 100644
--- a/GUI/Model/Sample/MesoCrystalItem.cpp
+++ b/GUI/Model/Sample/MesoCrystalItem.cpp
@@ -21,10 +21,10 @@
#include "GUI/Model/Types/VectorDescriptor.h"
#include "GUI/Util/Error.h"
#include "Sample/Particle/Crystal.h"
+#include "Sample/Particle/IBornFF.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
-#include "Sample/Particle/IBornFF.h"
namespace {
diff --git a/GUI/View/Intensity/IntensityDataCanvas.cpp b/GUI/View/Intensity/IntensityDataCanvas.cpp
index f778afd54e4..2a32a8cedcc 100644
--- a/GUI/View/Intensity/IntensityDataCanvas.cpp
+++ b/GUI/View/Intensity/IntensityDataCanvas.cpp
@@ -118,8 +118,9 @@ void IntensityDataCanvas::rotateData()
const QString title("Rotate data");
const QString message("Rotation will break the link between the data and the instrument. "
"Detector masks or projections, if they exist, will be removed.");
- if (!GUI::View::Helpers::question(GUI::Global::mainWindow, title, message, "Do you wish to rotate the data?",
- "Yes, please rotate", "No, cancel data rotation"))
+ if (!GUI::View::Helpers::question(GUI::Global::mainWindow, title, message,
+ "Do you wish to rotate the data?", "Yes, please rotate",
+ "No, cancel data rotation"))
return;
}
diff --git a/GUI/View/Main/PyImportAssistant.cpp b/GUI/View/Main/PyImportAssistant.cpp
index 8c548667966..2cba79bf2db 100644
--- a/GUI/View/Main/PyImportAssistant.cpp
+++ b/GUI/View/Main/PyImportAssistant.cpp
@@ -212,7 +212,9 @@ MultiLayerItem* PyImportAssistant::populateModels(SampleModel* sampleModel,
QString message("Exception thrown while trying to build GUI models.\n"
"GUI models might be in inconsistent state.\n\n");
QString details = QString::fromStdString(std::string(ex.what()));
- DetailedMessageBox(GUI::Global::mainWindow, "GUI::Model::ObjectBuilder failure", message, details).exec();
+ DetailedMessageBox(GUI::Global::mainWindow, "GUI::Model::ObjectBuilder failure", message,
+ details)
+ .exec();
return nullptr;
}
}
diff --git a/Sample/Particle/Particle.h b/Sample/Particle/Particle.h
index 474ccd97754..74d6d9ff36e 100644
--- a/Sample/Particle/Particle.h
+++ b/Sample/Particle/Particle.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_SAMPLE_PARTICLE_PARTICLE_H
#include "Sample/Material/Material.h"
-#include "Sample/Particle/IParticle.h"
#include "Sample/Particle/IBornFF.h"
+#include "Sample/Particle/IParticle.h"
//! A particle with a form factor and refractive index.
//! @ingroup samples
--
GitLab