From 41b01096ccae8761bb5a0a761780ad48ce7e34ba Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 17 Oct 2011 12:39:11 +0200 Subject: Remove Q_WS_ in text codecs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id27d82f91a21107f31f73d7f2920629a512dc2a1 Reviewed-by: João Abecasis --- src/plugins/codecs/cn/main.cpp | 10 +++++----- src/plugins/codecs/cn/qgb18030codec.cpp | 4 ++-- src/plugins/codecs/cn/qgb18030codec.h | 4 ++-- src/plugins/codecs/jp/main.cpp | 12 ++++++------ src/plugins/codecs/jp/qfontjpcodec.cpp | 2 +- src/plugins/codecs/jp/qfontjpcodec.h | 2 +- src/plugins/codecs/kr/main.cpp | 10 +++++----- src/plugins/codecs/kr/qeuckrcodec.cpp | 4 ++-- src/plugins/codecs/kr/qeuckrcodec.h | 2 +- src/plugins/codecs/tw/main.cpp | 10 +++++----- src/plugins/codecs/tw/qbig5codec.cpp | 4 ++-- src/plugins/codecs/tw/qbig5codec.h | 4 ++-- 12 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp index d9acf29b30..11be817289 100644 --- a/src/plugins/codecs/cn/main.cpp +++ b/src/plugins/codecs/cn/main.cpp @@ -68,7 +68,7 @@ QList CNTextCodecs::names() const list += QGb18030Codec::_name(); list += QGbkCodec::_name(); list += QGb2312Codec::_name(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontGb2312Codec::_name(); list += QFontGbkCodec::_name(); #endif @@ -81,7 +81,7 @@ QList CNTextCodecs::aliases() const list += QGb18030Codec::_aliases(); list += QGbkCodec::_aliases(); list += QGb2312Codec::_aliases(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontGb2312Codec::_aliases(); list += QFontGbkCodec::_aliases(); #endif @@ -94,7 +94,7 @@ QList CNTextCodecs::mibEnums() const list += QGb18030Codec::_mibEnum(); list += QGbkCodec::_mibEnum(); list += QGb2312Codec::_mibEnum(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontGb2312Codec::_mibEnum(); list += QFontGbkCodec::_mibEnum(); #endif @@ -109,7 +109,7 @@ QTextCodec *CNTextCodecs::createForMib(int mib) return new QGbkCodec; if (mib == QGb2312Codec::_mibEnum()) return new QGb2312Codec; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX if (mib == QFontGbkCodec::_mibEnum()) return new QFontGbkCodec; if (mib == QFontGb2312Codec::_mibEnum()) @@ -127,7 +127,7 @@ QTextCodec *CNTextCodecs::createForName(const QByteArray &name) return new QGbkCodec; if (name == QGb2312Codec::_name() || QGb2312Codec::_aliases().contains(name)) return new QGb2312Codec; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX if (name == QFontGbkCodec::_name() || QFontGbkCodec::_aliases().contains(name)) return new QFontGbkCodec; if (name == QFontGb2312Codec::_name() || QFontGb2312Codec::_aliases().contains(name)) diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp index d12f5d91f6..e647c5e78a 100644 --- a/src/plugins/codecs/cn/qgb18030codec.cpp +++ b/src/plugins/codecs/cn/qgb18030codec.cpp @@ -580,7 +580,7 @@ QByteArray QGb2312Codec::convertFromUnicode(const QChar *uc, int len, ConverterS } -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX QFontGb2312Codec::QFontGb2312Codec() { @@ -724,7 +724,7 @@ QByteArray QFontGb18030_0Codec::convertFromUnicode(const QChar *uc, int len, Con return result; } -#endif // Q_WS_X11 +#endif // Q_OS_UNIX static const indexTbl_t gb18030_to_ucs_index[154] = { diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h index 165526356b..4aacc42c8e 100644 --- a/src/plugins/codecs/cn/qgb18030codec.h +++ b/src/plugins/codecs/cn/qgb18030codec.h @@ -98,7 +98,7 @@ public: QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; }; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX class QFontGb2312Codec : public QTextCodec { @@ -150,7 +150,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 diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp index 91dd04a77a..2891f55671 100644 --- a/src/plugins/codecs/jp/main.cpp +++ b/src/plugins/codecs/jp/main.cpp @@ -48,7 +48,7 @@ #include "qeucjpcodec.h" #include "qjiscodec.h" #include "qsjiscodec.h" -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX #include "qfontjpcodec.h" #endif @@ -73,7 +73,7 @@ QList JPTextCodecs::names() const list += QEucJpCodec::_name(); list += QJisCodec::_name(); list += QSjisCodec::_name(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontJis0201Codec::_name(); list += QFontJis0208Codec::_name(); #endif @@ -86,7 +86,7 @@ QList JPTextCodecs::aliases() const list += QEucJpCodec::_aliases(); list += QJisCodec::_aliases(); list += QSjisCodec::_aliases(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontJis0201Codec::_aliases(); list += QFontJis0208Codec::_aliases(); #endif @@ -99,7 +99,7 @@ QList JPTextCodecs::mibEnums() const list += QEucJpCodec::_mibEnum(); list += QJisCodec::_mibEnum(); list += QSjisCodec::_mibEnum(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontJis0201Codec::_mibEnum(); list += QFontJis0208Codec::_mibEnum(); #endif @@ -114,7 +114,7 @@ QTextCodec *JPTextCodecs::createForMib(int mib) return new QJisCodec; if (mib == QSjisCodec::_mibEnum()) return new QSjisCodec; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX if (mib == QFontJis0208Codec::_mibEnum()) return new QFontJis0208Codec; if (mib == QFontJis0201Codec::_mibEnum()) @@ -132,7 +132,7 @@ QTextCodec *JPTextCodecs::createForName(const QByteArray &name) return new QJisCodec; if (name == QSjisCodec::_name() || QSjisCodec::_aliases().contains(name)) return new QSjisCodec; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX if (name == QFontJis0208Codec::_name() || QFontJis0208Codec::_aliases().contains(name)) return new QFontJis0208Codec; if (name == QFontJis0201Codec::_name() || QFontJis0201Codec::_aliases().contains(name)) diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp index 7910064223..e73f67801b 100644 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp +++ b/src/plugins/codecs/jp/qfontjpcodec.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX // JIS X 0201 QFontJis0201Codec::QFontJis0201Codec() diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h index 0d2538e2a6..37940440db 100644 --- a/src/plugins/codecs/jp/qfontjpcodec.h +++ b/src/plugins/codecs/jp/qfontjpcodec.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QJpUnicodeConv; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX class QFontJis0201Codec : public QTextCodec { public: diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp index 09c2b2de58..683dee3f74 100644 --- a/src/plugins/codecs/kr/main.cpp +++ b/src/plugins/codecs/kr/main.cpp @@ -66,7 +66,7 @@ QList KRTextCodecs::names() const { QList list; list += QEucKrCodec::_name(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontKsc5601Codec::_name(); #endif list += QCP949Codec::_name(); @@ -77,7 +77,7 @@ QList KRTextCodecs::aliases() const { QList list; list += QEucKrCodec::_aliases(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontKsc5601Codec::_aliases(); #endif list += QCP949Codec::_aliases(); @@ -88,7 +88,7 @@ QList KRTextCodecs::mibEnums() const { QList list; list += QEucKrCodec::_mibEnum(); -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX list += QFontKsc5601Codec::_mibEnum(); #endif list += QCP949Codec::_mibEnum(); @@ -99,7 +99,7 @@ QTextCodec *KRTextCodecs::createForMib(int mib) { if (mib == QEucKrCodec::_mibEnum()) return new QEucKrCodec; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX if (mib == QFontKsc5601Codec::_mibEnum()) return new QFontKsc5601Codec; #endif @@ -113,7 +113,7 @@ QTextCodec *KRTextCodecs::createForName(const QByteArray &name) { if (name == QEucKrCodec::_name() || QEucKrCodec::_aliases().contains(name)) return new QEucKrCodec; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX if (name == QFontKsc5601Codec::_name() || QFontKsc5601Codec::_aliases().contains(name)) return new QFontKsc5601Codec; #endif diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp index 49c2575bd6..ec6395adeb 100644 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp +++ b/src/plugins/codecs/kr/qeuckrcodec.cpp @@ -189,7 +189,7 @@ QByteArray QEucKrCodec::_name() } -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX QFontKsc5601Codec::QFontKsc5601Codec() { } @@ -235,7 +235,7 @@ QByteArray QFontKsc5601Codec::convertFromUnicode(const QChar *uc, int len, Conv return result; } -#endif // Q_WS_X11 +#endif // Q_OS_UNIX // code converter wrapper diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h index aa5e85c789..0a86c274e8 100644 --- a/src/plugins/codecs/kr/qeuckrcodec.h +++ b/src/plugins/codecs/kr/qeuckrcodec.h @@ -102,7 +102,7 @@ public: QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; }; -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX class QFontKsc5601Codec : public QTextCodec { public: 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 TWTextCodecs::names() const QList 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 TWTextCodecs::aliases() const QList 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 TWTextCodecs::mibEnums() const QList 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 -- cgit v1.2.3