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

List:       kde-commits
Subject:    KDE/kdebase/kicker/taskbar
From:       Wilco Greven <greven () kde ! org>
Date:       2005-08-23 17:15:18
Message-ID: 1124817318.982083.15401.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 452542 by wgreven:

Some more use of foreach and qDeleteAll.


 M  +20 -63    taskbar.cpp  


--- trunk/KDE/kdebase/kicker/taskbar/taskbar.cpp #452541:452542
@@ -116,19 +116,15 @@
     isGrouping = shouldGroup();
 
     // register existant tasks
-    Task::Dict tasks = TaskManager::self()->tasks();
-    Task::Dict::iterator taskEnd = tasks.end();
-    for (Task::Dict::iterator it = tasks.begin(); it != taskEnd; ++it)
+    foreach (Task::TaskPtr task, TaskManager::self()->tasks())
     {
-        add(it.data());
+        add(task);
     }
 
     // register existant startups
-    Startup::List startups = TaskManager::self()->startups();
-    Startup::List::iterator startupEnd = startups.end();
-    for (Startup::List::iterator sIt = startups.begin(); sIt != startupEnd; ++sIt)
+    foreach (Startup::StartupPtr startup, TaskManager::self()->startups())
     {
-        add((*sIt));
+        add(startup);
     }
 
     blocklayout = false;
@@ -142,20 +138,8 @@
 
 TaskBar::~TaskBar()
 {
-    for (TaskContainer::List::const_iterator it = containers.constBegin();
-         it != containers.constEnd();
-         ++it)
-    {
-        delete *it;
-    }
-
-    for (PixmapList::const_iterator it = frames.constBegin();
-         it != frames.constEnd();
-         ++it)
-    {
-        delete *it;
-    }
-
+    qDeleteAll(containers);
+    qDeleteAll(frames);
     delete m_windowListMenu;
 }
 
@@ -298,11 +282,9 @@
         wasShowIcon != m_showIcon)
     {
         // relevant settings changed, update our task containers
-        for (TaskContainer::Iterator it = containers.begin();
-             it != containers.end();
-             ++it)
+        foreach (TaskContainer* container, containers)
         {
-            (*it)->settingsChanged();
+            container->settingsChanged();
         }
     }
 
@@ -583,11 +565,9 @@
         return;
     }
 
-    for (TaskContainer::Iterator it = containers.begin();
-         it != containers.end();
-         ++it)
+    foreach (TaskContainer* container, containers)
     {
-        (*it)->desktopChanged(desktop);
+        container->desktopChanged(desktop);
     }
 
     emit containerCountChanged();
@@ -800,11 +780,9 @@
     }
 
     arrowType = at;
-    for (TaskContainer::Iterator it = containers.begin();
-         it != containers.end();
-         ++it)
+    foreach (TaskContainer* container, containers)
     {
-        (*it)->setArrowType(arrowType);
+        container->setArrowType(arrowType);
     }
 }
 
@@ -812,11 +790,9 @@
 {
     QPoint p = mapToGlobal(QPoint(0,0)); // roundtrip, don't do that too often
 
-    for (TaskContainer::Iterator it = containers.begin();
-         it != containers.end();
-         ++it)
+    foreach (TaskContainer* container, containers)
     {
-        (*it)->publishIconGeometry(p);
+        container->publishIconGeometry(p);
     }
 }
 
@@ -899,39 +875,23 @@
     isGrouping = shouldGroup();
     blocklayout = true;
 
-    TaskContainer::Iterator lastContainer = m_hiddenContainers.end();
-    for (TaskContainer::Iterator it = m_hiddenContainers.begin();
-         it != lastContainer;
-         ++it)
-    {
-        delete *it;
-    }
+    qDeleteAll(m_hiddenContainers);
     m_hiddenContainers.clear();
 
-    for (TaskContainer::List::const_iterator it = containers.constBegin();
-         it != containers.constEnd();
-         ++it)
-    {
-        delete *it;
-    }
+    qDeleteAll(containers);
     containers.clear();
 
-    Task::Dict tasks = TaskManager::self()->tasks();
-    Task::Dict::iterator lastTask = tasks.end();
-    for (Task::Dict::iterator it = tasks.begin(); it != lastTask; ++it)
+    foreach (Task::TaskPtr task, TaskManager::self()->tasks())
     {
-        Task::TaskPtr task = it.data();
         if (showScreen() == -1 || task->isOnScreen(showScreen()))
         {
             add(task);
         }
     }
 
-    Startup::List startups = TaskManager::self()->startups();
-    Startup::List::iterator itEnd = startups.end();
-    for (Startup::List::iterator sIt = startups.begin(); sIt != itEnd; ++sIt)
+    foreach (Startup::StartupPtr startup, TaskManager::self()->startups())
     {
-        add(*sIt);
+        add(startup);
     }
 
     blocklayout = false;
@@ -943,11 +903,8 @@
     // filter task container list
     TaskContainer::List list;
 
-    for (TaskContainer::List::const_iterator it = containers.constBegin();
-         it != containers.constEnd();
-         ++it)
+    foreach (TaskContainer* c, containers)
     {
-        TaskContainer* c = *it;
         if ((m_showAllWindows || c->onCurrentDesktop()) &&
             (!TaskBarSettings::showOnlyIconified() || c->isIconified()) &&
             ((showScreen() == -1) || c->isOnScreen()))
[prev in list] [next in list] [prev in thread] [next in thread]