From 39b9ee37b2e513d0d046cd61c492c054a41aed4d Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 3 Oct 2015 12:35:27 +0300
Subject: [PATCH] generic: misc cleanups

---
 kded/kded.cpp               | 7 +++----
 kdeui/icons/kiconloader.cpp | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kded/kded.cpp b/kded/kded.cpp
index 8cdc131a..9d1cdf4c 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -141,10 +141,9 @@ Kded::~Kded()
   delete m_pTimer;
   delete m_pDirWatch;
 
-  for (QHash<QByteArray,KDEDModule*>::iterator
-           it(m_modules.begin()), itEnd(m_modules.end());
-       it != itEnd; ++it)
-  {
+  QHashIterator<QString,KDEDModule*> it(m_modules);
+  while (it.hasNext()) {
+      it.next();
       KDEDModule* module(it.value());
 
       // first disconnect otherwise slotKDEDModuleRemoved() is called
diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
index 851f9d5b..a2fd3f09 100644
--- a/kdeui/icons/kiconloader.cpp
+++ b/kdeui/icons/kiconloader.cpp
@@ -611,7 +611,7 @@ void KIconLoaderPrivate::addBaseThemes(KIconThemeNode *node, const QString &appn
 void KIconLoaderPrivate::addInheritedThemes(KIconThemeNode *node, const QString &appname)
 {
     foreach (const QString it, node->theme->inherits()) {
-        if ((it) == "hicolor") {
+        if (it == "hicolor") {
           // The icon theme spec says that "hicolor" must be the very last
           // of all inherited themes, so don't add it here but at the very end
           // of addBaseThemes().