From cb6e6647552440875918da3928e834c3efc11e34 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 5 Aug 2020 20:44:24 +0200
Subject: [PATCH] clang-format
---
Core/Basics/Algorithms.h | 2 +-
Core/Basics/Assert.h | 4 +-
Core/Instrument/ChiSquaredModule.cpp | 2 +-
Core/Instrument/OutputData.h | 2 +-
Core/Multilayer/SampleProvider.cpp | 2 +-
Core/Parametrization/ParameterPool.cpp | 2 +-
Core/Tools/FileSystemUtils.cpp | 2 +-
Fit/RootAdapter/ResidualFunctionAdapter.cpp | 2 +-
GUI/coregui/Models/BeamDistributionItem.cpp | 2 +-
.../ImportDataWidgets/RealDataPresenter.cpp | 2 +-
GUI/main/MessageHandler.cpp | 61 +++++++++----------
GUI/main/main.cpp | 2 +-
Tests/Functional/Core/Consistence/compare.cpp | 2 +-
Tests/Functional/Core/Std/Check.cpp | 2 +-
.../Fit/Minimizer/ResidualTestPlan.cpp | 2 +-
.../Functional/GUI/Other/SaveLoadProject.cpp | 2 +-
Tests/Functional/Python/Std/Check.cpp | 2 +-
Tests/Functional/Std/Run.cpp | 2 +-
Tests/Performance/Core/CoreIO.cpp | 2 +-
19 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/Core/Basics/Algorithms.h b/Core/Basics/Algorithms.h
index cf52867fe50..91c1a2de8bb 100644
--- a/Core/Basics/Algorithms.h
+++ b/Core/Basics/Algorithms.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_CORE_BASICS_ALGORITHMS_H
#define BORNAGAIN_CORE_BASICS_ALGORITHMS_H
-#include <algorithm>
#include "Core/Basics/Assert.h"
+#include <algorithm>
#include <functional>
#include <vector>
diff --git a/Core/Basics/Assert.h b/Core/Basics/Assert.h
index fd0e15b53c4..0c8c4dffb54 100644
--- a/Core/Basics/Assert.h
+++ b/Core/Basics/Assert.h
@@ -21,7 +21,9 @@
#ifdef QT_MESSAGELOGCONTEXT
#include <QtGlobal>
-#define ASSERT(condition) if (!(condition)) qFatal("Assertion failed")
+#define ASSERT(condition) \
+ if (!(condition)) \
+ qFatal("Assertion failed")
#else // QT_MESSAGELOGCONTEXT undefined
diff --git a/Core/Instrument/ChiSquaredModule.cpp b/Core/Instrument/ChiSquaredModule.cpp
index 48b7ef7c3fa..42b7a4d94f6 100644
--- a/Core/Instrument/ChiSquaredModule.cpp
+++ b/Core/Instrument/ChiSquaredModule.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Instrument/ChiSquaredModule.h"
+#include "Core/Basics/Assert.h"
#include "Core/Instrument/IIntensityFunction.h"
#include "Core/Instrument/VarianceFunctions.h"
-#include "Core/Basics/Assert.h"
#include <cmath>
#include <limits>
diff --git a/Core/Instrument/OutputData.h b/Core/Instrument/OutputData.h
index f1ec1855f5c..1d62fd1fe03 100644
--- a/Core/Instrument/OutputData.h
+++ b/Core/Instrument/OutputData.h
@@ -15,13 +15,13 @@
#ifndef BORNAGAIN_CORE_INSTRUMENT_OUTPUTDATA_H
#define BORNAGAIN_CORE_INSTRUMENT_OUTPUTDATA_H
+#include "Core/Basics/Assert.h"
#include "Core/Binning/FixedBinAxis.h"
#include "Core/Instrument/LLData.h"
#include "Core/Instrument/OutputDataIterator.h"
#include "Core/Parametrization/ThreadInfo.h"
#include "Core/Tools/PyObject.h"
#include "Core/Tools/SafePointerVector.h"
-#include "Core/Basics/Assert.h"
#include <sstream>
using std::size_t;
diff --git a/Core/Multilayer/SampleProvider.cpp b/Core/Multilayer/SampleProvider.cpp
index 0fd0fc11664..612baba6279 100644
--- a/Core/Multilayer/SampleProvider.cpp
+++ b/Core/Multilayer/SampleProvider.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Core/Multilayer/SampleProvider.h"
-#include "Core/Multilayer/MultiLayer.h"
#include "Core/Basics/Assert.h"
+#include "Core/Multilayer/MultiLayer.h"
SampleProvider::SampleProvider() {}
diff --git a/Core/Parametrization/ParameterPool.cpp b/Core/Parametrization/ParameterPool.cpp
index ca50ffdbd28..88610abcb1b 100644
--- a/Core/Parametrization/ParameterPool.cpp
+++ b/Core/Parametrization/ParameterPool.cpp
@@ -13,12 +13,12 @@
// ************************************************************************** //
#include "Core/Parametrization/ParameterPool.h"
+#include "Core/Basics/Assert.h"
#include "Core/Basics/Exceptions.h"
#include "Core/Parametrization/RealParameter.h"
#include "Fit/Tools/RealLimits.h"
#include "Fit/Tools/StringUtils.h"
#include <algorithm>
-#include "Core/Basics/Assert.h"
#include <iostream>
#include <sstream>
#include <stdexcept>
diff --git a/Core/Tools/FileSystemUtils.cpp b/Core/Tools/FileSystemUtils.cpp
index 1d98496cfeb..041098612bd 100644
--- a/Core/Tools/FileSystemUtils.cpp
+++ b/Core/Tools/FileSystemUtils.cpp
@@ -13,9 +13,9 @@
// ************************************************************************** //
#include "Core/Tools/FileSystemUtils.h"
+#include "Core/Basics/Assert.h"
#include "Core/Basics/Exceptions.h"
#include <boost/filesystem.hpp>
-#include "Core/Basics/Assert.h"
#include <codecvt>
#include <locale>
#include <regex>
diff --git a/Fit/RootAdapter/ResidualFunctionAdapter.cpp b/Fit/RootAdapter/ResidualFunctionAdapter.cpp
index 4c492411a5c..2e6a10e4909 100644
--- a/Fit/RootAdapter/ResidualFunctionAdapter.cpp
+++ b/Fit/RootAdapter/ResidualFunctionAdapter.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "Fit/RootAdapter/ResidualFunctionAdapter.h"
-#include "Fit/RootAdapter/RootResidualFunction.h"
#include "Core/Basics/Assert.h"
+#include "Fit/RootAdapter/RootResidualFunction.h"
#include <sstream>
namespace
diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/coregui/Models/BeamDistributionItem.cpp
index 2ad4dae82ea..b1aa34820e2 100644
--- a/GUI/coregui/Models/BeamDistributionItem.cpp
+++ b/GUI/coregui/Models/BeamDistributionItem.cpp
@@ -134,7 +134,7 @@ double BeamDistributionItem::scaleFactor() const
void BeamDistributionItem::register_distribution_group(const QString& group_type)
{
ASSERT(group_type == "Distribution extended group"
- || group_type == "Symmetric distribution group");
+ || group_type == "Symmetric distribution group");
addGroupProperty(P_DISTRIBUTION, group_type);
}
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
index 6f4f259cb9f..89e9af3781c 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
@@ -13,6 +13,7 @@
// ************************************************************************** //
#include "GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h"
+#include "Core/Basics/Assert.h"
#include "GUI/coregui/Models/RealDataItem.h"
#include "GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h"
#include "GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h"
@@ -20,7 +21,6 @@
#include "GUI/coregui/Views/SpecularDataWidgets/SpecularDataWidget.h"
#include "GUI/coregui/utils/GUIHelpers.h"
#include <QAction>
-#include "Core/Basics/Assert.h"
RealDataPresenter::RealDataPresenter(QWidget* parent) : ItemComboWidget(parent)
{
diff --git a/GUI/main/MessageHandler.cpp b/GUI/main/MessageHandler.cpp
index db6b72c797c..dcb966e3885 100644
--- a/GUI/main/MessageHandler.cpp
+++ b/GUI/main/MessageHandler.cpp
@@ -13,8 +13,8 @@
// ************************************************************************** //
#include "GUI/main/MessageHandler.h"
-#include <iostream>
#include <QMessageBox>
+#include <iostream>
#ifndef QT_NO_DEBUG
#define context(ctx) " [" << ctx.function << "]"
@@ -26,37 +26,34 @@
void MessageHandler(QtMsgType type, const QMessageLogContext& ctx, const QString& msg)
{
switch (type) {
- case QtDebugMsg:
- if (!msg.size()) // KDE will pass a zero-length msg qstring
- break;
- std::cerr << "DEBUG: " << msg.toStdString() << std::endl;
- break;
- case QtInfoMsg:
- std::cerr << "INFO: " << msg.toStdString() << context(ctx) << std::endl;
- break;
- case QtWarningMsg:
- default:
- if (msg.left(4) == "QXcb")
- return;
- std::cerr << "WARNING: " << msg.toStdString() << " [" << ctx.function << "]"
- << std::endl;
- QMessageBox::warning(QApplication::activeWindow(), qAppName(), msg);
+ case QtDebugMsg:
+ if (!msg.size()) // KDE will pass a zero-length msg qstring
break;
- case QtFatalMsg:
- std::cerr << "FATAL: " << msg.toStdString() << " [" << ctx.function << "]" << std::endl;
- qApp->restoreOverrideCursor();
- QMessageBox::critical(
- QApplication::activeWindow(), qAppName(),
- "Sorry, you encountered a fatal bug.\n"
- "The application will terminate.\n"
- "Please note the following and inform the maintainers.\n\n"
- "Error:\n"
- + msg
- + "\n"
- "Context:\n"
- + ctx.function + "\n"
- );
- qApp->quit();
- exit(1);
+ std::cerr << "DEBUG: " << msg.toStdString() << std::endl;
+ break;
+ case QtInfoMsg:
+ std::cerr << "INFO: " << msg.toStdString() << context(ctx) << std::endl;
+ break;
+ case QtWarningMsg:
+ default:
+ if (msg.left(4) == "QXcb")
+ return;
+ std::cerr << "WARNING: " << msg.toStdString() << " [" << ctx.function << "]" << std::endl;
+ QMessageBox::warning(QApplication::activeWindow(), qAppName(), msg);
+ break;
+ case QtFatalMsg:
+ std::cerr << "FATAL: " << msg.toStdString() << " [" << ctx.function << "]" << std::endl;
+ qApp->restoreOverrideCursor();
+ QMessageBox::critical(QApplication::activeWindow(), qAppName(),
+ "Sorry, you encountered a fatal bug.\n"
+ "The application will terminate.\n"
+ "Please note the following and inform the maintainers.\n\n"
+ "Error:\n"
+ + msg
+ + "\n"
+ "Context:\n"
+ + ctx.function + "\n");
+ qApp->quit();
+ exit(1);
}
}
diff --git a/GUI/main/main.cpp b/GUI/main/main.cpp
index e997a45ba59..a1fa6610b1c 100644
--- a/GUI/main/main.cpp
+++ b/GUI/main/main.cpp
@@ -16,8 +16,8 @@
#include "GUI/coregui/mainwindow/SplashScreen.h"
#include "GUI/coregui/mainwindow/mainwindow.h"
#include "GUI/coregui/utils/hostosinfo.h"
-#include "GUI/main/appoptions.h"
#include "GUI/main/MessageHandler.h"
+#include "GUI/main/appoptions.h"
#include <QLocale>
#include <QMetaType>
diff --git a/Tests/Functional/Core/Consistence/compare.cpp b/Tests/Functional/Core/Consistence/compare.cpp
index f99eaf88834..10d45969c36 100644
--- a/Tests/Functional/Core/Consistence/compare.cpp
+++ b/Tests/Functional/Core/Consistence/compare.cpp
@@ -14,6 +14,7 @@
#include "BABuild.h"
#include "BATesting.h"
+#include "Core/Basics/Assert.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
@@ -22,7 +23,6 @@
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
#include "Core/Tools/FileSystemUtils.h"
-#include "Core/Basics/Assert.h"
#include <iostream>
std::unique_ptr<OutputData<double>> load(const std::string& name)
diff --git a/Tests/Functional/Core/Std/Check.cpp b/Tests/Functional/Core/Std/Check.cpp
index 6bd7c2f6fb7..713a8680c2a 100644
--- a/Tests/Functional/Core/Std/Check.cpp
+++ b/Tests/Functional/Core/Std/Check.cpp
@@ -14,6 +14,7 @@
#include "BABuild.h"
#include "BATesting.h"
+#include "Core/Basics/Assert.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
@@ -22,7 +23,6 @@
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
#include "Core/Tools/FileSystemUtils.h"
-#include "Core/Basics/Assert.h"
#include <iostream>
bool checkSimulation(const std::string& name, const Simulation& direct_simulation,
diff --git a/Tests/Functional/Fit/Minimizer/ResidualTestPlan.cpp b/Tests/Functional/Fit/Minimizer/ResidualTestPlan.cpp
index 8b0872fd82b..c972ebe2617 100644
--- a/Tests/Functional/Fit/Minimizer/ResidualTestPlan.cpp
+++ b/Tests/Functional/Fit/Minimizer/ResidualTestPlan.cpp
@@ -13,10 +13,10 @@
// ************************************************************************** //
#include "Tests/Functional/Fit/Minimizer/ResidualTestPlan.h"
+#include "Core/Basics/Assert.h"
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Kernel/Parameters.h"
#include "Fit/TestEngine/Numeric.h"
-#include "Core/Basics/Assert.h"
#include <iostream>
#include <sstream>
diff --git a/Tests/Functional/GUI/Other/SaveLoadProject.cpp b/Tests/Functional/GUI/Other/SaveLoadProject.cpp
index 0e16e77ff0f..17f81150cd4 100644
--- a/Tests/Functional/GUI/Other/SaveLoadProject.cpp
+++ b/Tests/Functional/GUI/Other/SaveLoadProject.cpp
@@ -14,6 +14,7 @@
#include "Tests/Functional/GUI/Other/SaveLoadProject.h"
#include "BATesting.h"
+#include "Core/Basics/Assert.h"
#include "Core/Multilayer/MultiLayer.h"
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/Tools/FileSystemUtils.h"
@@ -33,7 +34,6 @@
#include <QCoreApplication>
#include <QElapsedTimer>
#include <QXmlStreamWriter>
-#include "Core/Basics/Assert.h"
namespace
{
diff --git a/Tests/Functional/Python/Std/Check.cpp b/Tests/Functional/Python/Std/Check.cpp
index 87077872f03..0428d0cb642 100644
--- a/Tests/Functional/Python/Std/Check.cpp
+++ b/Tests/Functional/Python/Std/Check.cpp
@@ -14,12 +14,12 @@
#include "BABuild.h"
#include "BATesting.h"
+#include "Core/Basics/Assert.h"
#include "Core/Export/ExportToPython.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Simulation/Simulation.h"
#include "Core/Tools/FileSystemUtils.h"
-#include "Core/Basics/Assert.h"
#include <fstream>
#include <iostream>
diff --git a/Tests/Functional/Std/Run.cpp b/Tests/Functional/Std/Run.cpp
index cde2bd89ca5..8b8c32e275a 100644
--- a/Tests/Functional/Std/Run.cpp
+++ b/Tests/Functional/Std/Run.cpp
@@ -14,6 +14,7 @@
#include "BABuild.h"
#include "BATesting.h"
+#include "Core/Basics/Assert.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/IntensityDataFunctions.h"
#include "Core/Multilayer/IMultiLayerBuilder.h"
@@ -22,7 +23,6 @@
#include "Core/StandardSamples/SampleBuilderFactory.h"
#include "Core/StandardSamples/SimulationFactory.h"
#include "Core/Tools/FileSystemUtils.h"
-#include "Core/Basics/Assert.h"
#include <iostream>
// implemented differently for Core/Py/Gui tests:
diff --git a/Tests/Performance/Core/CoreIO.cpp b/Tests/Performance/Core/CoreIO.cpp
index be66e7d0b66..39183500e1a 100644
--- a/Tests/Performance/Core/CoreIO.cpp
+++ b/Tests/Performance/Core/CoreIO.cpp
@@ -12,12 +12,12 @@
//
// ************************************************************************** //
+#include "Core/Basics/Assert.h"
#include "Core/InputOutput/IntensityDataIOFactory.h"
#include "Core/Instrument/OutputData.h"
#include "Fit/TestEngine/Numeric.h"
#include "Tests/Performance/Benchmark.h"
#include <boost/format.hpp>
-#include "Core/Basics/Assert.h"
#include <iomanip>
#include <iostream>
#include <random>
--
GitLab