┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukáš Tinkl <[email protected]>2014-10-21 22:01:34 +0200
committerLukáš Tinkl <[email protected]>2014-10-21 22:02:26 +0200
commita8b39ff6015f67985fa9ddb93d5e08290d048001 (patch)
tree016dc79ecf772ab69e099b934a98b833e7ad52b0
parent9bf03a3c48f4847b5e0417e3529bf071108cbf1e (diff)
address 2 more KUrl -> QUrl issues mentioned in rr#120688
-rw-r--r--src/dolphintabwidget.cpp2
-rw-r--r--src/views/versioncontrol/versioncontrolobserver.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 7a4869421..b38cd5146 100644
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -184,7 +184,7 @@ void DolphinTabWidget::openFiles(const QList<QUrl>& files)
// directories are shown inside one tab (see openDirectories()).
QList<QUrl> dirs;
foreach (const QUrl& url, files) {
- const QUrl dir(url.adjusted(QUrl::RemoveFilename).path());
+ const QUrl dir(url.adjusted(QUrl::RemoveFilename));
if (!dirs.contains(dir)) {
dirs.append(dir);
}
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 9a1079e7f..79ba8dcc4 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -326,7 +326,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director
// Verify whether the current directory contains revision information
// like .svn, .git, ...
foreach (KVersionControlPlugin* plugin, plugins) {
- const QString fileName = directory.path() + plugin->fileName();
+ const QString fileName = directory.path() + '/' + plugin->fileName();
if (QFile::exists(fileName)) {
// The score of this plugin is 0 (best), so we can just return this plugin,
// instead of going through the plugin scoring procedure, we can't find a better one ;)
@@ -344,7 +344,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director
QUrl upUrl = KIO::upUrl(dirUrl);
int upUrlCounter = 1;
while ((upUrlCounter < bestScore) && (upUrl != dirUrl)) {
- const QString fileName = dirUrl.path() + plugin->fileName();
+ const QString fileName = dirUrl.path() + '/' + plugin->fileName();
if (QFile::exists(fileName)) {
if (upUrlCounter < bestScore) {
bestPlugin = plugin;