Merge doPaste and doPasteV2. Remove unused QPoint. Remove unused editMimeType.

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ccfd290e007ab879f407ba4181ee388e68fc36ea..f597d52e320af42aae784c190eb61bbee2e600f2 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -27,37 +27,28 @@
 #include "dolphinremoveaction.h"
 
 #include <KActionCollection>
-#include <KDesktopFile>
 #include <kfileitemactionplugin.h>
 #include <kabstractfileitemactionplugin.h>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
-#include <KGlobal>
-#include <KIconLoader>
 #include <KIO/RestoreJob>
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
-#include <KJobUiDelegate>
 #include <KJobWidgets>
-#include <KMenu>
-#include <KMenuBar>
-#include <KMessageBox>
+#include <QMenu>
 #include <KMimeTypeTrader>
 #include <KMimeType>
 #include <KNewFileMenu>
 #include <konq_operations.h>
 #include <KService>
-#include <KLocale>
-#include <KPropertiesDialog>
+#include <KLocalizedString>
 #include <KStandardAction>
 #include <KToolBar>
 
+#include <QMenuBar>
 #include <panels/places/placesitem.h>
 #include <panels/places/placesitemmodel.h>
 
-#include <QApplication>
-#include <QClipboard>
-#include <QDir>
 
 #include "views/dolphinview.h"
 #include "views/viewmodecontroller.h"
@@ -66,7 +57,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const QPoint& pos,
                                        const KFileItem& fileInfo,
                                        const KUrl& baseUrl) :
-    KMenu(parent),
+    QMenu(parent),
     m_pos(pos),
     m_mainWindow(parent),
     m_fileInfo(fileInfo),
@@ -131,7 +122,7 @@ void DolphinContextMenu::keyPressEvent(QKeyEvent *ev)
     if (m_removeAction && ev->key() == Qt::Key_Shift) {
         m_removeAction->update();
     }
-    KMenu::keyPressEvent(ev);
+    QMenu::keyPressEvent(ev);
 }
 
 void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev)
@@ -139,7 +130,7 @@ void DolphinContextMenu::keyReleaseEvent(QKeyEvent *ev)
     if (m_removeAction && ev->key() == Qt::Key_Shift) {
         m_removeAction->update();
     }
-    KMenu::keyReleaseEvent(ev);
+    QMenu::keyReleaseEvent(ev);
 }
 
 void DolphinContextMenu::openTrashContextMenu()