diff -r c9d1dad83ad0 -r 4b7306f52bb5 src/miscallenous.h --- a/src/miscallenous.h Mon Jun 02 14:34:23 2014 +0300 +++ b/src/miscallenous.h Tue Jun 03 20:28:10 2014 +0300 @@ -143,10 +143,10 @@ a.erase (std::unique (a.begin(), a.end()), a.end()); } -inline String utf16 (const char16_t* a) +inline QString utf16 (const char16_t* a) { if (Q_LIKELY (sizeof(char16_t) == sizeof(unsigned short))) - return String::fromUtf16 (reinterpret_cast (a)); + return QString::fromUtf16 (reinterpret_cast (a)); QVector data; @@ -154,5 +154,5 @@ data << *ap; data << '\u0000'; - return String::fromUtf16 (data.constData()); + return QString::fromUtf16 (data.constData()); }