kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Port away from QList::toSet()

Browse Source 
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.
This commit is contained in:
Elvis Angelaccio 2020-05-28 19:42:23 +02:00
parent 31cba55cff
commit 3bf2922e33
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -7,7 +7,7 @@ set (RELEASE_SERVICE_VERSION_MICRO "70")
set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.12.0")
set(QT_MIN_VERSION "5.14.0")
set(KF5_MIN_VERSION "5.73.0")
# ECM setup

3
src/kitemviews/kfileitemlistview.cpp
View File

@ -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");

3
src/kitemviews/kstandarditemlistwidget.cpp
View File

@ -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;
}

3
src/kitemviews/private/kfileitemclipboard.cpp
View File

@ -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();
}

2
src/views/dolphinview.cpp
View File

@ -963,7 +963,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
QPointer<QMenu> menu = new QMenu(QApplication::activeWindow());
KItemListView* view = m_container->controller()->view();
const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
const QList<QByteArray> visibleRolesSet = view->visibleRoles();
bool indexingEnabled = false;
#ifdef HAVE_BALOO

2
src/views/dolphinviewactionhandler.cpp
View File

@ -521,7 +521,7 @@ void DolphinViewActionHandler::slotVisibleRolesChanged(const QList<QByteArray>&
{
Q_UNUSED(previous)
const QSet<QByteArray> checkedRoles = current.toSet();
const auto checkedRoles = QSet<QByteArray>(current.constBegin(), current.constEnd());
QHashIterator<QByteArray, KToggleAction*> it(m_visibleRoles);
while (it.hasNext()) {
it.next();