[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

another attempt to fix bug of not freeing all codeaccessor/codeclassfield decl blocks at close of the program


  M +1 -0      codeaccessormethod.h   1.6
  M +2 -2      codeclassfield.cpp   1.12
  M +1 -0      codeclassfielddeclarationblock.h   1.6


--- kdesdk/umbrello/umbrello/codeaccessormethod.h  #1.5:1.6
@@ -30,4 +30,5 @@ class UMLRole;
 class CodeAccessorMethod : public CodeMethodBlock
 {
+        friend class CodeClassField;
         Q_OBJECT
 public:

--- kdesdk/umbrello/umbrello/codeclassfield.cpp  #1.11:1.12
@@ -54,5 +54,5 @@ CodeClassField::~CodeClassField ( ) { 
         {
                 removeMethod(m);
-                //delete m; // no..will be deleted by the owning hcodeblock/codedoc 
+                m->release(); 
         }
         list.clear();
@@ -62,5 +62,5 @@ CodeClassField::~CodeClassField ( ) { 
         {
                 getParentDocument()->removeTextBlock(m_declCodeBlock);
-                //delete m_declCodeBlock; // no..will be deleted by the owning hcodeblock/codedoc 
+                m_declCodeBlock->release(); 
         }
 

--- kdesdk/umbrello/umbrello/codeclassfielddeclarationblock.h  #1.5:1.6
@@ -35,4 +35,5 @@ class CodeClassField; 
 class CodeClassFieldDeclarationBlock : public CodeBlockWithComments, public OwnedCodeBlock 
 {
+        friend class CodeClassField;
         Q_OBJECT
 public: