From 0ff221f5229b2ca09a63c73b724348585934d7dd Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 23 Dec 2015 00:15:30 +0100 Subject: QtCore: eradicate all Q_FOREACH loops [mimetypes] Saves just shy of 6KiB in text size on optimized GCC 4.9 Linux AMD64 builds, iow: ~0.1% of the total QtCore library size. Change-Id: I087e1e34a64944affb1211e16371e314012c4b2c Reviewed-by: David Faure Reviewed-by: Thiago Macieira --- src/corelib/mimetypes/qmimetype.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/corelib/mimetypes/qmimetype.cpp') diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index e3b01bbb89..e6599d233c 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -241,7 +241,7 @@ QString QMimeType::comment() const QStringList languageList; languageList << QLocale::system().name(); languageList << QLocale::system().uiLanguages(); - Q_FOREACH (const QString &language, languageList) { + for (const QString &language : qAsConst(languageList)) { const QString lang = language == QLatin1String("C") ? QLatin1String("en_US") : language; const QString comm = d->localeComments.value(lang); if (!comm.isEmpty()) @@ -337,17 +337,16 @@ QStringList QMimeType::parentMimeTypes() const static void collectParentMimeTypes(const QString &mime, QStringList &allParents) { - QStringList parents = QMimeDatabasePrivate::instance()->provider()->parents(mime); - foreach (const QString &parent, parents) { + const QStringList parents = QMimeDatabasePrivate::instance()->provider()->parents(mime); + for (const QString &parent : parents) { // I would use QSet, but since order matters I better not if (!allParents.contains(parent)) allParents.append(parent); } // We want a breadth-first search, so that the least-specific parent (octet-stream) is last // This means iterating twice, unfortunately. - foreach (const QString &parent, parents) { + for (const QString &parent : parents) collectParentMimeTypes(parent, allParents); - } } /*! @@ -392,7 +391,7 @@ QStringList QMimeType::suffixes() const QMimeDatabasePrivate::instance()->provider()->loadMimeTypePrivate(*d); QStringList result; - foreach (const QString &pattern, d->globPatterns) { + for (const QString &pattern : qAsConst(d->globPatterns)) { // Not a simple suffix if it looks like: README or *. or *.* or *.JP*G or *.JP? if (pattern.startsWith(QLatin1String("*.")) && pattern.length() > 2 && -- cgit v1.2.3