Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: require all KMimeTypeRepository::findMimeTypeByName() arguments

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-05 01:34:52 +03:00
parent d6a21de5f9
commit 678417ea8d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kdecore/services/kmimetyperepository.cpp
View file

@ -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 {

2
kdecore/services/kmimetyperepository_p.h
View file

@ -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.