1 files changed, 8 insertions, 28 deletions

diff --git a/src/uml/qumlinteraction.cpp b/src/uml/qumlinteraction.cpp
index be385b76..8395d373 100644
--- a/src/uml/qumlinteraction.cpp
+++ b/src/uml/qumlinteraction.cpp
@@ -108,6 +108,14 @@ QUmlInteraction::QUmlInteraction(bool createQModelingObject)
 }
 
 /*!
+    Destroys the QUmlInteraction.
+ */
+QUmlInteraction::~QUmlInteraction()
+{
+    QModelingElement::deleteQModelingObject();
+}
+
+/*!
     Returns a deep-copied clone of the QUmlInteraction.
 */
 QModelingElement *QUmlInteraction::clone() const
@@ -115,8 +123,6 @@ QModelingElement *QUmlInteraction::clone() const
     QUmlInteraction *c = new QUmlInteraction;
     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()));
@@ -126,11 +132,7 @@ QModelingElement *QUmlInteraction::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()));
@@ -143,22 +145,10 @@ QModelingElement *QUmlInteraction::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())
@@ -182,16 +172,6 @@ QModelingElement *QUmlInteraction::clone() const
         c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone()));
     foreach (QUmlConstraint *element, preconditions())
         c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone()));
-    foreach (QUmlBehavior *element, redefinedBehaviors())
-        c->addRedefinedBehavior(dynamic_cast<QUmlBehavior *>(element->clone()));
-    if (specification())
-        c->setSpecification(dynamic_cast<QUmlBehavioralFeature *>(specification()->clone()));
-    foreach (QUmlLifeline *element, covered())
-        c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone()));
-    if (enclosingInteraction())
-        c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone()));
-    if (enclosingOperand())
-        c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone()));
     foreach (QUmlGeneralOrdering *element, generalOrderings())
         c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone()));
     foreach (QUmlAction *element, actions())