]> cloud.milkyroute.net Git - dolphin.git/commitdiff
get rid of KFileItemActionPlugin
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Sun, 14 Dec 2014 17:39:08 +0000 (18:39 +0100)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Sun, 14 Dec 2014 17:39:08 +0000 (18:39 +0100)
src/dolphincontextmenu.cpp

index a7300334f4dd2ec8749ee27d6afd4db265fb592d..c227be6d8fb574960e7db205f6ab0d7070d6dd63 100644 (file)
@@ -27,8 +27,7 @@
 #include "dolphinremoveaction.h"
 
 #include <KActionCollection>
 #include "dolphinremoveaction.h"
 
 #include <KActionCollection>
-#include <kfileitemactionplugin.h>
-#include <kabstractfileitemactionplugin.h>
+#include <KAbstractFileItemActionPlugin>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
 #include <KIO/RestoreJob>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
 #include <KIO/RestoreJob>
@@ -512,13 +511,6 @@ void DolphinContextMenu::addFileItemPluginActions()
             continue;
         }
 
             continue;
         }
 
-        // Old API (kdelibs-4.6.0 only)
-        KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();
-        if (plugin) {
-            plugin->setParent(this);
-            addActions(plugin->actions(props, m_mainWindow));
-        }
-        // New API (kdelibs >= 4.6.1)
         KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
         if (abstractPlugin) {
             abstractPlugin->setParent(this);
         KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
         if (abstractPlugin) {
             abstractPlugin->setParent(this);