9 files changed, 15 insertions, 19 deletions

diff --git a/utils/rbutilqt/base/system.cpp b/utils/rbutilqt/base/system.cpp
index dafab971ec..a1d3d1165d 100644
--- a/utils/rbutilqt/base/system.cpp
+++ b/utils/rbutilqt/base/system.cpp
@@ -190,7 +190,7 @@ QString System::osVersionString(void)
     if(ret != -1) {
         result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores);
         result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4")
-            .arg(u.sysname).arg(u.release).arg(u.version);
+            .arg(u.sysname, u.release, u.version);
     }
     else {
         result = QString("(Error when retrieving system information)");
diff --git a/utils/rbutilqt/base/talkfile.cpp b/utils/rbutilqt/base/talkfile.cpp
index cef53c852b..4c9cae5a16 100644
--- a/utils/rbutilqt/base/talkfile.cpp
+++ b/utils/rbutilqt/base/talkfile.cpp
@@ -252,9 +252,10 @@ bool TalkFileCreator::copyTalkFiles(QString* errString)
         // copying
         LOG_INFO() << "copying" << m_talkList[i].talkfilename
                    << "to" << m_talkList[i].target;
-        if(!QFile::copy(m_talkList[i].talkfilename,m_talkList[i].target))
+        if(!QFile::copy(m_talkList[i].talkfilename, m_talkList[i].target))
         {
-            *errString = tr("Copying of %1 to %2 failed").arg(m_talkList[i].talkfilename).arg(m_talkList[i].target);
+            *errString = tr("Copying of %1 to %2 failed")
+                    .arg(m_talkList[i].talkfilename, m_talkList[i].target);
             return false;
         }
 
diff --git a/utils/rbutilqt/base/talkgenerator.cpp b/utils/rbutilqt/base/talkgenerator.cpp
index 0ba2587fac..6798d53829 100644
--- a/utils/rbutilqt/base/talkgenerator.cpp
+++ b/utils/rbutilqt/base/talkgenerator.cpp
@@ -161,13 +161,13 @@ TalkGenerator::Status TalkGenerator::voiceList(QList<TalkEntry>* list,int wavtri
         if(status == Warning)
         {
             warnings = true;
-            emit logItem(tr("Voicing of %1 failed: %2").arg(list->at(i).toSpeak).arg(error),
-                    LOGWARNING);
+            emit logItem(tr("Voicing of %1 failed: %2")
+                         .arg(list->at(i).toSpeak, error), LOGWARNING);
         }
         else if (status == FatalError)
         {
-            emit logItem(tr("Voicing of %1 failed: %2").arg(list->at(i).toSpeak).arg(error),
-                    LOGERROR);
+            emit logItem(tr("Voicing of %1 failed: %2")
+                         .arg(list->at(i).toSpeak, error), LOGERROR);
             return eERROR;
         }
         else
diff --git a/utils/rbutilqt/base/ttsfestival.cpp b/utils/rbutilqt/base/ttsfestival.cpp
index 6acd423506..4c718de824 100644
--- a/utils/rbutilqt/base/ttsfestival.cpp
+++ b/utils/rbutilqt/base/ttsfestival.cpp
@@ -193,7 +193,7 @@ TTSStatus TTSFestival::voice(QString text, QString wavfile, QString* errStr)
     QString path = RbSettings::subValue("festival-client",
             RbSettings::TtsPath).toString();
     QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp"
-            " --output \"%2\" --prolog \"%3\" - ").arg(path).arg(wavfile).arg(prologPath);
+            " --output \"%2\" --prolog \"%3\" - ").arg(path, wavfile, prologPath);
     LOG_INFO() << "Client cmd:" << cmd;
 
     QProcess clientProcess;
diff --git a/utils/rbutilqt/base/ttssapi.cpp b/utils/rbutilqt/base/ttssapi.cpp
index 1b326b301e..66ca6cc144 100644
--- a/utils/rbutilqt/base/ttssapi.cpp
+++ b/utils/rbutilqt/base/ttssapi.cpp
@@ -197,7 +197,7 @@ QStringList TTSSapi::getVoiceList(QString language)
     voicescript->closeWriteChannel();
     voicescript->waitForReadyRead();
 
-    QString dataRaw = voicescript->readAllStandardError().data();
+    const QString dataRaw = voicescript->readAllStandardError().constData();
     if(dataRaw.startsWith("Error")) {
         LOG_INFO() << "Error:" << dataRaw;
     }
diff --git a/utils/rbutilqt/base/utils.cpp b/utils/rbutilqt/base/utils.cpp
index 5a9432c69c..285d48d6cf 100644
--- a/utils/rbutilqt/base/utils.cpp
+++ b/utils/rbutilqt/base/utils.cpp
@@ -1057,7 +1057,7 @@ qint64 Utils::recursiveFolderSize(QString path)
         size += item.size();
     }
     QList<QString> folders = QDir(path).entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-    for (auto folder: folders) {
+    for (auto const& folder: folders) {
         size += recursiveFolderSize(path + "/" + folder);
     }
     return size;
diff --git a/utils/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
index 3fe2dc7956..341a4072cc 100644
--- a/utils/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/utils/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -277,7 +277,6 @@ void SelectiveInstallWidget::installBootloader(void)
     if(ui.bootloaderCheckbox->isChecked()) {
         LOG_INFO() << "installing bootloader";
 
-        QString platform = RbSettings::value(RbSettings::Platform).toString();
         QString backupDestination = "";
 
         // create installer
@@ -509,7 +508,6 @@ void SelectiveInstallWidget::installVoicefile(void)
         RockboxInfo installInfo(m_mountpoint);
         QString voiceurl;
         QString logversion;
-        QString relversion = installInfo.release();
         if(m_buildtype != PlayerBuildInfo::TypeRelease) {
             // release is empty for non-release versions (i.e. daily / current)
             logversion = installInfo.release();
@@ -549,7 +547,6 @@ void SelectiveInstallWidget::installManual(void)
         RockboxInfo installInfo(m_mountpoint);
         QString manualurl;
         QString logversion;
-        QString relversion = installInfo.release();
         if(m_buildtype != PlayerBuildInfo::TypeRelease) {
             // release is empty for non-release versions (i.e. daily / current)
             logversion = installInfo.release();
@@ -638,7 +635,7 @@ void SelectiveInstallWidget::installPluginData(void)
         for(size_t i = 0; i < sizeof(PluginDataFiles) / sizeof(PluginDataFiles[0]); i++)
         {
             // check if installed Rockbox has this plugin.
-            if(QFileInfo(m_mountpoint + "/.rockbox/rocks/" + PluginDataFiles[i].rockfile).exists()) {
+            if(QFileInfo::exists(m_mountpoint + "/.rockbox/rocks/" + PluginDataFiles[i].rockfile)) {
                 dataName.append(PluginDataFiles[i].name);
                 // game URLs do not depend on the actual build type, but we need
                 // to pass it (simplifies the API, and will allow to make them
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp
index b425ed4d70..1a0841c0f3 100644
--- a/utils/rbutilqt/rbutilqt.cpp
+++ b/utils/rbutilqt/rbutilqt.cpp
@@ -281,8 +281,7 @@ void RbUtilQt::about()
     licenses[":/docs/LICENSE.BZIP2"] = "<a id='bzip2'>bzip2 License</a>";
     licenses[":/docs/LICENSE.BSPATCH"] = "<a id='bspatch'>bspatch License</a>";
 
-    for (int i = 0; i < licenses.size(); i++) {
-        QString key = licenses.keys().at(i);
+    for (auto const& key : licenses.keys()) {
         QFile license(key);
         license.open(QIODevice::ReadOnly);
         QTextStream s(&license);
@@ -461,8 +460,6 @@ void RbUtilQt::uninstallBootloader(void)
     ProgressLoggerGui* logger = new ProgressLoggerGui(this);
     logger->show();
 
-    QString platform = RbSettings::value(RbSettings::Platform).toString();
-
     // create installer
     BootloaderInstallBase *bl
         = BootloaderInstallHelper::createBootloaderInstaller(this,
diff --git a/utils/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp
index 87a6d96419..9d895d9487 100644
--- a/utils/rbutilqt/test/test-httpget.cpp
+++ b/utils/rbutilqt/test/test-httpget.cpp
@@ -148,7 +148,8 @@ class TestHttpGet : public QObject
             QString tempdir;
             for(int i = 0; i < 100000; i++) {
                 tempdir = QDir::tempPath() + QString("/qttest-temp-%1").arg(i);
-                if(!QFileInfo(tempdir).exists()) break;
+                if(!QFileInfo::exists(tempdir))
+                    break;
             }
             QDir().mkpath(tempdir);
             return QDir(tempdir);