From 41b01096ccae8761bb5a0a761780ad48ce7e34ba Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
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 <joao.abecasis@nokia.com>
---
 src/plugins/codecs/kr/main.cpp        | 10 +++++-----
 src/plugins/codecs/kr/qeuckrcodec.cpp |  4 ++--
 src/plugins/codecs/kr/qeuckrcodec.h   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/plugins/codecs/kr')

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<QByteArray> KRTextCodecs::names() const
 {
     QList<QByteArray> list;
     list += QEucKrCodec::_name();
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
     list += QFontKsc5601Codec::_name();
 #endif
     list += QCP949Codec::_name();
@@ -77,7 +77,7 @@ QList<QByteArray> KRTextCodecs::aliases() const
 {
     QList<QByteArray> list;
     list += QEucKrCodec::_aliases();
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
     list += QFontKsc5601Codec::_aliases();
 #endif
     list += QCP949Codec::_aliases();
@@ -88,7 +88,7 @@ QList<int> KRTextCodecs::mibEnums() const
 {
     QList<int> 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:
-- 
cgit v1.2.3