Merge remote-tracking branch 'origin/Applications/19.04'

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

diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index 58cdb5416068d423e1421201c5b82071781a06f0..537adb4da53ed6b0d8f7300d27e24a63ac68809b 100644 (file)
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -22,10 +22,9 @@
 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 
 #ifndef DOLPHINVIEWACTIONHANDLER_H
 #define DOLPHINVIEWACTIONHANDLER_H
 

-#include "libdolphin_export.h"
-#include <KActionMenu>
-#include <KSelectAction>
+#include "dolphin_export.h"

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

+

 #include <QObject>
 
 class KToggleAction;
 #include <QObject>
 
 class KToggleAction;


@@ -48,7 +47,7 @@ class KActionCollection;
  * @see DolphinMainWindow
  * @see DolphinPart
  */
  * @see DolphinMainWindow
  * @see DolphinPart
  */

-class LIBDOLPHINPRIVATE_EXPORT DolphinViewActionHandler : public QObject
+class DOLPHIN_EXPORT DolphinViewActionHandler : public QObject

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 


@@ -85,7 +84,7 @@ public Q_SLOTS:
 Q_SIGNALS:
     /**
      * Emitted by DolphinViewActionHandler when the user triggered an action.
 Q_SIGNALS:
     /**
      * Emitted by DolphinViewActionHandler when the user triggered an action.

-     * This is only used for clearining the statusbar in DolphinMainWindow.
+     * This is only used for clearing the statusbar in DolphinMainWindow.

      */
     void actionBeingHandled();
 
      */
     void actionBeingHandled();
 


@@ -94,7 +93,7 @@ Q_SIGNALS:
      * The receiver of the signal (DolphinMainWindow or DolphinPart) invokes
      * the method createDirectory of their KNewFileMenu instance.
      */
      * The receiver of the signal (DolphinMainWindow or DolphinPart) invokes
      * the method createDirectory of their KNewFileMenu instance.
      */

-    void createDirectory();
+    void createDirectoryTriggered();

 
 private Q_SLOTS:
     /**
 
 private Q_SLOTS:
     /**