mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
address 2 more KUrl -> QUrl issues mentioned in rr#120688
This commit is contained in:
parent
9bf03a3c48
commit
a8b39ff601
|
@ -184,7 +184,7 @@ void DolphinTabWidget::openFiles(const QList<QUrl>& files)
|
||||||
// directories are shown inside one tab (see openDirectories()).
|
// directories are shown inside one tab (see openDirectories()).
|
||||||
QList<QUrl> dirs;
|
QList<QUrl> dirs;
|
||||||
foreach (const QUrl& url, files) {
|
foreach (const QUrl& url, files) {
|
||||||
const QUrl dir(url.adjusted(QUrl::RemoveFilename).path());
|
const QUrl dir(url.adjusted(QUrl::RemoveFilename));
|
||||||
if (!dirs.contains(dir)) {
|
if (!dirs.contains(dir)) {
|
||||||
dirs.append(dir);
|
dirs.append(dir);
|
||||||
}
|
}
|
||||||
|
|
|
@ -326,7 +326,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director
|
||||||
// Verify whether the current directory contains revision information
|
// Verify whether the current directory contains revision information
|
||||||
// like .svn, .git, ...
|
// like .svn, .git, ...
|
||||||
foreach (KVersionControlPlugin* plugin, plugins) {
|
foreach (KVersionControlPlugin* plugin, plugins) {
|
||||||
const QString fileName = directory.path() + plugin->fileName();
|
const QString fileName = directory.path() + '/' + plugin->fileName();
|
||||||
if (QFile::exists(fileName)) {
|
if (QFile::exists(fileName)) {
|
||||||
// The score of this plugin is 0 (best), so we can just return this plugin,
|
// 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 ;)
|
// 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);
|
QUrl upUrl = KIO::upUrl(dirUrl);
|
||||||
int upUrlCounter = 1;
|
int upUrlCounter = 1;
|
||||||
while ((upUrlCounter < bestScore) && (upUrl != dirUrl)) {
|
while ((upUrlCounter < bestScore) && (upUrl != dirUrl)) {
|
||||||
const QString fileName = dirUrl.path() + plugin->fileName();
|
const QString fileName = dirUrl.path() + '/' + plugin->fileName();
|
||||||
if (QFile::exists(fileName)) {
|
if (QFile::exists(fileName)) {
|
||||||
if (upUrlCounter < bestScore) {
|
if (upUrlCounter < bestScore) {
|
||||||
bestPlugin = plugin;
|
bestPlugin = plugin;
|
||||||
|
|
Loading…
Reference in a new issue