Further cleanup to prepare the move.

[dolphin.git] / src / treeviewcontextmenu.cpp

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index 561435ca2f65e3557761496f02f79256256708bb..cdb1afedad8edd01c01fae8f820e8d04c0ffa610 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -21,6 +21,7 @@
 #include "treeviewcontextmenu.h"
 
 #include <kiconloader.h>
+#include <kio/deletejob.h>
 #include <kmenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
@@ -144,8 +145,8 @@ void TreeViewContextMenu::rename()
     if (dialog.exec() == QDialog::Accepted) {
         const QString& newName = dialog.newName();
         if (!newName.isEmpty()) {
-            KUrl newUrl = oldUrl.upUrl();
-            newUrl.addPath(newName);
+            KUrl newUrl = oldUrl;
+            newUrl.setFileName(newName);
             KonqOperations::rename(m_parent, oldUrl, newUrl);
         }
     }
@@ -158,10 +159,7 @@ void TreeViewContextMenu::moveToTrash()
 
 void TreeViewContextMenu::deleteItem()
 {
-    KonqOperations::askDeleteConfirmation(m_fileInfo->url(),
-                                          KonqOperations::DEL,
-                                          KonqOperations::FORCE_CONFIRMATION,
-                                          m_parent);
+    KonqOperations::del(m_parent, KonqOperations::DEL, m_fileInfo->url());
 }
 
 void TreeViewContextMenu::showProperties()