Merge branch 'master' into kf6

[dolphin.git] / src / dolphinnewfilemenu.cpp

diff --git a/src/dolphinnewfilemenu.cpp b/src/dolphinnewfilemenu.cpp
index 87f0932d87036c4f2b1848878e42479e05b7bde4..43fbdf5c9dbba3ca5b9471ece28fca17f1bdf753 100644 (file)
--- a/src/dolphinnewfilemenu.cpp
+++ b/src/dolphinnewfilemenu.cpp
@@ -1,22 +1,8 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Peter Penz <peter.penz@gmx.at>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "dolphinnewfilemenu.h"
 
@@ -24,10 +10,17 @@
 
 #include <KActionCollection>
 #include <KIO/Job>
+#include <kio_version.h>
 
-DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection* collection, QObject* parent) :
-    KNewFileMenu(collection, "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);
 }
 
@@ -36,12 +29,11 @@ DolphinNewFileMenu::~DolphinNewFileMenu()
     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);
     }
 }
-