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

List:       kde-commits
Subject:    KDE/kdebase/kicker/kicker/core
From:       Matt Broadstone <mbroadst () gmail ! com>
Date:       2005-08-20 20:01:06
Message-ID: 1124568066.074566.32363.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 451474 by mbroadst:

more cleanups, changed a lot of STL style iterators to use foreach. readability is next to godliness?

 M  +2 -0      container_extension.cpp  
 M  +34 -44    extensionmanager.cpp  
 M  +1 -1      pluginmanager.cpp  


--- trunk/KDE/kdebase/kicker/kicker/core/container_extension.cpp #451473:451474
@@ -108,6 +108,8 @@
                                        const QString& extensionId,
                                        QWidget *parent)
   : QFrame(parent, "ExtensionContainer", Qt::WStyle_Customize | Qt::WStyle_NoBorder),
+    m_hideMode(ManualHide),
+    m_unhideTriggeredAt(Plasma::NoEdge),
     _autoHidden(false),
     _userHidden(Unhidden),
     _block_user_input(false),
--- trunk/KDE/kdebase/kicker/kicker/core/extensionmanager.cpp #451473:451474
@@ -73,7 +73,7 @@
 {
     while (!_containers.isEmpty())
     {
-            delete _containers.takeFirst();
+        delete _containers.takeFirst();
     }
 
     delete m_menubarPanel;
@@ -130,11 +130,10 @@
     QStringList elist = config->readListEntry("Extensions2");
 
     // now restore the extensions
-    QStringList::iterator itEnd = elist.end();
-    for (QStringList::iterator it = elist.begin(); it !=  elist.end(); ++it)
+    foreach (QString it, elist)
     {
         // extension id
-        QString extensionId(*it);
+        QString extensionId(it);
 
         // create a matching applet container
         if(!extensionId.contains("Extension") > 0)
@@ -151,10 +150,12 @@
         // set config group
         config->setGroup(extensionId);
 
-        ExtensionContainer* e = pm->createExtensionContainer(config->readPathEntry("DesktopFile"),
-                                                             true, // is startup
-                                                             config->readPathEntry("ConfigFile"),
-                                                             extensionId);
+        ExtensionContainer* e =
+            pm->createExtensionContainer(config->readPathEntry("DesktopFile"),
+                                         true, // is startup
+                                         config->readPathEntry("ConfigFile"),
+                                         extensionId);
+
         if (e)
         {
             addContainer(e);
@@ -166,15 +167,15 @@
 
     pm->clearUntrustedLists();
     connect(Kicker::the(), SIGNAL(configurationChanged()), SLOT(configurationChanged()));
-    DCOPRef r( "ksmserver", "ksmserver" );
-    r.send( "resumeStartup" );
+    DCOPRef r("ksmserver", "ksmserver");
+    r.send("resumeStartup");
 }
 
 void ExtensionManager::configureMenubar(bool duringInit)
 {
-    KConfig menuConfig( "kdesktoprc", true );
-    if( KConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false)
-        || KConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false ))
+    KConfig menuConfig("kdesktoprc", true);
+    if(KConfigGroup(&menuConfig, "KDE").readBoolEntry("macStyle", false)
+        || KConfigGroup(&menuConfig, "Menubar").readBoolEntry("ShowMenubar", false))
     {
         if (KGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() ||
             m_menubarPanel)
@@ -247,10 +248,9 @@
     }
 
     QStringList elist = config->readListEntry("Extensions2");
-    QStringList::iterator itEnd = elist.end();
-    for (QStringList::iterator it = elist.begin(); it !=  elist.end(); ++it)
+    foreach (QString it, elist)
     {
-        QString extensionId(*it);
+        QString extensionId(it);
 
         if(!extensionId.contains("Extension") > 0)
         {
@@ -271,11 +271,9 @@
         if (extensionConfig.hasKey("Applets2"))
         {
             QStringList containers = extensionConfig.readListEntry("Applets2");
-            QStringList::iterator cit = containers.begin();
-            QStringList::iterator citEnd = containers.end();
-            for (; cit != citEnd; ++cit)
+            foreach (QString cit, containers)
             {
-                QString appletId(*cit);
+                QString appletId(cit);
 
                 // is there a config group for this applet?
                 if (!extensionConfig.hasGroup(appletId))
@@ -295,7 +293,7 @@
                         KIO::NetAccess::copy(menubarConfig,
                                              locateLocal("config",
                                              "kicker_menubarpanelrc"), 0);
-                        elist.remove(it);
+                        elist.removeAll(it);
                         config->setGroup("General");
                         config->writeEntry("Extensions2", elist);
                         config->writeEntry("CheckedForMenubar", true);
@@ -319,10 +317,9 @@
 
     // build the extension list
     QStringList elist;
-    ExtensionContainer::List::iterator itEnd = _containers.end();
-    for (ExtensionContainer::List::iterator it = _containers.begin(); it != itEnd; ++it)
+    foreach (ExtensionContainer *it, _containers)
     {
-        elist.append((*it)->extensionId());
+        elist.append(it->extensionId());
     }
 
     // write extension list
@@ -341,10 +338,9 @@
         m_menubarPanel->readConfig();
     }
 
-    ExtensionContainer::List::iterator itEnd = _containers.end();
-    for (ExtensionContainer::List::iterator it = _containers.begin(); it != itEnd; ++it)
+    foreach (ExtensionContainer *it, _containers)
     {
-        (*it)->readConfig();
+        it->readConfig();
     }
 }
 
@@ -424,9 +420,8 @@
 {
     while (!_containers.isEmpty())
     {
-        ExtensionContainer* e = _containers.first();
-        _containers.remove(e);
-        e->deleteLater(); // Wait till we return to the main event loop
+        ExtensionContainer *e = _containers.takeFirst();
+        e->deleteLater();
     }
 
     saveContainerConfig();
@@ -445,10 +440,9 @@
         newId = idBase.arg(i);
 
         unique = true;
-        ExtensionContainer::List::iterator itEnd = _containers.end();
-        for (ExtensionContainer::List::iterator it = _containers.begin(); it != itEnd; ++it)
+        foreach (ExtensionContainer *it, _containers)
         {
-            if ((*it)->extensionId() == newId)
+            if (it->extensionId() == newId)
             {
                 unique = false;
                 break;
@@ -468,10 +462,9 @@
        positions[i] = true;
     }
 
-    ExtensionContainer::List::iterator itEnd = _containers.end();
-    for (ExtensionContainer::List::iterator it = _containers.begin(); it != itEnd; ++it)
+    foreach (ExtensionContainer *it, _containers)
     {
-       positions[(int) (*it)->position()] = false;
+       positions[(int) it->position()] = false;
     }
 
     Plasma::Position pos = preferred;
@@ -606,9 +599,6 @@
 
     QList<WId> list;
 
-    ExtensionContainer::List::iterator itEnd = _containers.end();
-    ExtensionContainer::List::iterator it = _containers.begin();
-
     // If the hide mode is Manual, exclude the struts of
     // panels below this one in the list. Else exclude the
     // struts of all panels.
@@ -621,11 +611,11 @@
             list.append(m_mainPanel->winId());
         }
 
-        for (; it != itEnd; ++it)
+        foreach (ExtensionContainer *it, _containers)
         {
-            if (shouldExclude(XineramaScreen, extension, *it))
+            if (shouldExclude(XineramaScreen, extension, it))
             {
-                list.append((*it)->winId());
+                list.append(it->winId());
             }
         }
     }
@@ -642,9 +632,9 @@
             list.append(m_mainPanel->winId());
         }
 
-        for (; it != itEnd; ++it)
+        foreach (ExtensionContainer *it, _containers)
         {
-            list.append((*it)->winId());
+            list.append(it->winId());
         }
     }
 
--- trunk/KDE/kdebase/kicker/kicker/core/pluginmanager.cpp #451473:451474
@@ -276,7 +276,7 @@
         return 0;
     }
 
-    AppletInfo info( desktopPath, configFile );
+    AppletInfo info(desktopPath, configFile);
 
     bool internal = (info.library() == "childpanel_panelextension");
     bool instance = !internal && hasInstance(info);
[prev in list] [next in list] [prev in thread] [next in thread]