Merge branch 'Applications/16.04'

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index e692c8fa9a0cd8c9ef3f53cc5c6ff71d04043a9c..dfec76144dafd9210aa8b6f45458ded98e27ab53 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -27,34 +27,30 @@
 #include "dolphinremoveaction.h"
 
 #include <KActionCollection>
 #include "dolphinremoveaction.h"
 
 #include <KActionCollection>

-#include <KDesktopFile>
-#include <kfileitemactionplugin.h>
-#include <kabstractfileitemactionplugin.h>
+#include <KAbstractFileItemActionPlugin>

 #include <KFileItemActions>
 #include <KFileItemListProperties>
 #include <KFileItemActions>
 #include <KFileItemListProperties>

-#include <KGlobal>
-#include <KIconLoader>
-#include <KIO/NetAccess>
-#include <KMenu>
-#include <KMenuBar>
-#include <KMessageBox>
+#include <KIO/RestoreJob>
+#include <KIO/EmptyTrashJob>
+#include <KIO/JobUiDelegate>
+#include <KIO/Paste>
+#include <KJobWidgets>

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

-#include <konqmimedata.h>
-#include <konq_operations.h>

 #include <KService>
 #include <KService>

-#include <KLocale>
-#include <KPropertiesDialog>
+#include <KLocalizedString>

 #include <KStandardAction>
 #include <KStandardAction>

-#include <KStandardDirs>

 #include <KToolBar>
 
 #include <KToolBar>
 

+#include <QApplication>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QMenuBar>
+#include <QMenu>
+

 #include <panels/places/placesitem.h>
 #include <panels/places/placesitemmodel.h>
 
 #include <panels/places/placesitem.h>
 #include <panels/places/placesitemmodel.h>
 

-#include <QApplication>
-#include <QClipboard>
-#include <QDir>

 
 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
 
 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"


@@ -62,8 +58,8 @@
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const QPoint& pos,
                                        const KFileItem& fileInfo,
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const QPoint& pos,
                                        const KFileItem& fileInfo,

-                                       const KUrl& baseUrl) :
-    KMenu(parent),
+                                       const QUrl& baseUrl) :
+    QMenu(parent),

     m_pos(pos),
     m_mainWindow(parent),
     m_fileInfo(fileInfo),
     m_pos(pos),
     m_mainWindow(parent),
     m_fileInfo(fileInfo),


@@ -97,7 +93,7 @@ void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
 DolphinContextMenu::Command DolphinContextMenu::open()
 {
     // get the context information
 DolphinContextMenu::Command DolphinContextMenu::open()
 {
     // get the context information

-    if (m_baseUrl.protocol() == QLatin1String("trash")) {
+    if (m_baseUrl.scheme() == QLatin1String("trash")) {

         m_context |= TrashContext;
     }
 
         m_context |= TrashContext;
     }
 


@@ -128,7 +124,7 @@ void DolphinContextMenu::keyPressEvent(QKeyEvent *ev)
     if (m_removeAction && ev->key() == Qt::Key_Shift) {
         m_removeAction->update();
     }
     if (m_removeAction && ev->key() == Qt::Key_Shift) {
         m_removeAction->update();
     }

-    KMenu::keyPressEvent(ev);
+    QMenu::keyPressEvent(ev);

 }
 
 void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev)
 }
 
 void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev)


@@ -136,27 +132,33 @@ void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev)
     if (m_removeAction && ev->key() == Qt::Key_Shift) {
         m_removeAction->update();
     }
     if (m_removeAction && ev->key() == Qt::Key_Shift) {
         m_removeAction->update();
     }

-    KMenu::keyReleaseEvent(ev);
+    QMenu::keyReleaseEvent(ev);

 }
 
 void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 
 }
 
 void DolphinContextMenu::openTrashContextMenu()
 {
     Q_ASSERT(m_context & TrashContext);
 

-    QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), this);
-    KConfig trashConfig("trashrc", KConfig::SimpleConfig);
+    QAction* emptyTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash"), this);
+    KConfig trashConfig(QStringLiteral("trashrc"), KConfig::SimpleConfig);

     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     addAction(emptyTrashAction);
 
     addCustomActions();
 
     emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true));
     addAction(emptyTrashAction);
 
     addCustomActions();
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
 
     addShowMenuBarAction();
 
     if (exec(m_pos) == emptyTrashAction) {
     addAction(propertiesAction);
 
     addShowMenuBarAction();
 
     if (exec(m_pos) == emptyTrashAction) {

-        KonqOperations::emptyTrash(m_mainWindow);
+        KIO::JobUiDelegate uiDelegate;
+        uiDelegate.setWindow(m_mainWindow);
+        if (uiDelegate.askDeleteConfirmation(QList<QUrl>(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) {
+            KIO::Job* job = KIO::emptyTrash();
+            KJobWidgets::setWindow(job, m_mainWindow);
+            job->ui()->setAutoErrorHandlingEnabled(true);
+        }

     }
 }
 
     }
 }
 


@@ -168,19 +170,22 @@ void DolphinContextMenu::openTrashItemContextMenu()
     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
     addAction(restoreAction);
 
     QAction* restoreAction = new QAction(i18nc("@action:inmenu", "Restore"), m_mainWindow);
     addAction(restoreAction);
 

-    QAction* deleteAction = m_mainWindow->actionCollection()->action("delete");
+    QAction* deleteAction = m_mainWindow->actionCollection()->action(QStringLiteral("delete"));

     addAction(deleteAction);
 
     addAction(deleteAction);
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
 
     if (exec(m_pos) == restoreAction) {
     addAction(propertiesAction);
 
     if (exec(m_pos) == restoreAction) {

-        KUrl::List selectedUrls;
+        QList<QUrl> selectedUrls;
+        selectedUrls.reserve(m_selectedItems.count());

         foreach (const KFileItem &item, m_selectedItems) {
             selectedUrls.append(item.url());
         }
 
         foreach (const KFileItem &item, m_selectedItems) {
             selectedUrls.append(item.url());
         }
 

-        KonqOperations::restoreTrashedItems(selectedUrls, m_mainWindow);
+        KIO::RestoreJob *job = KIO::restoreFromTrash(selectedUrls);
+        KJobWidgets::setWindow(job, m_mainWindow);
+        job->uiDelegate()->setAutoErrorHandlingEnabled(true);

     }
 }
 
     }
 }
 


@@ -188,6 +193,7 @@ void DolphinContextMenu::openItemContextMenu()
 {
     Q_ASSERT(!m_fileInfo.isNull());
 
 {
     Q_ASSERT(!m_fileInfo.isNull());
 

+    QAction* openParentAction = 0;

     QAction* openParentInNewWindowAction = 0;
     QAction* openParentInNewTabAction = 0;
     QAction* addToPlacesAction = 0;
     QAction* openParentInNewWindowAction = 0;
     QAction* openParentInNewTabAction = 0;
     QAction* addToPlacesAction = 0;


@@ -202,35 +208,41 @@ void DolphinContextMenu::openItemContextMenu()
             newFileMenu->checkUpToDate();
             newFileMenu->setPopupFiles(m_fileInfo.url());
             newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
             newFileMenu->checkUpToDate();
             newFileMenu->setPopupFiles(m_fileInfo.url());
             newFileMenu->setEnabled(selectedItemsProps.supportsWriting());

-            connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
-            connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
+            connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);
+            connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater);

 
 

-            KMenu* menu = newFileMenu->menu();
+            QMenu* menu = newFileMenu->menu();

             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
             menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));

-            menu->setIcon(KIcon("document-new"));
+            menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));

             addMenu(menu);
             addSeparator();
 
             // insert 'Open in new window' and 'Open in new tab' entries
             addMenu(menu);
             addSeparator();
 
             // insert 'Open in new window' and 'Open in new tab' entries

-            addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
-            addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));

 
             // insert 'Add to Places' entry
             if (!placeExists(m_fileInfo.url())) {
 
             // insert 'Add to Places' entry
             if (!placeExists(m_fileInfo.url())) {

-                addToPlacesAction = addAction(KIcon("bookmark-new"),
+                addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),

                                                        i18nc("@action:inmenu Add selected folder to places",
                                                              "Add to Places"));
             }
 
             addSeparator();
                                                        i18nc("@action:inmenu Add selected folder to places",
                                                              "Add to Places"));
             }
 
             addSeparator();

-        } else if (m_baseUrl.protocol().contains("search")) {
-            openParentInNewWindowAction = new QAction(KIcon("window-new"),
+        } else if (m_baseUrl.scheme().contains(QStringLiteral("search")) || m_baseUrl.scheme().contains(QStringLiteral("timeline"))) {
+            openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")),
+                                           i18nc("@action:inmenu",
+                                                 "Open Path"),
+                                           this);
+            addAction(openParentAction);
+
+            openParentInNewWindowAction = new QAction(QIcon::fromTheme(QStringLiteral("window-new")),

                                                     i18nc("@action:inmenu",
                                                           "Open Path in New Window"),
                                                     this);
             addAction(openParentInNewWindowAction);
 
                                                     i18nc("@action:inmenu",
                                                           "Open Path in New Window"),
                                                     this);
             addAction(openParentInNewWindowAction);
 

-            openParentInNewTabAction = new QAction(KIcon("tab-new"),
+            openParentInNewTabAction = new QAction(QIcon::fromTheme(QStringLiteral("tab-new")),

                                                    i18nc("@action:inmenu",
                                                          "Open Path in New Tab"),
                                                    this);
                                                    i18nc("@action:inmenu",
                                                          "Open Path in New Tab"),
                                                    this);


@@ -239,15 +251,15 @@ void DolphinContextMenu::openItemContextMenu()
             addSeparator();
         } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) {
             // insert 'Open in new window' and 'Open in new tab' entries
             addSeparator();
         } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) {
             // insert 'Open in new window' and 'Open in new tab' entries

-            addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
-            addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window")));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab")));

 
             addSeparator();
         }
     } else {
         bool selectionHasOnlyDirs = true;
         foreach (const KFileItem& item, m_selectedItems) {
 
             addSeparator();
         }
     } else {
         bool selectionHasOnlyDirs = true;
         foreach (const KFileItem& item, m_selectedItems) {

-            const KUrl& url = DolphinView::openItemAsFolderUrl(item);
+            const QUrl& url = DolphinView::openItemAsFolderUrl(item);

             if (url.isEmpty()) {
                 selectionHasOnlyDirs = false;
                 break;
             if (url.isEmpty()) {
                 selectionHasOnlyDirs = false;
                 break;


@@ -256,7 +268,7 @@ void DolphinContextMenu::openItemContextMenu()
 
         if (selectionHasOnlyDirs) {
             // insert 'Open in new tab' entry
 
         if (selectionHasOnlyDirs) {
             // insert 'Open in new tab' entry

-            addAction(m_mainWindow->actionCollection()->action("open_in_new_tabs"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs")));

             addSeparator();
         }
     }
             addSeparator();
         }
     }


@@ -275,25 +287,29 @@ void DolphinContextMenu::openItemContextMenu()
 
     // insert 'Copy To' and 'Move To' sub menus
     if (GeneralSettings::showCopyMoveMenu()) {
 
     // insert 'Copy To' and 'Move To' sub menus
     if (GeneralSettings::showCopyMoveMenu()) {

-        m_copyToMenu.setItems(m_selectedItems);
+        m_copyToMenu.setUrls(m_selectedItems.urlList());

         m_copyToMenu.setReadOnly(!selectedItemsProps.supportsWriting());
         m_copyToMenu.setReadOnly(!selectedItemsProps.supportsWriting());

+        m_copyToMenu.setAutoErrorHandlingEnabled(true);

         m_copyToMenu.addActionsTo(this);
     }
 
     // insert 'Properties...' entry
         m_copyToMenu.addActionsTo(this);
     }
 
     // insert 'Properties...' entry

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
 
     QAction* activatedAction = exec(m_pos);
     if (activatedAction) {
         if (activatedAction == addToPlacesAction) {
     addAction(propertiesAction);
 
     QAction* activatedAction = exec(m_pos);
     if (activatedAction) {
         if (activatedAction == addToPlacesAction) {

-            const KUrl selectedUrl(m_fileInfo.url());
+            const QUrl selectedUrl(m_fileInfo.url());

             if (selectedUrl.isValid()) {
                 PlacesItemModel model;
                 const QString text = selectedUrl.fileName();
                 PlacesItem* item = model.createPlacesItem(text, selectedUrl);
                 model.appendItemToGroup(item);
             if (selectedUrl.isValid()) {
                 PlacesItemModel model;
                 const QString text = selectedUrl.fileName();
                 PlacesItem* item = model.createPlacesItem(text, selectedUrl);
                 model.appendItemToGroup(item);

+                model.saveBookmarks();

             }
             }

+        } else if (activatedAction == openParentAction) {
+            m_command = OpenParentFolder;

         } else if (activatedAction == openParentInNewWindowAction) {
             m_command = OpenParentFolderInNewWindow;
         } else if (activatedAction == openParentInNewTabAction) {
         } else if (activatedAction == openParentInNewWindowAction) {
             m_command = OpenParentFolderInNewWindow;
         } else if (activatedAction == openParentInNewTabAction) {


@@ -315,13 +331,13 @@ void DolphinContextMenu::openViewportContextMenu()
 
     // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and
     // "open_in_new_tab" here, as the current selection should get ignored.
 
     // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and
     // "open_in_new_tab" here, as the current selection should get ignored.

-    addAction(m_mainWindow->actionCollection()->action("new_window"));
-    addAction(m_mainWindow->actionCollection()->action("new_tab"));
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_window")));
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab")));

 
     // Insert 'Add to Places' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
 
     // Insert 'Add to Places' entry if exactly one item is selected
     QAction* addToPlacesAction = 0;
     if (!placeExists(m_mainWindow->activeViewContainer()->url())) {

-        addToPlacesAction = addAction(KIcon("bookmark-new"),
+        addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),

                                              i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     }
 
                                              i18nc("@action:inmenu Add current folder to places", "Add to Places"));
     }
 


@@ -343,7 +359,7 @@ void DolphinContextMenu::openViewportContextMenu()
 
     addCustomActions();
 
 
     addCustomActions();
 

-    QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+    QAction* propertiesAction = m_mainWindow->actionCollection()->action(QStringLiteral("properties"));

     addAction(propertiesAction);
 
     addShowMenuBarAction();
     addAction(propertiesAction);
 
     addShowMenuBarAction();


@@ -356,6 +372,7 @@ void DolphinContextMenu::openViewportContextMenu()
             PlacesItem* item = model.createPlacesItem(container->placesText(),
                                                       container->url());
             model.appendItemToGroup(item);
             PlacesItem* item = model.createPlacesItem(container->placesText(),
                                                       container->url());
             model.appendItemToGroup(item);

+            model.saveBookmarks();

         }
     }
 }
         }
     }
 }


@@ -372,12 +389,12 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
     addSeparator();
 
     // Insert 'Rename'
     addSeparator();
 
     // Insert 'Rename'

-    QAction* renameAction = collection->action("rename");
+    QAction* renameAction = collection->action(QStringLiteral("rename"));

     addAction(renameAction);
 
     // Insert 'Move to Trash' and/or 'Delete'
     if (properties.supportsDeleting()) {
     addAction(renameAction);
 
     // Insert 'Move to Trash' and/or 'Delete'
     if (properties.supportsDeleting()) {

-        const bool showDeleteAction = (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false) ||
+        const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) ||

                                        !properties.isLocal());
         const bool showMoveToTrashAction = (properties.isLocal() &&
                                             properties.supportsMoving());
                                        !properties.isLocal());
         const bool showMoveToTrashAction = (properties.isLocal() &&
                                             properties.supportsMoving());


@@ -385,10 +402,10 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties&
         if (showDeleteAction && showMoveToTrashAction) {
             delete m_removeAction;
             m_removeAction = 0;
         if (showDeleteAction && showMoveToTrashAction) {
             delete m_removeAction;
             m_removeAction = 0;

-            addAction(m_mainWindow->actionCollection()->action("move_to_trash"));
-            addAction(m_mainWindow->actionCollection()->action("delete"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("move_to_trash")));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("delete")));

         } else if (showDeleteAction && !showMoveToTrashAction) {
         } else if (showDeleteAction && !showMoveToTrashAction) {

-            addAction(m_mainWindow->actionCollection()->action("delete"));
+            addAction(m_mainWindow->actionCollection()->action(QStringLiteral("delete")));

         } else {
             if (!m_removeAction) {
                 m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection());
         } else {
             if (!m_removeAction) {
                 m_removeAction = new DolphinRemoveAction(this, m_mainWindow->actionCollection());


@@ -409,18 +426,13 @@ void DolphinContextMenu::addShowMenuBarAction()
     }
 }
 
     }
 }
 

-bool DolphinContextMenu::placeExists(const KUrl& url) const
+bool DolphinContextMenu::placeExists(const QUrl& url) const

 {
 {

-    PlacesItemModel model;
-
-    const int count = model.count();
-    for (int i = 0; i < count; ++i) {
-        const KUrl placeUrl = model.placesItem(i)->url();
-        if (placeUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
-            return true;
-        }
-    }
-
+    // Creating up a PlacesItemModel to find out if 'url' is one of the Places
+    // can be expensive because the model asks Solid for the devices which are
+    // available, which can take some time.
+    // TODO: Consider restoring this check if the handling of Places and devices
+    // will be decoupled in the future.

     return false;
 }
 
     return false;
 }
 


@@ -429,10 +441,12 @@ QAction* DolphinContextMenu::createPasteAction()
     QAction* action = 0;
     const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir();
     if (isDir && (m_selectedItems.count() == 1)) {
     QAction* action = 0;
     const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir();
     if (isDir && (m_selectedItems.count() == 1)) {

-        const QPair<bool, QString> pasteInfo = KonqOperations::pasteInfo(m_fileInfo.url());
-        action = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this);
-        action->setEnabled(pasteInfo.first);
-        connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder()));
+        const QMimeData *mimeData = QApplication::clipboard()->mimeData();
+        bool canPaste;
+        const QString text = KIO::pasteActionText(mimeData, &canPaste, m_fileInfo);
+        action = new QAction(QIcon::fromTheme(QStringLiteral("edit-paste")), text, this);
+        action->setEnabled(canPaste);
+        connect(action, &QAction::triggered, m_mainWindow, &DolphinMainWindow::pasteIntoFolder);

     } else {
         action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
     }
     } else {
         action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
     }


@@ -451,7 +465,7 @@ KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const
 KFileItem DolphinContextMenu::baseFileItem()
 {
     if (!m_baseFileItem) {
 KFileItem DolphinContextMenu::baseFileItem()
 {
     if (!m_baseFileItem) {

-        m_baseFileItem = new KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_baseUrl);
+        m_baseFileItem = new KFileItem(m_baseUrl);

     }
     return *m_baseFileItem;
 }
     }
     return *m_baseFileItem;
 }


@@ -461,7 +475,7 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions)
     fileItemActions.setParentWidget(m_mainWindow);
 
     // insert 'Open With...' action or sub menu
     fileItemActions.setParentWidget(m_mainWindow);
 
     // insert 'Open With...' action or sub menu

-    fileItemActions.addOpenWithActionsTo(this, "DesktopEntryName != 'dolphin'");
+    fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != 'dolphin'"));

 
     // insert 'Actions' sub menu
     fileItemActions.addServiceActionsTo(this);
 
     // insert 'Actions' sub menu
     fileItemActions.addServiceActionsTo(this);


@@ -478,30 +492,23 @@ void DolphinContextMenu::addFileItemPluginActions()
 
     QString commonMimeType = props.mimeType();
     if (commonMimeType.isEmpty()) {
 
     QString commonMimeType = props.mimeType();
     if (commonMimeType.isEmpty()) {

-        commonMimeType = QLatin1String("application/octet-stream");
+        commonMimeType = QStringLiteral("application/octet-stream");

     }
 
     }
 

-    const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, "KFileItemAction/Plugin", "exist Library");
+    const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, QStringLiteral("KFileItemAction/Plugin"), QStringLiteral("exist Library"));

     if (pluginServices.isEmpty()) {
         return;
     }
 
     if (pluginServices.isEmpty()) {
         return;
     }
 

-    const KConfig config("kservicemenurc", KConfig::NoGlobals);
+    const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);

     const KConfigGroup showGroup = config.group("Show");
 
     const KConfigGroup showGroup = config.group("Show");
 

-    foreach (const KSharedPtr<KService>& service, pluginServices) {
+    foreach (const KService::Ptr& service, pluginServices) {

         if (!showGroup.readEntry(service->desktopEntryName(), true)) {
             // The plugin has been disabled
             continue;
         }
 
         if (!showGroup.readEntry(service->desktopEntryName(), true)) {
             // The plugin has been disabled
             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);


@@ -515,18 +522,13 @@ void DolphinContextMenu::addVersionControlPluginActions()
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
     if (!versionControlActions.isEmpty()) {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
     if (!versionControlActions.isEmpty()) {

-        foreach (QAction* action, versionControlActions) {
-            addAction(action);
-        }
+        addActions(versionControlActions);

         addSeparator();
     }
 }
 
 void DolphinContextMenu::addCustomActions()
 {
         addSeparator();
     }
 }
 
 void DolphinContextMenu::addCustomActions()
 {

-    foreach (QAction* action, m_customActions) {
-        addAction(action);
-    }
+    addActions(m_customActions);

 }
 
 }
 

-#include "dolphincontextmenu.moc"