diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,7 @@ ) add_definitions(-DTRANSLATION_DOMAIN=\"kfilemetadata5\") - +add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) diff --git a/src/externalextractor.cpp b/src/externalextractor.cpp --- a/src/externalextractor.cpp +++ b/src/externalextractor.cpp @@ -147,7 +147,8 @@ QJsonObject rootObject = extractorData.object(); QJsonObject propertiesObject = rootObject[QStringLiteral("properties")].toObject(); - Q_FOREACH(const auto &key, propertiesObject.keys()) { + const auto lstKeys = propertiesObject.keys(); + for(const auto &key : lstKeys) { if (key == QStringLiteral("typeInfo")) { TypeInfo info = TypeInfo::fromName(propertiesObject.value(key).toString()); result->addType(info.type()); diff --git a/src/externalwriter.cpp b/src/externalwriter.cpp --- a/src/externalwriter.cpp +++ b/src/externalwriter.cpp @@ -81,9 +81,9 @@ } QJsonObject rootObject = manifestDoc.object(); - QJsonArray mimetypesArray = rootObject.value(QStringLiteral("mimetypes")).toArray(); + const QJsonArray mimetypesArray = rootObject.value(QStringLiteral("mimetypes")).toArray(); QStringList mimetypes; - Q_FOREACH(const QVariant &mimetype, mimetypesArray) { + for (const QVariant &mimetype : mimetypesArray) { mimetypes << mimetype.toString(); } @@ -109,7 +109,7 @@ QMap properties = data.getAllProperties(); const auto &propertiesKeys = properties.keys(); - Q_FOREACH(const Property::Property &property, propertiesKeys) { + for (const Property::Property &property : propertiesKeys) { PropertyInfo propertyInfo(property); propertiesObject[propertyInfo.name()] = QJsonValue::fromVariant(properties[property]); } diff --git a/src/extractorcollection.cpp b/src/extractorcollection.cpp --- a/src/extractorcollection.cpp +++ b/src/extractorcollection.cpp @@ -48,8 +48,9 @@ { d->m_allExtractors = d->allExtractors(); - foreach (Extractor* ex, d->m_allExtractors) { - foreach (const QString& type, ex->mimetypes()) { + for (Extractor* ex : qAsConst(d->m_allExtractors)) { + const QStringList lstMimetypes = ex->mimetypes(); + for (const QString& type : lstMimetypes) { d->m_extractors.insertMulti(type, ex); } } @@ -74,8 +75,8 @@ QStringList externalPlugins; QStringList externalPluginPaths; - QStringList paths = QCoreApplication::libraryPaths(); - Q_FOREACH (const QString& libraryPath, paths) { + const QStringList paths = QCoreApplication::libraryPaths(); + for (const QString& libraryPath : paths) { QString path(libraryPath + QStringLiteral("/kf5/kfilemetadata")); QDir dir(path); @@ -109,7 +110,7 @@ externalPlugins.clear(); QList extractors; - Q_FOREACH (const QString& pluginPath, pluginPaths) { + for (const QString& pluginPath : qAsConst(pluginPaths)) { QPluginLoader loader(pluginPath); if (!loader.load()) { @@ -142,7 +143,7 @@ } } - Q_FOREACH (const QString& externalPluginPath, externalPluginPaths) { + for (const QString& externalPluginPath : qAsConst(externalPluginPaths)) { ExternalExtractor *plugin = new ExternalExtractor(externalPluginPath); Extractor* extractor = new Extractor; extractor->setExtractorPlugin(plugin); diff --git a/src/extractorplugin.cpp b/src/extractorplugin.cpp --- a/src/extractorplugin.cpp +++ b/src/extractorplugin.cpp @@ -137,7 +137,7 @@ QStringList list; list.reserve(contactStrings.count()); - foreach(const QString& contactName, contactStrings) { + for(const QString& contactName : qAsConst(contactStrings)) { list << contactName.trimmed(); } diff --git a/src/extractors/office2007extractor.cpp b/src/extractors/office2007extractor.cpp --- a/src/extractors/office2007extractor.cpp +++ b/src/extractors/office2007extractor.cpp @@ -258,7 +258,7 @@ void Office2007Extractor::extractTextFromFiles(const KArchiveDirectory* archiveDir, ExtractionResult* result) { const QStringList entries = archiveDir->entries(); - foreach(const QString & entryName, entries) { + for (const QString & entryName : entries) { const KArchiveEntry* entry = archiveDir->entry(entryName); if (entry->isDirectory()) { const KArchiveDirectory* subDir = dynamic_cast(entry); diff --git a/src/extractors/taglibextractor.cpp b/src/extractors/taglibextractor.cpp --- a/src/extractors/taglibextractor.cpp +++ b/src/extractors/taglibextractor.cpp @@ -922,74 +922,74 @@ } QString locationsString = TStringToQString(data.location).trimmed(); - QStringList locations = contactsFromString(locationsString); - foreach(const QString& loc, locations) { + const QStringList locations = contactsFromString(locationsString); + for (const QString& loc : locations) { result->add(Property::Location, loc); } QString performersString = TStringToQString(data.performer).trimmed(); - QStringList performers = contactsFromString(performersString); - foreach(const QString& per, performers) { + const QStringList performers = contactsFromString(performersString); + for (const QString& per : performers) { result->add(Property::Performer, per); } QString ensembleString = TStringToQString(data.ensemble).trimmed(); - QStringList ensembles = contactsFromString(ensembleString); - foreach(const QString& ens, ensembles) { + const QStringList ensembles = contactsFromString(ensembleString); + for (const QString& ens : ensembles) { result->add(Property::Ensemble, ens); } QString arrangerString = TStringToQString(data.arranger).trimmed(); - QStringList arrangers = contactsFromString(arrangerString); - foreach(const QString& arr, arrangers) { + const QStringList arrangers = contactsFromString(arrangerString); + for (const QString& arr : arrangers) { result->add(Property::Arranger, arr); } QString conductorString = TStringToQString(data.conductor).trimmed(); - QStringList conductors = contactsFromString(conductorString); - foreach(const QString& arr, conductors) { + const QStringList conductors = contactsFromString(conductorString); + for (const QString& arr : conductors) { result->add(Property::Conductor, arr); } QString publisherString = TStringToQString(data.publisher).trimmed(); - QStringList publishers = contactsFromString(publisherString); - foreach(const QString& arr, publishers) { + const QStringList publishers = contactsFromString(publisherString); + for (const QString& arr : publishers) { result->add(Property::Publisher, arr); } QString copyrightString = TStringToQString(data.copyright).trimmed(); - QStringList copyrights = contactsFromString(copyrightString); - foreach(const QString& arr, copyrights) { + const QStringList copyrights = contactsFromString(copyrightString); + for (const QString& arr : copyrights) { result->add(Property::Copyright, arr); } QString labelString = TStringToQString(data.label).trimmed(); - QStringList labels = contactsFromString(labelString); - foreach(const QString& arr, labels) { + const QStringList labels = contactsFromString(labelString); + for (const QString& arr : labels) { result->add(Property::Label, arr); } QString authorString = TStringToQString(data.author).trimmed(); - QStringList authors = contactsFromString(authorString); - foreach(const QString& arr, authors) { + const QStringList authors = contactsFromString(authorString); + for (const QString& arr : authors) { result->add(Property::Author, arr); } QString languageString = TStringToQString(data.language).trimmed(); - QStringList languages = contactsFromString(languageString); - foreach(const QString& arr, languages) { + const QStringList languages = contactsFromString(languageString); + for (const QString& arr : languages) { result->add(Property::Language, arr); } QString licenseString = TStringToQString(data.license).trimmed(); - QStringList licenses = contactsFromString(licenseString); - foreach(const QString& arr, licenses) { + const QStringList licenses = contactsFromString(licenseString); + for (const QString& arr : licenses) { result->add(Property::License, arr); } QString compilationString = TStringToQString(data.compilation).trimmed(); - QStringList compilations = contactsFromString(compilationString); - foreach(const QString& arr, compilations) { + const QStringList compilations = contactsFromString(compilationString); + for (const QString& arr : compilations) { result->add(Property::Compilation, arr); } diff --git a/src/writercollection.cpp b/src/writercollection.cpp --- a/src/writercollection.cpp +++ b/src/writercollection.cpp @@ -53,8 +53,9 @@ Q_D(WriterCollection); const QList all = d->allWriters(); - foreach (Writer* writer, all) { - foreach (const QString& type, writer->mimetypes()) { + for (Writer* writer : all) { + const QStringList lst = writer->mimetypes(); + for (const QString& type : lst) { d->m_writers.insertMulti(type, writer); } } @@ -76,7 +77,7 @@ QStringList externalPluginPaths; const QStringList paths = QCoreApplication::libraryPaths(); - Q_FOREACH (const QString& libraryPath, paths) { + for (const QString& libraryPath : paths) { QString path(libraryPath + QStringLiteral("/kf5/kfilemetadata/writers")); QDir dir(path); @@ -110,7 +111,7 @@ externalPlugins.clear(); QList writers; - Q_FOREACH (const QString& pluginPath, pluginPaths) { + for (const QString& pluginPath : qAsConst(pluginPaths)) { QPluginLoader loader(pluginPath); if (!loader.load()) { @@ -137,7 +138,7 @@ } } - Q_FOREACH (const QString& externalPluginPath, externalPluginPaths) { + for (const QString& externalPluginPath : qAsConst(externalPluginPaths)) { ExternalWriter *plugin = new ExternalWriter(externalPluginPath); Writer* writer = new Writer; writer->d_ptr->m_plugin = plugin; diff --git a/tests/dump.cpp b/tests/dump.cpp --- a/tests/dump.cpp +++ b/tests/dump.cpp @@ -57,7 +57,7 @@ QTextStream out(stdout); out << url << " " << mimetype << "\n\n"; - Q_FOREACH (KFileMetaData::Extractor* ex, exList) { + for (KFileMetaData::Extractor* ex : qAsConst(exList)) { KFileMetaData::SimpleExtractionResult result(url, mimetype, KFileMetaData::ExtractionResult::ExtractMetaData); ex->extract(&result);