address 2 more KUrl -> QUrl issues mentioned in rr#120688

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index 7a486942103c2db0a5571668c0e96228653acf5a..b38cd5146140e51eec3ca9847a8662cd24b6b42d 100644 (file)
--- 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) {
     // 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);
         }
         if (!dirs.contains(dir)) {
             dirs.append(dir);
         }

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 9a1079e7f247fa73709d03cc0e8e263bdfa31131..79ba8dcc4bcb68f21722bc3a60bf47b8313f6263 100644 (file)
--- 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) {
     // 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 ;)
         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)) {
             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;
                 if (QFile::exists(fileName)) {
                     if (upUrlCounter < bestScore) {
                         bestPlugin = plugin;