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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/src
From:       David Faure <faure () kde ! org>
Date:       2010-07-11 9:44:36
Message-ID: 20100711094436.C6FE6AC85F () svn ! kde ! org
[Download RAW message or body]

SVN commit 1148612 by dfaure:

Forwardport r1148419:
Use KTempDir::removeDir instead of KIO::NetAccess::del to avoid the nested event \
loop.


 M  +5 -7      konqsessiondlg.cpp  
 M  +4 -12     konqsessionmanager.cpp  


--- trunk/KDE/kdebase/apps/konqueror/src/konqsessiondlg.cpp #1148611:1148612
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kio/copyjob.h>
-#include <kio/netaccess.h>
+#include <ktempdir.h>
 #include <kio/renamedialog.h>
 #include <kfileitemdelegate.h>
 #include <kdirlister.h>
@@ -156,11 +156,9 @@
     if(!d->m_pListView->currentIndex().isValid())
         return;
     
-    QDir dir(d->m_pModel->itemForIndex(d->m_pListView->currentIndex()).url().path());
                
-    if(dir.exists())
-    {
-        KIO::NetAccess::del(d->m_pModel->itemForIndex(
-            d->m_pListView->currentIndex()).url(), d->m_pParent);
+    const QString dir = \
d->m_pModel->itemForIndex(d->m_pListView->currentIndex()).url().toLocalFile(); +    \
if (!KTempDir::removeDir(dir)) { +        // TODO show error msg box
     }
 }
 
@@ -249,7 +247,7 @@
             i18n("A session with the name '%1' already exists, do you want to \
overwrite it?", d->m_pSessionName->text()),  i18n("Session exists. Overwrite?")) == \
KMessageBox::Yes)  {
-            KIO::NetAccess::del(KUrl(dirpath), d->m_pParent);
+            KTempDir::removeDir(dirpath);
         } else {
             KonqNewSessionDlg newDialog(d->m_pParent,
                 d->m_pSessionName->text());
--- trunk/KDE/kdebase/apps/konqueror/src/konqsessionmanager.cpp #1148611:1148612
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <ktempdir.h>
 
 #include <QPushButton>
 #include <QtCore/QFileInfo>
@@ -122,14 +122,8 @@
 void KonqSessionManager::deleteOwnedSessions()
 {
     // Not dealing with the sessions about to remove anymore
-    QDir dir(dirForMyOwnedSessionFiles());
-
-    if(dir.exists())
-    {
-        KIO::Job *delJob = KIO::del(KUrl(dir.path()), KIO::HideProgressInfo);
-        KIO::NetAccess::synchronousRun(delJob, NULL);
+    KTempDir::removeDir(dirForMyOwnedSessionFiles());
     }
-}
 
 KonqSessionManager* KonqSessionManager::self()
 {
@@ -229,8 +223,7 @@
                     sessionFilePaths.append(newFileName);
                 }
                 // Remove the old directory
-                KIO::Job *delJob = KIO::del(KUrl(it.filePath()), \
                KIO::HideProgressInfo);
-                KIO::NetAccess::synchronousRun(delJob, NULL);
+                KTempDir::removeDir(it.filePath());
             }
         } else { // it's a file
             if(!idbus->isServiceRegistered(KonqMisc::decodeFilename(it.fileName())))
@@ -363,8 +356,7 @@
                 QFile::rename(it.filePath(), m_autosaveDir + '/' + it.fileName());
             }
             // Remove the owned_by directory
-            KIO::Job *delJob = KIO::del(KUrl(dirForMyOwnedSessionFiles()), \
                KIO::HideProgressInfo);
-            KIO::NetAccess::synchronousRun(delJob, NULL);
+            KTempDir::removeDir(dirForMyOwnedSessionFiles());
             enableAutosave();
             return false;
     }


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