Merge branch 'master' into kf6

[dolphin.git] / src / views / draganddrophelper.cpp

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index 4d76992cadcda90f49f8f97bed5a6e0e34ac5cff..aaf2baa383501f89e79258e5d9df396f1eb74efd 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -1,61 +1,50 @@
-/***************************************************************************
- *   Copyright (C) 2007-2011 by Peter Penz <peter.penz19@gmail.com>        *
- *   Copyright (C) 2007 by David Faure <faure@kde.org>                     *
- *                                                                         *
- *   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: 2007-2011 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2007 David Faure <faure@kde.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "draganddrophelper.h"
 
-#include <QUrl>
-#include <QDBusMessage>
+#include <KIO/DropJob>
+#include <KJobWidgets>
+
 #include <QDBusConnection>
+#include <QDBusMessage>
 #include <QDropEvent>
 #include <QMimeData>
 
-#include <KIO/DropJob>
-#include <KJobWidgets>
-
 QHash<QUrl, bool> DragAndDropHelper::m_urlListMatchesUrlCache;
 
-bool DragAndDropHelper::urlListMatchesUrl(const QList<QUrl>& urls, const QUrl& destUrl)
+bool DragAndDropHelper::urlListMatchesUrl(const QList<QUrl> &urls, const QUrl &destUrl)
 {
     auto iteratorResult = m_urlListMatchesUrlCache.constFind(destUrl);
     if (iteratorResult != m_urlListMatchesUrlCache.constEnd()) {
         return *iteratorResult;
     }
 
-    const bool destUrlMatches =
-        std::find_if(urls.constBegin(), urls.constEnd(), [destUrl](const QUrl& url) {
-            return url.matches(destUrl, QUrl::StripTrailingSlash);
-        }) != urls.constEnd();
+    const bool destUrlMatches = std::find_if(urls.constBegin(),
+                                             urls.constEnd(),
+                                             [destUrl](const QUrl &url) {
+                                                 return url.matches(destUrl, QUrl::StripTrailingSlash);
+                                             })
+        != urls.constEnd();
 
     return *m_urlListMatchesUrlCache.insert(destUrl, destUrlMatches);
 }
 
-KIO::DropJob* DragAndDropHelper::dropUrls(const QUrl& destUrl, QDropEvent* event, QWidget* window)
+KIO::DropJob *DragAndDropHelper::dropUrls(const QUrl &destUrl, QDropEvent *event, QWidget *window)
 {
-    const QMimeData* mimeData = event->mimeData();
-    if (mimeData->hasFormat(QStringLiteral("application/x-kde-ark-dndextract-service")) &&
-        mimeData->hasFormat(QStringLiteral("application/x-kde-ark-dndextract-path"))) {
-        const QString remoteDBusClient = mimeData->data(QStringLiteral("application/x-kde-ark-dndextract-service"));
-        const QString remoteDBusPath = mimeData->data(QStringLiteral("application/x-kde-ark-dndextract-path"));
+    const QMimeData *mimeData = event->mimeData();
+    if (isArkDndMimeType(mimeData)) {
+        const QString remoteDBusClient = mimeData->data(arkDndServiceMimeType());
+        const QString remoteDBusPath = mimeData->data(arkDndPathMimeType());
 
-        QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient, remoteDBusPath,
-                                                              QStringLiteral("org.kde.ark.DndExtract"), QStringLiteral("extractSelectedFilesTo"));
+        QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient,
+                                                              remoteDBusPath,
+                                                              QStringLiteral("org.kde.ark.DndExtract"),
+                                                              QStringLiteral("extractSelectedFilesTo"));
         message.setArguments({destUrl.toDisplayString(QUrl::PreferLocalFile)});
         QDBusConnection::sessionBus().call(message);
     } else {
@@ -77,3 +66,7 @@ void DragAndDropHelper::clearUrlListMatchesUrlCache()
     DragAndDropHelper::m_urlListMatchesUrlCache.clear();
 }
 
+bool DragAndDropHelper::isArkDndMimeType(const QMimeData *mimeData)
+{
+    return mimeData->hasFormat(arkDndServiceMimeType()) && mimeData->hasFormat(arkDndPathMimeType());
+}