From 244d7aae4168d320f93b1bfdebd0d2b7dc941ac5 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 27 Jul 2020 14:39:14 +0200 Subject: [PATCH] LGTM: [skip ci] fix: Inconsistent definition of copy constructor and assignment ('Rule of Two') --- src/App/DocumentObserver.cpp | 5 +++++ src/App/DocumentObserver.h | 2 ++ src/Gui/DocumentObserver.cpp | 11 +++++++++++ src/Gui/DocumentObserver.h | 4 ++++ src/Gui/SpaceballEvent.cpp | 26 ++++++++++++++++++++++++++ src/Gui/SpaceballEvent.h | 2 ++ src/Mod/Part/App/GeometryExtension.h | 1 + 7 files changed, 51 insertions(+) diff --git a/src/App/DocumentObserver.cpp b/src/App/DocumentObserver.cpp index 165a4f62e1..5c4f5a9d1a 100644 --- a/src/App/DocumentObserver.cpp +++ b/src/App/DocumentObserver.cpp @@ -55,6 +55,11 @@ DocumentT::DocumentT(const std::string& name) document = name; } +DocumentT::DocumentT(const DocumentT& doc) +{ + document = doc.document; +} + DocumentT::~DocumentT() { } diff --git a/src/App/DocumentObserver.h b/src/App/DocumentObserver.h index 3fa6329dc2..2b79752fed 100644 --- a/src/App/DocumentObserver.h +++ b/src/App/DocumentObserver.h @@ -51,6 +51,8 @@ public: DocumentT(Document*); /*! Constructor */ DocumentT(const std::string&); + /*! Constructor */ + DocumentT(const DocumentT&); /*! Destructor */ ~DocumentT(); /*! Assignment operator */ diff --git a/src/Gui/DocumentObserver.cpp b/src/Gui/DocumentObserver.cpp index a4e519a5b8..6959f94b70 100644 --- a/src/Gui/DocumentObserver.cpp +++ b/src/Gui/DocumentObserver.cpp @@ -52,6 +52,11 @@ DocumentT::DocumentT(const std::string& name) document = name; } +DocumentT::DocumentT(const DocumentT& doc) +{ + document = doc.document; +} + DocumentT::~DocumentT() { } @@ -125,6 +130,12 @@ ViewProviderT::ViewProviderT(ViewProviderDocumentObject* obj) document = obj->getObject()->getDocument()->getName(); } +ViewProviderT::ViewProviderT(const ViewProviderT& vp) +{ + object = vp.object; + document = vp.document; +} + ViewProviderT::~ViewProviderT() { } diff --git a/src/Gui/DocumentObserver.h b/src/Gui/DocumentObserver.h index c25d8841dc..d09ea3c382 100644 --- a/src/Gui/DocumentObserver.h +++ b/src/Gui/DocumentObserver.h @@ -49,6 +49,8 @@ public: DocumentT(Document*); /*! Constructor */ DocumentT(const std::string&); + /*! Constructor */ + DocumentT(const DocumentT&); /*! Destructor */ ~DocumentT(); /*! Assignment operator */ @@ -85,6 +87,8 @@ public: ViewProviderT(); /*! Constructor */ ViewProviderT(ViewProviderDocumentObject*); + /*! Constructor */ + ViewProviderT(const ViewProviderT&); /*! Destructor */ ~ViewProviderT(); /*! Assignment operator */ diff --git a/src/Gui/SpaceballEvent.cpp b/src/Gui/SpaceballEvent.cpp index d420dd434e..758367e5f7 100644 --- a/src/Gui/SpaceballEvent.cpp +++ b/src/Gui/SpaceballEvent.cpp @@ -50,6 +50,21 @@ MotionEvent::MotionEvent(const MotionEvent& in) : EventBase(static_cast