diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-17 12:39:11 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 08:21:33 +0200 |
| commit | 41b01096ccae8761bb5a0a761780ad48ce7e34ba (patch) | |
| tree | 7a62c245aba5470f5b582db202e38d5d6e7e60f3 /src/plugins/codecs/tw | |
| parent | da68749fdbbdca0a946d6b6334d2709c47f8a23d (diff) | |
Remove Q_WS_ in text codecs.
Change-Id: Id27d82f91a21107f31f73d7f2920629a512dc2a1
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/plugins/codecs/tw')
| -rw-r--r-- | src/plugins/codecs/tw/main.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/codecs/tw/qbig5codec.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/codecs/tw/qbig5codec.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp index 7fe01492dc..cb2792f232 100644 --- a/src/plugins/codecs/tw/main.cpp +++ b/src/plugins/codecs/tw/main.cpp @@ -67,7 +67,7 @@ QList<QByteArray> TWTextCodecs::names() const QList<QByteArray> list; list += QBig5Codec::_name(); list += QBig5hkscsCodec::_name(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontBig5Codec::_name(); list += QFontBig5hkscsCodec::_name(); #endif @@ -79,7 +79,7 @@ QList<QByteArray> TWTextCodecs::aliases() const QList<QByteArray> list; list += QBig5Codec::_aliases(); list += QBig5hkscsCodec::_aliases(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontBig5Codec::_aliases(); list += QFontBig5hkscsCodec::_aliases(); #endif @@ -91,7 +91,7 @@ QList<int> TWTextCodecs::mibEnums() const QList<int> list; list += QBig5Codec::_mibEnum(); list += QBig5hkscsCodec::_mibEnum(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontBig5Codec::_mibEnum(); list += QFontBig5hkscsCodec::_mibEnum(); #endif @@ -104,7 +104,7 @@ QTextCodec *TWTextCodecs::createForMib(int mib) return new QBig5Codec; if (mib == QBig5hkscsCodec::_mibEnum()) return new QBig5hkscsCodec; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX if (mib == QFontBig5hkscsCodec::_mibEnum()) return new QFontBig5hkscsCodec; if (mib == QFontBig5Codec::_mibEnum()) @@ -120,7 +120,7 @@ QTextCodec *TWTextCodecs::createForName(const QByteArray &name) return new QBig5Codec; if (name == QBig5hkscsCodec::_name() || QBig5hkscsCodec::_aliases().contains(name)) return new QBig5hkscsCodec; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX if (name == QFontBig5hkscsCodec::_name() || QFontBig5hkscsCodec::_aliases().contains(name)) return new QFontBig5hkscsCodec; if (name == QFontBig5Codec::_name() || QFontBig5Codec::_aliases().contains(name)) diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp index 7a1c019d47..9ec7c75220 100644 --- a/src/plugins/codecs/tw/qbig5codec.cpp +++ b/src/plugins/codecs/tw/qbig5codec.cpp @@ -1933,7 +1933,7 @@ QByteArray QBig5hkscsCodec::convertFromUnicode(const QChar *uc, int len, Convert -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX QFontBig5Codec::QFontBig5Codec() { //qDebug("QFontBig5Codec::QFontBig5Codec()"); @@ -2051,7 +2051,7 @@ QByteArray QFontBig5hkscsCodec::convertFromUnicode(const QChar *uc, int len, Con } -#endif // Q_WS_X11 +#endif // Q_OS_UNIX /* ====================================================================== */ diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h index 834724163d..495e378ef5 100644 --- a/src/plugins/codecs/tw/qbig5codec.h +++ b/src/plugins/codecs/tw/qbig5codec.h @@ -81,7 +81,7 @@ public: QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; }; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX class Q_CORE_EXPORT QFontBig5Codec : public QTextCodec { public: @@ -115,7 +115,7 @@ public: QString convertToUnicode(const char *, int, ConverterState *) const; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; }; -#endif // Q_WS_X11 +#endif // Q_OS_UNIX #endif // QT_NO_TEXTCODEC |