Popupmenu: use KIO 5.27's new addPluginActionsTo method

REVIEW: 129085

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 971ef1e35fa1f4d64257067a10b3e6a18ccb14b3..ed3f64379ed0bc0a0025f3fbf38f7a9d03434691 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -34,6 +34,7 @@
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>

+#include <kio_version.h>

 #include <KJobWidgets>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>
 #include <KJobWidgets>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>


@@ -283,7 +284,7 @@ void DolphinContextMenu::openItemContextMenu()
     fileItemActions.setItemListProperties(selectedItemsProps);
     addServiceActions(fileItemActions);
 
     fileItemActions.setItemListProperties(selectedItemsProps);
     addServiceActions(fileItemActions);
 

-    addFileItemPluginActions();
+    addFileItemPluginActions(fileItemActions);

 
     addVersionControlPluginActions();
 
 
     addVersionControlPluginActions();
 


@@ -355,7 +356,7 @@ void DolphinContextMenu::openViewportContextMenu()
     fileItemActions.setItemListProperties(baseUrlProperties);
     addServiceActions(fileItemActions);
 
     fileItemActions.setItemListProperties(baseUrlProperties);
     addServiceActions(fileItemActions);
 

-    addFileItemPluginActions();
+    addFileItemPluginActions(fileItemActions);

 
     addVersionControlPluginActions();
 
 
     addVersionControlPluginActions();
 


@@ -483,8 +484,12 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
     fileItemActions.addServiceActionsTo(this);
 }
 
     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());
     KFileItemListProperties props;
     if (m_selectedItems.isEmpty()) {
         props.setItems(KFileItemList() << baseFileItem());


@@ -550,6 +555,7 @@ void DolphinContextMenu::addFileItemPluginActions()
             addedPlugins << jsonMetadata.pluginId();
         }
     }
             addedPlugins << jsonMetadata.pluginId();
         }
     }

+#endif

 }
 
 void DolphinContextMenu::addVersionControlPluginActions()
 }
 
 void DolphinContextMenu::addVersionControlPluginActions()

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 419d3f9bd4bd0c71fe9132c0299cb2381f399536..f67300dc1a820a729ab0eb8bb69dc47ccbb71717 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -126,7 +126,7 @@ private:
     /**
      * Adds actions that are provided by a KFileItemActionPlugin.
      */
     /**
      * Adds actions that are provided by a KFileItemActionPlugin.
      */

-    void addFileItemPluginActions();
+    void addFileItemPluginActions(KFileItemActions& fileItemActions);

 
     /**
      * Adds actions that are provided by a KVersionControlPlugin.
 
     /**
      * Adds actions that are provided by a KVersionControlPlugin.