From: David Faure <faure@kde.org>
Date: Sun, 2 Oct 2016 19:03:01 +0000 (+0200)
Subject: Popupmenu: use KIO 5.27's new addPluginActionsTo method
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f54174f9f6b99aac433e81cad9965a7f31786ce7

Popupmenu: use KIO 5.27's new addPluginActionsTo method

REVIEW: 129085
---

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 971ef1e35..ed3f64379 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -34,6 +34,7 @@
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
+#include <kio_version.h>
 #include <KJobWidgets>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>
@@ -283,7 +284,7 @@ void DolphinContextMenu::openItemContextMenu()
     fileItemActions.setItemListProperties(selectedItemsProps);
     addServiceActions(fileItemActions);
 
-    addFileItemPluginActions();
+    addFileItemPluginActions(fileItemActions);
 
     addVersionControlPluginActions();
 
@@ -355,7 +356,7 @@ void DolphinContextMenu::openViewportContextMenu()
     fileItemActions.setItemListProperties(baseUrlProperties);
     addServiceActions(fileItemActions);
 
-    addFileItemPluginActions();
+    addFileItemPluginActions(fileItemActions);
 
     addVersionControlPluginActions();
 
@@ -483,8 +484,12 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
     fileItemActions.addServiceActionsTo(this);
 }
 
-void DolphinContextMenu::addFileItemPluginActions()
+void DolphinContextMenu::addFileItemPluginActions(KFileItemActions& fileItemActions)
 {
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 27, 0)
+    fileItemActions.addPluginActionsTo(this);
+#else
+    Q_UNUSED(fileItemActions);
     KFileItemListProperties props;
     if (m_selectedItems.isEmpty()) {
         props.setItems(KFileItemList() << baseFileItem());
@@ -550,6 +555,7 @@ void DolphinContextMenu::addFileItemPluginActions()
             addedPlugins << jsonMetadata.pluginId();
         }
     }
+#endif
 }
 
 void DolphinContextMenu::addVersionControlPluginActions()
diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 419d3f9bd..f67300dc1 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -126,7 +126,7 @@ private:
     /**
      * Adds actions that are provided by a KFileItemActionPlugin.
      */
-    void addFileItemPluginActions();
+    void addFileItemPluginActions(KFileItemActions& fileItemActions);
 
     /**
      * Adds actions that are provided by a KVersionControlPlugin.