From 6132cb5af2fc146c8931bd8a5fa25cfbca597c74 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 12 Nov 2021 08:29:57 +0100
Subject: [PATCH] .clang-tidy
---
.clang-tidy | 5 +++++
GUI/Model/From/FromDomain.cpp | 6 +++---
GUI/View/Intensity/Plot1D.cpp | 2 +-
Tests/Unit/Core/SimDataPairTest.cpp | 4 ++--
Tests/Unit/Core/SimulationResultTest.cpp | 10 ----------
5 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index 21b1a8391a1..01d514dcf04 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -53,6 +53,7 @@ Checks: '*,
-google-readability-casting,
-google-readability-todo,
-google-runtime-int,
+-hicpp-exception-baseclass,
-hicpp-signed-bitwise,
-hicpp-vararg,
-llvmlibc-callee-namespace,
@@ -91,12 +92,14 @@ Checks: '*,
-*avoid-c-arrays,
-*narrowing-conversions,
-cppcoreguidelines-owning-memory,
+-bugprone-unused-return-value,
-SectionComment_Temporarily_disabled_checks__To_be_resolved_soon,
-*use-auto,
-*move-const-arg,
+-*-use-emplace,
-*use-equals-default,
-*use-nullptr,
-*use-override,
@@ -115,6 +118,7 @@ Checks: '*,
-llvm-qualified-auto,
-misc-non-private-member-variables-in-classes,
-misc-uniqueptr-reset-release,
+-modernize-avoid-bind,
-modernize-loop-convert,
-modernize-make-unique,
-modernize-pass-by-value,
@@ -134,6 +138,7 @@ Checks: '*,
-SectionComment_Temporarily_disabled_checks__We_need_to_investigate_them_one_by_one,
+-bugprone-exception-escape,
-bugprone-misplaced-widening-cast,
'
diff --git a/GUI/Model/From/FromDomain.cpp b/GUI/Model/From/FromDomain.cpp
index 141a3a7a593..bbe77913987 100644
--- a/GUI/Model/From/FromDomain.cpp
+++ b/GUI/Model/From/FromDomain.cpp
@@ -424,7 +424,7 @@ void GUI::Transform::FromDomain::setGISASBeamItem(BeamItem* beam_item,
const GISASSimulation& simulation)
{
ASSERT(beam_item);
- Beam beam = simulation.beam();
+ const Beam& beam = simulation.beam();
beam_item->setIntensity(beam.intensity());
beam_item->setWavelength(beam.wavelength());
@@ -432,7 +432,7 @@ void GUI::Transform::FromDomain::setGISASBeamItem(BeamItem* beam_item,
beam_item->setAzimuthalAngle(Units::rad2deg(beam.direction().phi()));
// distribution parameters
- const std::vector<ParameterDistribution> distributions = simulation.getDistributions();
+ const std::vector<ParameterDistribution>& distributions = simulation.getDistributions();
for (size_t i = 0; i < distributions.size(); ++i) {
// try all, one will have the right 'whichParameter'
addDistributionToBeamItem(ParameterDistribution::BeamWavelength,
@@ -447,7 +447,7 @@ void GUI::Transform::FromDomain::setGISASBeamItem(BeamItem* beam_item,
void GUI::Transform::FromDomain::setOffSpecularBeamItem(BeamItem* beam_item,
const OffSpecularSimulation& simulation)
{
- Beam beam = simulation.beam();
+ const Beam& beam = simulation.beam();
beam_item->setIntensity(beam.intensity());
beam_item->setWavelength(beam.wavelength());
diff --git a/GUI/View/Intensity/Plot1D.cpp b/GUI/View/Intensity/Plot1D.cpp
index 3c02dbbf06b..acdbd6f9b9b 100644
--- a/GUI/View/Intensity/Plot1D.cpp
+++ b/GUI/View/Intensity/Plot1D.cpp
@@ -248,7 +248,7 @@ void Plot1D::updateGraph(Data1DProperties* item)
auto data_points = viewItem()->graphData(item);
auto graph = m_graph_map.at(item);
- graph->setData(data_points.first, data_points.second, /*sorted =*/true);
+ graph->setData(data_points.first, data_points.second, /*alreadySorted =*/true);
}
Data1DViewItem* Plot1D::viewItem()
diff --git a/Tests/Unit/Core/SimDataPairTest.cpp b/Tests/Unit/Core/SimDataPairTest.cpp
index a0a86eb4442..a850b2f9bd6 100644
--- a/Tests/Unit/Core/SimDataPairTest.cpp
+++ b/Tests/Unit/Core/SimDataPairTest.cpp
@@ -35,7 +35,7 @@ TEST_F(SimDataPairTest, standardPair)
// checking arrays
auto array = obj.simulation_array();
- EXPECT_DOUBLE_EQ(std::accumulate(array.begin(), array.end(), 0), 0.0);
+ EXPECT_DOUBLE_EQ(std::accumulate(array.begin(), array.end(), 0.), 0.);
array = obj.experimental_array();
// calling builder second time
@@ -44,7 +44,7 @@ TEST_F(SimDataPairTest, standardPair)
// checking arrays
array = obj.simulation_array();
- EXPECT_DOUBLE_EQ(std::accumulate(array.begin(), array.end(), 0), 0.0);
+ EXPECT_DOUBLE_EQ(std::accumulate(array.begin(), array.end(), 0.), 0.);
array = obj.experimental_array();
}
diff --git a/Tests/Unit/Core/SimulationResultTest.cpp b/Tests/Unit/Core/SimulationResultTest.cpp
index 42cdad2de5f..b904e68e9b2 100644
--- a/Tests/Unit/Core/SimulationResultTest.cpp
+++ b/Tests/Unit/Core/SimulationResultTest.cpp
@@ -6,16 +6,6 @@
class SimulationResultTest : public ::testing::Test {
};
-TEST_F(SimulationResultTest, initialState)
-{
- SimulationResult simres;
-
- SimulationResult other;
- EXPECT_THROW(other = simres, std::runtime_error);
-
- EXPECT_THROW(SimulationResult another(other), std::runtime_error);
-}
-
TEST_F(SimulationResultTest, accessToEmptySimulation)
{
const int nx(5), ny(4);
--
GitLab