Move QModelingElement and QModelingObject removal to base classes

Change-Id: I48fbd0e1c63e5627137b00a26fcbe7ea82eaa78f
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

4 files changed, 1 insertions, 26 deletions

diff --git a/scripts/templates/qclass.cpp b/scripts/templates/qclass.cpp
index 3b9d5429..706f7aca 100644
--- a/scripts/templates/qclass.cpp
+++ b/scripts/templates/qclass.cpp
@@ -123,17 +123,6 @@ Q${namespace}${className}::Q${namespace}${className}([%- IF class.findvalue("@is
 [%- END %]
 }
 
-Q${namespace}${className}::~Q${namespace}${className}()
-{
-[%- IF class.findvalue("@isAbstract") != "true" %]
-    if (!deletingFromQModelingObject) {
-        if (_qModelingObject)
-            _qModelingObject->setProperty("deletingFromModelingObject", true);
-        delete _qModelingObject;
-    }
-[%- END %]
-}
-
 QModelingElement *Q${namespace}${className}::clone() const
 {
     Q${namespace}${className} *c = new Q${namespace}${className};
diff --git a/scripts/templates/qclass.h b/scripts/templates/qclass.h
index f725a0ed..b75f0e8e 100644
--- a/scripts/templates/qclass.h
+++ b/scripts/templates/qclass.h
@@ -94,9 +94,8 @@ public QModelingElement
 public:
 [%- IF class.findvalue("@isAbstract") != "true" %]
     explicit Q${namespace}${className}(bool createQModelingObject = true);
-[%- END %]
-    virtual ~Q${namespace}${className}();
 
+[%- END %]
     [% IF class.findvalue("@isAbstract") == "true" %]Q_DECL_HIDDEN [% END %]virtual QModelingElement *clone() const;
 [% FOREACH attribute = class.findnodes("ownedAttribute") -%]
     [%- IF loop.first %]
diff --git a/scripts/templates/qobjectclass.cpp b/scripts/templates/qobjectclass.cpp
index aa9f5a4e..96d4aa60 100644
--- a/scripts/templates/qobjectclass.cpp
+++ b/scripts/templates/qobjectclass.cpp
@@ -61,16 +61,6 @@ Q${namespace}${className}Object::Q${namespace}${className}Object(Q${namespace}${
     setPropertyData();
 }
 
-[%- IF class.findvalue("@isAbstract") != "true" %]
-Q${namespace}${className}Object::~Q${namespace}${className}Object()
-{
-    if (!property("deletingFromModelingObject").isValid()) {
-        qmodelingelementproperty_cast<Q${namespace}${className} *>(this)->deletingFromQModelingObject = true;
-        delete qmodelingelementproperty_cast<QUmlComment *>(this);
-    }
-}
-
-[%- END %]
 [%- SET originalClassName = class.findvalue("@name") -%]
 [%- visitedClasses = [] -%]
 [%- redefinedProperties = [] -%]
diff --git a/scripts/templates/qobjectclass_p.h b/scripts/templates/qobjectclass_p.h
index e2956b0f..7d146db9 100644
--- a/scripts/templates/qobjectclass_p.h
+++ b/scripts/templates/qobjectclass_p.h
@@ -74,9 +74,6 @@ class Q_${namespace.upper}_EXPORT Q${namespace}${className}Object : public QMode
 
 public:
     [% IF class.findvalue("@isAbstract") == "true" %]Q_DECL_HIDDEN [% ELSE %]Q_INVOKABLE [% END %]explicit Q${namespace}${className}Object(Q${namespace}${className} *modelingElement);
-    [%- IF class.findvalue("@isAbstract") != "true" %]
-    virtual ~Q${namespace}${className}Object();
-    [%- END %]
 [%- visitedClasses = [] -%]
 [%- GENERATE_ATTRIBUTES(class, visitedClasses, redefinedProperties) -%]
 [%- visitedClasses = [] -%]