Fix some Clazy warnings

7 files changed, 12 insertions, 12 deletions

diff --git a/src/core/kconfiggroup.cpp b/src/core/kconfiggroup.cpp
index e09d602e..39d2441a 100644
--- a/src/core/kconfiggroup.cpp
+++ b/src/core/kconfiggroup.cpp
@@ -203,9 +203,9 @@ static QList<qreal> asRealList(const QByteArray &string)
 static QString errString(const char *pKey, const QByteArray &value, const QVariant &aDefault)
 {
     return QStringLiteral("\"%1\" - conversion of \"%3\" to %2 failed")
-           .arg(QString::fromLatin1(pKey))
-           .arg(QString::fromLatin1(QVariant::typeToName(aDefault.type())))
-           .arg(QString::fromLatin1(value));
+           .arg( QString::fromLatin1(pKey),
+                 QString::fromLatin1(QVariant::typeToName(aDefault.type())),
+                 QString::fromLatin1(value) );
 }
 
 static QString formatError(int expected, int got)
diff --git a/src/core/kemailsettings.cpp b/src/core/kemailsettings.cpp
index 59d5f6e3..527ef16c 100644
--- a/src/core/kemailsettings.cpp
+++ b/src/core/kemailsettings.cpp
@@ -261,7 +261,7 @@ KEMailSettings::KEMailSettings()
             setDefault(p->m_sDefaultProfile);
         }
     } else {
-        if (p->profiles.count()) {
+        if (!p->profiles.isEmpty()) {
             setDefault(p->profiles[0]);
         } else {
             setDefault(tr("Default"));
diff --git a/src/gui/kconfiggroupgui.cpp b/src/gui/kconfiggroupgui.cpp
index b8d30895..c399a65b 100644
--- a/src/gui/kconfiggroupgui.cpp
+++ b/src/gui/kconfiggroupgui.cpp
@@ -40,9 +40,9 @@ static bool readEntryGui(const QByteArray &data, const char *key, const QVariant
 {
     const auto errString = [&]() {
         return QStringLiteral("\"%1\" - conversion from \"%3\" to %2 failed")
-                              .arg(QLatin1String(key))
-                              .arg(QLatin1String(QVariant::typeToName(input.type())))
-                              .arg(QLatin1String(data.constData()));
+                              .arg(QLatin1String(key),
+                                   QLatin1String(QVariant::typeToName(input.type())),
+                                   QLatin1String(data.constData()) );
     };
 
     // set in case of failure
diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
index 9567c2d6..5108fb2e 100644
--- a/src/kconf_update/kconf_update.cpp
+++ b/src/kconf_update/kconf_update.cpp
@@ -131,7 +131,7 @@ KonfUpdate::KonfUpdate(QCommandLineParser *parser)
             return;
         }
         updateFiles.append(file);
-    } else if (parser->positionalArguments().count()) {
+    } else if (!parser->positionalArguments().isEmpty()) {
         updateFiles += parser->positionalArguments();
     } else {
         if (cg.readEntry("autoUpdateDisabled", false)) {
@@ -520,7 +520,7 @@ void KonfUpdate::gotFile(const QString &_file)
     if (!m_oldFile.isEmpty()) { // if File= is specified, it doesn't exist, is empty or contains only kconf_update's [$Version] group, skip
         if (m_oldConfig1 != Q_NULLPTR
                 && (m_oldConfig1->groupList().isEmpty()
-                    || (m_oldConfig1->groupList().count() == 1 && m_oldConfig1->groupList().first() == QLatin1String("$Version")))) {
+                    || (m_oldConfig1->groupList().count() == 1 && m_oldConfig1->groupList().at(0) == QLatin1String("$Version")))) {
             log() << m_currentFilename << ": File '" << m_oldFile << "' does not exist or empty, skipping" << endl;
             m_skipFile = true;
         }
diff --git a/src/kconf_update/kconfigutils.cpp b/src/kconf_update/kconfigutils.cpp
index 12b07499..02b3f0a9 100644
--- a/src/kconf_update/kconfigutils.cpp
+++ b/src/kconf_update/kconfigutils.cpp
@@ -96,7 +96,7 @@ QString unescapeString(const QString &src, bool *ok, QString *error)
                 dst += '\\';
             } else if (ch == 'x') {
                 if (pos + 2 < length) {
-                    char value = src.mid(pos + 1, 2).toInt(ok, 16);
+                    char value = src.midRef(pos + 1, 2).toInt(ok, 16);
                     if (*ok) {
                         dst += QChar::fromLatin1(value);
                         pos += 2;
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index 91f60052..c5bcdc1b 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -1262,7 +1262,7 @@ QString paramString(const QString &s, const CfgEntry *e, int i)
     if (result.contains(needle)) {
         QString tmp;
         if (e->paramType() == QLatin1String("Enum")) {
-            tmp = e->paramValues()[i];
+            tmp = e->paramValues().at(i);
         } else {
             tmp = QString::number(i);
         }
diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp
index a852c286..2168e8a9 100644
--- a/src/kreadconfig/kwriteconfig.cpp
+++ b/src/kreadconfig/kwriteconfig.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
     if (parser.positionalArguments().isEmpty()) {
         parser.showHelp(1);
     }
-    QString value = parser.positionalArguments().first();
+    QString value = parser.positionalArguments().at(0);
 
     KConfig *konfig;
     if (file.isEmpty())