┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2020-05-28 19:42:23 +0200
committerElvis Angelaccio <[email protected]>2020-10-15 01:22:00 +0200
commit3bf2922e3337511fff974978b8b92f6e7bb53bec (patch)
tree6771e1975ee3b4188e16cd8470b3b3e1d1766b0c /src/kitemviews
parent31cba55cff36d1d1501350209482f25a429c0a27 (diff)
Port away from QList::toSet()
The QSet range constructor requires Qt 5.14. In `DolphinView::slotHeaderContextMenuRequested()` the conversion from QList to QSet was pointless, so we just use a QList now.
Diffstat (limited to 'src/kitemviews')
-rw-r--r--src/kitemviews/kfileitemlistview.cpp3
-rw-r--r--src/kitemviews/kstandarditemlistwidget.cpp3
-rw-r--r--src/kitemviews/private/kfileitemclipboard.cpp3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 73d6c72e9..4ccda7b51 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -388,7 +388,8 @@ void KFileItemListView::applyRolesToModel()
// KFileItemModel does not distinct between "visible" and "invisible" roles.
// Add all roles that are mandatory for having a working KFileItemListView:
- QSet<QByteArray> roles = visibleRoles().toSet();
+ const auto visibleRoles = this->visibleRoles();
+ auto roles = QSet<QByteArray>(visibleRoles.constBegin(), visibleRoles.constEnd());
roles.insert("iconPixmap");
roles.insert("iconName");
roles.insert("text");
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 3939fd237..daf765cc2 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -658,7 +658,8 @@ void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& cur
QSet<QByteArray> dirtyRoles;
if (roles.isEmpty()) {
- dirtyRoles = visibleRoles().toSet();
+ const auto visibleRoles = this->visibleRoles();
+ dirtyRoles = QSet<QByteArray>(visibleRoles.constBegin(), visibleRoles.constEnd());
} else {
dirtyRoles = roles;
}
diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp
index e1deda3dd..c12b4b7b1 100644
--- a/src/kitemviews/private/kfileitemclipboard.cpp
+++ b/src/kitemviews/private/kfileitemclipboard.cpp
@@ -54,7 +54,8 @@ void KFileItemClipboard::updateCutItems()
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();
}