1 files changed, 8 insertions, 22 deletions

diff --git a/src/uml/qumlassociationclass.cpp b/src/uml/qumlassociationclass.cpp
index 333a8f7c..f76d8be3 100644
--- a/src/uml/qumlassociationclass.cpp
+++ b/src/uml/qumlassociationclass.cpp
@@ -100,6 +100,14 @@ QUmlAssociationClass::QUmlAssociationClass(bool createQModelingObject) :
 }
 
 /*!
+    Destroys the QUmlAssociationClass.
+ */
+QUmlAssociationClass::~QUmlAssociationClass()
+{
+    QModelingElement::deleteQModelingObject();
+}
+
+/*!
     Returns a deep-copied clone of the QUmlAssociationClass.
 */
 QModelingElement *QUmlAssociationClass::clone() const
@@ -107,8 +115,6 @@ QModelingElement *QUmlAssociationClass::clone() const
     QUmlAssociationClass *c = new QUmlAssociationClass;
     foreach (QUmlComment *element, ownedComments())
         c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone()));
-    foreach (QUmlDependency *element, clientDependencies())
-        c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone()));
     c->setName(name());
     if (nameExpression())
         c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone()));
@@ -118,11 +124,7 @@ QModelingElement *QUmlAssociationClass::clone() const
         c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone()));
     foreach (QUmlPackageImport *element, packageImports())
         c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone()));
-    if (owningTemplateParameter())
-        c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone()));
     c->setVisibility(visibility());
-    if (package())
-        c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone()));
     c->setLeaf(isLeaf());
     foreach (QUmlTemplateBinding *element, templateBindings())
         c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone()));
@@ -135,22 +137,10 @@ QModelingElement *QUmlAssociationClass::clone() const
         c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone()));
     foreach (QUmlUseCase *element, ownedUseCases())
         c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone()));
-    foreach (QUmlGeneralizationSet *element, powertypeExtents())
-        c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone()));
-    foreach (QUmlClassifier *element, redefinedClassifiers())
-        c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone()));
-    if (representation())
-        c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone()));
     foreach (QUmlSubstitution *element, substitutions())
         c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone()));
-    if (templateParameter())
-        c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone()));
-    foreach (QUmlUseCase *element, useCases())
-        c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone()));
     foreach (QUmlConnector *element, ownedConnectors())
         c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone()));
-    if (classifierBehavior())
-        c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone()));
     foreach (QUmlInterfaceRealization *element, interfaceRealizations())
         c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone()));
     foreach (QUmlBehavior *element, ownedBehaviors())
@@ -166,10 +156,6 @@ QModelingElement *QUmlAssociationClass::clone() const
     foreach (QUmlReception *element, ownedReceptions())
         c->addOwnedReception(dynamic_cast<QUmlReception *>(element->clone()));
     c->setDerived(isDerived());
-    foreach (QUmlProperty *element, memberEnds())
-        c->addMemberEnd(dynamic_cast<QUmlProperty *>(element->clone()));
-    foreach (QUmlProperty *element, navigableOwnedEnds())
-        c->addNavigableOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone()));
     foreach (QUmlProperty *element, ownedEnds())
         c->addOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone()));
     return c;