whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Q_WS_ in text codecs. 

Change-Id: Id27d82f91a21107f31f73d7f2920629a512dc2a1
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
bb10
Friedemann Kleint 2011-10-17 12:39:11 +02:00 committed by Qt by Nokia
parent da68749fdb
commit 41b01096cc
12 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/codecs/cn/main.cpp
View File

@ -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))

4
src/plugins/codecs/cn/qgb18030codec.cpp
View File

@ -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] = {

4
src/plugins/codecs/cn/qgb18030codec.h
View File

@ -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

12
src/plugins/codecs/jp/main.cpp
View File

@ -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))

2
src/plugins/codecs/jp/qfontjpcodec.cpp
View File

@ -45,7 +45,7 @@
QT_BEGIN_NAMESPACE
#ifdef Q_WS_X11
#ifdef Q_OS_UNIX
// JIS X 0201
QFontJis0201Codec::QFontJis0201Codec()

2
src/plugins/codecs/jp/qfontjpcodec.h
View File

@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
class QJpUnicodeConv;
#ifdef Q_WS_X11
#ifdef Q_OS_UNIX
class QFontJis0201Codec : public QTextCodec
{
public:

10
src/plugins/codecs/kr/main.cpp
View File

@ -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

4
src/plugins/codecs/kr/qeuckrcodec.cpp
View File

@ -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

2
src/plugins/codecs/kr/qeuckrcodec.h
View File

@ -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:

10
src/plugins/codecs/tw/main.cpp
View File

@ -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))

4
src/plugins/codecs/tw/qbig5codec.cpp
View File

@ -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
/* ====================================================================== */

4
src/plugins/codecs/tw/qbig5codec.h
View File

@ -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