diff options
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallhex.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/system.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/ttsfestival.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp index 3fdfba6c8a..506a05522a 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallhex.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallhex.cpp | |||
@@ -87,7 +87,7 @@ bool BootloaderInstallHex::install(void) | |||
87 | while(i--) { | 87 | while(i--) { |
88 | if(md5sums[i].orig == 0) | 88 | if(md5sums[i].orig == 0) |
89 | m_model--; | 89 | m_model--; |
90 | if(!qstrcmp(md5sums[i].orig, hash.toAscii())) | 90 | if(!qstrcmp(md5sums[i].orig, hash.toLatin1())) |
91 | break; | 91 | break; |
92 | } | 92 | } |
93 | if(i < 0) { | 93 | if(i < 0) { |
@@ -110,8 +110,8 @@ bool BootloaderInstallHex::install(void) | |||
110 | emit logItem(tr("Descrambling file"), LOGINFO); | 110 | emit logItem(tr("Descrambling file"), LOGINFO); |
111 | m_descrambled.open(); | 111 | m_descrambled.open(); |
112 | int result; | 112 | int result; |
113 | result = iriver_decode(m_offile.toAscii().data(), | 113 | result = iriver_decode(m_offile.toLatin1().data(), |
114 | m_descrambled.fileName().toAscii().data(), FALSE, STRIP_NONE); | 114 | m_descrambled.fileName().toLatin1().data(), FALSE, STRIP_NONE); |
115 | qDebug() << "[BootloaderInstallHex] iriver_decode" << result; | 115 | qDebug() << "[BootloaderInstallHex] iriver_decode" << result; |
116 | 116 | ||
117 | if(result < 0) { | 117 | if(result < 0) { |
diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp index 7726e5738a..ffd667995a 100644 --- a/rbutil/rbutilqt/base/system.cpp +++ b/rbutil/rbutilqt/base/system.cpp | |||
@@ -268,9 +268,9 @@ QMap<uint32_t, QString> System::listUsbDevices(void) | |||
268 | libusb_device_handle *dh; | 268 | libusb_device_handle *dh; |
269 | if(libusb_open(dev, &dh) == 0) { | 269 | if(libusb_open(dev, &dh) == 0) { |
270 | libusb_get_string_descriptor_ascii(dh, descriptor.iManufacturer, buf, 256); | 270 | libusb_get_string_descriptor_ascii(dh, descriptor.iManufacturer, buf, 256); |
271 | name += QString::fromAscii((char*)buf) + " "; | 271 | name += QString::fromLatin1((char*)buf) + " "; |
272 | libusb_get_string_descriptor_ascii(dh, descriptor.iProduct, buf, 256); | 272 | libusb_get_string_descriptor_ascii(dh, descriptor.iProduct, buf, 256); |
273 | name += QString::fromAscii((char*)buf); | 273 | name += QString::fromLatin1((char*)buf); |
274 | libusb_close(dh); | 274 | libusb_close(dh); |
275 | } | 275 | } |
276 | if(name.isEmpty()) | 276 | if(name.isEmpty()) |
@@ -309,13 +309,13 @@ QMap<uint32_t, QString> System::listUsbDevices(void) | |||
309 | res = usb_get_string_simple(dev, u->descriptor.iManufacturer, | 309 | res = usb_get_string_simple(dev, u->descriptor.iManufacturer, |
310 | string, sizeof(string)); | 310 | string, sizeof(string)); |
311 | if(res > 0) | 311 | if(res > 0) |
312 | name += QString::fromAscii(string) + " "; | 312 | name += QString::fromLatin1(string) + " "; |
313 | } | 313 | } |
314 | if(u->descriptor.iProduct) { | 314 | if(u->descriptor.iProduct) { |
315 | res = usb_get_string_simple(dev, u->descriptor.iProduct, | 315 | res = usb_get_string_simple(dev, u->descriptor.iProduct, |
316 | string, sizeof(string)); | 316 | string, sizeof(string)); |
317 | if(res > 0) | 317 | if(res > 0) |
318 | name += QString::fromAscii(string); | 318 | name += QString::fromLatin1(string); |
319 | } | 319 | } |
320 | usb_close(dev); | 320 | usb_close(dev); |
321 | } | 321 | } |
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 | ||
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index 6261c36424..3a19397efb 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp | |||
@@ -467,7 +467,7 @@ QString Utils::resolveDevicename(QString path) | |||
467 | UCHAR buffer[0x400]; | 467 | UCHAR buffer[0x400]; |
468 | PVOLUME_DISK_EXTENTS extents = (PVOLUME_DISK_EXTENTS)buffer; | 468 | PVOLUME_DISK_EXTENTS extents = (PVOLUME_DISK_EXTENTS)buffer; |
469 | 469 | ||
470 | _stprintf(uncpath, _TEXT("\\\\.\\%c:"), path.toAscii().at(0)); | 470 | _stprintf(uncpath, _TEXT("\\\\.\\%c:"), path.toLatin1().at(0)); |
471 | h = CreateFile(uncpath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, | 471 | h = CreateFile(uncpath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, |
472 | NULL, OPEN_EXISTING, 0, NULL); | 472 | NULL, OPEN_EXISTING, 0, NULL); |
473 | if(h == INVALID_HANDLE_VALUE) { | 473 | if(h == INVALID_HANDLE_VALUE) { |
@@ -711,7 +711,7 @@ bool Utils::ejectDevice(QString device) | |||
711 | TCHAR volume[8]; | 711 | TCHAR volume[8]; |
712 | 712 | ||
713 | /* CreateFile */ | 713 | /* CreateFile */ |
714 | _stprintf(volume, _TEXT("\\\\.\\%c:"), device.toAscii().at(0)); | 714 | _stprintf(volume, _TEXT("\\\\.\\%c:"), device.toLatin1().at(0)); |
715 | hdl = CreateFile(volume, GENERIC_READ | GENERIC_WRITE, | 715 | hdl = CreateFile(volume, GENERIC_READ | GENERIC_WRITE, |
716 | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, | 716 | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, |
717 | OPEN_EXISTING, 0, NULL); | 717 | OPEN_EXISTING, 0, NULL); |