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

List:       kde-commits
Subject:    kdebase/kicker/ui
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-02-05 10:53:59
Message-ID: 20050205105359.DB5351D1CA () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

use ExtensionManager::removeAllContainers(), rm a method and don't take
for ever to remove all anymore. voila!


  M +9 -13     removeextension_mnu.cpp   1.13
  M +0 -1      removeextension_mnu.h   1.5


--- kdebase/kicker/ui/removeextension_mnu.cpp  #1.12:1.13
@@ -33,4 +33,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #include "removeextension_mnu.moc"
 
+static const int REMOVEALLID = 1000;
+
 PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( QWidget *parent, const char *name )
     : QPopupMenu( parent, name )
@@ -52,5 +54,4 @@ void PanelRemoveExtensionMenu::slotAbout
     QValueList<PanelMenuItemInfo> items;
 
-    bool haveExtensions = false;
     ExtensionList::iterator itEnd = m_containers.end();
     for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it)
@@ -78,5 +79,4 @@ void PanelRemoveExtensionMenu::slotAbout
         items.append(PanelMenuItemInfo(QString::null, name, id));
         ++id;
-        haveExtensions = true;
     }
 
@@ -88,8 +88,8 @@ void PanelRemoveExtensionMenu::slotAbout
     }
 
-    if (haveExtensions)
+    if (m_containers.count() > 1)
     {
         insertSeparator();
-        insertItem(i18n("All"), this, SLOT(slotRemoveAll()));
+        insertItem(i18n("All"), REMOVEALLID);
     }
 }
@@ -97,16 +97,11 @@ void PanelRemoveExtensionMenu::slotAbout
 void PanelRemoveExtensionMenu::slotExec( int id )
 {
-    if (m_containers.at(id) != m_containers.end())
+    if (id == REMOVEALLID)
     {
-        ExtensionManager::the()->removeContainer(*m_containers.at(id));
+        ExtensionManager::the()->removeAllContainers();
     }
-}
-
-void PanelRemoveExtensionMenu::slotRemoveAll()
-{
-    ExtensionList::iterator itEnd = m_containers.end();
-    for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it)
+    else if (m_containers.at(id) != m_containers.end())
     {
-        ExtensionManager::the()->removeContainer(*it);
+        ExtensionManager::the()->removeContainer(*m_containers.at(id));
     }
 }

--- kdebase/kicker/ui/removeextension_mnu.h  #1.4:1.5
@@ -41,5 +41,4 @@ protected slots:
     void slotExec( int id );
     void slotAboutToShow();
-    void slotRemoveAll();
 
 private:


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