From 8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling 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/system.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rbutil/rbutilqt/base/system.cpp') 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 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 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); } -- cgit v1.2.3