diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-25 19:59:57 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-25 19:59:57 +0100 |
commit | 01e245417e24fe6c9957b35850db6b1473f66e98 (patch) | |
tree | dc0f5e27196f80167a1d52cfbc8703caabe1f19e | |
parent | 076870554531b50223fa7f5d89a192427a66a1ea (diff) | |
download | rockbox-01e245417e24fe6c9957b35850db6b1473f66e98.tar.gz rockbox-01e245417e24fe6c9957b35850db6b1473f66e98.zip |
rbutil: Fix various issues found by clazy.
Change-Id: I91ca2baed34f0f3b561602f95f66bbd4e17e74ab
-rw-r--r-- | utils/rbutilqt/base/system.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/talkfile.cpp | 5 | ||||
-rw-r--r-- | utils/rbutilqt/base/talkgenerator.cpp | 8 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttsfestival.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/ttssapi.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/base/utils.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/gui/selectiveinstallwidget.cpp | 5 | ||||
-rw-r--r-- | utils/rbutilqt/rbutilqt.cpp | 5 | ||||
-rw-r--r-- | utils/rbutilqt/test/test-httpget.cpp | 3 |
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) | |||
190 | if(ret != -1) { | 190 | if(ret != -1) { |
191 | result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores); | 191 | result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores); |
192 | result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4") | 192 | result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4") |
193 | .arg(u.sysname).arg(u.release).arg(u.version); | 193 | .arg(u.sysname, u.release, u.version); |
194 | } | 194 | } |
195 | else { | 195 | else { |
196 | result = QString("(Error when retrieving system information)"); | 196 | 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) | |||
252 | // copying | 252 | // copying |
253 | LOG_INFO() << "copying" << m_talkList[i].talkfilename | 253 | LOG_INFO() << "copying" << m_talkList[i].talkfilename |
254 | << "to" << m_talkList[i].target; | 254 | << "to" << m_talkList[i].target; |
255 | if(!QFile::copy(m_talkList[i].talkfilename,m_talkList[i].target)) | 255 | if(!QFile::copy(m_talkList[i].talkfilename, m_talkList[i].target)) |
256 | { | 256 | { |
257 | *errString = tr("Copying of %1 to %2 failed").arg(m_talkList[i].talkfilename).arg(m_talkList[i].target); | 257 | *errString = tr("Copying of %1 to %2 failed") |
258 | .arg(m_talkList[i].talkfilename, m_talkList[i].target); | ||
258 | return false; | 259 | return false; |
259 | } | 260 | } |
260 | 261 | ||
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 | |||
161 | if(status == Warning) | 161 | if(status == Warning) |
162 | { | 162 | { |
163 | warnings = true; | 163 | warnings = true; |
164 | emit logItem(tr("Voicing of %1 failed: %2").arg(list->at(i).toSpeak).arg(error), | 164 | emit logItem(tr("Voicing of %1 failed: %2") |
165 | LOGWARNING); | 165 | .arg(list->at(i).toSpeak, error), LOGWARNING); |
166 | } | 166 | } |
167 | else if (status == FatalError) | 167 | else if (status == FatalError) |
168 | { | 168 | { |
169 | emit logItem(tr("Voicing of %1 failed: %2").arg(list->at(i).toSpeak).arg(error), | 169 | emit logItem(tr("Voicing of %1 failed: %2") |
170 | LOGERROR); | 170 | .arg(list->at(i).toSpeak, error), LOGERROR); |
171 | return eERROR; | 171 | return eERROR; |
172 | } | 172 | } |
173 | else | 173 | 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) | |||
193 | QString path = RbSettings::subValue("festival-client", | 193 | QString path = RbSettings::subValue("festival-client", |
194 | RbSettings::TtsPath).toString(); | 194 | RbSettings::TtsPath).toString(); |
195 | QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp" | 195 | QString cmd = QString("%1 --server localhost --otype riff --ttw --withlisp" |
196 | " --output \"%2\" --prolog \"%3\" - ").arg(path).arg(wavfile).arg(prologPath); | 196 | " --output \"%2\" --prolog \"%3\" - ").arg(path, wavfile, prologPath); |
197 | LOG_INFO() << "Client cmd:" << cmd; | 197 | LOG_INFO() << "Client cmd:" << cmd; |
198 | 198 | ||
199 | QProcess clientProcess; | 199 | 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) | |||
197 | voicescript->closeWriteChannel(); | 197 | voicescript->closeWriteChannel(); |
198 | voicescript->waitForReadyRead(); | 198 | voicescript->waitForReadyRead(); |
199 | 199 | ||
200 | QString dataRaw = voicescript->readAllStandardError().data(); | 200 | const QString dataRaw = voicescript->readAllStandardError().constData(); |
201 | if(dataRaw.startsWith("Error")) { | 201 | if(dataRaw.startsWith("Error")) { |
202 | LOG_INFO() << "Error:" << dataRaw; | 202 | LOG_INFO() << "Error:" << dataRaw; |
203 | } | 203 | } |
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) | |||
1057 | size += item.size(); | 1057 | size += item.size(); |
1058 | } | 1058 | } |
1059 | QList<QString> folders = QDir(path).entryList(QDir::Dirs | QDir::NoDotAndDotDot); | 1059 | QList<QString> folders = QDir(path).entryList(QDir::Dirs | QDir::NoDotAndDotDot); |
1060 | for (auto folder: folders) { | 1060 | for (auto const& folder: folders) { |
1061 | size += recursiveFolderSize(path + "/" + folder); | 1061 | size += recursiveFolderSize(path + "/" + folder); |
1062 | } | 1062 | } |
1063 | return size; | 1063 | 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) | |||
277 | if(ui.bootloaderCheckbox->isChecked()) { | 277 | if(ui.bootloaderCheckbox->isChecked()) { |
278 | LOG_INFO() << "installing bootloader"; | 278 | LOG_INFO() << "installing bootloader"; |
279 | 279 | ||
280 | QString platform = RbSettings::value(RbSettings::Platform).toString(); | ||
281 | QString backupDestination = ""; | 280 | QString backupDestination = ""; |
282 | 281 | ||
283 | // create installer | 282 | // create installer |
@@ -509,7 +508,6 @@ void SelectiveInstallWidget::installVoicefile(void) | |||
509 | RockboxInfo installInfo(m_mountpoint); | 508 | RockboxInfo installInfo(m_mountpoint); |
510 | QString voiceurl; | 509 | QString voiceurl; |
511 | QString logversion; | 510 | QString logversion; |
512 | QString relversion = installInfo.release(); | ||
513 | if(m_buildtype != PlayerBuildInfo::TypeRelease) { | 511 | if(m_buildtype != PlayerBuildInfo::TypeRelease) { |
514 | // release is empty for non-release versions (i.e. daily / current) | 512 | // release is empty for non-release versions (i.e. daily / current) |
515 | logversion = installInfo.release(); | 513 | logversion = installInfo.release(); |
@@ -549,7 +547,6 @@ void SelectiveInstallWidget::installManual(void) | |||
549 | RockboxInfo installInfo(m_mountpoint); | 547 | RockboxInfo installInfo(m_mountpoint); |
550 | QString manualurl; | 548 | QString manualurl; |
551 | QString logversion; | 549 | QString logversion; |
552 | QString relversion = installInfo.release(); | ||
553 | if(m_buildtype != PlayerBuildInfo::TypeRelease) { | 550 | if(m_buildtype != PlayerBuildInfo::TypeRelease) { |
554 | // release is empty for non-release versions (i.e. daily / current) | 551 | // release is empty for non-release versions (i.e. daily / current) |
555 | logversion = installInfo.release(); | 552 | logversion = installInfo.release(); |
@@ -638,7 +635,7 @@ void SelectiveInstallWidget::installPluginData(void) | |||
638 | for(size_t i = 0; i < sizeof(PluginDataFiles) / sizeof(PluginDataFiles[0]); i++) | 635 | for(size_t i = 0; i < sizeof(PluginDataFiles) / sizeof(PluginDataFiles[0]); i++) |
639 | { | 636 | { |
640 | // check if installed Rockbox has this plugin. | 637 | // check if installed Rockbox has this plugin. |
641 | if(QFileInfo(m_mountpoint + "/.rockbox/rocks/" + PluginDataFiles[i].rockfile).exists()) { | 638 | if(QFileInfo::exists(m_mountpoint + "/.rockbox/rocks/" + PluginDataFiles[i].rockfile)) { |
642 | dataName.append(PluginDataFiles[i].name); | 639 | dataName.append(PluginDataFiles[i].name); |
643 | // game URLs do not depend on the actual build type, but we need | 640 | // game URLs do not depend on the actual build type, but we need |
644 | // to pass it (simplifies the API, and will allow to make them | 641 | // 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() | |||
281 | licenses[":/docs/LICENSE.BZIP2"] = "<a id='bzip2'>bzip2 License</a>"; | 281 | licenses[":/docs/LICENSE.BZIP2"] = "<a id='bzip2'>bzip2 License</a>"; |
282 | licenses[":/docs/LICENSE.BSPATCH"] = "<a id='bspatch'>bspatch License</a>"; | 282 | licenses[":/docs/LICENSE.BSPATCH"] = "<a id='bspatch'>bspatch License</a>"; |
283 | 283 | ||
284 | for (int i = 0; i < licenses.size(); i++) { | 284 | for (auto const& key : licenses.keys()) { |
285 | QString key = licenses.keys().at(i); | ||
286 | QFile license(key); | 285 | QFile license(key); |
287 | license.open(QIODevice::ReadOnly); | 286 | license.open(QIODevice::ReadOnly); |
288 | QTextStream s(&license); | 287 | QTextStream s(&license); |
@@ -461,8 +460,6 @@ void RbUtilQt::uninstallBootloader(void) | |||
461 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); | 460 | ProgressLoggerGui* logger = new ProgressLoggerGui(this); |
462 | logger->show(); | 461 | logger->show(); |
463 | 462 | ||
464 | QString platform = RbSettings::value(RbSettings::Platform).toString(); | ||
465 | |||
466 | // create installer | 463 | // create installer |
467 | BootloaderInstallBase *bl | 464 | BootloaderInstallBase *bl |
468 | = BootloaderInstallHelper::createBootloaderInstaller(this, | 465 | = 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 | |||
148 | QString tempdir; | 148 | QString tempdir; |
149 | for(int i = 0; i < 100000; i++) { | 149 | for(int i = 0; i < 100000; i++) { |
150 | tempdir = QDir::tempPath() + QString("/qttest-temp-%1").arg(i); | 150 | tempdir = QDir::tempPath() + QString("/qttest-temp-%1").arg(i); |
151 | if(!QFileInfo(tempdir).exists()) break; | 151 | if(!QFileInfo::exists(tempdir)) |
152 | break; | ||
152 | } | 153 | } |
153 | QDir().mkpath(tempdir); | 154 | QDir().mkpath(tempdir); |
154 | return QDir(tempdir); | 155 | return QDir(tempdir); |