From 898c767de2db71b17653aaa2e84387d355d7bd2c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 19 May 2022 15:46:42 +0200
Subject: [PATCH] clang-format
---
Device/Coord/CoordSystem1D.cpp | 4 ++--
Device/Coord/ICoordSystem.cpp | 4 ++--
Device/Data/LLData.h | 3 +--
Fit/Adapter/MinimizerAdapter.cpp | 3 +--
GUI/Support/IO/IOUtils.cpp | 2 +-
GUI/View/Loaders/QREDataLoader.cpp | 4 ++--
GUI/View/Loaders/QREDataLoader.h | 2 +-
7 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Device/Coord/CoordSystem1D.cpp b/Device/Coord/CoordSystem1D.cpp
index 0ca9a27cc24..79493314f2a 100644
--- a/Device/Coord/CoordSystem1D.cpp
+++ b/Device/Coord/CoordSystem1D.cpp
@@ -121,8 +121,8 @@ IAxis* CoordSystem1D::createConvertedAxis(size_t i_axis, Coords units) const
return new PointwiseAxis(axisName(0, units), coords);
}
-Powerfield<double>*
-CoordSystem1D::createConvertedData(const Powerfield<double>& data, Coords units) const
+Powerfield<double>* CoordSystem1D::createConvertedData(const Powerfield<double>& data,
+ Coords units) const
{
ASSERT(data.rank() == 1);
diff --git a/Device/Coord/ICoordSystem.cpp b/Device/Coord/ICoordSystem.cpp
index a56d8a5db1d..2a60be6f36e 100644
--- a/Device/Coord/ICoordSystem.cpp
+++ b/Device/Coord/ICoordSystem.cpp
@@ -41,8 +41,8 @@ std::string ICoordSystem::axisName(size_t i_axis, const Coords units) const
return it->second;
}
-Powerfield<double>*
-ICoordSystem::createConvertedData(const Powerfield<double>& data, Coords units) const
+Powerfield<double>* ICoordSystem::createConvertedData(const Powerfield<double>& data,
+ Coords units) const
{
std::vector<IAxis*> axes;
for (size_t i = 0; i < rank(); ++i)
diff --git a/Device/Data/LLData.h b/Device/Data/LLData.h
index 5fc3d88468b..c7c4557c879 100644
--- a/Device/Data/LLData.h
+++ b/Device/Data/LLData.h
@@ -242,8 +242,7 @@ void LLData<T>::clear()
template <class T>
inline bool LLData<T>::checkSizes(size_t rank, const int* sizes) const
{
- return std::all_of(sizes, sizes + rank,
- [](const int& dim) -> bool { return dim > 0; });
+ return std::all_of(sizes, sizes + rank, [](const int& dim) -> bool { return dim > 0; });
}
template <class T>
diff --git a/Fit/Adapter/MinimizerAdapter.cpp b/Fit/Adapter/MinimizerAdapter.cpp
index 2cabe7c02cf..eb2f902ff3b 100644
--- a/Fit/Adapter/MinimizerAdapter.cpp
+++ b/Fit/Adapter/MinimizerAdapter.cpp
@@ -199,8 +199,7 @@ std::vector<double> MinimizerAdapter::parErrorsAtMinimum() const
std::vector<double> result;
result.resize(fitRank(), 0.0);
if (rootMinimizer()->Errors() != nullptr) {
- std::copy(rootMinimizer()->Errors(), rootMinimizer()->Errors() + fitRank(),
- result.begin());
+ std::copy(rootMinimizer()->Errors(), rootMinimizer()->Errors() + fitRank(), result.begin());
}
return result;
}
diff --git a/GUI/Support/IO/IOUtils.cpp b/GUI/Support/IO/IOUtils.cpp
index a3684388ab8..1f77e2b6f4a 100644
--- a/GUI/Support/IO/IOUtils.cpp
+++ b/GUI/Support/IO/IOUtils.cpp
@@ -19,7 +19,7 @@
std::unique_ptr<Powerfield<double>> GUI::Util::IO::binifyAxes(const Powerfield<double>& data)
{
std::vector<IAxis*> axes;
- for (size_t i=0; i<data.rank(); ++i)
+ for (size_t i = 0; i < data.rank(); ++i)
axes.emplace_back(data.axis(i).clone());
auto result = std::make_unique<Powerfield<double>>(axes);
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index 0310bc9a1b0..a180bcbc899 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -262,7 +262,7 @@ void QREDataLoader::processContents()
if (creationOfPowerfieldIsNecessary) {
try {
- createPowerfieldFromParsingResult(m_item);
+ powerfieldFromParsingResult(m_item);
} catch (...) {
m_importResult.error = "Import not successful - caught an exception.";
invalidateItemData();
@@ -518,7 +518,7 @@ void QREDataLoader::calculateFromParseResult() const
}
}
-void QREDataLoader::createPowerfieldFromParsingResult(RealDataItem* item) const
+void QREDataLoader::powerfieldFromParsingResult(RealDataItem* item) const
{
// create data sorted by ascending Q values.
// For this, the line numbers are sorted by Q
diff --git a/GUI/View/Loaders/QREDataLoader.h b/GUI/View/Loaders/QREDataLoader.h
index 89f355c9729..e865e49f939 100644
--- a/GUI/View/Loaders/QREDataLoader.h
+++ b/GUI/View/Loaders/QREDataLoader.h
@@ -49,7 +49,7 @@ public:
private:
void parseFileContent() const;
void calculateFromParseResult() const;
- void createPowerfieldFromParsingResult(RealDataItem* item) const;
+ void powerfieldFromParsingResult(RealDataItem* item) const;
private:
enum class UnitInFile { none, perNanoMeter, perAngstrom, other };
--
GitLab