shiboken: Refactor copying of the MetaLang* classes

Disable copying of the base classes AbstractMetaAttributes and
AbstractMetaVariable and refactor the copy() functions of the derived
classes in terms of protected assign*() functions.

Change-Id: I6cbe1cfa02207230e914ad41dddba46c866cb689
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index d30e70c4a..31d9fa53e 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -99,6 +99,7 @@ private:
 
 class AbstractMetaAttributes
 {
+    Q_DISABLE_COPY(AbstractMetaAttributes)
     Q_GADGET
 public:
     AbstractMetaAttributes();
@@ -281,6 +282,9 @@ public:
         return m_doc;
     }
 
+protected:
+    void assignMetaAttributes(const AbstractMetaAttributes &other);
+
 private:
     Attributes m_attributes;
     Attributes m_originalAttributes;
@@ -632,9 +636,9 @@ QDebug operator<<(QDebug d, const AbstractMetaType *at);
 
 class AbstractMetaVariable
 {
+    Q_DISABLE_COPY(AbstractMetaVariable)
 public:
     AbstractMetaVariable();
-    AbstractMetaVariable(const AbstractMetaVariable &other);
 
     virtual ~AbstractMetaVariable();
 
@@ -684,6 +688,9 @@ public:
         return m_doc;
     }
 
+protected:
+    void assignMetaVariable(const AbstractMetaVariable &other);
+
 private:
     QString m_originalName;
     QString m_name;
@@ -736,6 +743,10 @@ public:
     }
 
     AbstractMetaArgument *copy() const;
+
+protected:
+    void assignMetaArgument(const AbstractMetaArgument &other);
+
 private:
     QString m_expression;
     QString m_originalExpression;