diff options
Diffstat (limited to 'src/codecs')
37 files changed, 100 insertions, 100 deletions
diff --git a/src/codecs/ntqbig5codec.h b/src/codecs/ntqbig5codec.h index 24b8747e..73039967 100644 --- a/src/codecs/ntqbig5codec.h +++ b/src/codecs/ntqbig5codec.h @@ -49,7 +49,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS class TQBig5Codec : public TQTextCodec { public: diff --git a/src/codecs/ntqeucjpcodec.h b/src/codecs/ntqeucjpcodec.h index e0f2edcf..eb140e94 100644 --- a/src/codecs/ntqeucjpcodec.h +++ b/src/codecs/ntqeucjpcodec.h @@ -75,7 +75,7 @@ #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/src/codecs/ntqeuckrcodec.h b/src/codecs/ntqeuckrcodec.h index 216cce61..00b26029 100644 --- a/src/codecs/ntqeuckrcodec.h +++ b/src/codecs/ntqeuckrcodec.h @@ -70,7 +70,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_KR diff --git a/src/codecs/ntqgb18030codec.h b/src/codecs/ntqgb18030codec.h index fa7f897c..5369a6c3 100644 --- a/src/codecs/ntqgb18030codec.h +++ b/src/codecs/ntqgb18030codec.h @@ -46,7 +46,7 @@ #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_CN diff --git a/src/codecs/ntqjiscodec.h b/src/codecs/ntqjiscodec.h index 6a34cb7d..c464df00 100644 --- a/src/codecs/ntqjiscodec.h +++ b/src/codecs/ntqjiscodec.h @@ -75,7 +75,7 @@ #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/src/codecs/ntqjpunicode.h b/src/codecs/ntqjpunicode.h index 8d19960f..689c0abb 100644 --- a/src/codecs/ntqjpunicode.h +++ b/src/codecs/ntqjpunicode.h @@ -74,7 +74,7 @@ #include "ntqglobal.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP @@ -178,5 +178,5 @@ private: int rule; }; -#endif // QT_NO_BIG_CODECS +#endif // TQT_NO_BIG_CODECS #endif /* TQJPUNICODE_H */ diff --git a/src/codecs/ntqrtlcodec.h b/src/codecs/ntqrtlcodec.h index bb031da4..859da5ca 100644 --- a/src/codecs/ntqrtlcodec.h +++ b/src/codecs/ntqrtlcodec.h @@ -45,7 +45,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_CODEC_HEBREW +#ifndef TQT_NO_CODEC_HEBREW class Q_EXPORT TQHebrewCodec : public TQTextCodec { public: diff --git a/src/codecs/ntqsjiscodec.h b/src/codecs/ntqsjiscodec.h index 46fbc918..9187672f 100644 --- a/src/codecs/ntqsjiscodec.h +++ b/src/codecs/ntqsjiscodec.h @@ -75,7 +75,7 @@ #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/src/codecs/ntqtextcodec.h b/src/codecs/ntqtextcodec.h index d6ea1a3b..ad49b587 100644 --- a/src/codecs/ntqtextcodec.h +++ b/src/codecs/ntqtextcodec.h @@ -45,7 +45,7 @@ #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC class TQTextCodec; class TQIODevice; @@ -67,10 +67,10 @@ class Q_EXPORT TQTextCodec { public: virtual ~TQTextCodec(); -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS static TQTextCodec* loadCharmap(TQIODevice*); static TQTextCodec* loadCharmapFile(TQString filename); -#endif //QT_NO_CODECS +#endif //TQT_NO_CODECS static TQTextCodec* codecForMib(int mib); static TQTextCodec* codecForName(const char* hint, int accuracy=0); static TQTextCodec* codecForContent(const char* chars, int len); @@ -130,5 +130,5 @@ inline void TQTextCodec::setCodecForTr(TQTextCodec *c) { cftr = c; } inline TQTextCodec* TQTextCodec::codecForCStrings() { return cfcs; } inline void TQTextCodec::setCodecForCStrings(TQTextCodec *c) { cfcs = c; } -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC #endif // TQTEXTCODEC_H diff --git a/src/codecs/ntqtextcodecfactory.h b/src/codecs/ntqtextcodecfactory.h index 94b4ddda..947d32f7 100644 --- a/src/codecs/ntqtextcodecfactory.h +++ b/src/codecs/ntqtextcodecfactory.h @@ -43,7 +43,7 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC class TQTextCodec; @@ -54,6 +54,6 @@ public: static TQTextCodec *createForMib( int ); }; -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC #endif // TQTEXTCODECFACTORY_H diff --git a/src/codecs/ntqtextcodecplugin.h b/src/codecs/ntqtextcodecplugin.h index d0ac8103..70c1ce12 100644 --- a/src/codecs/ntqtextcodecplugin.h +++ b/src/codecs/ntqtextcodecplugin.h @@ -46,7 +46,7 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_TEXTCODECPLUGIN +#ifndef TQT_NO_TEXTCODECPLUGIN class TQTextCodec; class TQTextCodecPluginPrivate; @@ -66,5 +66,5 @@ public: private: TQTextCodecPluginPrivate *d; }; -#endif // QT_NO_TEXTCODECPLUGIN +#endif // TQT_NO_TEXTCODECPLUGIN #endif // TQTEXTCODECPLUGIN_H diff --git a/src/codecs/ntqtsciicodec.h b/src/codecs/ntqtsciicodec.h index ad04e2f7..d9486f23 100644 --- a/src/codecs/ntqtsciicodec.h +++ b/src/codecs/ntqtsciicodec.h @@ -72,7 +72,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS class Q_EXPORT TQTsciiCodec : public TQTextCodec { public: diff --git a/src/codecs/ntqutfcodec.h b/src/codecs/ntqutfcodec.h index 8955b6c2..9c6408af 100644 --- a/src/codecs/ntqutfcodec.h +++ b/src/codecs/ntqutfcodec.h @@ -45,7 +45,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC class Q_EXPORT TQUtf8Codec : public TQTextCodec { public: @@ -74,5 +74,5 @@ public: int heuristicContentMatch(const char* chars, int len) const; }; -#endif //QT_NO_TEXTCODEC +#endif //TQT_NO_TEXTCODEC #endif // TQUTFCODEC_H diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp index ddf6a2a2..efeb5415 100644 --- a/src/codecs/qbig5codec.cpp +++ b/src/codecs/qbig5codec.cpp @@ -100,7 +100,7 @@ #include "ntqbig5codec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS static int qt_Big5hkscsToUnicode(const uchar *s, uint *pwc); int qt_UnicodeToBig5hkscs(uint wc, uchar *r); diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp index 6230559d..226becf0 100644 --- a/src/codecs/qeucjpcodec.cpp +++ b/src/codecs/qeucjpcodec.cpp @@ -116,7 +116,7 @@ #include "ntqeucjpcodec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS static const uchar Esc = 0x1b; static const uchar Ss2 = 0x8e; // Single Shift 2 diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp index 1b325ce6..44e7779c 100644 --- a/src/codecs/qeuckrcodec.cpp +++ b/src/codecs/qeuckrcodec.cpp @@ -94,7 +94,7 @@ #include "ntqeuckrcodec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS unsigned int qt_Ksc5601ToUnicode(unsigned int code); diff --git a/src/codecs/qfontcncodec.cpp b/src/codecs/qfontcncodec.cpp index f4d5fc32..e628dd85 100644 --- a/src/codecs/qfontcncodec.cpp +++ b/src/codecs/qfontcncodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS extern int qt_UnicodeToGbk(uint unicode, uchar *gbchar); @@ -324,5 +324,5 @@ bool TQFontGb18030_0Codec::canEncode( TQChar ch ) const //========================================================================== -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfontcodecs_p.h b/src/codecs/qfontcodecs_p.h index d323fbb9..cc2cd40b 100644 --- a/src/codecs/qfontcodecs_p.h +++ b/src/codecs/qfontcodecs_p.h @@ -59,8 +59,8 @@ #endif // QT_H -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS class TQJpUnicodeConv; @@ -378,7 +378,7 @@ public: bool canEncode( TQChar ) const; }; -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS #endif // TQFONTCODECS_P_H diff --git a/src/codecs/qfonthkcodec.cpp b/src/codecs/qfonthkcodec.cpp index 954d53ea..98fad1dc 100644 --- a/src/codecs/qfonthkcodec.cpp +++ b/src/codecs/qfonthkcodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS extern int qt_UnicodeToBig5hkscs(uint wc, uchar *r); @@ -156,5 +156,5 @@ bool TQFontBig5hkscsCodec::canEncode( TQChar ch ) const return ( qt_UnicodeToBig5hkscs( ch.unicode(), c ) == 2 ); } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfontjpcodec.cpp b/src/codecs/qfontjpcodec.cpp index bd21e167..92c4fe6d 100644 --- a/src/codecs/qfontjpcodec.cpp +++ b/src/codecs/qfontjpcodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS #include "ntqjpunicode.h" @@ -219,5 +219,5 @@ bool TQFontJis0208Codec::canEncode( TQChar ch ) const -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfontkrcodec.cpp b/src/codecs/qfontkrcodec.cpp index 1c4a21a5..f7dc7f9f 100644 --- a/src/codecs/qfontkrcodec.cpp +++ b/src/codecs/qfontkrcodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS extern unsigned int qt_UnicodeToKsc5601(unsigned int unicode); @@ -117,5 +117,5 @@ bool TQFontKsc5601Codec::canEncode( TQChar ch ) const return (qt_UnicodeToKsc5601(ch.unicode()) != 0); } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfontlaocodec.cpp b/src/codecs/qfontlaocodec.cpp index 4a9eda3d..53da705f 100644 --- a/src/codecs/qfontlaocodec.cpp +++ b/src/codecs/qfontlaocodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS static unsigned char const unicode_to_mulelao[256] = { @@ -147,6 +147,6 @@ bool TQFontLaoCodec::canEncode( TQChar ch ) const } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfonttwcodec.cpp b/src/codecs/qfonttwcodec.cpp index 7fe3f80d..39cc5dd4 100644 --- a/src/codecs/qfonttwcodec.cpp +++ b/src/codecs/qfonttwcodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS extern int qt_UnicodeToBig5hkscs(uint wc, uchar *r); @@ -158,5 +158,5 @@ bool TQFontBig5Codec::canEncode( TQChar ch ) const c[0] >= 0xa1 && c[0] <= 0xf9 ); } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp index db2a76fd..f2c84dab 100644 --- a/src/codecs/qgb18030codec.cpp +++ b/src/codecs/qgb18030codec.cpp @@ -121,7 +121,7 @@ #error "move obsolete header <ntqgbkcodec.h> into the src/compat directory" #endif -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #define InRange(c, lower, upper) (((c) >= (lower)) && ((c) <= (upper))) #define IsLatin(c) ((c) <= 0x7F) diff --git a/src/codecs/qisciicodec.cpp b/src/codecs/qisciicodec.cpp index fa181ca8..952abddb 100644 --- a/src/codecs/qisciicodec.cpp +++ b/src/codecs/qisciicodec.cpp @@ -1,5 +1,5 @@ #include "qisciicodec_p.h" -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS #define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::replacement) @@ -237,4 +237,4 @@ TQString TQIsciiCodec::toUnicode( const char* chars, int len_in ) const } return result; } -#endif // QT_NO_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qisciicodec_p.h b/src/codecs/qisciicodec_p.h index ebf9fe14..2fe0a115 100644 --- a/src/codecs/qisciicodec_p.h +++ b/src/codecs/qisciicodec_p.h @@ -5,7 +5,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS class TQIsciiCodec : public TQTextCodec { public: @@ -29,5 +29,5 @@ private: int idx; }; -#endif // QT_NO_CODECS +#endif // TQT_NO_CODECS #endif // TQISCIIDEVCODEC_H diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp index 366a19f5..8922209c 100644 --- a/src/codecs/qjiscodec.cpp +++ b/src/codecs/qjiscodec.cpp @@ -134,7 +134,7 @@ #include "ntqjiscodec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS static const uchar Esc = 0x1b; static const uchar So = 0x0e; // Shift Out diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp index ea0ca2ba..aa281249 100644 --- a/src/codecs/qjpunicode.cpp +++ b/src/codecs/qjpunicode.cpp @@ -83,7 +83,7 @@ */ #include "ntqjpunicode.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #include "ntqcstring.h" #ifdef Q_OS_TEMP #include "qwinfunctions_wce.h" diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp index c03506b6..f4e471b0 100644 --- a/src/codecs/qrtlcodec.cpp +++ b/src/codecs/qrtlcodec.cpp @@ -41,7 +41,7 @@ #include "ntqrtlcodec.h" #include <private/qtextengine_p.h> -#ifndef QT_NO_CODEC_HEBREW +#ifndef TQT_NO_CODEC_HEBREW // NOT REVISED diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp index 33aee755..731e2bef 100644 --- a/src/codecs/qsjiscodec.cpp +++ b/src/codecs/qsjiscodec.cpp @@ -92,7 +92,7 @@ #include "ntqsjiscodec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS static const uchar Esc = 0x1b; diff --git a/src/codecs/qt_codecs.pri b/src/codecs/qt_codecs.pri index 709c3ce6..196448d3 100644 --- a/src/codecs/qt_codecs.pri +++ b/src/codecs/qt_codecs.pri @@ -1,6 +1,6 @@ # TQt codecs module -!bigcodecs:DEFINES += QT_NO_BIG_CODECS +!bigcodecs:DEFINES += TQT_NO_BIG_CODECS tools { CODECS_P = codecs HEADERS += \ diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index 764aacb8..c37a7cb1 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -46,18 +46,18 @@ #endif #include "ntqtextcodec.h" -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC #include "ntqvaluelist.h" #include "ntqtextcodecfactory.h" #include "ntqutfcodec.h" #include "ntqnamespace.h" -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS #include "ntqrtlcodec.h" #include "ntqtsciicodec.h" #include "qisciicodec_p.h" -#endif // QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#endif // TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS #include "ntqbig5codec.h" #include "ntqeucjpcodec.h" #include "ntqeuckrcodec.h" @@ -65,13 +65,13 @@ #include "ntqjiscodec.h" #include "ntqjpunicode.h" #include "ntqsjiscodec.h" -#endif // QT_NO_BIG_CODECS +#endif // TQT_NO_BIG_CODECS #include "ntqfile.h" #include "ntqstrlist.h" #include "ntqstring.h" #include "../tools/qlocale_p.h" -#if !defined(QT_NO_CODECS) && !defined(QT_NO_BIG_CODECS) && defined(Q_WS_X11) +#if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(Q_WS_X11) # include "qfontcodecs_p.h" #endif @@ -549,13 +549,13 @@ TQTextCodec* TQTextCodec::codecForMib(int mib) return result; } -#if !defined(QT_NO_COMPONENT) && !defined(QT_LITE_COMPONENT) +#if !defined(TQT_NO_COMPONENT) && !defined(QT_LITE_COMPONENT) if ( !result || (result && result->mibEnum() != mib) ) { TQTextCodec *codec = TQTextCodecFactory::createForMib(mib); if (codec) result = codec; } -#endif // !QT_NO_COMPONENT !QT_LITE_COMPONENT +#endif // !TQT_NO_COMPONENT !QT_LITE_COMPONENT return result; } @@ -855,10 +855,10 @@ TQTextCodec* TQTextCodec::codecForName( const char* name, int accuracy ) } } -#if !defined(QT_NO_COMPONENT) && !defined(QT_LITE_COMPONENT) +#if !defined(TQT_NO_COMPONENT) && !defined(QT_LITE_COMPONENT) if ( !result ) result = TQTextCodecFactory::createForName(name); -#endif // !QT_NO_COMPONENT !QT_LITE_COMPONENT +#endif // !TQT_NO_COMPONENT !QT_LITE_COMPONENT return result; } @@ -1566,7 +1566,7 @@ TQString TQTextCodecFromIODDecoder::toUnicode(const char* chars, int len) return result; } -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS // Cannot use <pre> or \code /*! Reads a POSIX2 charmap definition from \a iod. @@ -1621,7 +1621,7 @@ TQTextCodec* TQTextCodec::loadCharmapFile(TQString filename) return 0; } -#endif //QT_NO_CODECS +#endif //TQT_NO_CODECS /*! Returns a string representing the current language and @@ -1633,7 +1633,7 @@ const char* TQTextCodec::locale() return TQLocalePrivate::systemLocaleName(); } -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS class TQSimpleTextCodec: public TQTextCodec { @@ -2914,7 +2914,7 @@ static void realSetup() (void)new TQUtf8Codec; (void)new TQUtf16Codec; -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS int i = 0; do { (void)new TQSimpleTextCodec( i ); @@ -2925,11 +2925,11 @@ static void realSetup() for (i = 0; i < 9; ++i) { (void)new TQIsciiCodec(i); } -#endif // QT_NO_CODECS -#ifndef QT_NO_CODEC_HEBREW +#endif // TQT_NO_CODECS +#ifndef TQT_NO_CODEC_HEBREW (void)new TQHebrewCodec; #endif -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS (void)new TQBig5Codec; (void)new TQBig5hkscsCodec; (void)new TQEucJpCodec; @@ -2939,7 +2939,7 @@ static void realSetup() (void)new TQGb18030Codec; (void)new TQJisCodec; (void)new TQSjisCodec; -#endif // QT_NO_BIG_CODECS +#endif // TQT_NO_BIG_CODECS #ifdef Q_OS_WIN32 (void) new TQWindowsLocalCodec; @@ -2952,7 +2952,7 @@ static void realSetup() void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, int length ) { switch( mibEnum() ) { -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS case 2084: case 2088: case 5: @@ -2982,7 +2982,7 @@ void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, in ((TQSimpleTextCodec *)this)->fromUnicode( in, out, length ); break; -#if !defined(QT_NO_BIG_CODECS) && defined(Q_WS_X11) +#if !defined(TQT_NO_BIG_CODECS) && defined(Q_WS_X11) // the TQFont*Codecs are only used on X11 case 15: @@ -3021,7 +3021,7 @@ void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, in ((TQFontLaoCodec *) this)->fromUnicode( in, out, length ); break; #endif -#endif // QT_NO_CODECS +#endif // TQT_NO_CODECS case 4: ((TQLatin1Codec *) this)->fromUnicode( in, out, length ); @@ -3118,4 +3118,4 @@ TQTextCodec *TQTextCodec::cftr = 0; TQTextCodec *TQTextCodec::cfcs = 0; -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp index 29ee86e0..6a570157 100644 --- a/src/codecs/qtextcodecfactory.cpp +++ b/src/codecs/qtextcodecfactory.cpp @@ -40,9 +40,9 @@ #include "ntqtextcodecfactory.h" -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT #include "ntqapplication.h" #include "ntqcleanuphandler.h" #include <private/qpluginmanager_p.h> @@ -83,14 +83,14 @@ static void create_manager() cleanup_manager.set( &manager ); } -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT TQTextCodec *TQTextCodecFactory::createForName(const TQString &name) { TQTextCodec *codec = 0; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT // make sure the manager is created create_manager(); @@ -101,7 +101,7 @@ TQTextCodec *TQTextCodecFactory::createForName(const TQString &name) if (iface) codec = iface->createForName(name); -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT return codec; } @@ -111,7 +111,7 @@ TQTextCodec *TQTextCodecFactory::createForMib(int mib) { TQTextCodec *codec = 0; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT // make sure the manager is created create_manager(); @@ -122,10 +122,10 @@ TQTextCodec *TQTextCodecFactory::createForMib(int mib) if (iface) codec = iface->createForMib(mib); -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT return codec; } -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC diff --git a/src/codecs/qtextcodecinterface_p.h b/src/codecs/qtextcodecinterface_p.h index e3645a80..cba2cdd6 100644 --- a/src/codecs/qtextcodecinterface_p.h +++ b/src/codecs/qtextcodecinterface_p.h @@ -56,8 +56,8 @@ #include <private/qcom_p.h> #endif // QT_H -#ifndef QT_NO_TEXTCODEC -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_TEXTCODEC +#ifndef TQT_NO_COMPONENT class TQTextCodec; @@ -74,7 +74,7 @@ struct Q_EXPORT TQTextCodecFactoryInterface : public TQFeatureListInterface virtual TQTextCodec *createForName( const TQString &name ) = 0; }; -#endif // QT_NO_COMPONENT -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_COMPONENT +#endif // TQT_NO_TEXTCODEC #endif // TQTEXTCODECINTERFACE_P_H diff --git a/src/codecs/qtextcodecplugin.cpp b/src/codecs/qtextcodecplugin.cpp index 6f084584..2d05117e 100644 --- a/src/codecs/qtextcodecplugin.cpp +++ b/src/codecs/qtextcodecplugin.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqtextcodecplugin.h" -#ifndef QT_NO_TEXTCODECPLUGIN +#ifndef TQT_NO_TEXTCODECPLUGIN #include "qtextcodecinterface_p.h" /*! @@ -183,4 +183,4 @@ TQTextCodecPlugin::~TQTextCodecPlugin() { } -#endif // QT_NO_TEXTCODECPLUGIN +#endif // TQT_NO_TEXTCODECPLUGIN diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp index 5a615e74..0bf558e6 100644 --- a/src/codecs/qtsciicodec.cpp +++ b/src/codecs/qtsciicodec.cpp @@ -94,7 +94,7 @@ #include "ntqtsciicodec.h" -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS static unsigned char qt_UnicodeToTSCII(ushort u1, ushort u2, ushort u3); static unsigned int qt_TSCIIToUnicode(unsigned int code, uint *s); diff --git a/src/codecs/qutfcodec.cpp b/src/codecs/qutfcodec.cpp index 9c9f4283..0a47f152 100644 --- a/src/codecs/qutfcodec.cpp +++ b/src/codecs/qutfcodec.cpp @@ -40,7 +40,7 @@ #include "ntqutfcodec.h" -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC int TQUtf8Codec::mibEnum() const { @@ -347,4 +347,4 @@ TQTextEncoder* TQUtf16Codec::makeEncoder() const return new TQUtf16Encoder; } -#endif //QT_NO_TEXTCODEC +#endif //TQT_NO_TEXTCODEC |