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/utils.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/utils.cpp')
| -rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |