diff options
Diffstat (limited to 'utils/rbutilqt/base')
-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 |
6 files changed, 11 insertions, 10 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; |