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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Thomas McGuire <Thomas.McGuire () gmx ! net>
Date:       2008-07-31 19:58:09
Message-ID: 1217534289.632985.5753.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 840283 by tmcguire:

Fix bogus error message when deleting folders.


 M  +13 -11    kmfoldermgr.cpp  


--- trunk/KDE/kdepim/kmail/kmfoldermgr.cpp #840282:840283
@@ -331,20 +331,22 @@
 //-----------------------------------------------------------------------------
 void KMFolderMgr::remove(KMFolder* aFolder)
 {
-  if (!aFolder) return;
+  if ( !aFolder )
+    return;
+
   // remember the original folder to trigger contentsChanged later
-  if (!mRemoveOrig) mRemoveOrig = aFolder;
-  if (aFolder->child())
+  if ( !mRemoveOrig )
+    mRemoveOrig = aFolder;
+
+  if ( aFolder->child() )
   {
     // call remove for every child
-
-    QList<KMFolderNode*>::const_iterator it;
-    for ( it = (*aFolder->child()).begin(); it != (*aFolder->child()).end(); ++it )
-    {
-      KMFolderNode *node = *it;
-      if (node->isDir()) continue;
-      KMFolder *folder = static_cast<KMFolder*>(node);
-      remove(folder);
+    KMFolderNodeList childs = *aFolder->child();
+    foreach( KMFolderNode *child, childs ) {
+      if ( child->isDir() )
+        continue;
+      KMFolder *folder = static_cast<KMFolder*>( child );
+      remove( folder );
     }
   }
   emit folderRemoved(aFolder);
[prev in list] [next in list] [prev in thread] [next in thread]