summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/base/bootloaderinstallhex.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/bootloaderinstallhex.cpp
parentabd87ccf156b803ea1b9941865ca60600b742724 (diff)
downloadrockbox-8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4.tar.gz
rockbox-8f4ab09a8ea80a90ae2702eee6ee792f3b232ca4.tar.bz2
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/bootloaderinstallhex.cpp')
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallhex.cpp6
1 files changed, 3 insertions, 3 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)
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) {