From c62abd76e640d30d0778c78eadd7c2fc44cc1ab9 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 16 May 2024 12:09:32 +0200
Subject: [PATCH] Scale, Coord pass string and vector args the normal way
(#963)
---
Base/Axis/Coordinate.cpp | 6 +++---
Base/Axis/Coordinate.h | 2 +-
Base/Axis/Scale.cpp | 4 ++--
Base/Axis/Scale.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Base/Axis/Coordinate.cpp b/Base/Axis/Coordinate.cpp
index 945c61099b8..33f73c14991 100644
--- a/Base/Axis/Coordinate.cpp
+++ b/Base/Axis/Coordinate.cpp
@@ -38,9 +38,9 @@ std::pair<std::string, std::string> parse_label(const std::string& label)
} // namespace
-Coordinate::Coordinate(std::string name, std::string unit)
- : m_name(std::move(name))
- , m_unit(std::move(unit))
+Coordinate::Coordinate(const std::string& name, const std::string& unit)
+ : m_name(name)
+ , m_unit(unit)
{
}
diff --git a/Base/Axis/Coordinate.h b/Base/Axis/Coordinate.h
index f569dc5693b..3bd802836de 100644
--- a/Base/Axis/Coordinate.h
+++ b/Base/Axis/Coordinate.h
@@ -26,7 +26,7 @@ public:
{
}
Coordinate(const std::string& label);
- Coordinate(std::string name, std::string unit);
+ Coordinate(const std::string& name, const std::string& unit);
bool operator==(const Coordinate& other) const = default;
diff --git a/Base/Axis/Scale.cpp b/Base/Axis/Scale.cpp
index 5aee9bd7703..e64ad552525 100644
--- a/Base/Axis/Scale.cpp
+++ b/Base/Axis/Scale.cpp
@@ -24,8 +24,8 @@
using std::numbers::pi;
-Scale::Scale(const Coordinate& coord, std::vector<Bin1D> bins)
- : m_bins(std::move(bins))
+Scale::Scale(const Coordinate& coord, const std::vector<Bin1D>& bins)
+ : m_bins(bins)
, m_coord(std::make_unique<Coordinate>(coord))
{
if (size() == 0)
diff --git a/Base/Axis/Scale.h b/Base/Axis/Scale.h
index 2516940455a..d6c3a00eab6 100644
--- a/Base/Axis/Scale.h
+++ b/Base/Axis/Scale.h
@@ -29,7 +29,7 @@ using trafo_t = std::function<double(double)>;
class Scale {
public:
- Scale(const Coordinate& coord, std::vector<Bin1D> bins);
+ Scale(const Coordinate& coord, const std::vector<Bin1D>& bins);
Scale(const Scale& other);
Scale* clone() const;
--
GitLab