From 3f25a71ebdc121c35616c8ba32d03df049a3f1d9 Mon Sep 17 00:00:00 2001
From: schroedtert <t.schroedter@fz-juelich.de>
Date: Mon, 10 Jan 2022 11:58:00 +0100
Subject: [PATCH] Apply rule of five to fix deprecation warning
Signed-off-by: schroedtert <t.schroedter@fz-juelich.de>
---
include/ellipse.h | 6 +++++-
include/vector.h | 6 +++++-
src/qtColorTriangle.cpp | 4 ++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/include/ellipse.h b/include/ellipse.h
index d4cd1a5c3..21b89775d 100644
--- a/include/ellipse.h
+++ b/include/ellipse.h
@@ -42,7 +42,11 @@ public:
MyEllipse();
MyEllipse(double x, double y, double r1, double r2, double angle);
MyEllipse(QPointF center, QSizeF size, double angle);
- MyEllipse(const MyEllipse &ellipse) = default;
+ MyEllipse(const MyEllipse &c) = default;
+ MyEllipse(MyEllipse &&c) = default;
+ MyEllipse &operator=(const MyEllipse &c) = default;
+ MyEllipse &operator=(MyEllipse &&c) = default;
+ ~MyEllipse() = default;
Vec2F center() const;
QSizeF size() const;
diff --git a/include/vector.h b/include/vector.h
index e93697701..d04674983 100644
--- a/include/vector.h
+++ b/include/vector.h
@@ -122,11 +122,15 @@ protected:
public:
Vec2F();
Vec2F(double x, double y);
- Vec2F(const Vec2F &v) = default;
Vec2F(const QPointF &v);
Vec2F(const cv::Point2f &p);
Vec2F(const CvPoint *v);
Vec2F(const CvPoint2D32f *v);
+ Vec2F(const Vec2F &c) = default;
+ Vec2F(Vec2F &&c) = default;
+ Vec2F &operator=(const Vec2F &c) = default;
+ Vec2F &operator=(Vec2F &&c) = default;
+ ~Vec2F() = default;
cv::Point toCvPoint() const;
CvPoint2D32f toCvPoint2D32f() const;
diff --git a/src/qtColorTriangle.cpp b/src/qtColorTriangle.cpp
index e9039245d..591b773d2 100644
--- a/src/qtColorTriangle.cpp
+++ b/src/qtColorTriangle.cpp
@@ -104,6 +104,10 @@ struct DoubleColor
DoubleColor() : r(0.0), g(0.0), b(0.0) {}
DoubleColor(double red, double green, double blue) : r(red), g(green), b(blue) {}
DoubleColor(const DoubleColor &c) = default;
+ DoubleColor(DoubleColor &&c) = default;
+ DoubleColor &operator=(const DoubleColor &c) = default;
+ DoubleColor &operator=(DoubleColor &&c) = default;
+ ~DoubleColor() = default;
};
/*
--
GitLab