diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index 4eb02ad1d..82b928219 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -418,7 +418,7 @@ Database* Database::unlockFromStdin(QString databaseFilename, QString keyFilenam
         FileKey fileKey;
         QString errorMessage;
         if (!fileKey.load(keyFilename, &errorMessage)) {
-            errorTextStream << QObject::tr("Failed to load key file %1 : %2").arg(keyFilename).arg(errorMessage);
+            errorTextStream << QObject::tr("Failed to load key file %1 : %2").arg(keyFilename, errorMessage);
             errorTextStream << endl;
             return nullptr;
         }
diff --git a/src/core/EntryAttachments.cpp b/src/core/EntryAttachments.cpp
index a53a3c997..d700ed443 100644
--- a/src/core/EntryAttachments.cpp
+++ b/src/core/EntryAttachments.cpp
@@ -29,7 +29,7 @@ QList<QString> EntryAttachments::keys() const
 
 bool EntryAttachments::hasKey(const QString& key) const
 {
-    return m_attachments.keys().contains(key);
+    return m_attachments.contains(key);
 }
 
 QList<QByteArray> EntryAttachments::values() const
diff --git a/src/core/EntryAttributes.cpp b/src/core/EntryAttributes.cpp
index a5143aa04..8ffdaa8f5 100644
--- a/src/core/EntryAttributes.cpp
+++ b/src/core/EntryAttributes.cpp
@@ -41,7 +41,7 @@ QList<QString> EntryAttributes::keys() const
 
 bool EntryAttributes::hasKey(const QString& key) const
 {
-    return m_attributes.keys().contains(key);
+    return m_attributes.contains(key);
 }
 
 QList<QString> EntryAttributes::customKeys()
diff --git a/src/format/KeePass2XmlWriter.cpp b/src/format/KeePass2XmlWriter.cpp
index f8dfa1581..8f1d9231d 100644
--- a/src/format/KeePass2XmlWriter.cpp
+++ b/src/format/KeePass2XmlWriter.cpp
@@ -521,9 +521,9 @@ void KeePass2XmlWriter::writeColor(const QString& qualifiedName, const QColor& c
     QString colorStr;
 
     if (color.isValid()) {
-      colorStr = QString("#%1%2%3").arg(colorPartToString(color.red()))
-              .arg(colorPartToString(color.green()))
-              .arg(colorPartToString(color.blue()));
+      colorStr = QString("#%1%2%3").arg(colorPartToString(color.red()),
+                                        colorPartToString(color.green()),
+                                        colorPartToString(color.blue()));
     }
 
     writeString(qualifiedName, colorStr);
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index 0e0f2960a..7cbd648ec 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -59,16 +59,16 @@ AboutDialog::AboutDialog(QWidget* parent)
     }
 
     debugInfo.append(QString("%1\n- Qt %2\n- %3\n\n")
-             .arg(tr("Libraries:"))
-             .arg(QString::fromLocal8Bit(qVersion()))
-             .arg(Crypto::backendVersion()));
+             .arg(tr("Libraries:"),
+                  QString::fromLocal8Bit(qVersion()),
+                  Crypto::backendVersion()));
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
     debugInfo.append(tr("Operating system: %1\nCPU architecture: %2\nKernel: %3 %4")
-             .arg(QSysInfo::prettyProductName())
-             .arg(QSysInfo::currentCpuArchitecture())
-             .arg(QSysInfo::kernelType())
-             .arg(QSysInfo::kernelVersion()));
+             .arg(QSysInfo::prettyProductName(),
+                  QSysInfo::currentCpuArchitecture(),
+                  QSysInfo::kernelType(),
+                  QSysInfo::kernelVersion()));
 
     debugInfo.append("\n\n");
 #endif