diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-27 11:57:46 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-01-27 20:11:17 +0100 |
commit | 8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4 (patch) | |
tree | 1e7b1a316e13a0834c83a74484e22c223e8d11f5 /rbutil/rbutilqt/base/ttsfestival.cpp | |
parent | abd87ccf156b803ea1b9941865ca60600b742724 (diff) | |
download | rockbox-8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4.tar.gz rockbox-8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4.zip |
Replace toAscii() / fromAscii() with Latin1() functions.
Qt5 deprecates the Ascii conversion functions, and the Latin1 functions pretty
much do the same.
Change-Id: I5dee6a443fcfee6afd3256ee536698bcf65ff896
Diffstat (limited to 'rbutil/rbutilqt/base/ttsfestival.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/ttsfestival.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/ttsfestival.cpp b/rbutil/rbutilqt/base/ttsfestival.cpp index 9ba6275ea6..cbf24a3f03 100644 --- a/rbutil/rbutilqt/base/ttsfestival.cpp +++ b/rbutil/rbutilqt/base/ttsfestival.cpp | |||
@@ -159,7 +159,7 @@ bool TTSFestival::start(QString* errStr) | |||
159 | 159 | ||
160 | if(prologFile.open()) | 160 | if(prologFile.open()) |
161 | { | 161 | { |
162 | prologFile.write(voiceSelect.toAscii()); | 162 | prologFile.write(voiceSelect.toLatin1()); |
163 | prologFile.close(); | 163 | prologFile.close(); |
164 | prologPath = QFileInfo(prologFile).absoluteFilePath(); | 164 | prologPath = QFileInfo(prologFile).absoluteFilePath(); |
165 | qDebug() << "[Festival] Prolog created at " << prologPath; | 165 | qDebug() << "[Festival] Prolog created at " << prologPath; |
@@ -192,7 +192,7 @@ TTSStatus TTSFestival::voice(QString text, QString wavfile, QString* errStr) | |||
192 | 192 | ||
193 | QProcess clientProcess; | 193 | QProcess clientProcess; |
194 | clientProcess.start(cmd); | 194 | clientProcess.start(cmd); |
195 | clientProcess.write(QString("%1.\n").arg(text).toAscii()); | 195 | clientProcess.write(QString("%1.\n").arg(text).toLatin1()); |
196 | clientProcess.waitForBytesWritten(); | 196 | clientProcess.waitForBytesWritten(); |
197 | clientProcess.closeWriteChannel(); | 197 | clientProcess.closeWriteChannel(); |
198 | clientProcess.waitForReadyRead(); | 198 | clientProcess.waitForReadyRead(); |
@@ -357,7 +357,7 @@ QString TTSFestival::queryServer(QString query, int timeout) | |||
357 | 357 | ||
358 | if(socket.state() == QAbstractSocket::ConnectedState) | 358 | if(socket.state() == QAbstractSocket::ConnectedState) |
359 | { | 359 | { |
360 | socket.write(QString("%1\n").arg(query).toAscii()); | 360 | socket.write(QString("%1\n").arg(query).toLatin1()); |
361 | socket.waitForBytesWritten(); | 361 | socket.waitForBytesWritten(); |
362 | socket.waitForReadyRead(); | 362 | socket.waitForReadyRead(); |
363 | 363 | ||