SVN_SILENT: assure that the order of the methods match in the h + cpp file

[dolphin.git] / src / treeviewcontextmenu.cpp

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index 20840060eec89e5ad135628e66d5539a031d1308..9e86380028d451f252aca121c636fb529d86d6ab 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -85,7 +85,7 @@ void TreeViewContextMenu::open()
         KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
         KConfigGroup configGroup(globalConfig, "KDE");
         bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
-        
+
         const KUrl& url = m_fileInfo.url();
         if (url.isLocalFile()) {
             QAction* moveToTrashAction = new QAction(KIcon("user-trash"),
@@ -126,21 +126,27 @@ void TreeViewContextMenu::open()
     popup->deleteLater();
 }
 
-void TreeViewContextMenu::cut()
+void TreeViewContextMenu::populateMimeData(QMimeData* mimeData, bool cut)
 {
-    QMimeData* mimeData = new QMimeData();
     KUrl::List kdeUrls;
     kdeUrls.append(m_fileInfo.url());
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), true);
+    KUrl::List mostLocalUrls;
+    bool dummy;
+    mostLocalUrls.append(m_fileInfo.mostLocalUrl(dummy));
+    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, cut);
+}
+
+void TreeViewContextMenu::cut()
+{
+    QMimeData* mimeData = new QMimeData();
+    populateMimeData(mimeData, true);
     QApplication::clipboard()->setMimeData(mimeData);
 }
 
 void TreeViewContextMenu::copy()
 {
     QMimeData* mimeData = new QMimeData();
-    KUrl::List kdeUrls;
-    kdeUrls.append(m_fileInfo.url());
-    KonqMimeData::populateMimeData(mimeData, kdeUrls, KUrl::List(), false);
+    populateMimeData(mimeData, false);
     QApplication::clipboard()->setMimeData(mimeData);
 }