From 602730bac19e32e787077929637fff3bbb904720 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 26 Jun 2023 20:57:07 +0300 Subject: [PATCH] generic: adjust to KUrl changes Signed-off-by: Ivailo Monev --- gwenview/lib/urlutils.cpp | 2 +- .../wallpapers/qmlwallpapers/wallpapersmodel.cpp | 2 +- .../wallpapers/qmlwallpapers/wallpapersqml.cpp | 2 +- kget/core/kget.cpp | 10 +++++----- kget/ui/newtransferdialog.cpp | 6 +++--- okular/core/document.cpp | 2 +- okular/generators/epub/epubdocument.cpp | 2 +- okular/part.cpp | 2 +- okular/shell/shell.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gwenview/lib/urlutils.cpp b/gwenview/lib/urlutils.cpp index 6a920473..ed28ae10 100644 --- a/gwenview/lib/urlutils.cpp +++ b/gwenview/lib/urlutils.cpp @@ -62,7 +62,7 @@ bool urlIsFastLocalFile(const KUrl& url) bool urlIsDirectory(const KUrl& url) { - if (url.fileName(KUrl::ObeyTrailingSlash).isEmpty()) { + if (url.fileName(KUrl::LeaveTrailingSlash).isEmpty()) { return true; // file:/somewhere/ } diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersmodel.cpp b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersmodel.cpp index 0d206960..ad7d98f2 100644 --- a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersmodel.cpp +++ b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersmodel.cpp @@ -83,7 +83,7 @@ QVariant WallpapersModel::data(const QModelIndex& index, int role) const Plasma::Package* p = m_packages[index.row()]; switch (role) { case PackageNameRole: - return KUrl(p->path()).fileName(KUrl::IgnoreTrailingSlash); + return KUrl(p->path()).fileName(KUrl::LeaveTrailingSlash); case Qt::DisplayRole: return p->metadata().name(); case Qt::ToolTipRole: diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.cpp b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.cpp index 64a70b1c..2b2dbcc4 100644 --- a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.cpp +++ b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.cpp @@ -173,7 +173,7 @@ QWidget* WallpaperQml::createConfigurationInterface(QWidget* parent) v.m_view->setItemDelegate(new BackgroundDelegate(v.m_view)); if (m_package) { v.m_view->setCurrentIndex(m->indexForPackagePath(m_package->path())); - m_packageName = KUrl(m_package->path()).fileName(KUrl::IgnoreTrailingSlash); + m_packageName = KUrl(m_package->path()).fileName(KUrl::LeaveTrailingSlash); } v.m_color->setColor(m_scene->backgroundBrush().color()); diff --git a/kget/core/kget.cpp b/kget/core/kget.cpp index e60194a1..7695ff1c 100644 --- a/kget/core/kget.cpp +++ b/kget/core/kget.cpp @@ -204,8 +204,8 @@ TransferHandler * KGet::addTransfer(KUrl srcUrl, QString destDir, QString sugges } else { // check whether destDir is actually already the path to a file KUrl targetUrl = KUrl(destDir); - QString directory = targetUrl.directory(KUrl::ObeyTrailingSlash); - QString fileName = targetUrl.fileName(KUrl::ObeyTrailingSlash); + QString directory = targetUrl.directory(KUrl::LeaveTrailingSlash); + QString fileName = targetUrl.fileName(KUrl::LeaveTrailingSlash); if (QFileInfo(directory).isDir() && !fileName.isEmpty()) { destDir = directory; suggestedFileName = fileName; @@ -215,7 +215,7 @@ TransferHandler * KGet::addTransfer(KUrl srcUrl, QString destDir, QString sugges if (suggestedFileName.isEmpty()) { confirmDestination = true; - suggestedFileName = srcUrl.fileName(KUrl::ObeyTrailingSlash); + suggestedFileName = srcUrl.fileName(KUrl::LeaveTrailingSlash); if (suggestedFileName.isEmpty()) { // simply use the full url as filename @@ -232,7 +232,7 @@ TransferHandler * KGet::addTransfer(KUrl srcUrl, QString destDir, QString sugges if (destUrl.isEmpty()) return 0; - destDir = destUrl.directory(KUrl::ObeyTrailingSlash); + destDir = destUrl.directory(KUrl::LeaveTrailingSlash); } while (!isValidDestDirectory(destDir)); } else { destUrl = KUrl(); @@ -972,7 +972,7 @@ KUrl KGet::destFileInputDialog(QString destDir, const QString& suggestedFileName KUrl destUrl = KFileDialog::getSaveUrl(startLocation, QString(), m_mainWindow, i18n("Save As")); if (!destUrl.isEmpty()) { - Settings::setLastDirectory(destUrl.directory(KUrl::ObeyTrailingSlash)); + Settings::setLastDirectory(destUrl.directory(KUrl::LeaveTrailingSlash)); } return destUrl; diff --git a/kget/ui/newtransferdialog.cpp b/kget/ui/newtransferdialog.cpp index 6da4f98b..d940015d 100644 --- a/kget/ui/newtransferdialog.cpp +++ b/kget/ui/newtransferdialog.cpp @@ -519,13 +519,13 @@ void NewTransferDialogHandler::showNewTransferDialog(KUrl::List urls) folder = lastUrl.path(KUrl::AddTrailingSlash); } else { //second url is a file path, use this one - folder = lastUrl.directory(KUrl::AppendTrailingSlash); + folder = lastUrl.directory(KUrl::AddTrailingSlash); suggestedFileName = lastUrl.fileName(); } urls.removeLast(); } else { //second url is just a file name - suggestedFileName = lastUrl.fileName(KUrl::ObeyTrailingSlash); + suggestedFileName = lastUrl.fileName(KUrl::LeaveTrailingSlash); urls.removeLast(); } } else if (!lastUrl.isValid() || (lastUrl.scheme().isEmpty() && lastUrl.directory().isEmpty())) { @@ -544,7 +544,7 @@ void NewTransferDialogHandler::showNewTransferDialog(KUrl::List urls) * and giving them the possibility to improve their mistake */ // if (!QFileInfo(urls.last().toLocalFile()).isDir()) { -// folder = urls.last().directory(KUrl::AppendTrailingSlash); +// folder = urls.last().directory(KUrl::AddTrailingSlash); // } else { folder = urls.last().path(KUrl::AddTrailingSlash);//checks if that folder is correct happen later // } diff --git a/okular/core/document.cpp b/okular/core/document.cpp index 5be4a8e9..1686d704 100644 --- a/okular/core/document.cpp +++ b/okular/core/document.cpp @@ -1953,7 +1953,7 @@ Document::OpenResult Document::openDocument( const QString & docFile, const KUrl KMimeType::Ptr mime = _mime; QByteArray filedata; qint64 document_size = -1; - bool isstdin = url.fileName( KUrl::ObeyTrailingSlash ) == QLatin1String( "-" ); + bool isstdin = url.fileName( KUrl::LeaveTrailingSlash ) == QLatin1String( "-" ); bool triedMimeFromFileContent = false; if ( !isstdin ) { diff --git a/okular/generators/epub/epubdocument.cpp b/okular/generators/epub/epubdocument.cpp index 44eb5401..eec1a718 100644 --- a/okular/generators/epub/epubdocument.cpp +++ b/okular/generators/epub/epubdocument.cpp @@ -21,7 +21,7 @@ namespace { QString resourceUrl(const KUrl &baseUrl, const QString &u) { - KUrl newUrl(KUrl(baseUrl.directory(KUrl::AppendTrailingSlash)), u); + KUrl newUrl(KUrl(baseUrl.directory(KUrl::AddTrailingSlash)), u); QString newDir = newUrl.toLocalFile(); newDir.remove(0, 1); return newDir; diff --git a/okular/part.cpp b/okular/part.cpp index 7ade9c69..51256d23 100644 --- a/okular/part.cpp +++ b/okular/part.cpp @@ -1243,7 +1243,7 @@ bool Part::openFile() { QList mimes; QString fileNameToOpen = localFilePath(); - const bool isstdin = url().isLocalFile() && url().fileName( KUrl::ObeyTrailingSlash ) == QLatin1String( "-" ); + const bool isstdin = url().isLocalFile() && url().fileName( KUrl::LeaveTrailingSlash ) == QLatin1String( "-" ); const QFileInfo fileInfo( fileNameToOpen ); if ( !isstdin && !fileInfo.exists() ) return false; diff --git a/okular/shell/shell.cpp b/okular/shell/shell.cpp index 71fcdd14..31e80bce 100644 --- a/okular/shell/shell.cpp +++ b/okular/shell/shell.cpp @@ -228,7 +228,7 @@ void Shell::openUrl( const KUrl & url, const QString &serializedOptions ) m_tabWidget->setTabText( activeTab, url.fileName() ); applyOptionsToPart( activePart, serializedOptions ); bool openOk = activePart->openUrl( url ); - const bool isstdin = url.fileName( KUrl::ObeyTrailingSlash ) == QLatin1String( "-" ); + const bool isstdin = url.fileName( KUrl::LeaveTrailingSlash ) == QLatin1String( "-" ); if ( !isstdin ) { if ( openOk )