diff --git a/kcms/kfontinst/kcmfontinst/FontsPackage.cpp b/kcms/kfontinst/kcmfontinst/FontsPackage.cpp --- a/kcms/kfontinst/kcmfontinst/FontsPackage.cpp +++ b/kcms/kfontinst/kcmfontinst/FontsPackage.cpp @@ -77,12 +77,12 @@ // unhide 1st! if(Misc::isHidden(name)) { - ::rename(QFile::encodeName((*tempDir)->path()+QLatin1Char('/')+name).data(), - QFile::encodeName((*tempDir)->path()+QLatin1Char('/')+name.mid(1)).data()); + ::rename(QFile::encodeName((*tempDir)->filePath(name)).data(), + QFile::encodeName((*tempDir)->filePath(name.mid(1))).data()); name=name.mid(1); } - urls.insert(QUrl((*tempDir)->path()+QLatin1Char('/')+name)); + urls.insert(QUrl((*tempDir)->filePath(name))); } } } diff --git a/kcms/kfontinst/kcmfontinst/JobRunner.cpp b/kcms/kfontinst/kcmfontinst/JobRunner.cpp --- a/kcms/kfontinst/kcmfontinst/JobRunner.cpp +++ b/kcms/kfontinst/kcmfontinst/JobRunner.cpp @@ -713,7 +713,7 @@ itsTempDir->setAutoRemove(true); } - QString tempName(itsTempDir->path()+QLatin1Char('/')+Misc::getFile(url.path())); + QString tempName(itsTempDir->filePath(Misc::getFile(url.path()))); auto job = KIO::file_copy(url, QUrl::fromLocalFile(tempName), -1, KIO::Overwrite); if (job->exec()) return tempName; diff --git a/kcms/kfontinst/kio/KioFonts.cpp b/kcms/kfontinst/kio/KioFonts.cpp --- a/kcms/kfontinst/kio/KioFonts.cpp +++ b/kcms/kfontinst/kio/KioFonts.cpp @@ -235,7 +235,7 @@ itsTempDir->setAutoRemove(true); } - QString tempFile(itsTempDir->path()+QLatin1Char('/')+url.fileName()); + QString tempFile(itsTempDir->filePath(url.fileName())); QFile dest(tempFile); if (dest.open(QIODevice::WriteOnly)) diff --git a/kcms/kfontinst/thumbnail/FontThumbnail.cpp b/kcms/kfontinst/thumbnail/FontThumbnail.cpp --- a/kcms/kfontinst/thumbnail/FontThumbnail.cpp +++ b/kcms/kfontinst/thumbnail/FontThumbnail.cpp @@ -91,16 +91,16 @@ ((KArchiveFile *)entry)->copyTo(tempDir->path()); - QString mime(db.mimeTypeForFile(tempDir->path()+QLatin1Char('/')+entry->name()).name()); + QString mime(db.mimeTypeForFile(tempDir->filePath(entry->name())).name()); if(mime=="font/ttf" || mime=="font/otf" || mime=="application/x-font-ttf" || mime=="application/x-font-otf" || mime=="application/x-font-type1") { - realPath=tempDir->path()+QLatin1Char('/')+entry->name(); + realPath=tempDir->filePath(entry->name()); break; } else - ::unlink(QFile::encodeName(tempDir->path()+QLatin1Char('/')+entry->name()).data()); + ::unlink(QFile::encodeName(tempDir->filePath(entry->name())).data()); } } } diff --git a/kcms/kfontinst/viewpart/FontViewPart.cpp b/kcms/kfontinst/viewpart/FontViewPart.cpp --- a/kcms/kfontinst/viewpart/FontViewPart.cpp +++ b/kcms/kfontinst/viewpart/FontViewPart.cpp @@ -317,18 +317,18 @@ ((KArchiveFile *)entry)->copyTo(itsTempDir->path()); QMimeDatabase db; - QString mime(db.mimeTypeForFile(itsTempDir->path()+QLatin1Char('/')+entry->name()).name()); + QString mime(db.mimeTypeForFile(itsTempDir->filePath(entry->name())).name()); if(mime=="font/ttf" || mime=="font/otf" || mime=="application/x-font-ttf" || mime=="application/x-font-otf" || mime=="application/x-font-type1") { - fontFile=itsTempDir->path()+QLatin1Char('/')+entry->name(); + fontFile=itsTempDir->filePath(entry->name()); //setLocalFilePath(itsTempDir->path()+QLatin1Char('/')+entry->name()); // itsMetaUrl=QUrl::fromLocalFile(localFilePath()); break; } else - ::unlink(QFile::encodeName(itsTempDir->path()+QLatin1Char('/')+entry->name()).data()); + ::unlink(QFile::encodeName(itsTempDir->filePath(entry->name())).data()); } } }