diff options
Diffstat (limited to 'tqtinterface/qt4/src/codecs')
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqbig5codec.cpp | 30 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp | 28 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp | 12 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqgb18030codec.cpp | 50 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqisciicodec.cpp | 2 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqjiscodec.cpp | 8 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqjpunicode.cpp | 2 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqrtlcodec.cpp | 12 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqsjiscodec.cpp | 16 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqtextcodec.cpp | 34 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqtsciicodec.cpp | 4 | ||||
| -rw-r--r-- | tqtinterface/qt4/src/codecs/tqutfcodec.cpp | 6 |
12 files changed, 102 insertions, 102 deletions
diff --git a/tqtinterface/qt4/src/codecs/tqbig5codec.cpp b/tqtinterface/qt4/src/codecs/tqbig5codec.cpp index bdab025..be0d14c 100644 --- a/tqtinterface/qt4/src/codecs/tqbig5codec.cpp +++ b/tqtinterface/qt4/src/codecs/tqbig5codec.cpp @@ -112,7 +112,7 @@ int qt_UnicodeToBig5hkscs(uint wc, uchar *r); #define IsSecondByteRange2(c) (InRange((c), 0xA1, 0xFE)) #define IsSecondByte(c) (IsSecondByteRange1(c) || IsSecondByteRange2(c)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) struct B5Map { ushort x; @@ -569,7 +569,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -581,11 +581,11 @@ public: result += TQValidChar(u); else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; @@ -655,19 +655,19 @@ TQString TQBig5Codec::toUnicode(const char* chars, int len) const if ( qt_Big5ToUnicode( (const uchar*)(chars + i - 1), &u ) == 2 ) result += TQValidChar(u); else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Bad String - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; @@ -855,7 +855,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -867,11 +867,11 @@ public: result += TQValidChar(u); else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; @@ -938,19 +938,19 @@ TQString TQBig5hkscsCodec::toUnicode(const char* chars, int len) const if ( qt_Big5hkscsToUnicode( (const uchar*)(chars + i - 1), &u ) == 2 ) result += TQValidChar(u); else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Bad String - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; diff --git a/tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp b/tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp index 416ad78..f758586 100644 --- a/tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp @@ -125,7 +125,7 @@ static const uchar Ss3 = 0x8f; // Single Shift 3 #define IsKana(c) (((c) >= 0xa1) && ((c) <= 0xdf)) #define IsEucChar(c) (((c) >= 0xa1) && ((c) <= 0xfe)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) /*! Constructs a TQEucJpCodec. @@ -230,7 +230,7 @@ TQString TQEucJpCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } } else if ( ch == Ss3 ) { @@ -245,17 +245,17 @@ TQString TQEucJpCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else if ( IsEucChar(ch) ) { // JIS X 0208 @@ -266,14 +266,14 @@ TQString TQEucJpCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; @@ -424,7 +424,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -434,7 +434,7 @@ public: uint u = conv->jisx0201ToUnicode(ch); result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } else if ( buf[0] == Ss3 ) { @@ -444,7 +444,7 @@ public: nbuf = 2; } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } } else { @@ -454,7 +454,7 @@ public: result += TQValidChar(u); } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } @@ -465,7 +465,7 @@ public: uint u = conv->jisx0212ToUnicode(buf[1] & 0x7f, ch & 0x7f); result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } diff --git a/tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp b/tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp index 67ac98e..7ae89eb 100644 --- a/tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp @@ -101,7 +101,7 @@ unsigned int qt_Ksc5601ToUnicode(unsigned int code); unsigned int qt_UnicodeToKsc5601(unsigned int tqunicode); #define IsEucChar(c) (((c) >= 0xa1) && ((c) <= 0xfe)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) /*! \reimp @@ -174,14 +174,14 @@ TQString TQEucKrCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; @@ -304,7 +304,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -314,7 +314,7 @@ public: result += TQValidChar(u); } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; diff --git a/tqtinterface/qt4/src/codecs/tqgb18030codec.cpp b/tqtinterface/qt4/src/codecs/tqgb18030codec.cpp index 4abf8f4..257b631 100644 --- a/tqtinterface/qt4/src/codecs/tqgb18030codec.cpp +++ b/tqtinterface/qt4/src/codecs/tqgb18030codec.cpp @@ -133,7 +133,7 @@ #define Is3rdByte(c) (InRange((c), 0x81, 0xFE)) #define Is4thByte(c) (InRange((c), 0x30, 0x39)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) /* User-defined areas: UDA 1: 0xAAA1 - 0xAFFE (564/0) UDA 2: 0xF8A1 - 0xFEFE (658/0) @@ -257,12 +257,12 @@ TQString TQGb18030Codec::toUnicode(const char* chars, int len) const } i += clen; } else if (i < len) { - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } else { // Invalid or undefined - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } @@ -365,7 +365,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -377,7 +377,7 @@ public: if (clen == 2) { result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } else if ( Is2ndByteIn4Bytes(ch) ) { @@ -385,7 +385,7 @@ public: nbuf = 2; } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } break; @@ -395,7 +395,7 @@ public: buf[2] = ch; nbuf = 3; } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } break; @@ -417,10 +417,10 @@ public: result += TQChar(low); } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; @@ -540,7 +540,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -552,12 +552,12 @@ public: if (clen == 2) { result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } break; @@ -627,15 +627,15 @@ TQString TQGbkCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); i += 2; } else if (clen == 4) { - result += TQChar::tqreplacement; + result += TQChar::replacement; i += 4; } else if (i < len) { - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } else { // Invalid or undefined - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } @@ -739,7 +739,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -751,12 +751,12 @@ public: if (clen == 2) { result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } break; @@ -828,15 +828,15 @@ TQString TQGb2312Codec::toUnicode(const char* chars, int len) const if ( clen == 2 && IsByteInGb2312(ch) && IsByteInGb2312((uchar)(chars[i+1])) ) result += TQValidChar(u); else - result += TQChar::tqreplacement; + result += TQChar::replacement; i += clen; } else if (i < len) { - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } else { // Invalid or undefined - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } @@ -9204,22 +9204,22 @@ static uint qt_Gb18030ToUnicode(const uchar *gbstr, int& len) { } else { /* undefined or reserved area */ len = 1; - uni = TQChar::tqreplacement.tqunicode(); + uni = TQChar::replacement.tqunicode(); } } else { len = 1; - uni = TQChar::tqreplacement.tqunicode(); + uni = TQChar::replacement.tqunicode(); } } else { len = 1; - uni = TQChar::tqreplacement.tqunicode(); + uni = TQChar::replacement.tqunicode(); } } else { len = 1; - uni = TQChar::tqreplacement.tqunicode(); + uni = TQChar::replacement.tqunicode(); } return uni; } diff --git a/tqtinterface/qt4/src/codecs/tqisciicodec.cpp b/tqtinterface/qt4/src/codecs/tqisciicodec.cpp index e6063b4..b9f414b 100644 --- a/tqtinterface/qt4/src/codecs/tqisciicodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqisciicodec.cpp @@ -1,7 +1,7 @@ #include "tqisciicodec_p.h" #ifndef TQT_NO_CODECS -#define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::replacement) /*! \class TQIsciiCodec diff --git a/tqtinterface/qt4/src/codecs/tqjiscodec.cpp b/tqtinterface/qt4/src/codecs/tqjiscodec.cpp index ebebca2..c8cccbb 100644 --- a/tqtinterface/qt4/src/codecs/tqjiscodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqjiscodec.cpp @@ -148,7 +148,7 @@ static const uchar Overline = 0x7e; #define IsKana(c) (((c) >= 0xa1) && ((c) <= 0xdf)) #define IsJisChar(c) (((c) >= 0x21) && ((c) <= 0x7e)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) enum Iso2022State{ Ascii, MinState = Ascii, JISX0201_Latin, JISX0201_Kana, @@ -362,7 +362,7 @@ TQString TQJisCodec::toUnicode(const char* chars, int len) const } break; default: - result += TQChar::tqreplacement; + result += TQChar::replacement; break; } } @@ -668,7 +668,7 @@ public: buf[nbuf++] = ch; break; default: - result += TQChar::tqreplacement; + result += TQChar::replacement; break; } break; @@ -684,7 +684,7 @@ public: result += TQValidChar(u); break; default: - result += TQChar::tqreplacement; + result += TQChar::replacement; break; } nbuf = 0; diff --git a/tqtinterface/qt4/src/codecs/tqjpunicode.cpp b/tqtinterface/qt4/src/codecs/tqjpunicode.cpp index d0ced80..9d0e875 100644 --- a/tqtinterface/qt4/src/codecs/tqjpunicode.cpp +++ b/tqtinterface/qt4/src/codecs/tqjpunicode.cpp @@ -769,7 +769,7 @@ TQJpUnicodeConv *TQJpUnicodeConv::newConverter(int rule) if ( rule == Default && (e=getenv("UNICODEMAP_JP")) != 0 ) { TQCString env( e ); for (int i = 0; i < (int)env.length(); ) { - int j = env.tqfind(',', i); + int j = env.find(',', i); TQCString s; if (j < 0) { s = env.mid(i).stripWhiteSpace(); diff --git a/tqtinterface/qt4/src/codecs/tqrtlcodec.cpp b/tqtinterface/qt4/src/codecs/tqrtlcodec.cpp index 56bf40d..a5640aa 100644 --- a/tqtinterface/qt4/src/codecs/tqrtlcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqrtlcodec.cpp @@ -291,9 +291,9 @@ static TQString reverseLine(const TQString &str, unsigned int from, unsigned int * "SHALOM my friend" or "my friend SHALOM", depending on the basic direction * one assumes for the text. * - * So this function uses some heuristics to tqfind the right answer... + * So this function uses some heuristics to find the right answer... */ -static TQChar::Direction tqfindBasicDirection(TQString str) +static TQChar::Direction findBasicDirection(TQString str) { unsigned int pos; unsigned int len = str.length(); @@ -421,7 +421,7 @@ const char* TQHebrewCodec::mimeName() const static TQString visualOrder(TQString logical, TQChar::Direction basicDir) { - logical.tqreplace(TQChar('\n'), TQChar(0x2028)); + logical.replace(TQChar('\n'), TQChar(0x2028)); #ifdef USE_QT4 // [FIXME] @@ -471,8 +471,8 @@ static TQString visualOrder(TQString logical, TQChar::Direction basicDir) } visual += sub; } - // tqreplace Unicode newline back with \n to compare. - visual.tqreplace(TQChar(0x2028), TQChar('\n')); + // replace Unicode newline back with \n to compare. + visual.replace(TQChar(0x2028), TQChar('\n')); if (l != levels) { delete [] levels; delete [] visualOrder; @@ -542,7 +542,7 @@ TQString TQHebrewCodec::toUnicode(const char* chars, int len ) const // do transformation from visual byte ordering to logical byte // ordering if( basicDir == TQChar::DirON ) - basicDir = tqfindBasicDirection(r); + basicDir = findBasicDirection(r); return visualOrder(r, basicDir); } diff --git a/tqtinterface/qt4/src/codecs/tqsjiscodec.cpp b/tqtinterface/qt4/src/codecs/tqsjiscodec.cpp index 000898d..5b907d6 100644 --- a/tqtinterface/qt4/src/codecs/tqsjiscodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqsjiscodec.cpp @@ -102,7 +102,7 @@ static const uchar Esc = 0x1b; #define IsSjisChar2(c) (((c) >= 0x40) && ((c) != 0x7f) && ((c) <= 0xfc)) #define IsUserDefinedChar1(c) (((c) >= 0xf0) && ((c) <= 0xfc)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) /*! Creates a Shift-JIS codec. Note that this is done automatically by @@ -207,20 +207,20 @@ TQString TQSjisCodec::toUnicode(const char* chars, int len) const } else if ((u = conv->cp932ToUnicode(ch, c2))) { result += TQValidChar(u); } else if ( IsUserDefinedChar1(ch) ) { - result += TQChar::tqreplacement; + result += TQChar::replacement; } else { u = conv->sjisToUnicode(ch, c2); result += TQValidChar(u); } } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; @@ -343,7 +343,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -354,14 +354,14 @@ public: } else if ((u = conv->cp932ToUnicode(buf[0], ch))) { result += TQValidChar(u); } else if ( IsUserDefinedChar1(buf[0]) ) { - result += TQChar::tqreplacement; + result += TQChar::replacement; } else { u = conv->sjisToUnicode(buf[0], ch); result += TQValidChar(u); } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; diff --git a/tqtinterface/qt4/src/codecs/tqtextcodec.cpp b/tqtinterface/qt4/src/codecs/tqtextcodec.cpp index 7458db6..8784e4d 100644 --- a/tqtinterface/qt4/src/codecs/tqtextcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqtextcodec.cpp @@ -320,7 +320,7 @@ TQString TQTextStatelessDecoder::toUnicode(const char* chars, int len) recently created TQTextCodec objects take precedence over earlier ones. - You may tqfind it more convenient to make your codec class available + You may find it more convenient to make your codec class available as a plugin; see the \link plugins-howto.html plugin documentation\endlink for more details. @@ -872,7 +872,7 @@ TQTextCodec* TQTextCodec::codecForName( const char* name, int accuracy ) often use most of the available character sequences, and so only by linguistic analysis could a true match be made. - \a chars tqcontains the string to check, and \a len tqcontains the + \a chars contains the string to check, and \a len contains the number of characters in the string to use. \sa heuristicContentMatch() @@ -944,7 +944,7 @@ const char* TQTextCodec::mimeName() const the first \a len bytes of \a chars and returns a value indicating how likely it is that the string is a prefix of text encoded in the encoding of the subclass. A negative return value indicates - that the text is detectably not in the encoding (e.g. it tqcontains + that the text is detectably not in the encoding (e.g. it contains characters undefined in the encoding). A return value of 0 indicates that the text should be decoded with this codec rather than as ASCII, but there is no particular evidence. The value @@ -1064,7 +1064,7 @@ TQCString TQTextCodec::fromUnicode(const TQString& uc) const /*! \overload - \a a tqcontains the source characters; \a len tqcontains the number of + \a a contains the source characters; \a len contains the number of characters in \a a to use. */ TQString TQTextCodec::toUnicode(const TQByteArray& a, int len) const @@ -1077,7 +1077,7 @@ TQString TQTextCodec::toUnicode(const TQByteArray& a, int len) const /*! \overload - \a a tqcontains the source characters. + \a a contains the source characters. */ TQString TQTextCodec::toUnicode(const TQByteArray& a) const { @@ -1088,7 +1088,7 @@ TQString TQTextCodec::toUnicode(const TQByteArray& a) const /*! \overload - \a a tqcontains the source characters; \a len tqcontains the number of + \a a contains the source characters; \a len contains the number of characters in \a a to use. */ TQString TQTextCodec::toUnicode(const TQCString& a, int len) const @@ -1101,7 +1101,7 @@ TQString TQTextCodec::toUnicode(const TQCString& a, int len) const /*! \overload - \a a tqcontains the source characters. + \a a contains the source characters. */ TQString TQTextCodec::toUnicode(const TQCString& a) const { @@ -1112,7 +1112,7 @@ TQString TQTextCodec::toUnicode(const TQCString& a) const /*! \overload - \a chars tqcontains the source characters. + \a chars contains the source characters. */ TQString TQTextCodec::toUnicode(const char* chars) const { @@ -1149,7 +1149,7 @@ bool TQTextCodec::canEncode( TQChar ch ) const /*! \overload - \a s tqcontains the string being tested for encode-ability. + \a s contains the string being tested for encode-ability. */ bool TQTextCodec::canEncode( const TQString& s ) const { @@ -2657,7 +2657,7 @@ TQString TQLatin15Codec::toUnicode(const char* chars, int len) const } static inline unsigned char -latin15CharFromUnicode( unsigned short uc, bool tqreplacement = TRUE ) +latin15CharFromUnicode( unsigned short uc, bool replacement = TRUE ) { uchar c; if ( uc < 0x0100 ) { @@ -2671,7 +2671,7 @@ latin15CharFromUnicode( unsigned short uc, bool tqreplacement = TRUE ) case 0xbc: case 0xbd: case 0xbe: - c = tqreplacement ? '?' : 0; + c = replacement ? '?' : 0; break; default: c = (unsigned char) uc; @@ -2707,10 +2707,10 @@ latin15CharFromUnicode( unsigned short uc, bool tqreplacement = TRUE ) c = 0xbe; break; default: - c = tqreplacement ? '?' : 0; + c = replacement ? '?' : 0; } } else { - c = tqreplacement ? '?' : 0; + c = replacement ? '?' : 0; } } return c; @@ -2818,20 +2818,20 @@ static void setupLocaleMapper() } // Now try these in order: - // 1. CODESET from ctype if it tqcontains a .CODESET part (e.g. en_US.ISO8859-15) - // 2. CODESET from lang if it tqcontains a .CODESET part + // 1. CODESET from ctype if it contains a .CODESET part (e.g. en_US.ISO8859-15) + // 2. CODESET from lang if it contains a .CODESET part // 3. ctype (maybe the locale is named "ISO-8859-1" or something) // 4. locale (ditto) // 5. check for "@euro" // 6. guess locale from ctype unless ctype is "C" // 7. guess locale from lang - // 1. CODESET from ctype if it tqcontains a .CODESET part (e.g. en_US.ISO8859-15) + // 1. CODESET from ctype if it contains a .CODESET part (e.g. en_US.ISO8859-15) char * codeset = ctype ? strchr( ctype, '.' ) : 0; if ( codeset && *codeset == '.' ) localeMapper = checkForCodec( codeset + 1 ); - // 2. CODESET from lang if it tqcontains a .CODESET part + // 2. CODESET from lang if it contains a .CODESET part codeset = lang ? strchr( lang, '.' ) : 0; if ( !localeMapper && codeset && *codeset == '.' ) localeMapper = checkForCodec( codeset + 1 ); diff --git a/tqtinterface/qt4/src/codecs/tqtsciicodec.cpp b/tqtinterface/qt4/src/codecs/tqtsciicodec.cpp index e35758b..b9b3dc8 100644 --- a/tqtinterface/qt4/src/codecs/tqtsciicodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqtsciicodec.cpp @@ -100,7 +100,7 @@ static unsigned char qt_UnicodeToTSCII(ushort u1, ushort u2, ushort u3); static unsigned int qt_TSCIIToUnicode(unsigned int code, uint *s); #define IsTSCIIChar(c) (((c) >= 0x80) && ((c) <= 0xfd)) -#define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::replacement) /*! \reimp */ int TQTsciiCodec::mibEnum() const @@ -162,7 +162,7 @@ TQString TQTsciiCodec::toUnicode(const char* chars, int len) const } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } diff --git a/tqtinterface/qt4/src/codecs/tqutfcodec.cpp b/tqtinterface/qt4/src/codecs/tqutfcodec.cpp index 3a80d31..c0f4fac 100644 --- a/tqtinterface/qt4/src/codecs/tqutfcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqutfcodec.cpp @@ -188,7 +188,7 @@ public: *qch++ = TQChar(low); headerDone = TRUE; } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { - *qch++ = TQChar::tqreplacement; + *qch++ = TQChar::replacement; } else { if (headerDone || TQChar(uc) != TQChar::byteOrderMark) *qch++ = uc; @@ -198,7 +198,7 @@ public: } else { // error i = error; - *qch++ = TQChar::tqreplacement; + *qch++ = TQChar::replacement; need = 0; } } else { @@ -222,7 +222,7 @@ public: min_uc = 0x10000; } else { // error - *qch++ = TQChar::tqreplacement; + *qch++ = TQChar::replacement; } } } |