diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp
index 8467fb416..ded3a1651 100644
--- a/src/core/Tools.cpp
+++ b/src/core/Tools.cpp
@@ -121,8 +121,8 @@ QString imageReaderFilter()
     QStringList formatsStringList;
 
     for (const QByteArray& format : formats) {
-        for (int i = 0; i < format.size(); i++) {
-            if (!QChar(format.at(i)).isLetterOrNumber()) {
+        for (char codePoint : format) {
+            if (!QChar(codePoint).isLetterOrNumber()) {
                 continue;
             }
         }
diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
index c23e2bfa5..a0293ce8d 100644
--- a/src/gui/ApplicationSettingsWidget.cpp
+++ b/src/gui/ApplicationSettingsWidget.cpp
@@ -146,8 +146,8 @@ void ApplicationSettingsWidget::loadSettings()
 
     m_generalUi->languageComboBox->clear();
     QList<QPair<QString, QString>> languages = Translator::availableLanguages();
-    for (int i = 0; i < languages.size(); i++) {
-        m_generalUi->languageComboBox->addItem(languages[i].second, languages[i].first);
+    for (const auto& language : languages) {
+        m_generalUi->languageComboBox->addItem(language.second, language.first);
     }
     int defaultIndex = m_generalUi->languageComboBox->findData(config()->get("GUI/Language"));
     if (defaultIndex > 0) {
diff --git a/src/gui/DialogyWidget.cpp b/src/gui/DialogyWidget.cpp
index 89e114f10..858d2949b 100644
--- a/src/gui/DialogyWidget.cpp
+++ b/src/gui/DialogyWidget.cpp
@@ -71,8 +71,7 @@ bool DialogyWidget::clickButton(QDialogButtonBox::StandardButton standardButton)
     }
 
     QList<QDialogButtonBox*> buttonBoxes = findChildren<QDialogButtonBox*>();
-    for (int i = 0; i < buttonBoxes.size(); ++i) {
-        QDialogButtonBox* buttonBox = buttonBoxes.at(i);
+    for (auto buttonBox : buttonBoxes) {
         pb = buttonBox->button(standardButton);
         if (pb && pb->isVisible() && pb->isEnabled()) {
             pb->click();
diff --git a/src/gui/entry/EntryModel.cpp b/src/gui/entry/EntryModel.cpp
index 0616374ac..fa3db177b 100644
--- a/src/gui/entry/EntryModel.cpp
+++ b/src/gui/entry/EntryModel.cpp
@@ -208,12 +208,12 @@ QVariant EntryModel::data(const QModelIndex& index, int role) const
         case Attachments: {
             // Display comma-separated list of attachments
             QList<QString> attachments = entry->attachments()->keys();
-            for (int i = 0; i < attachments.size(); ++i) {
+            for (const auto& attachment : attachments) {
                 if (result.isEmpty()) {
-                    result.append(attachments.at(i));
+                    result.append(attachment);
                     continue;
                 }
-                result.append(QString(", ") + attachments.at(i));
+                result.append(QString(", ") + attachment);
             }
             return result;
         }