devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutil: Fix various issues found by clazy.

Browse source 
Change-Id: I91ca2baed34f0f3b561602f95f66bbd4e17e74ab
This commit is contained in:
Dominik Riebeling 2021-12-25 19:59:57 +01:00
parent 0768705545
commit 01e245417e
9 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
utils/rbutilqt/base/system.cpp
View file

@ -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)");

5
utils/rbutilqt/base/talkfile.cpp
View file

@ -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;
}

8
utils/rbutilqt/base/talkgenerator.cpp
View file

@ -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

2
utils/rbutilqt/base/ttsfestival.cpp
View file

@ -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;

2
utils/rbutilqt/base/ttssapi.cpp
View file

@ -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;
}

2
utils/rbutilqt/base/utils.cpp
View file

@ -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;