mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Port to non-deprecated QString::split() variant
This requires Qt 5.14, which we now depend on.
This commit is contained in:
parent
3bf2922e33
commit
a403df91b7
|
@ -626,7 +626,7 @@ void KFileItemModel::expandParentDirectories(const QUrl &url)
|
||||||
// first subdir can be empty, if m_dirLister->url().path() does not end with '/'
|
// 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,
|
// this happens if baseUrl is not root but a home directory, see FoldersPanel,
|
||||||
// so using QString::SkipEmptyParts
|
// 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) {
|
for (int i = 0; i < subDirs.count() - 1; ++i) {
|
||||||
QString path = urlToExpand.path();
|
QString path = urlToExpand.path();
|
||||||
if (!path.endsWith(QLatin1Char('/'))) {
|
if (!path.endsWith(QLatin1Char('/'))) {
|
||||||
|
|
|
@ -175,7 +175,7 @@ void DolphinRemoteEncoding::slotDefault()
|
||||||
// settings here since it affects what will be matched.
|
// settings here since it affects what will be matched.
|
||||||
KConfig config(("kio_" + m_currentURL.scheme() + "rc").toLatin1());
|
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()) {
|
if (!partList.isEmpty()) {
|
||||||
partList.erase(partList.begin());
|
partList.erase(partList.begin());
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue