summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/system.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2013-01-27 11:57:46 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2013-01-27 20:11:17 +0100
commit8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4 (patch)
tree1e7b1a316e13a0834c83a74484e22c223e8d11f5 /rbutil/rbutilqt/base/system.cpp
parentabd87ccf156b803ea1b9941865ca60600b742724 (diff)
downloadrockbox-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/system.cpp')
-rw-r--r--rbutil/rbutilqt/base/system.cpp8
1 files changed, 4 insertions, 4 deletions
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 }