diff --git a/src/lib/autofill/autofill.cpp b/src/lib/autofill/autofill.cpp
index 9571d405e..470295dc1 100644
--- a/src/lib/autofill/autofill.cpp
+++ b/src/lib/autofill/autofill.cpp
@@ -188,7 +188,7 @@ void AutoFill::saveForm(WebPage *page, const QUrl &frameUrl, const PageFormData
     if (isStored(frameUrl)) {
         const QVector<PasswordEntry> &list = getFormData(frameUrl);
 
-        foreach (const PasswordEntry &data, list) {
+        for (const PasswordEntry &data : list) {
             if (data.username == formData.username) {
                 updateData = data;
                 updateLastUsed(updateData);
@@ -256,9 +256,9 @@ QByteArray AutoFill::exportPasswords()
     stream.writeStartElement(QStringLiteral("passwords"));
     stream.writeAttribute(QStringLiteral("version"), QStringLiteral("1.0"));
 
-    QVector<PasswordEntry> entries = m_manager->getAllEntries();
+    const QVector<PasswordEntry> entries = m_manager->getAllEntries();
 
-    foreach (const PasswordEntry &entry, entries) {
+    for (const PasswordEntry &entry : entries) {
         stream.writeStartElement(QStringLiteral("entry"));
         stream.writeTextElement(QStringLiteral("server"), entry.host);
         stream.writeTextElement(QStringLiteral("username"), entry.username);
@@ -318,7 +318,8 @@ bool AutoFill::importPasswords(const QByteArray &data)
                 if (entry.isValid()) {
                     bool containsEntry = false;
 
-                    foreach (const PasswordEntry &e, m_manager->getEntries(QUrl(entry.host))) {
+                    const auto entries = m_manager->getEntries(QUrl(entry.host));
+                    for (const PasswordEntry &e : entries) {
                         if (e.username == entry.username) {
                             containsEntry = true;
                             break;
diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp
index 68053a2a1..6b2719497 100644
--- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp
+++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp
@@ -609,17 +609,17 @@ void MasterPasswordDialog::clearMasterPasswordAndConvert(bool forcedAskPass)
     }
 
     if (m_backend->hasPermission()) {
-        QVector<PasswordEntry> list = m_backend->getAllEntries();
+        const QVector<PasswordEntry> list = m_backend->getAllEntries();
         PasswordBackend* databaseBackend = mApp->autoFill()->passwordManager()->availableBackends().value(QSL("database"));
         if (!databaseBackend) {
             return;
         }
 
-        QVector<PasswordEntry> databaseList = databaseBackend->getAllEntries();
+        const QVector<PasswordEntry> databaseList = databaseBackend->getAllEntries();
         bool allDataMoved = true;
-        foreach (const PasswordEntry &entry, list) {
+        for (const PasswordEntry &entry : list) {
             bool sameEntry = false;
-            foreach (const PasswordEntry &dbEntry, databaseList) {
+            for (const PasswordEntry &dbEntry : databaseList) {
                 sameEntry = samePasswordEntry(dbEntry, entry);
                 if (sameEntry) {
                     allDataMoved = false;