Whenever we are trying to sort, bypass lessThanGeneralPurpose when is not allowed...

[dolphin.git] / src / treeviewcontextmenu.cpp

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index e9963073f99662a1a7789cdb37f65896f9c4a9ad..834456e02c09e0dbe7c4bbc081565882821a30f7 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -20,6 +20,7 @@
 
 #include "treeviewcontextmenu.h"
 
+#include <kfileitem.h>
 #include <kiconloader.h>
 #include <kio/deletejob.h>
 #include <kmenu.h>
@@ -34,7 +35,7 @@
 #include <QtGui/QClipboard>
 
 TreeViewContextMenu::TreeViewContextMenu(QWidget* parent,
-                                         KFileItem* fileInfo) :
+                                         const KFileItem& fileInfo) :
     m_parent(parent),
     m_fileInfo(fileInfo)
 {
@@ -46,7 +47,7 @@ TreeViewContextMenu::~TreeViewContextMenu()
 
 void TreeViewContextMenu::open()
 {
-    Q_ASSERT(m_fileInfo != 0);
+    Q_ASSERT(!m_fileInfo.isNull());
 
     KMenu* popup = new KMenu(m_parent);
 
@@ -77,7 +78,7 @@ void TreeViewContextMenu::open()
     const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
     const KConfigGroup kdeConfig(globalConfig, "KDE");
     bool showDeleteCommand = kdeConfig.readEntry("ShowDeleteCommand", false);
-    const KUrl& url = m_fileInfo->url();
+    const KUrl& url = m_fileInfo.url();
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = new QAction(KIcon("edit-trash"),
                                                  i18nc("@action:inmenu", "Move To Trash"), this);
@@ -108,7 +109,7 @@ void TreeViewContextMenu::cut()
 {
     QMimeData* mimeData = new QMimeData();
     KUrl::List kdeUrls;
-    kdeUrls.append(m_fileInfo->url());
+    kdeUrls.append(m_fileInfo.url());
     KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), true);
     QApplication::clipboard()->setMimeData(mimeData);
 }
@@ -117,7 +118,7 @@ void TreeViewContextMenu::copy()
 {
     QMimeData* mimeData = new QMimeData();
     KUrl::List kdeUrls;
-    kdeUrls.append(m_fileInfo->url());
+    kdeUrls.append(m_fileInfo.url());
     KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), false);
     QApplication::clipboard()->setMimeData(mimeData);
 }
@@ -128,7 +129,7 @@ void TreeViewContextMenu::paste()
     const QMimeData* mimeData = clipboard->mimeData();
 
     const KUrl::List source = KUrl::List::fromMimeData(mimeData);
-    const KUrl& dest = m_fileInfo->url();
+    const KUrl& dest = m_fileInfo.url();
     if (KonqMimeData::decodeIsCutSelection(mimeData)) {
         KonqOperations::copy(m_parent, KonqOperations::MOVE, source, dest);
         clipboard->clear();
@@ -139,31 +140,32 @@ void TreeViewContextMenu::paste()
 
 void TreeViewContextMenu::rename()
 {
-    const KUrl& oldUrl = m_fileInfo->url();
-    RenameDialog dialog(oldUrl);
+    QList<KFileItem> item;
+    item.append(m_fileInfo);
+    RenameDialog dialog(item);
     if (dialog.exec() == QDialog::Accepted) {
         const QString& newName = dialog.newName();
         if (!newName.isEmpty()) {
-            KUrl newUrl = oldUrl;
+            KUrl newUrl = m_fileInfo.url();
             newUrl.setFileName(newName);
-            KonqOperations::rename(m_parent, oldUrl, newUrl);
+            KonqOperations::rename(m_parent, m_fileInfo.url(), newUrl);
         }
     }
 }
 
 void TreeViewContextMenu::moveToTrash()
 {
-    KonqOperations::del(m_parent, KonqOperations::TRASH, m_fileInfo->url());
+    KonqOperations::del(m_parent, KonqOperations::TRASH, m_fileInfo.url());
 }
 
 void TreeViewContextMenu::deleteItem()
 {
-    KonqOperations::del(m_parent, KonqOperations::DEL, m_fileInfo->url());
+    KonqOperations::del(m_parent, KonqOperations::DEL, m_fileInfo.url());
 }
 
 void TreeViewContextMenu::showProperties()
 {
-    KPropertiesDialog dialog(m_fileInfo->url());
+    KPropertiesDialog dialog(m_fileInfo.url());
     dialog.exec();
 }