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

kdecore: format and indent

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-29 19:00:26 +03:00
parent 5454997f02
commit 962b0b0ef1
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
kdecore/services/kmimetype.cpp
View file

@ -533,12 +533,13 @@ QStringList KMimeType::parentMimeTypes() const
static void collectParentMimeTypes(const QString &mime, QStringList &allParents) static void collectParentMimeTypes(const QString &mime, QStringList &allParents)
{ {
QStringList parents = KMimeTypeRepository::self()->parents(mime); const QStringList parents = KMimeTypeRepository::self()->parents(mime);
Q_FOREACH(const QString &parent, parents) { Q_FOREACH(const QString &parent, parents) {
// I would use QSet, but since order matters I better not // I would use QSet, but since order matters I better not
if (!allParents.contains(parent)) if (!allParents.contains(parent)) {
allParents.append(parent); allParents.append(parent);
} }
}
// We want a breadth-first search, so that the least-specific parent (octet-stream) is last // We want a breadth-first search, so that the least-specific parent (octet-stream) is last
// This means iterating twice, unfortunately. // This means iterating twice, unfortunately.
Q_FOREACH(const QString &parent, parents) { Q_FOREACH(const QString &parent, parents) {
@ -577,8 +578,9 @@ QStringList KMimeType::patterns() const
// loads comment, icon, mainPattern, m_lstPatterns // loads comment, icon, mainPattern, m_lstPatterns
void KMimeTypePrivate::ensureXmlDataLoaded() const void KMimeTypePrivate::ensureXmlDataLoaded() const
{ {
if (m_xmlDataLoaded) if (m_xmlDataLoaded) {
return; return;
}
m_xmlDataLoaded = true; m_xmlDataLoaded = true;
@ -602,8 +604,9 @@ void KMimeTypePrivate::ensureXmlDataLoaded() const
while (mimeFilesIter.hasPrevious()) { // global first, then local. while (mimeFilesIter.hasPrevious()) { // global first, then local.
const QString fullPath = mimeFilesIter.previous(); const QString fullPath = mimeFilesIter.previous();
QFile qfile(fullPath); QFile qfile(fullPath);
if (!qfile.open(QFile::ReadOnly)) if (!qfile.open(QFile::ReadOnly)) {
continue; continue;
}
QXmlStreamReader xml(&qfile); QXmlStreamReader xml(&qfile);
if (xml.readNextStartElement()) { if (xml.readNextStartElement()) {
@ -641,9 +644,10 @@ void KMimeTypePrivate::ensureXmlDataLoaded() const
if (mainPattern.isEmpty() && pattern.startsWith(QLatin1Char('*'))) { if (mainPattern.isEmpty() && pattern.startsWith(QLatin1Char('*'))) {
mainPattern = pattern; mainPattern = pattern;
} }
if (!m_lstPatterns.contains(pattern)) if (!m_lstPatterns.contains(pattern)) {
m_lstPatterns.append(pattern); m_lstPatterns.append(pattern);
} }
}
xml.skipCurrentElement(); xml.skipCurrentElement();
} }
#warning FIXME: non-glibc crash workaround, investigate #warning FIXME: non-glibc crash workaround, investigate
@ -702,7 +706,6 @@ int KMimeType::sharedMimeInfoVersion()
QString KMimeType::mainExtension() const QString KMimeType::mainExtension() const
{ {
Q_D(const KMimeType); Q_D(const KMimeType);
Q_FOREACH(const QString &pattern, d->patterns()) { Q_FOREACH(const QString &pattern, d->patterns()) {
// Skip if if looks like: README or *. or *.* // Skip if if looks like: README or *. or *.*
// or *.JP*G or *.JP? // or *.JP*G or *.JP?
@ -726,12 +729,15 @@ int KMimeTypePrivate::serviceOffersOffset() const
return KMimeTypeFactory::self()->serviceOffersOffset(name()); return KMimeTypeFactory::self()->serviceOffersOffset(name());
} }
QString KMimeTypePrivate::iconName(const KUrl &) const QString KMimeTypePrivate::iconName(const KUrl &url) const
{ {
Q_UNUSED(url);
static QHash<QUrl, QString> iconNameCache; static QHash<QUrl, QString> iconNameCache;
QString iconNameFromCache = iconNameCache.value(m_strName); QString iconNameFromCache = iconNameCache.value(m_strName);
if (!iconNameFromCache.isEmpty()) if (!iconNameFromCache.isEmpty()) {
return iconNameFromCache; return iconNameFromCache;
}
ensureXmlDataLoaded(); ensureXmlDataLoaded();
QString result; QString result;