From 01e245417e24fe6c9957b35850db6b1473f66e98 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sat, 25 Dec 2021 19:59:57 +0100
Subject: rbutil: Fix various issues found by clazy.

Change-Id: I91ca2baed34f0f3b561602f95f66bbd4e17e74ab
---
 utils/rbutilqt/base/system.cpp        | 2 +-
 utils/rbutilqt/base/talkfile.cpp      | 5 +++--
 utils/rbutilqt/base/talkgenerator.cpp | 8 ++++----
 utils/rbutilqt/base/ttsfestival.cpp   | 2 +-
 utils/rbutilqt/base/ttssapi.cpp       | 2 +-
 utils/rbutilqt/base/utils.cpp         | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'utils/rbutilqt/base')

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;
-- 
cgit v1.2.3