From 678417ea8de67c3f4f1db9d2e2b26b83df9c4400 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 5 May 2024 01:34:52 +0300 Subject: [PATCH] kdecore: require all KMimeTypeRepository::findMimeTypeByName() arguments Signed-off-by: Ivailo Monev --- kdecore/services/kmimetyperepository.cpp | 8 ++++---- kdecore/services/kmimetyperepository_p.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kdecore/services/kmimetyperepository.cpp b/kdecore/services/kmimetyperepository.cpp index 066e3d4d..ca4ed8fe 100644 --- a/kdecore/services/kmimetyperepository.cpp +++ b/kdecore/services/kmimetyperepository.cpp @@ -314,7 +314,7 @@ KMimeType::Ptr KMimeTypeRepository::findFromContent(QIODevice* device, int* accu if (accuracy) { *accuracy = 100; } - return findMimeTypeByName(QLatin1String("application/x-zerosize")); + return findMimeTypeByName(QLatin1String("application/x-zerosize"), KMimeType::DontResolveAlias); } // provide enough data for most rules (there are exceptions which require twice as much tho) const qint64 dataNeeded = qMin(deviceSize, (qint64) 16384); @@ -329,7 +329,7 @@ KMimeType::Ptr KMimeTypeRepository::findFromContent(QIODevice* device, int* accu if (accuracy) { *accuracy = rule.priority(); } - return findMimeTypeByName(rule.mimetype()); + return findMimeTypeByName(rule.mimetype(), KMimeType::DontResolveAlias); } } @@ -339,7 +339,7 @@ KMimeType::Ptr KMimeTypeRepository::findFromContent(QIODevice* device, int* accu if (accuracy) { *accuracy = 5; } - return findMimeTypeByName(QLatin1String("text/plain")); + return findMimeTypeByName(QLatin1String("text/plain"), KMimeType::DontResolveAlias); } if (accuracy) { *accuracy = 0; @@ -615,7 +615,7 @@ KMimeType::Ptr KMimeTypeRepository::defaultMimeTypePtr() { if (!m_defaultMimeType) { // Try to find the default type - KMimeType::Ptr mime = findMimeTypeByName(KMimeType::defaultMimeType()); + KMimeType::Ptr mime = findMimeTypeByName(KMimeType::defaultMimeType(), KMimeType::DontResolveAlias); if (mime) { m_defaultMimeType = mime; } else { diff --git a/kdecore/services/kmimetyperepository_p.h b/kdecore/services/kmimetyperepository_p.h index ec40bd33..85b713f5 100644 --- a/kdecore/services/kmimetyperepository_p.h +++ b/kdecore/services/kmimetyperepository_p.h @@ -46,7 +46,7 @@ public: /** * Creates a KMimeType */ - KMimeType::Ptr findMimeTypeByName(const QString &_name, KMimeType::FindByNameOption options = KMimeType::DontResolveAlias) const; + KMimeType::Ptr findMimeTypeByName(const QString &_name, KMimeType::FindByNameOption options) const; /** * Check if mime is an alias, and return the canonical name for it if it is, otherwise empty.