Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / views / dolphinviewactionhandler.h

diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index edbe41b9009d9a04cf86ddb65b221be98aaa83e1..bf664f73172a3cf408c596f89d91732b2b8b5f86 100644 (file)
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -23,8 +23,6 @@
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #include "libdolphin_export.h"
-#include <KActionMenu>
-#include <KSelectAction>
 #include "views/dolphinview.h"
 #include <QObject>
 
@@ -112,7 +110,7 @@ private Q_SLOTS:
      * Moves the selected items of the active view to the trash.
      * This methods adds "shift means del" handling.
      */
-    void slotTrashActivated(Qt::MouseButtons, Qt::KeyboardModifiers);
+    void slotTrashActivated();
 
     /**
      * Deletes the selected items of the active view.
@@ -196,6 +194,11 @@ private Q_SLOTS:
      */
     void slotHiddenFilesShownChanged(bool shown);
 
+    /**
+     * Updates the state of the 'Create Folder...' action.
+     */
+    void slotWriteStateChanged(bool isFolderWritable);
+
     /**
      * Opens the view properties dialog, which allows to modify the properties
      * of the currently active view.