From f68421a53f9040b71c4b17f52e3d14a5425a52bf Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Sat, 20 May 2023 00:42:28 +0200 Subject: [PATCH] QmlDesigner: Add move contructors Because of adding a default destructor is removing the move construtor we add default move contructor. Change-Id: Ic253e3173956389b11c0aa04204ea27f00c0e9b3 Reviewed-by: Thomas Hartmann Reviewed-by: --- .../qmldesigner/designercore/include/abstractproperty.h | 4 ++++ src/plugins/qmldesigner/designercore/include/modelnode.h | 4 ++++ .../qmldesigner/designercore/include/qmlmodelnodefacade.h | 1 - .../qmldesigner/designercore/model/qmlmodelnodefacade.cpp | 2 -- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h index 7b5c6ccf68d..c22402202d8 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h @@ -50,6 +50,10 @@ class QMLDESIGNERCORE_EXPORT AbstractProperty public: AbstractProperty() = default; + AbstractProperty(const AbstractProperty &) = default; + AbstractProperty &operator=(const AbstractProperty &) = default; + AbstractProperty(AbstractProperty &&) = default; + AbstractProperty &operator=(AbstractProperty &&) noexcept = default; ~AbstractProperty(); AbstractProperty(const AbstractProperty &property, AbstractView *view); diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index a48713ee864..685b900cb0b 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -80,6 +80,10 @@ public: ModelNode(); ModelNode(const Internal::InternalNodePointer &internalNode, Model *model, const AbstractView *view); ModelNode(const ModelNode &modelNode, AbstractView *view); + ModelNode(const ModelNode &) = default; + ModelNode &operator=(const ModelNode &) = default; + ModelNode(ModelNode &&) = default; + ModelNode &operator=(ModelNode &&) noexcept = default; ~ModelNode(); TypeName type() const; diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h index 9c63fd040a2..e76b5893792 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h +++ b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h @@ -20,7 +20,6 @@ public: static bool isValidQmlModelNodeFacade(const ModelNode &modelNode); virtual bool isValid() const; explicit operator bool() const { return isValid(); } - virtual ~QmlModelNodeFacade(); QmlModelNodeFacade() = default; AbstractView *view() const; diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp index 47699eae468..7e3bc793247 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp @@ -29,8 +29,6 @@ const NodeInstanceView *QmlModelNodeFacade::nodeInstanceView() const return nodeInstanceView(m_modelNode); } -QmlModelNodeFacade::~QmlModelNodeFacade() = default; - bool QmlModelNodeFacade::hasModelNode() const { return m_modelNode.isValid();