From a403df91b7a4f794f95604a28a56644d4c06ab58 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Wed, 14 Oct 2020 23:26:05 +0200 Subject: [PATCH] Port to non-deprecated QString::split() variant This requires Qt 5.14, which we now depend on. --- src/kitemviews/kfileitemmodel.cpp | 2 +- src/views/dolphinremoteencoding.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 28376c5d0c..a3a2bef32d 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -626,7 +626,7 @@ void KFileItemModel::expandParentDirectories(const QUrl &url) // first subdir can be empty, if m_dirLister->url().path() does not end with '/' // this happens if baseUrl is not root but a home directory, see FoldersPanel, // so using QString::SkipEmptyParts - const QStringList subDirs = url.path().mid(pos).split(QDir::separator(), QString::SkipEmptyParts); + const QStringList subDirs = url.path().mid(pos).split(QDir::separator(), Qt::SkipEmptyParts); for (int i = 0; i < subDirs.count() - 1; ++i) { QString path = urlToExpand.path(); if (!path.endsWith(QLatin1Char('/'))) { diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 4f006df599..fee3db1c19 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -175,7 +175,7 @@ void DolphinRemoteEncoding::slotDefault() // settings here since it affects what will be matched. KConfig config(("kio_" + m_currentURL.scheme() + "rc").toLatin1()); - QStringList partList = m_currentURL.host().split('.', QString::SkipEmptyParts); + QStringList partList = m_currentURL.host().split('.', Qt::SkipEmptyParts); if (!partList.isEmpty()) { partList.erase(partList.begin());