[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kicker/taskbar
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-04-18 6:21:58
Message-ID: 20050418062158.90DBA3EF () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

delete quicker


  M +8 -12     taskbar.cpp   1.84


--- kdebase/kicker/taskbar/taskbar.cpp  #1.83:1.84
@@ -361,5 +361,5 @@ void TaskBar::remove(Task *task, TaskCon
         containers.removeRef(container);
         removeChild(container);
-        container->deleteLater();
+        delete container;
 
         if (!blocklayout)
@@ -373,4 +373,6 @@ void TaskBar::remove(Task *task, TaskCon
 void TaskBar::remove(Startup *startup, TaskContainer* container)
 {
+    // startup containers only ever contain that one item. so
+    // just delete the poor bastard.
     if (!container)
     {
@@ -392,11 +394,6 @@ void TaskBar::remove(Startup *startup, T
     }
 
-    container->remove(startup);
-
-    if (container->isEmpty())
-    {
         containers.removeRef(container);
-        removeChild(container);
-        container->deleteLater();
+    delete container;
 
         if (!blocklayout)
@@ -405,5 +402,4 @@ void TaskBar::remove(Startup *startup, T
             reLayout();
         }
-    }
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]