X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/8eb9b508ca87fb1d634d8b8ba62c054ed04466d2..d3496b12310d9fec0e52e537c341e87fcaa2f8b5:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index dacdc9c83..9b6512aa2 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -26,28 +26,29 @@
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
-#include <KActionCollection>
-#include <KDesktopFile>
+#include <kactioncollection.h>
+#include <kdesktopfile.h>
 #include <kfileitemactionplugin.h>
-#include <KFileItemActions>
-#include <KFileItemListProperties>
-#include <KFilePlacesModel>
-#include <KGlobal>
+#include <kabstractfileitemactionplugin.h>
+#include <kfileitemactions.h>
+#include <kfileitemlistproperties.h>
+#include <kfileplacesmodel.h>
+#include <kglobal.h>
 #include <KIconLoader>
-#include <KIO/NetAccess>
-#include <KMenu>
-#include <KMenuBar>
-#include <KMessageBox>
-#include <KMimeTypeTrader>
-#include <KModifierKeyInfo>
-#include <knewfilemenu.h>
+#include <kio/netaccess.h>
+#include <kmenu.h>
+#include <kmenubar.h>
+#include <kmessagebox.h>
+#include <kmimetypetrader.h>
+#include <kmodifierkeyinfo.h>
+#include <KNewFileMenu>
 #include <konqmimedata.h>
 #include <konq_operations.h>
-#include <KService>
+#include <kservice.h>
 #include <KLocale>
-#include <KPropertiesDialog>
-#include <KStandardAction>
-#include <KStandardDirs>
+#include <kpropertiesdialog.h>
+#include <kstandardaction.h>
+#include <kstandarddirs.h>
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
@@ -80,7 +81,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     m_selectedItems = view->selectedItems();
 
-    if (m_keyInfo != 0) {
+    if (m_keyInfo) {
         if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) {
             m_shiftPressed = true;
         }
@@ -305,7 +306,7 @@ void DolphinContextMenu::openItemContextMenu()
     m_popup->addAction(propertiesAction);
 
     QAction* activatedAction = m_popup->exec(QCursor::pos());
-    if (activatedAction != 0) {
+    if (activatedAction) {
         if (activatedAction == addToPlacesAction) {
             const KUrl selectedUrl(m_fileInfo.url());
             if (selectedUrl.isValid()) {
@@ -373,7 +374,7 @@ void DolphinContextMenu::openViewportContextMenu()
         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
-    } else if ((addToPlacesAction != 0) && (action == addToPlacesAction)) {
+    } else if (addToPlacesAction && (action == addToPlacesAction)) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
             DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
@@ -458,7 +459,7 @@ QAction* DolphinContextMenu::createPasteAction()
 
 KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
 {
-    if (m_selectedItemsProperties == 0) {
+    if (!m_selectedItemsProperties) {
         m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
     }
     return *m_selectedItemsProperties;
@@ -466,7 +467,7 @@ KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
 
 KFileItem DolphinContextMenu::baseFileItem()
 {
-    if (m_baseFileItem == 0) {
+    if (!m_baseFileItem) {
         m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
     }
     return *m_baseFileItem;
@@ -511,15 +512,17 @@ void DolphinContextMenu::addFileItemPluginActions()
             continue;
         }
 
+        // Old API (kdelibs-4.6.0 only)
         KFileItemActionPlugin* plugin = service->createInstance<KFileItemActionPlugin>();
-        if (plugin == 0) {
-            continue;
+        if (plugin) {
+            plugin->setParent(m_popup);
+            m_popup->addActions(plugin->actions(props, m_mainWindow));
         }
-
-        plugin->setParent(m_popup);
-        const QList<QAction*> actions = plugin->actions(props, m_mainWindow);
-        foreach (QAction* action, actions) {
-            m_popup->addAction(action);
+        // New API (kdelibs >= 4.6.1)
+        KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance<KAbstractFileItemActionPlugin>();
+        if (abstractPlugin) {
+            abstractPlugin->setParent(m_popup);
+            m_popup->addActions(abstractPlugin->actions(props, m_mainWindow));
         }
     }
 }