summaryrefslogtreecommitdiffstats
path: root/src/plugins/codecs/jp/main.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-17 12:39:11 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-18 08:21:33 +0200
commit41b01096ccae8761bb5a0a761780ad48ce7e34ba (patch)
tree7a62c245aba5470f5b582db202e38d5d6e7e60f3 /src/plugins/codecs/jp/main.cpp
parentda68749fdbbdca0a946d6b6334d2709c47f8a23d (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/jp/main.cpp')
-rw-r--r--src/plugins/codecs/jp/main.cpp12
1 files changed, 6 insertions, 6 deletions
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<QByteArray> 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<QByteArray> 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<int> 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))