diff --git a/src/filter/filterconverter/filterconverttosieve.cpp b/src/filter/filterconverter/filterconverttosieve.cpp
index 9969b31..cae51af 100644
--- a/src/filter/filterconverter/filterconverttosieve.cpp
+++ b/src/filter/filterconverter/filterconverttosieve.cpp
@@ -27,12 +27,12 @@ void FilterConvertToSieve::convert()
if (!mListFilters.isEmpty()) {
QStringList requiresModule;
QString code;
- for (MailFilter *filter : qAsConst(mListFilters)) {
+ for (MailFilter *filter : std::as_const(mListFilters)) {
filter->generateSieveScript(requiresModule, code);
code += QLatin1Char('\n');
}
QString requireStr;
- for (const QString &require : qAsConst(requiresModule)) {
+ for (const QString &require : std::as_const(requiresModule)) {
requireStr += QStringLiteral("require \"%1\";").arg(require);
requireStr += QLatin1Char('\n');
}
diff --git a/src/filter/filterimporter/filterimporterbalsa.cpp b/src/filter/filterimporter/filterimporterbalsa.cpp
index 5f99c27..41811d3 100644
--- a/src/filter/filterimporter/filterimporterbalsa.cpp
+++ b/src/filter/filterimporter/filterimporterbalsa.cpp
@@ -87,7 +87,7 @@ void FilterImporterBalsa::parseCondition(const QString &condition, MailCommon::M
// no multi condition
conditionList << condition;
}
- for (QString cond : qAsConst(conditionList)) {
+ for (QString cond : std::as_const(conditionList)) {
cond = cond.trimmed();
if (cond.startsWith(QLatin1String("NOT"))) {
cond = cond.right(cond.length() - 3);
diff --git a/src/filter/filterlog.cpp b/src/filter/filterlog.cpp
index 33d170c..cf8d6d7 100644
--- a/src/filter/filterlog.cpp
+++ b/src/filter/filterlog.cpp
@@ -165,7 +165,7 @@ QStringList FilterLog::logEntries() const
void FilterLog::dump()
{
qCDebug(MAILCOMMON_LOG) << "----- starting filter log -----";
- for (const QString &entry : qAsConst(d->mLogEntries)) {
+ for (const QString &entry : std::as_const(d->mLogEntries)) {
qCDebug(MAILCOMMON_LOG) << entry;
}
qCDebug(MAILCOMMON_LOG) << "------ end of filter log ------";
@@ -180,7 +180,7 @@ bool FilterLog::saveToFile(const QString &fileName) const
file.write("\n\n");
file.write("\n");
- for (const QString &entry : qAsConst(d->mLogEntries)) {
+ for (const QString &entry : std::as_const(d->mLogEntries)) {
const QString line = QLatin1String("") + entry + QLatin1String("
") + QLatin1Char('\n');
file.write(line.toLocal8Bit());
}
diff --git a/src/job/backupjob.cpp b/src/job/backupjob.cpp
index 17ae3d2..7e852b1 100644
--- a/src/job/backupjob.cpp
+++ b/src/job/backupjob.cpp
@@ -108,7 +108,7 @@ bool BackupJob::queueFolders(const Akonadi::Collection &root)
bool BackupJob::hasChildren(const Akonadi::Collection &collection) const
{
- for (const Akonadi::Collection &curCol : qAsConst(mAllFolders)) {
+ for (const Akonadi::Collection &curCol : std::as_const(mAllFolders)) {
if (collection == curCol.parentCollection()) {
return true;
}
@@ -281,7 +281,7 @@ bool BackupJob::writeDirHelper(const QString &directoryPath)
QString BackupJob::collectionName(const Akonadi::Collection &collection) const
{
- for (const Akonadi::Collection &curCol : qAsConst(mAllFolders)) {
+ for (const Akonadi::Collection &curCol : std::as_const(mAllFolders)) {
if (curCol == collection) {
return curCol.name();
}
diff --git a/src/search/searchpattern.cpp b/src/search/searchpattern.cpp
index 3169822..a239ff9 100644
--- a/src/search/searchpattern.cpp
+++ b/src/search/searchpattern.cpp
@@ -347,7 +347,7 @@ QDataStream &SearchPattern::operator>>(QDataStream &s) const
break;
}
- for (const SearchRule::Ptr &rule : qAsConst(*this)) {
+ for (const SearchRule::Ptr &rule : std::as_const(*this)) {
*rule >> s;
}
return s;
diff --git a/src/tag/addtagdialog.cpp b/src/tag/addtagdialog.cpp
index 70a94f9..b61b9ff 100644
--- a/src/tag/addtagdialog.cpp
+++ b/src/tag/addtagdialog.cpp
@@ -76,7 +76,7 @@ void AddTagDialog::slotSave()
{
const QString name(d->mTagWidget->tagNameLineEdit()->text());
- for (const MailCommon::Tag::Ptr &tag : qAsConst(d->mTags)) {
+ for (const MailCommon::Tag::Ptr &tag : std::as_const(d->mTags)) {
if (tag->name() == name) {
KMessageBox::error(this, i18n("Tag %1 already exists", name));
d->mTagWidget->tagNameLineEdit()->setFocus();
diff --git a/src/util/cryptoutils.cpp b/src/util/cryptoutils.cpp
index 9cd8380..e8169a7 100644
--- a/src/util/cryptoutils.cpp
+++ b/src/util/cryptoutils.cpp
@@ -169,7 +169,7 @@ KMime::Message::Ptr CryptoUtils::assembleMessage(const KMime::Message::Ptr &orig
// Copy over headers from the original message, except for CT, CTE and CD
// headers, we want to preserve those from the new content
QVector headers = orig->headers();
- for (const auto hdr : qAsConst(headers)) {
+ for (const auto hdr : std::as_const(headers)) {
if (isContentHeader(hdr)) {
continue;
}
@@ -179,7 +179,7 @@ KMime::Message::Ptr CryptoUtils::assembleMessage(const KMime::Message::Ptr &orig
// Overwrite some headers by those provided by the new content
headers = newContent->headers();
- for (const auto hdr : qAsConst(headers)) {
+ for (const auto hdr : std::as_const(headers)) {
if (isContentHeader(hdr)) {
copyHeader(hdr, out);
}