Merge branch 'Applications/17.12'

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index f7f3a231a24ee9373c39251efb7d3d71eca6f549..558115fb045587fb0ffcc5f158d25f11812c4512 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -22,7 +22,7 @@
 
 #include <KFileItem>
 #include <QUrl>
-#include <konq_copytomenu.h>
+#include <KFileCopyToMenu>
 #include <QMenu>
 
 
@@ -74,7 +74,7 @@ public:
                        const KFileItem& fileInfo,
                        const QUrl& baseUrl);
 
-    virtual ~DolphinContextMenu();
+    ~DolphinContextMenu() override;
 
     void setCustomActions(const QList<QAction*>& actions);
 
@@ -89,8 +89,8 @@ public:
     Command open();
 
 protected:
-    virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
-    virtual void keyReleaseEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *ev) override;
+    void keyReleaseEvent(QKeyEvent *ev) override;
 
 private:
     void openTrashContextMenu();
@@ -123,11 +123,6 @@ private:
      */
     void addServiceActions(KFileItemActions& fileItemActions);
 
-    /**
-     * Adds actions that are provided by a KFileItemActionPlugin.
-     */
-    void addFileItemPluginActions();
-
     /**
      * Adds actions that are provided by a KVersionControlPlugin.
      */
@@ -169,7 +164,7 @@ private:
     mutable KFileItemListProperties* m_selectedItemsProperties;
 
     int m_context;
-    KonqCopyToMenu m_copyToMenu;
+    KFileCopyToMenu m_copyToMenu;
     QList<QAction*> m_customActions;
 
     Command m_command;