[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 517371 by okellogg:

createChildUMLObject(), itemRenamed(): Deletion of the UMLListViewItem
is done at the caller, UMLListViewItem::okRename().
BUG:122497


 M  +0 -6      umllistview.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umllistview.cpp #517370:517371
@@ -2256,7 +2256,6 @@
                         kapp -> mainWidget(),
                         i18n( "The name you entered was not unique.\nIs this what you wanted?" ),
                         i18n( "Name Not Unique" ), i18n("Use Name"), i18n("Enter New Name") ) == KMessageBox::No ) {
-                delete item;
                 return false;
             }
         } else {
@@ -2416,7 +2415,6 @@
     if( !parent ) {
         kdError() << "UMLListView::createChildUMLObject: parent UMLObject is NULL"
         << endl;
-        delete item;
         m_bCreatingChildObject = false;
         return false;
     }
@@ -2431,7 +2429,6 @@
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
                                 i18n("Creation canceled") );
-            delete item;
             m_bCreatingChildObject = false;
             return false;
         }
@@ -2447,7 +2444,6 @@
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
                                 i18n("Creation canceled") );
-            delete item;
             m_bCreatingChildObject = false;
             return false;
         }
@@ -2465,7 +2461,6 @@
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
                                 i18n("Creation canceled") );
-            delete item;
             m_bCreatingChildObject = false;
             return false;
         }
@@ -2477,7 +2472,6 @@
                     kapp -> mainWidget(),
                     i18n( "The name you entered was not unique!\nCreation process has been canceled." ),
                     i18n( "Name Not Unique" ) );
-            delete item;
             m_bCreatingChildObject = false;
             return false;
         }