From: Scott Wheeler Date: Sat, 2 Feb 2008 21:12:47 +0000 (+0000) Subject: Bleh, just remove this. Back to UTF-8-based conversions... X-Git-Tag: v1.5~26 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c619ea1d587329328e88d0051254592bc3b42fe2;p=taglib Bleh, just remove this. Back to UTF-8-based conversions... BUG:157113 git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@770124 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h index 06edfc94..55b44e01 100644 --- a/taglib/toolkit/tstring.h +++ b/taglib/toolkit/tstring.h @@ -47,16 +47,6 @@ */ #define TStringToQString(s) QString::fromUtf8(s.toCString(true)) - -#if defined(QT_VERSION_CHECK) -# if (QT_VERSION >= QT_VERSION_CHECK(4, 0, 0)) -# undef QStringToTString -# undef TStringToQString -# define QStringToTString(s) TagLib::String(s.toStdWString()) -# define TStringToQString(s) QString::fromStdWString(s.toWString()) -# endif -#endif - namespace TagLib { //! A \e wide string class suitable for unicode.