kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix KUrl -> QUrl porting error

Browse source 
Trailing slashes should be removed before calling QUrl::filename(),
else it will return an empty string.

BUG: 341411
REVIEW: 121293
This commit is contained in:
Arjun AK 2014-12-01 17:31:39 +05:30
parent de7eefeb7e
commit 1d7b3b8df5
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dolphinmainwindow.cpp
View file

@ -969,7 +969,11 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url)
}
}
const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName();
QString fileName = url.adjusted(QUrl::StripTrailingSlash).fileName();
if (fileName.isEmpty()) {
fileName = '/';
}
caption.append(fileName);
setCaption(caption);

2
src/dolphintabwidget.cpp
View file

@ -348,7 +348,7 @@ QString DolphinTabWidget::tabName(const QUrl& url) const
if (url == QUrl("file:///")) {
name = '/';
} else {
name = url.fileName();
name = url.adjusted(QUrl::StripTrailingSlash).fileName();
if (name.isEmpty()) {
name = url.scheme();
} else {