# HG changeset patch # User Teemu Piippo # Date 1376217492 -10800 # Node ID b41d74bacdeaf7255881073e9b15b846d2d9a580 # Parent a8c78391e41453445df872e8a083caf35bc429ed Qt4 has QChar::toLatin1() as well so we don't need to use toAscii() in Qt4. diff -r a8c78391e414 -r b41d74bacdea src/bytestream.cpp --- a/src/bytestream.cpp Sun Aug 11 13:33:57 2013 +0300 +++ b/src/bytestream.cpp Sun Aug 11 13:38:12 2013 +0300 @@ -211,11 +211,7 @@ growToFit (val.length() + 1); for (qchar c : val) -#if (QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)) doWrite (c.toLatin1()); -#else - doWrite (c.toAscii()); -#endif // QT_VERSION doWrite ('\0'); } diff -r a8c78391e414 -r b41d74bacdea src/demo.cpp --- a/src/demo.cpp Sun Aug 11 13:33:57 2013 +0300 +++ b/src/demo.cpp Sun Aug 11 13:38:12 2013 +0300 @@ -38,12 +38,7 @@ if (skip-- > 0) continue; -#if (QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)) - if (c.toLatin1() == '\034') -#else - if (c.toAscii() == '\034') -#endif // QT_VERSION - { + if (c.toLatin1() == '\034') { skip = 1; continue; }