Fix the build of kde-baseapps temporarily (categorized logging in DolphinPart)

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index f597d52e320af42aae784c190eb61bbee2e600f2..27ad19924ccfb4e598a3e9be1378a04523aa5ee8 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -27,25 +27,27 @@
 #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 <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
 #include <KIO/RestoreJob>
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>

+#include <KIO/Paste>

 #include <KJobWidgets>
 #include <KJobWidgets>

-#include <QMenu>

 #include <KMimeTypeTrader>
 #include <KMimeTypeTrader>

-#include <KMimeType>

 #include <KNewFileMenu>
 #include <KNewFileMenu>

-#include <konq_operations.h>

 #include <KService>
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KToolBar>
 
 #include <KService>
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KToolBar>
 

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

 #include <QMenuBar>
 #include <QMenuBar>

+#include <QMenu>
+

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


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

-                                       const KUrl& baseUrl) :
+                                       const QUrl& baseUrl) :

     QMenu(parent),
     m_pos(pos),
     m_mainWindow(parent),
     QMenu(parent),
     m_pos(pos),
     m_mainWindow(parent),


@@ -91,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;
     }
 


@@ -175,7 +177,7 @@ void DolphinContextMenu::openTrashItemContextMenu()
     addAction(propertiesAction);
 
     if (exec(m_pos) == restoreAction) {
     addAction(propertiesAction);
 
     if (exec(m_pos) == restoreAction) {

-        KUrl::List selectedUrls;
+        QList<QUrl> selectedUrls;

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


@@ -226,7 +228,7 @@ void DolphinContextMenu::openItemContextMenu()
             }
 
             addSeparator();
             }
 
             addSeparator();

-        } else if (m_baseUrl.protocol().contains("search") || m_baseUrl.protocol().contains("timeline")) {
+        } else if (m_baseUrl.scheme().contains("search") || m_baseUrl.scheme().contains("timeline")) {

             openParentAction = new QAction(QIcon::fromTheme("document-open-folder"),
                                            i18nc("@action:inmenu",
                                                  "Open Path"),
             openParentAction = new QAction(QIcon::fromTheme("document-open-folder"),
                                            i18nc("@action:inmenu",
                                                  "Open Path"),


@@ -256,7 +258,7 @@ void DolphinContextMenu::openItemContextMenu()
     } else {
         bool selectionHasOnlyDirs = true;
         foreach (const KFileItem& item, m_selectedItems) {
     } 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;


@@ -284,8 +286,9 @@ 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);
     }
 
         m_copyToMenu.addActionsTo(this);
     }
 


@@ -296,7 +299,7 @@ void DolphinContextMenu::openItemContextMenu()
     QAction* activatedAction = exec(m_pos);
     if (activatedAction) {
         if (activatedAction == addToPlacesAction) {
     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();
             if (selectedUrl.isValid()) {
                 PlacesItemModel model;
                 const QString text = selectedUrl.fileName();


@@ -420,14 +423,14 @@ 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) {
 {
     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)) {
+        const QUrl placeUrl = model.placesItem(i)->url();
+        if (placeUrl.matches(url, QUrl::StripTrailingSlash)) {

             return true;
         }
     }
             return true;
         }
     }


@@ -440,9 +443,11 @@ 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(QIcon::fromTheme("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this);
-        action->setEnabled(pasteInfo.first);
+        const QMimeData *mimeData = QApplication::clipboard()->mimeData();
+        bool canPaste;
+        const QString text = KIO::pasteActionText(mimeData, &canPaste, m_fileInfo);
+        action = new QAction(QIcon::fromTheme("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));
         connect(action, &QAction::triggered, m_mainWindow, &DolphinMainWindow::pasteIntoFolder);
     } else {
         action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste));


@@ -462,7 +467,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;
 }


@@ -506,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);


@@ -526,17 +524,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);

 }
 
 }