Revert copy method

Author: YuriUfimtsev

generator/abstractmetabuilder.cpp

@@ -1936,15 +1936,16 @@ bool AbstractMetaBuilder::isEnum(const QStringList &qualified_name)
     return item && item->kind() == _EnumModelItem::__node_kind;
 }
 
-AbstractMetaType::shared_pointer AbstractMetaBuilder::inheritTemplateType(const QList<AbstractMetaType::shared_pointer> &template_types,
+AbstractMetaType::shared_pointer AbstractMetaBuilder::inheritTemplateType(
+                                                const QList<AbstractMetaType::shared_pointer> &template_types,
                                                    AbstractMetaType::shared_pointer meta_type, bool *ok)
 {
     if (ok != 0)
         *ok = true;
     if (!meta_type || (!meta_type->typeEntry()->isTemplateArgument() && !meta_type->hasInstantiations()))
-        return meta_type ? meta_type : 0;
+        return meta_type ? meta_type->copy() : 0;
 
-    AbstractMetaType::shared_pointer returned = meta_type;
+    AbstractMetaType::shared_pointer returned = meta_type->copy();
     returned->setOriginalTemplateType(meta_type);
 
     if (returned->typeEntry()->isTemplateArgument()) {
@@ -1958,7 +1959,7 @@ AbstractMetaType::shared_pointer AbstractMetaBuilder::inheritTemplateType(const
             return 0;
         }
 
-        AbstractMetaType::shared_pointer t = returned;
+        AbstractMetaType::shared_pointer t = returned->copy();
         t->setTypeEntry(template_types.at(tae->ordinal())->typeEntry());
         t->setIndirections(template_types.at(tae->ordinal())->indirections() + t->indirections()
                            ? 1

generator/abstractmetalang.cpp

@@ -47,6 +47,26 @@
 /*******************************************************************************
  * AbstractMetaType
  */
+AbstractMetaType::shared_pointer AbstractMetaType::copy() const
+{
+    AbstractMetaType *cpy = new AbstractMetaType;
+
+    cpy->setTypeUsagePattern(typeUsagePattern());
+    cpy->setConstant(isConstant());
+    cpy->setReference(isReference());
+    cpy->setIndirections(indirections());
+    cpy->setInstantiations(instantiations());
+    cpy->setArrayElementCount(arrayElementCount());
+    cpy->setOriginalTypeDescription(originalTypeDescription());
+    cpy->setOriginalTemplateType(originalTemplateType() ? originalTemplateType()->copy() : 0);
+
+    cpy->setArrayElementType(arrayElementType() ? arrayElementType()->copy() : 0);
+
+    cpy->setTypeEntry(typeEntry());
+
+    return AbstractMetaType::shared_pointer(cpy);
+}
+
 QString AbstractMetaType::cppSignature() const
 {
     QString s;

generator/abstractmetalang.h

@@ -280,6 +280,8 @@ class AbstractMetaType
 
     QString cppSignature() const;
 
+    AbstractMetaType::shared_pointer copy() const;
+
     const TypeEntry *typeEntry() const { return m_type_entry; }
     void setTypeEntry(const TypeEntry *type) { m_type_entry = type; }