diff --git a/autotests/foldertreewidgettest.cpp b/autotests/foldertreewidgettest.cpp index ffcb2a2..3d9c50d 100644 --- a/autotests/foldertreewidgettest.cpp +++ b/autotests/foldertreewidgettest.cpp @@ -231,7 +231,7 @@ private: CollectionFetchJob *job = new CollectionFetchJob(Collection::root(), CollectionFetchJob::FirstLevel); if (job->exec()) { const Collection::List collections = job->collections(); - foreach (const Collection &col, collections) { + for (const Collection &col : collections) { //qDebug() << col.resource() << col.mimeType(); if (col.resource() == identifier) { return col; diff --git a/src/util/mailutil.cpp b/src/util/mailutil.cpp index 0d3ab00..10bd139 100644 --- a/src/util/mailutil.cpp +++ b/src/util/mailutil.cpp @@ -353,19 +353,18 @@ QString MailCommon::Util::convertFolderPathToCollectionStr(const QString &folder bool MailCommon::Util::foundMailer() { - QStringList lst; - lst << MailImporter::FilterEvolution::defaultSettingsPath(); - lst << MailImporter::FilterEvolution_v2::defaultSettingsPath(); - lst << MailImporter::FilterEvolution_v3::defaultSettingsPath(); - lst << MailImporter::FilterBalsa::defaultSettingsPath(); - lst << MailImporter::FilterClawsMail::defaultSettingsPath(); - lst << MailImporter::FilterOpera::defaultSettingsPath(); - lst << MailImporter::FilterSylpheed::defaultSettingsPath(); - lst << MailImporter::FilterThunderbird::defaultSettingsPath(); - lst << MailImporter::OtherMailerUtil::trojitaDefaultPath(); - lst << MailImporter::FilterIcedove::defaultSettingsPath(); - - Q_FOREACH (const QString &path, lst) { + const QStringList lst = { MailImporter::FilterEvolution::defaultSettingsPath(), + MailImporter::FilterEvolution_v2::defaultSettingsPath(), + MailImporter::FilterEvolution_v3::defaultSettingsPath(), + MailImporter::FilterBalsa::defaultSettingsPath(), + MailImporter::FilterClawsMail::defaultSettingsPath(), + MailImporter::FilterOpera::defaultSettingsPath(), + MailImporter::FilterSylpheed::defaultSettingsPath(), + MailImporter::FilterThunderbird::defaultSettingsPath(), + MailImporter::OtherMailerUtil::trojitaDefaultPath(), + MailImporter::FilterIcedove::defaultSettingsPath()}; + + for (const QString &path : lst) { QDir directory(path); if (directory.exists()) { return true;