[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

bug fix: free connections to parent object of ownedcodeblock were not being made completely in some situations


  M +3 -1      codeaccessormethod.cpp   1.7
  M +4 -1      codeclassfielddeclarationblock.cpp   1.6
  M +3 -1      codemethodblock.cpp   1.8
  M +3 -2      ownedhierarchicalcodeblock.cpp   1.5


--- kdesdk/umbrello/umbrello/codeaccessormethod.cpp  #1.6:1.7
@@ -33,5 +33,7 @@ CodeAccessorMethod::CodeAccessorMethod (
 }
 
-CodeAccessorMethod::~CodeAccessorMethod ( ) { }
+CodeAccessorMethod::~CodeAccessorMethod ( ) { 
+        m_parentclassfield->disconnect(this);
+}
 
 //  

--- kdesdk/umbrello/umbrello/codeclassfielddeclarationblock.cpp  #1.5:1.6
@@ -32,5 +32,8 @@ CodeClassFieldDeclarationBlock::CodeClas
 }
 
-CodeClassFieldDeclarationBlock::~CodeClassFieldDeclarationBlock ( ) { }
+CodeClassFieldDeclarationBlock::~CodeClassFieldDeclarationBlock ( ) { 
+        m_parentclassfield->getParentObject()->disconnect();
+        m_parentclassfield->disconnect();
+}
 
 //  

--- kdesdk/umbrello/umbrello/codemethodblock.cpp  #1.7:1.8
@@ -31,5 +31,7 @@ CodeMethodBlock::CodeMethodBlock ( Class
 }
 
-CodeMethodBlock::~CodeMethodBlock ( ) { }
+CodeMethodBlock::~CodeMethodBlock ( ) { 
+        ((ClassifierCodeDocument *) getParentDocument())->getParentClassifier()->disconnect();
+}
 
 //  

--- kdesdk/umbrello/umbrello/ownedhierarchicalcodeblock.cpp  #1.4:1.5
@@ -32,5 +32,7 @@ OwnedHierarchicalCodeBlock::OwnedHierarc
 } 
 
-OwnedHierarchicalCodeBlock::~OwnedHierarchicalCodeBlock ( ) { }
+OwnedHierarchicalCodeBlock::~OwnedHierarchicalCodeBlock ( ) { 
+        getParentObject()->disconnect();
+}
 
 //  
@@ -144,5 +146,4 @@ void OwnedHierarchicalCodeBlock::syncToP
 void OwnedHierarchicalCodeBlock::initFields ( UMLObject * parent) { 
         m_parentObject = parent; 
-        connect(parent,SIGNAL(modified()),this,SLOT(syncToParent()));
 }