Merge branch 'master' into kf6

[dolphin.git] / src / dolphinnewfilemenu.cpp

diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index bcfaebd57013f2145dc346ff38d1a214d1ba026d..43fbdf5c9dbba3ca5b9471ece28fca17f1bdf753 100644 (file)
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -10,10 +10,17 @@
 
 #include <KActionCollection>
 #include <KIO/Job>
 
 #include <KActionCollection>
 #include <KIO/Job>

+#include <kio_version.h>

 
 

-DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection* collection, QObject* parent) :
-    KNewFileMenu(collection, QStringLiteral("new_menu"), parent)
+DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection *collection, QObject *parent)
+#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+    : KNewFileMenu(parent)

 {
 {

+    Q_UNUSED(collection)
+#else
+    : KNewFileMenu(collection, QStringLiteral("new_menu"), parent)
+{
+#endif

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


@@ -22,12 +29,11 @@ DolphinNewFileMenu::~DolphinNewFileMenu()
     DolphinNewFileMenuObserver::instance().detach(this);
 }
 
     DolphinNewFileMenuObserver::instance().detach(this);
 }
 

-void DolphinNewFileMenu::slotResult(KJob* job)
+void DolphinNewFileMenu::slotResult(KJob *job)

 {
 {

-    if (job->error()) {
-        emit errorMessage(job->errorString());
+    if (job->error() && job->error() != KIO::ERR_USER_CANCELED) {
+        Q_EMIT errorMessage(job->errorString());

     } else {
         KNewFileMenu::slotResult(job);
     }
 }
     } else {
         KNewFileMenu::slotResult(job);
     }
 }

-