diff options
Diffstat (limited to 'src/codecs/qtextcodec.cpp')
| -rw-r--r-- | src/codecs/qtextcodec.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index c37a7cb12..1c6df6953 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -71,7 +71,7 @@ #include "ntqstring.h" #include "../tools/qlocale_p.h" -#if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(Q_WS_X11) +#if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(TQ_WS_X11) # include "qfontcodecs_p.h" #endif @@ -1666,12 +1666,12 @@ private: void buildReverseMap(); int forwardIndex; -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS TQMemArray<unsigned char> *reverseMap; #endif }; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS static const TQSimpleTextCodec * reverseOwner = 0; static TQMemArray<unsigned char> * reverseMap = 0; #endif @@ -2244,7 +2244,7 @@ static const struct { TQSimpleTextCodec::TQSimpleTextCodec( int i ) : TQTextCodec(), forwardIndex( i ) { -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS reverseMap = 0; #endif } @@ -2252,7 +2252,7 @@ TQSimpleTextCodec::TQSimpleTextCodec( int i ) TQSimpleTextCodec::~TQSimpleTextCodec() { -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS delete reverseMap; #else if ( reverseOwner == this ) { @@ -2265,7 +2265,7 @@ TQSimpleTextCodec::~TQSimpleTextCodec() void TQSimpleTextCodec::buildReverseMap() { -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS if ( reverseOwner != this ) { int m = 0; int i = 0; @@ -2347,7 +2347,7 @@ TQString TQSimpleTextCodec::toUnicode(const char* chars, int len) const TQCString TQSimpleTextCodec::fromUnicode(const TQString& uc, int& len ) const { -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS if ( this != reverseOwner ) #else if ( !reverseMap ) @@ -2377,7 +2377,7 @@ TQCString TQSimpleTextCodec::fromUnicode(const TQString& uc, int& len ) const void TQSimpleTextCodec::fromUnicode( const TQChar *in, unsigned short *out, int length ) const { -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS if ( this != reverseOwner ) #else if ( !reverseMap ) @@ -2396,7 +2396,7 @@ void TQSimpleTextCodec::fromUnicode( const TQChar *in, unsigned short *out, int unsigned short TQSimpleTextCodec::characterFromUnicode(const TQString &str, int pos) const { -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS if ( this != reverseOwner ) #else if ( !reverseMap ) @@ -2411,7 +2411,7 @@ unsigned short TQSimpleTextCodec::characterFromUnicode(const TQString &str, int bool TQSimpleTextCodec::canEncode( TQChar ch ) const { -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS if ( this != reverseOwner ) #else if ( !reverseMap ) @@ -2982,7 +2982,7 @@ void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, in ((TQSimpleTextCodec *)this)->fromUnicode( in, out, length ); break; -#if !defined(TQT_NO_BIG_CODECS) && defined(Q_WS_X11) +#if !defined(TQT_NO_BIG_CODECS) && defined(TQ_WS_X11) // the TQFont*Codecs are only used on X11 case 15: |