SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphinnewfilemenu.cpp

diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index 43fbdf5c9dbba3ca5b9471ece28fca17f1bdf753..2ccd7dd694927ee339b7323e0a7073b2ca85ad46 100644 (file)
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -8,19 +8,15 @@
 
 #include "views/dolphinnewfilemenuobserver.h"
 
 
 #include "views/dolphinnewfilemenuobserver.h"
 

-#include <KActionCollection>
-#include <KIO/Job>
-#include <kio_version.h>
+#include <KIO/Global>

 
 

-DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection *collection, QObject *parent)
-#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+#include <QAction>
+
+DolphinNewFileMenu::DolphinNewFileMenu(QAction *createDirAction, QAction *createFileAction, QObject *parent)

     : KNewFileMenu(parent)
 {
     : KNewFileMenu(parent)
 {

-    Q_UNUSED(collection)
-#else
-    : KNewFileMenu(collection, QStringLiteral("new_menu"), parent)
-{
-#endif
+    setNewFolderShortcutAction(createDirAction);
+    setNewFileShortcutAction(createFileAction);

     DolphinNewFileMenuObserver::instance().attach(this);
 }
 
     DolphinNewFileMenuObserver::instance().attach(this);
 }
 


@@ -37,3 +33,5 @@ void DolphinNewFileMenu::slotResult(KJob *job)
         KNewFileMenu::slotResult(job);
     }
 }
         KNewFileMenu::slotResult(job);
     }
 }

+
+#include "moc_dolphinnewfilemenu.cpp"