From 8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 27 Jan 2013 11:57:46 +0100
Subject: Replace toAscii() / fromAscii() with Latin1() functions.

Qt5 deprecates the Ascii conversion functions, and the Latin1 functions pretty
much do the same.

Change-Id: I5dee6a443fcfee6afd3256ee536698bcf65ff896
---
 rbutil/rbutilqt/base/bootloaderinstallhex.cpp | 6 +++---
 rbutil/rbutilqt/base/system.cpp               | 8 ++++----
 rbutil/rbutilqt/base/ttsfestival.cpp          | 6 +++---
 rbutil/rbutilqt/base/utils.cpp                | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'rbutil/rbutilqt/base')

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)
     while(i--) {
         if(md5sums[i].orig == 0)
             m_model--;
-        if(!qstrcmp(md5sums[i].orig, hash.toAscii()))
+        if(!qstrcmp(md5sums[i].orig, hash.toLatin1()))
             break;
     }
     if(i < 0) {
@@ -110,8 +110,8 @@ bool BootloaderInstallHex::install(void)
     emit logItem(tr("Descrambling file"), LOGINFO);
     m_descrambled.open();
     int result;
-    result = iriver_decode(m_offile.toAscii().data(),
-        m_descrambled.fileName().toAscii().data(), FALSE, STRIP_NONE);
+    result = iriver_decode(m_offile.toLatin1().data(),
+        m_descrambled.fileName().toLatin1().data(), FALSE, STRIP_NONE);
     qDebug() << "[BootloaderInstallHex] iriver_decode" << result;
 
     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)
             libusb_device_handle *dh;
             if(libusb_open(dev, &dh) == 0) {
                 libusb_get_string_descriptor_ascii(dh, descriptor.iManufacturer, buf, 256);
-                name += QString::fromAscii((char*)buf) + " ";
+                name += QString::fromLatin1((char*)buf) + " ";
                 libusb_get_string_descriptor_ascii(dh, descriptor.iProduct, buf, 256);
-                name += QString::fromAscii((char*)buf);
+                name += QString::fromLatin1((char*)buf);
                 libusb_close(dh);
             }
             if(name.isEmpty())
@@ -309,13 +309,13 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
                         res = usb_get_string_simple(dev, u->descriptor.iManufacturer,
                                                     string, sizeof(string));
                         if(res > 0)
-                            name += QString::fromAscii(string) + " ";
+                            name += QString::fromLatin1(string) + " ";
                     }
                     if(u->descriptor.iProduct) {
                         res = usb_get_string_simple(dev, u->descriptor.iProduct,
                                                     string, sizeof(string));
                         if(res > 0)
-                            name += QString::fromAscii(string);
+                            name += QString::fromLatin1(string);
                     }
                     usb_close(dev);
                 }
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)
         
         if(prologFile.open())
         {
-          prologFile.write(voiceSelect.toAscii());
+          prologFile.write(voiceSelect.toLatin1());
           prologFile.close();
           prologPath = QFileInfo(prologFile).absoluteFilePath();
           qDebug() << "[Festival] Prolog created at " << prologPath;
@@ -192,7 +192,7 @@ TTSStatus TTSFestival::voice(QString text, QString wavfile, QString* errStr)
 
     QProcess clientProcess;
     clientProcess.start(cmd);
-    clientProcess.write(QString("%1.\n").arg(text).toAscii());
+    clientProcess.write(QString("%1.\n").arg(text).toLatin1());
     clientProcess.waitForBytesWritten();
     clientProcess.closeWriteChannel();
     clientProcess.waitForReadyRead();
@@ -357,7 +357,7 @@ QString TTSFestival::queryServer(QString query, int timeout)
 
         if(socket.state() == QAbstractSocket::ConnectedState)
         {
-            socket.write(QString("%1\n").arg(query).toAscii());
+            socket.write(QString("%1\n").arg(query).toLatin1());
             socket.waitForBytesWritten();
             socket.waitForReadyRead();
 
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)
     UCHAR buffer[0x400];
     PVOLUME_DISK_EXTENTS extents = (PVOLUME_DISK_EXTENTS)buffer;
 
-    _stprintf(uncpath, _TEXT("\\\\.\\%c:"), path.toAscii().at(0));
+    _stprintf(uncpath, _TEXT("\\\\.\\%c:"), path.toLatin1().at(0));
     h = CreateFile(uncpath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
             NULL, OPEN_EXISTING, 0, NULL);
     if(h == INVALID_HANDLE_VALUE) {
@@ -711,7 +711,7 @@ bool Utils::ejectDevice(QString device)
     TCHAR volume[8];
 
     /* CreateFile */
-    _stprintf(volume, _TEXT("\\\\.\\%c:"), device.toAscii().at(0));
+    _stprintf(volume, _TEXT("\\\\.\\%c:"), device.toLatin1().at(0));
     hdl = CreateFile(volume, GENERIC_READ | GENERIC_WRITE,
             FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
             OPEN_EXISTING, 0, NULL);
-- 
cgit v1.2.3