Merge branch 'release/22.04'

[dolphin.git] / src / kitemviews / private / kfileitemclipboard.cpp

diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp
index e127678535aca1f63b747d91824dc23c2ffa457f..ec31068e7db3ef58c246aa19f4d199faf36c0210 100644 (file)
--- a/src/kitemviews/private/kfileitemclipboard.cpp
+++ b/src/kitemviews/private/kfileitemclipboard.cpp
@@ -1,28 +1,16 @@
-/***************************************************************************
- *   Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   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: 2011 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "kfileitemclipboard.h"
 
+#include <KUrlMimeData>
+
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
-#include <KUrlMimeData>
 
 class KFileItemClipboardSingleton
 {
@@ -45,7 +33,7 @@ bool KFileItemClipboard::isCut(const QUrl& url) const
 
 QList<QUrl> KFileItemClipboard::cutItems() const
 {
-    return m_cutItems.toList();
+    return m_cutItems.values();
 }
 
 KFileItemClipboard::~KFileItemClipboard()
@@ -59,22 +47,23 @@ void KFileItemClipboard::updateCutItems()
     // mimeData can be 0 according to https://bugs.kde.org/show_bug.cgi?id=335053
     if (!mimeData) {
         m_cutItems.clear();
-        emit cutItemsChanged();
+        Q_EMIT cutItemsChanged();
         return;
     }
 
-    const QByteArray data = mimeData->data("application/x-kde-cutselection");
+    const QByteArray data = mimeData->data(QStringLiteral("application/x-kde-cutselection"));
     const bool isCutSelection = (!data.isEmpty() && data.at(0) == QLatin1Char('1'));
     if (isCutSelection) {
-        m_cutItems = KUrlMimeData::urlsFromMimeData(mimeData).toSet();
+        const auto urlsFromMimeData = KUrlMimeData::urlsFromMimeData(mimeData);
+        m_cutItems = QSet<QUrl>(urlsFromMimeData.constBegin(), urlsFromMimeData.constEnd());
     } else {
         m_cutItems.clear();
     }
-    emit cutItemsChanged();
+    Q_EMIT cutItemsChanged();
 }
 
 KFileItemClipboard::KFileItemClipboard() :
-    QObject(0),
+    QObject(nullptr),
     m_cutItems()
 {
     updateCutItems();