From c2d19af39fb9e6ac559f2697cc2ff8237d333df3 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 4 May 2024 21:35:38 +0300 Subject: [PATCH] generic: replace MIME name checks with method calls for flexibility Signed-off-by: Ivailo Monev --- gwenview/lib/mimetypeutils.cpp | 7 +++---- okular/core/document.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gwenview/lib/mimetypeutils.cpp b/gwenview/lib/mimetypeutils.cpp index 3f238eb6..f1b9ca4b 100644 --- a/gwenview/lib/mimetypeutils.cpp +++ b/gwenview/lib/mimetypeutils.cpp @@ -62,12 +62,11 @@ QString urlMimeType(const KUrl& url) if (url.isEmpty()) { return "unknown"; } - // Try a simple guess, using extension for remote urls + // Check for local files QString mimeType = KMimeType::findByUrl(url)->name(); - if (mimeType == "application/octet-stream") { + if (mimeType == KMimeType::defaultMimeType()) { kDebug() << "KMimeType::findByUrl() failed to find mimetype for" << url << ". Falling back to KIO::stat()."; - // No luck, look deeper. This can happens with http urls if the filename - // does not provide any extension. + // No luck, look deeper KIO::UDSEntry statentry; KIO::NetAccess::stat(url, statentry, KApplication::kApplication()->activeWindow()); mimeType = statentry.stringValue(KIO::UDSEntry::UDS_MIME_TYPE); diff --git a/okular/core/document.cpp b/okular/core/document.cpp index 4d5b490b..2dda86aa 100644 --- a/okular/core/document.cpp +++ b/okular/core/document.cpp @@ -1982,7 +1982,7 @@ Document::OpenResult Document::openDocument( const QString & docFile, const KUrl qstdin.open( stdin, QIODevice::ReadOnly ); filedata = qstdin.readAll(); mime = KMimeType::findByContent( filedata ); - if ( !mime || mime->name() == QLatin1String( "application/octet-stream" ) ) + if ( !mime || mime->isDefault() ) return OpenError; document_size = filedata.size(); triedMimeFromFileContent = true;