[Uml-devel] KDE_3_3_BRANCH: kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Backport fix for bugs.kde.org/88152 et al.


  M +1 -1      associationwidget.cpp   1.111.2.1
  M +1 -1      textblock.cpp   1.8.4.1
  M +2 -2      umldoc.cpp   1.174.2.2


--- kdesdk/umbrello/umbrello/textblock.cpp  #1.8:1.8.4.1
@@ -190,5 +190,5 @@ QString TextBlock::unformatText ( const 
 void TextBlock::release () {
         this->disconnect();
-        this->deleteLater();
+        //this->deleteLater();
 }
 

--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.111:1.111.2.1
@@ -739,5 +739,5 @@ void AssociationWidget::setUMLAssociatio
                 // delete orphaned associations or we well get code crashes and memory leaks.
                 if (umla->nrof_parent_widgets == 0) {
-                        umla->deleteLater();
+                        //umla->deleteLater();
                 }
         

--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.174.2.1:1.174.2.2
@@ -629,10 +629,10 @@ void UMLDoc::deleteContents() {
                         // clear our object list. We do this explicitly since setAutoDelete is false for the objectList now.
                         for(UMLObject * obj = m_objectList.first(); obj != 0; obj = m_objectList.next())
-                                obj->deleteLater();
+                                ; //obj->deleteLater();
                         m_objectList.clear();
                 }
                 if (m_stereoList.count() > 0) {
                         for (UMLStereotype *s = m_stereoList.first(); s; s = m_stereoList.next())
-                                s->deleteLater();
+                                ; //s->deleteLater();
                         m_stereoList.clear();
                 }