Fix issues if QT_NO_CAST_FROM_ASCII is defined

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

diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp
index e1deda3ddb3e5227e937e931dd2ae423643f5dfb..47718fa025efb12d438ac1cd98f8b82464ab087d 100644 (file)
--- a/src/kitemviews/private/kfileitemclipboard.cpp
+++ b/src/kitemviews/private/kfileitemclipboard.cpp
@@ -19,14 +19,12 @@ public:
 };
 Q_GLOBAL_STATIC(KFileItemClipboardSingleton, s_KFileItemClipboard)
 
-
-
-KFileItemClipboard* KFileItemClipboard::instance()
+KFileItemClipboard *KFileItemClipboard::instance()
 {
     return &s_KFileItemClipboard->instance;
 }
 
-bool KFileItemClipboard::isCut(const QUrl& url) const
+bool KFileItemClipboard::isCut(const QUrl &url) const
 {
     return m_cutItems.contains(url);
 }
@@ -42,31 +40,33 @@ KFileItemClipboard::~KFileItemClipboard()
 
 void KFileItemClipboard::updateCutItems()
 {
-    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
+    const QMimeData *mimeData = QApplication::clipboard()->mimeData();
 
     // 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(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(nullptr),
-    m_cutItems()
+KFileItemClipboard::KFileItemClipboard()
+    : QObject(nullptr)
+    , m_cutItems()
 {
     updateCutItems();
 
-    connect(QApplication::clipboard(), &QClipboard::dataChanged,
-            this, &KFileItemClipboard::updateCutItems);
+    connect(QApplication::clipboard(), &QClipboard::dataChanged, this, &KFileItemClipboard::updateCutItems);
 }
+
+#include "moc_kfileitemclipboard.cpp"