summaryrefslogtreecommitdiffstats
path: root/src/plugins/codecs/cn
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/codecs/cn')
-rw-r--r--src/plugins/codecs/cn/main.cpp10
-rw-r--r--src/plugins/codecs/cn/qgb18030codec.cpp4
-rw-r--r--src/plugins/codecs/cn/qgb18030codec.h4
3 files changed, 9 insertions, 9 deletions
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<QByteArray> 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<QByteArray> 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<int> 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