diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-17 19:46:30 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-17 19:46:30 +0900 |
| commit | 69d87202cb139ffe9e4b3ce92e434523b7b09b64 (patch) | |
| tree | 7b133311a4d5e5394f2612dced305f815c04847b /src/tools | |
| parent | e07baa10b7b8e7105e02a621efadac67216c61ed (diff) | |
| download | tqt3-69d87202cb139ffe9e4b3ce92e434523b7b09b64.tar.gz tqt3-69d87202cb139ffe9e4b3ce92e434523b7b09b64.zip | |
QT_NO_* -> TQT_NO_* renaming.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/tools')
62 files changed, 1138 insertions, 1138 deletions
diff --git a/src/tools/ntqbitarray.h b/src/tools/ntqbitarray.h index 45a022e6d..c63e4ac3f 100644 --- a/src/tools/ntqbitarray.h +++ b/src/tools/ntqbitarray.h @@ -161,7 +161,7 @@ inline TQBitVal &TQBitVal::operator=( bool v ) /***************************************************************************** TQBitArray stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & ); #endif diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h index e60e09693..e009b0c09 100644 --- a/src/tools/ntqcstring.h +++ b/src/tools/ntqcstring.h @@ -105,7 +105,7 @@ public: typedef TQMemArray<char> TQByteArray; #endif -#ifndef QT_NO_COMPRESS +#ifndef TQT_NO_COMPRESS Q_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes ); Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes ); Q_EXPORT inline TQByteArray tqCompress( const TQByteArray& data) @@ -117,7 +117,7 @@ Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) /***************************************************************************** TQByteArray stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & ); #endif @@ -158,17 +158,17 @@ public: int find( char c, int index=0, bool cs=TRUE ) const; int find( const char *str, int index=0, bool cs=TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int find( const TQRegExp &, int index=0 ) const; #endif int findRev( char c, int index=-1, bool cs=TRUE) const; int findRev( const char *str, int index=-1, bool cs=TRUE) const; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int findRev( const TQRegExp &, int index=-1 ) const; #endif int contains( char c, bool cs=TRUE ) const; int contains( const char *str, bool cs=TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int contains( const TQRegExp & ) const; #endif TQCString left( uint len ) const; @@ -190,7 +190,7 @@ public: TQCString &prepend( const char * ); TQCString &remove( uint index, uint len ); TQCString &replace( uint index, uint len, const char * ); -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP TQCString &replace( const TQRegExp &, const char * ); #endif TQCString &replace( char c, const char *after ); @@ -229,7 +229,7 @@ private: /***************************************************************************** TQCString stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & ); #endif diff --git a/src/tools/ntqdatastream.h b/src/tools/ntqdatastream.h index 3c2df1474..47c6c2d38 100644 --- a/src/tools/ntqdatastream.h +++ b/src/tools/ntqdatastream.h @@ -46,7 +46,7 @@ #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM class Q_EXPORT TQDataStream // data stream class { public: @@ -189,5 +189,5 @@ inline TQDataStream &TQDataStream::operator<<( TQ_ULONG i ) { return *this << (TQ_LONG)i; } #endif -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #endif // TQDATASTREAM_H diff --git a/src/tools/ntqdatetime.h b/src/tools/ntqdatetime.h index 8439bf5fe..f4d989d14 100644 --- a/src/tools/ntqdatetime.h +++ b/src/tools/ntqdatetime.h @@ -70,7 +70,7 @@ public: int daysInYear() const; int weekNumber( int *yearNum = 0 ) const; -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE #ifndef TQT_NO_COMPAT static TQString monthName( int month ) { return shortMonthName( month ); } static TQString dayName( int weekday ) { return shortDayName( weekday ); } @@ -79,9 +79,9 @@ public: static TQString shortDayName( int weekday ); static TQString longMonthName( int month ); static TQString longDayName( int weekday ); -#endif //QT_NO_TEXTDATE -#ifndef QT_NO_TEXTSTRING -#if !defined(QT_NO_SPRINTF) +#endif //TQT_NO_TEXTDATE +#ifndef TQT_NO_TEXTSTRING +#if !defined(TQT_NO_SPRINTF) TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; @@ -102,7 +102,7 @@ public: static TQDate currentDate(); static TQDate currentDate( TQt::TimeSpec ); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING static TQDate fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate ); #endif static bool isValid( int y, int m, int d ); @@ -113,7 +113,7 @@ public: private: uint jd; friend class TQDateTime; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); #endif @@ -137,8 +137,8 @@ public: int minute() const; // 0..59 int second() const; // 0..59 int msec() const; // 0..999 -#ifndef QT_NO_DATESTRING -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_DATESTRING +#ifndef TQT_NO_SPRINTF TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; @@ -159,7 +159,7 @@ public: static TQTime currentTime(); static TQTime currentTime( TQt::TimeSpec ); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING static TQTime fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate ); #endif static bool isValid( int h, int m, int s, int ms=0 ); @@ -174,7 +174,7 @@ private: uint ds; friend class TQDateTime; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); #endif @@ -202,8 +202,8 @@ public: void setTime( const TQTime &time ) { t = time; } void setTime_t( time_t secsSince1Jan1970UTC ); void setTime_t( time_t secsSince1Jan1970UTC, TQt::TimeSpec ); -#ifndef QT_NO_DATESTRING -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_DATESTRING +#ifndef TQT_NO_SPRINTF TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; @@ -224,13 +224,13 @@ public: static TQDateTime currentDateTime(); static TQDateTime currentDateTime( TQt::TimeSpec ); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING static TQDateTime fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate ); #endif private: TQDate d; TQTime t; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); #endif @@ -241,14 +241,14 @@ private: Date and time stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #endif // TQDATETIME_H diff --git a/src/tools/ntqdir.h b/src/tools/ntqdir.h index 87083f8f4..332cc960e 100644 --- a/src/tools/ntqdir.h +++ b/src/tools/ntqdir.h @@ -48,7 +48,7 @@ #endif // QT_H -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR typedef TQPtrList<TQFileInfo> TQFileInfoList; typedef TQPtrListIterator<TQFileInfo> TQFileInfoListIterator; class TQStringList; @@ -246,5 +246,5 @@ struct TQDirSortItem { TQFileInfo* item; }; -#endif // QT_NO_DIR +#endif // TQT_NO_DIR #endif // TQDIR_H diff --git a/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h index 289190a3e..9bc4921af 100644 --- a/src/tools/ntqfeatures.h +++ b/src/tools/ntqfeatures.h @@ -3,992 +3,992 @@ // This list is generated from $TQTDIR/src/tools/qfeatures.txt // // Asynchronous I/O -//#define QT_NO_ASYNC_IO +//#define TQT_NO_ASYNC_IO // Bezier curves -//#define QT_NO_BEZIER +//#define TQT_NO_BEZIER // Buttons -//#define QT_NO_BUTTON +//#define TQT_NO_BUTTON // Named colors -//#define QT_NO_COLORNAMES +//#define TQT_NO_COLORNAMES // Cursors -//#define QT_NO_CURSOR +//#define TQT_NO_CURSOR // TQDataStream -//#define QT_NO_DATASTREAM +//#define TQT_NO_DATASTREAM // TQDate/TQTime/TQDateTime toString() and fromString() -//#define QT_NO_DATESTRING +//#define TQT_NO_DATESTRING // Dialogs -//#define QT_NO_DIALOG +//#define TQT_NO_DIALOG // TQDirectPainter -//#define QT_NO_DIRECTPAINTER +//#define TQT_NO_DIRECTPAINTER // Special widget effects (fading, scrolling) -//#define QT_NO_EFFECTS +//#define TQT_NO_EFFECTS // Freetype font engine -//#define QT_NO_FREETYPE +//#define TQT_NO_FREETYPE // Dither TQImage to 1-bit image -//#define QT_NO_IMAGE_DITHER_TO_1 +//#define TQT_NO_IMAGE_DITHER_TO_1 // TQImage::createHeuristicMask() -//#define QT_NO_IMAGE_HEURISTIC_MASK +//#define TQT_NO_IMAGE_HEURISTIC_MASK // TQImage mirroring -//#define QT_NO_IMAGE_MIRROR +//#define TQT_NO_IMAGE_MIRROR // Smooth TQImage scaling -//#define QT_NO_IMAGE_SMOOTHSCALE +//#define TQT_NO_IMAGE_SMOOTHSCALE // TrueColor TQImage -//#define QT_NO_IMAGE_TRUECOLOR +//#define TQT_NO_IMAGE_TRUECOLOR // Automatic widget layout -//#define QT_NO_LAYOUT +//#define TQT_NO_LAYOUT // Networking -//#define QT_NO_NETWORK +//#define TQT_NO_NETWORK // Palettes -//#define QT_NO_PALETTE +//#define TQT_NO_PALETTE // Alpha-blended cursor -//#define QT_NO_QWS_ALPHA_CURSOR +//#define TQT_NO_QWS_ALPHA_CURSOR // 1-bit monochrome -//#define QT_NO_QWS_DEPTH_1 +//#define TQT_NO_QWS_DEPTH_1 // 15 or 16-bit color -//#define QT_NO_QWS_DEPTH_16 +//#define TQT_NO_QWS_DEPTH_16 // 24-bit color -//#define QT_NO_QWS_DEPTH_24 +//#define TQT_NO_QWS_DEPTH_24 // 32-bit color -//#define QT_NO_QWS_DEPTH_32 +//#define TQT_NO_QWS_DEPTH_32 // 4-bit grayscale -//#define QT_NO_QWS_DEPTH_4 +//#define TQT_NO_QWS_DEPTH_4 // 8-bit color -//#define QT_NO_QWS_DEPTH_8 +//#define TQT_NO_QWS_DEPTH_8 // 8-bit grayscale -//#define QT_NO_QWS_DEPTH_8GRAYSCALE +//#define TQT_NO_QWS_DEPTH_8GRAYSCALE // Favour code size over graphics speed -//#define QT_NO_QWS_GFX_SPEED +//#define TQT_NO_QWS_GFX_SPEED // Console keyboard -//#define QT_NO_QWS_KEYBOARD +//#define TQT_NO_QWS_KEYBOARD // Linux framebuffer -//#define QT_NO_QWS_LINUXFB +//#define TQT_NO_QWS_LINUXFB // Mach64 acceleration -//#define QT_NO_QWS_MACH64 +//#define TQT_NO_QWS_MACH64 // Window Manager -//#define QT_NO_QWS_MANAGER +//#define TQT_NO_QWS_MANAGER // Matrox MGA acceleration -//#define QT_NO_QWS_MATROX +//#define TQT_NO_QWS_MATROX // Autodetecting mouse driver -//#define QT_NO_QWS_MOUSE_AUTO +//#define TQT_NO_QWS_MOUSE_AUTO // Non-autodetecting mouse driver -//#define QT_NO_QWS_MOUSE_MANUAL +//#define TQT_NO_QWS_MOUSE_MANUAL // TQt/Embedded window system properties. -//#define QT_NO_QWS_PROPERTIES +//#define TQT_NO_QWS_PROPERTIES // Repeater display -//#define QT_NO_QWS_REPEATER +//#define TQT_NO_QWS_REPEATER // Saving of fonts -//#define QT_NO_QWS_SAVEFONTS +//#define TQT_NO_QWS_SAVEFONTS // Shadow frame buffer -//#define QT_NO_QWS_SHADOWFB +//#define TQT_NO_QWS_SHADOWFB // Virtual frame buffer -//#define QT_NO_QWS_VFB +//#define TQT_NO_QWS_VFB // 4-bit VGA -//#define QT_NO_QWS_VGA_16 +//#define TQT_NO_QWS_VGA_16 // Voodoo3 acceleration -//#define QT_NO_QWS_VOODOO3 +//#define TQT_NO_QWS_VOODOO3 // Range-control widgets -//#define QT_NO_RANGECONTROL +//#define TQT_NO_RANGECONTROL // Regular expression capture -//#define QT_NO_REGEXP +//#define TQT_NO_REGEXP // TQSignalMapper -//#define QT_NO_SIGNALMAPPER +//#define TQT_NO_SIGNALMAPPER // Playing sounds -//#define QT_NO_SOUND +//#define TQT_NO_SOUND // Standard template library compatiblity //#define TQT_NO_STL // TQStringList -//#define QT_NO_STRINGLIST +//#define TQT_NO_STRINGLIST // Character set conversions -//#define QT_NO_TEXTCODEC +//#define TQT_NO_TEXTCODEC // TQTextStream -//#define QT_NO_TEXTSTREAM +//#define TQT_NO_TEXTSTREAM // Unicode property tables -//#define QT_NO_UNICODETABLES +//#define TQT_NO_UNICODETABLES // Input validators -//#define QT_NO_VALIDATOR +//#define TQT_NO_VALIDATOR // TQVariant -//#define QT_NO_VARIANT +//#define TQT_NO_VARIANT // Wheel-mouse events -//#define QT_NO_WHEELEVENT +//#define TQT_NO_WHEELEVENT // TQWMatrix -//#define QT_NO_WMATRIX +//#define TQT_NO_WMATRIX // Non-Unicode text conversions -#if !defined(QT_NO_CODECS) && (defined(QT_NO_TEXTCODEC)) -#define QT_NO_CODECS +#if !defined(TQT_NO_CODECS) && (defined(TQT_NO_TEXTCODEC)) +#define TQT_NO_CODECS #endif // TQCop IPC -#if !defined(QT_NO_COP) && (defined(QT_NO_DATASTREAM)) -#define QT_NO_COP +#if !defined(TQT_NO_COP) && (defined(TQT_NO_DATASTREAM)) +#define TQT_NO_COP #endif // TQFontDatabase -#if !defined(QT_NO_FONTDATABASE) && (defined(QT_NO_STRINGLIST)) -#define QT_NO_FONTDATABASE +#if !defined(TQT_NO_FONTDATABASE) && (defined(TQT_NO_STRINGLIST)) +#define TQT_NO_FONTDATABASE #endif // Image formats -#if !defined(QT_NO_IMAGEIO) && (defined(QT_NO_REGEXP)) -#define QT_NO_IMAGEIO +#if !defined(TQT_NO_IMAGEIO) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_IMAGEIO #endif // 16-bit TQImage -#if !defined(QT_NO_IMAGE_16_BIT) && (defined(QT_NO_IMAGE_TRUECOLOR)) -#define QT_NO_IMAGE_16_BIT +#if !defined(TQT_NO_IMAGE_16_BIT) && (defined(TQT_NO_IMAGE_TRUECOLOR)) +#define TQT_NO_IMAGE_16_BIT #endif // Image file text strings -#if !defined(QT_NO_IMAGE_TEXT) && (defined(QT_NO_STRINGLIST)) -#define QT_NO_IMAGE_TEXT +#if !defined(TQT_NO_IMAGE_TEXT) && (defined(TQT_NO_STRINGLIST)) +#define TQT_NO_IMAGE_TEXT #endif // Shared library wrapper -#if !defined(QT_NO_LIBRARY) && (defined(QT_NO_REGEXP)) -#define QT_NO_LIBRARY +#if !defined(TQT_NO_LIBRARY) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_LIBRARY #endif // Pixmap transformations -#if !defined(QT_NO_PIXMAP_TRANSFORMATION) && (defined(QT_NO_WMATRIX)) -#define QT_NO_PIXMAP_TRANSFORMATION +#if !defined(TQT_NO_PIXMAP_TRANSFORMATION) && (defined(TQT_NO_WMATRIX)) +#define TQT_NO_PIXMAP_TRANSFORMATION #endif // Convert UUID to/from string -#if !defined(QT_NO_QUUID_STRING) && (defined(QT_NO_STRINGLIST)) -#define QT_NO_QUUID_STRING +#if !defined(TQT_NO_QUUID_STRING) && (defined(TQT_NO_STRINGLIST)) +#define TQT_NO_QUUID_STRING #endif // The "BeOS" style -#if !defined(QT_NO_QWS_BEOS_WM_STYLE) && (defined(QT_NO_QWS_MANAGER)) -#define QT_NO_QWS_BEOS_WM_STYLE +#if !defined(TQT_NO_QWS_BEOS_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER)) +#define TQT_NO_QWS_BEOS_WM_STYLE #endif // Visible cursor -#if !defined(QT_NO_QWS_CURSOR) && (defined(QT_NO_CURSOR)) -#define QT_NO_QWS_CURSOR +#if !defined(TQT_NO_QWS_CURSOR) && (defined(TQT_NO_CURSOR)) +#define TQT_NO_QWS_CURSOR #endif // 32-bit color, BGR order -#if !defined(QT_NO_QWS_DEPTH_32_BGR) && (defined(QT_NO_QWS_DEPTH_32)) -#define QT_NO_QWS_DEPTH_32_BGR +#if !defined(TQT_NO_QWS_DEPTH_32_BGR) && (defined(TQT_NO_QWS_DEPTH_32)) +#define TQT_NO_QWS_DEPTH_32_BGR #endif // The "Hydro" style -#if !defined(QT_NO_QWS_HYDRO_WM_STYLE) && (defined(QT_NO_QWS_MANAGER)) -#define QT_NO_QWS_HYDRO_WM_STYLE +#if !defined(TQT_NO_QWS_HYDRO_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER)) +#define TQT_NO_QWS_HYDRO_WM_STYLE #endif // Keyboard for SHARP Zaurus SL5xxx devices -#if !defined(QT_NO_QWS_KBD_SHARP) && (defined(QT_NO_QWS_KEYBOARD)) -#define QT_NO_QWS_KBD_SHARP +#if !defined(TQT_NO_QWS_KBD_SHARP) && (defined(TQT_NO_QWS_KEYBOARD)) +#define TQT_NO_QWS_KBD_SHARP #endif // The "KDE2" style -#if !defined(QT_NO_QWS_KDE2_WM_STYLE) && (defined(QT_NO_QWS_MANAGER)) -#define QT_NO_QWS_KDE2_WM_STYLE +#if !defined(TQT_NO_QWS_KDE2_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER)) +#define TQT_NO_QWS_KDE2_WM_STYLE #endif // The "KDE" style -#if !defined(QT_NO_QWS_KDE_WM_STYLE) && (defined(QT_NO_QWS_MANAGER)) -#define QT_NO_QWS_KDE_WM_STYLE +#if !defined(TQT_NO_QWS_KDE_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER)) +#define TQT_NO_QWS_KDE_WM_STYLE #endif // Multi-process architecture -#if !defined(QT_NO_QWS_MULTIPROCESS) && (defined(QT_NO_NETWORK)) -#define QT_NO_QWS_MULTIPROCESS +#if !defined(TQT_NO_QWS_MULTIPROCESS) && (defined(TQT_NO_NETWORK)) +#define TQT_NO_QWS_MULTIPROCESS #endif // Transformed frame buffer -#if !defined(QT_NO_QWS_TRANSFORMED) && (defined(QT_NO_QWS_LINUXFB)) -#define QT_NO_QWS_TRANSFORMED +#if !defined(TQT_NO_QWS_TRANSFORMED) && (defined(TQT_NO_QWS_LINUXFB)) +#define TQT_NO_QWS_TRANSFORMED #endif // Remote frame buffer (VNC) -#if !defined(QT_NO_QWS_VNC) && (defined(QT_NO_NETWORK)) -#define QT_NO_QWS_VNC +#if !defined(TQT_NO_QWS_VNC) && (defined(TQT_NO_NETWORK)) +#define TQT_NO_QWS_VNC #endif // The "Windows" style -#if !defined(QT_NO_QWS_WINDOWS_WM_STYLE) && (defined(QT_NO_QWS_MANAGER)) -#define QT_NO_QWS_WINDOWS_WM_STYLE +#if !defined(TQT_NO_QWS_WINDOWS_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER)) +#define TQT_NO_QWS_WINDOWS_WM_STYLE #endif // Regular expression anchors -#if !defined(QT_NO_REGEXP_ANCHOR_ALT) && (defined(QT_NO_REGEXP)) -#define QT_NO_REGEXP_ANCHOR_ALT +#if !defined(TQT_NO_REGEXP_ANCHOR_ALT) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_REGEXP_ANCHOR_ALT #endif // Regular expression back-reference -#if !defined(QT_NO_REGEXP_BACKREF) && (defined(QT_NO_REGEXP)) -#define QT_NO_REGEXP_BACKREF +#if !defined(TQT_NO_REGEXP_BACKREF) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_REGEXP_BACKREF #endif // Regular expression character-class -#if !defined(QT_NO_REGEXP_CCLASS) && (defined(QT_NO_REGEXP)) -#define QT_NO_REGEXP_CCLASS +#if !defined(TQT_NO_REGEXP_CCLASS) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_REGEXP_CCLASS #endif // Regular expression escape -#if !defined(QT_NO_REGEXP_ESCAPE) && (defined(QT_NO_REGEXP)) -#define QT_NO_REGEXP_ESCAPE +#if !defined(TQT_NO_REGEXP_ESCAPE) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_REGEXP_ESCAPE #endif // Regular expression interval -#if !defined(QT_NO_REGEXP_INTERVAL) && (defined(QT_NO_REGEXP)) -#define QT_NO_REGEXP_INTERVAL +#if !defined(TQT_NO_REGEXP_INTERVAL) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_REGEXP_INTERVAL #endif // Regular expression lookahead -#if !defined(QT_NO_REGEXP_LOOKAHEAD) && (defined(QT_NO_REGEXP)) -#define QT_NO_REGEXP_LOOKAHEAD +#if !defined(TQT_NO_REGEXP_LOOKAHEAD) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_REGEXP_LOOKAHEAD #endif // Regular expression optimization -#if !defined(QT_NO_REGEXP_OPTIM) && (defined(QT_NO_REGEXP)) -#define QT_NO_REGEXP_OPTIM +#if !defined(TQT_NO_REGEXP_OPTIM) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_REGEXP_OPTIM #endif // Regular expression wildcard -#if !defined(QT_NO_REGEXP_WILDCARD) && (defined(QT_NO_REGEXP)) -#define QT_NO_REGEXP_WILDCARD +#if !defined(TQT_NO_REGEXP_WILDCARD) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_REGEXP_WILDCARD #endif // Semi-modal dialogs -#if !defined(QT_NO_SEMIMODAL) && (defined(QT_NO_DIALOG)) -#define QT_NO_SEMIMODAL +#if !defined(TQT_NO_SEMIMODAL) && (defined(TQT_NO_DIALOG)) +#define TQT_NO_SEMIMODAL #endif // Session management -#if !defined(QT_NO_SESSIONMANAGER) && (defined(QT_NO_STRINGLIST)) -#define QT_NO_SESSIONMANAGER +#if !defined(TQT_NO_SESSIONMANAGER) && (defined(TQT_NO_STRINGLIST)) +#define TQT_NO_SESSIONMANAGER #endif // TQString::sprintf() -#if !defined(QT_NO_SPRINTF) && (defined(QT_NO_REGEXP)) -#define QT_NO_SPRINTF +#if !defined(TQT_NO_SPRINTF) && (defined(TQT_NO_REGEXP)) +#define TQT_NO_SPRINTF #endif // Scaling and rotation -#if !defined(QT_NO_TRANSFORMATIONS) && (defined(QT_NO_WMATRIX)) -#define QT_NO_TRANSFORMATIONS +#if !defined(TQT_NO_TRANSFORMATIONS) && (defined(TQT_NO_WMATRIX)) +#define TQT_NO_TRANSFORMATIONS #endif // Translations via TQObject::tr() -#if !defined(TQT_NO_TRANSLATION) && (defined(QT_NO_DATASTREAM)) +#if !defined(TQT_NO_TRANSLATION) && (defined(TQT_NO_DATASTREAM)) #define TQT_NO_TRANSLATION #endif // Window icon and caption -#if !defined(QT_NO_WIDGET_TOPEXTRA) && (defined(QT_NO_IMAGE_HEURISTIC_MASK)) -#define QT_NO_WIDGET_TOPEXTRA +#if !defined(TQT_NO_WIDGET_TOPEXTRA) && (defined(TQT_NO_IMAGE_HEURISTIC_MASK)) +#define TQT_NO_WIDGET_TOPEXTRA #endif // Keyboard accelerators and shortcuts -#if !defined(QT_NO_ACCEL) && (defined(QT_NO_SPRINTF)) -#define QT_NO_ACCEL +#if !defined(TQT_NO_ACCEL) && (defined(TQT_NO_SPRINTF)) +#define TQT_NO_ACCEL #endif // Asynchronous image I/O -#if !defined(QT_NO_ASYNC_IMAGE_IO) && (defined(QT_NO_IMAGEIO)) -#define QT_NO_ASYNC_IMAGE_IO +#if !defined(TQT_NO_ASYNC_IMAGE_IO) && (defined(TQT_NO_IMAGEIO)) +#define TQT_NO_ASYNC_IMAGE_IO #endif // BDF font files -#if !defined(QT_NO_BDF) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_STRINGLIST)) -#define QT_NO_BDF +#if !defined(TQT_NO_BDF) && (defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_STRINGLIST)) +#define TQT_NO_BDF #endif // TQDir -#if !defined(QT_NO_DIR) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_REGEXP)) -#define QT_NO_DIR +#if !defined(TQT_NO_DIR) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_REGEXP)) +#define TQT_NO_DIR #endif // JPEG image I/O -#if !defined(QT_NO_IMAGEIO_JPEG) && (defined(QT_NO_IMAGEIO)) -#define QT_NO_IMAGEIO_JPEG +#if !defined(TQT_NO_IMAGEIO_JPEG) && (defined(TQT_NO_IMAGEIO)) +#define TQT_NO_IMAGEIO_JPEG #endif // MNG image I/O -#if !defined(QT_NO_IMAGEIO_MNG) && (defined(QT_NO_IMAGEIO)) -#define QT_NO_IMAGEIO_MNG +#if !defined(TQT_NO_IMAGEIO_MNG) && (defined(TQT_NO_IMAGEIO)) +#define TQT_NO_IMAGEIO_MNG #endif // PNG image I/O -#if !defined(QT_NO_IMAGEIO_PNG) && (defined(QT_NO_IMAGEIO)) -#define QT_NO_IMAGEIO_PNG +#if !defined(TQT_NO_IMAGEIO_PNG) && (defined(TQT_NO_IMAGEIO)) +#define TQT_NO_IMAGEIO_PNG #endif // PPM image I/O -#if !defined(QT_NO_IMAGEIO_PPM) && (defined(QT_NO_IMAGEIO)) -#define QT_NO_IMAGEIO_PPM +#if !defined(TQT_NO_IMAGEIO_PPM) && (defined(TQT_NO_IMAGEIO)) +#define TQT_NO_IMAGEIO_PPM #endif // XBM image I/O -#if !defined(QT_NO_IMAGEIO_XBM) && (defined(QT_NO_IMAGEIO)) -#define QT_NO_IMAGEIO_XBM +#if !defined(TQT_NO_IMAGEIO_XBM) && (defined(TQT_NO_IMAGEIO)) +#define TQT_NO_IMAGEIO_XBM #endif // Image transformations -#if !defined(QT_NO_IMAGE_TRANSFORMATION) && (defined(QT_NO_PIXMAP_TRANSFORMATION)) -#define QT_NO_IMAGE_TRANSFORMATION +#if !defined(TQT_NO_IMAGE_TRANSFORMATION) && (defined(TQT_NO_PIXMAP_TRANSFORMATION)) +#define TQT_NO_IMAGE_TRANSFORMATION #endif // External process invocation. -#if !defined(QT_NO_PROCESS) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_REGEXP)) -#define QT_NO_PROCESS +#if !defined(TQT_NO_PROCESS) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_REGEXP)) +#define TQT_NO_PROCESS #endif // Regular expression capture -#if !defined(QT_NO_REGEXP_CAPTURE) && (defined(QT_NO_REGEXP) || defined(QT_NO_STRINGLIST)) -#define QT_NO_REGEXP_CAPTURE +#if !defined(TQT_NO_REGEXP_CAPTURE) && (defined(TQT_NO_REGEXP) || defined(TQT_NO_STRINGLIST)) +#define TQT_NO_REGEXP_CAPTURE #endif // Splash screen widget -#if !defined(QT_NO_SPLASHSCREEN) && (defined(QT_NO_IMAGEIO)) -#define QT_NO_SPLASHSCREEN +#if !defined(TQT_NO_SPLASHSCREEN) && (defined(TQT_NO_IMAGEIO)) +#define TQT_NO_SPLASHSCREEN #endif // Template classes in TQVariant -#if !defined(QT_NO_TEMPLATE_VARIANT) && (defined(QT_NO_VARIANT) || defined(QT_NO_STRINGLIST)) -#define QT_NO_TEMPLATE_VARIANT +#if !defined(TQT_NO_TEMPLATE_VARIANT) && (defined(TQT_NO_VARIANT) || defined(TQT_NO_STRINGLIST)) +#define TQT_NO_TEMPLATE_VARIANT #endif // Month and day names in dates -#if !defined(QT_NO_TEXTDATE) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_DATESTRING)) -#define QT_NO_TEXTDATE +#if !defined(TQT_NO_TEXTDATE) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_DATESTRING)) +#define TQT_NO_TEXTDATE #endif // Drawing utility functions -#if !defined(QT_NO_DRAWUTIL) && (defined(QT_NO_SPRINTF) || defined(QT_NO_PALETTE)) -#define QT_NO_DRAWUTIL +#if !defined(TQT_NO_DRAWUTIL) && (defined(TQT_NO_SPRINTF) || defined(TQT_NO_PALETTE)) +#define TQT_NO_DRAWUTIL #endif // BMP image I/O -#if !defined(QT_NO_IMAGEIO_BMP) && (defined(QT_NO_IMAGEIO) || defined(QT_NO_DATASTREAM)) -#define QT_NO_IMAGEIO_BMP +#if !defined(TQT_NO_IMAGEIO_BMP) && (defined(TQT_NO_IMAGEIO) || defined(TQT_NO_DATASTREAM)) +#define TQT_NO_IMAGEIO_BMP #endif // TQPicture -#if !defined(QT_NO_PICTURE) && (defined(QT_NO_DATASTREAM) || defined(QT_NO_IMAGEIO)) -#define QT_NO_PICTURE +#if !defined(TQT_NO_PICTURE) && (defined(TQT_NO_DATASTREAM) || defined(TQT_NO_IMAGEIO)) +#define TQT_NO_PICTURE #endif // Translations via TQObject::trUtf8() -#if !defined(TQT_NO_TRANSLATION_UTF8) && (defined(TQT_NO_TRANSLATION) || defined(QT_NO_TEXTCODEC)) +#if !defined(TQT_NO_TRANSLATION_UTF8) && (defined(TQT_NO_TRANSLATION) || defined(TQT_NO_TEXTCODEC)) #define TQT_NO_TRANSLATION_UTF8 #endif // URL parser -#if !defined(QT_NO_URL) && (defined(QT_NO_DIR)) -#define QT_NO_URL +#if !defined(TQT_NO_URL) && (defined(TQT_NO_DIR)) +#define TQT_NO_URL #endif // Animated images -#if !defined(QT_NO_MOVIE) && (defined(QT_NO_ASYNC_IO) || defined(QT_NO_ASYNC_IMAGE_IO)) -#define QT_NO_MOVIE +#if !defined(TQT_NO_MOVIE) && (defined(TQT_NO_ASYNC_IO) || defined(TQT_NO_ASYNC_IMAGE_IO)) +#define TQT_NO_MOVIE #endif // TQStyle -#if !defined(QT_NO_STYLE) && (defined(QT_NO_DRAWUTIL)) -#define QT_NO_STYLE +#if !defined(TQT_NO_STYLE) && (defined(TQT_NO_DRAWUTIL)) +#define TQT_NO_STYLE #endif // DNS -#if !defined(QT_NO_DNS) && (defined(QT_NO_NETWORK) || defined(QT_NO_STRINGLIST) || defined(QT_NO_TEXTSTREAM) || defined(QT_NO_SPRINTF)) -#define QT_NO_DNS +#if !defined(TQT_NO_DNS) && (defined(TQT_NO_NETWORK) || defined(TQT_NO_STRINGLIST) || defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_SPRINTF)) +#define TQT_NO_DNS #endif // Framed widgets -#if !defined(QT_NO_FRAME) && (defined(QT_NO_STYLE)) -#define QT_NO_FRAME +#if !defined(TQT_NO_FRAME) && (defined(TQT_NO_STYLE)) +#define TQT_NO_FRAME #endif // TQIconSet -#if !defined(QT_NO_ICONSET) && (defined(QT_NO_IMAGEIO) || defined(QT_NO_IMAGE_SMOOTHSCALE) || defined(QT_NO_PALETTE) || defined(QT_NO_IMAGE_HEURISTIC_MASK)) -#define QT_NO_ICONSET +#if !defined(TQT_NO_ICONSET) && (defined(TQT_NO_IMAGEIO) || defined(TQT_NO_IMAGE_SMOOTHSCALE) || defined(TQT_NO_PALETTE) || defined(TQT_NO_IMAGE_HEURISTIC_MASK)) +#define TQT_NO_ICONSET #endif // XPM image I/O -#if !defined(QT_NO_IMAGEIO_XPM) && (defined(QT_NO_IMAGEIO) || defined(QT_NO_SPRINTF) || defined(QT_NO_TEXTSTREAM)) -#define QT_NO_IMAGEIO_XPM +#if !defined(TQT_NO_IMAGEIO_XPM) && (defined(TQT_NO_IMAGEIO) || defined(TQT_NO_SPRINTF) || defined(TQT_NO_TEXTSTREAM)) +#define TQT_NO_IMAGEIO_XPM #endif // Network file access -#if !defined(QT_NO_NETWORKPROTOCOL) && (defined(QT_NO_TEXTCODEC) || defined(QT_NO_URL)) -#define QT_NO_NETWORKPROTOCOL +#if !defined(TQT_NO_NETWORKPROTOCOL) && (defined(TQT_NO_TEXTCODEC) || defined(TQT_NO_URL)) +#define TQT_NO_NETWORKPROTOCOL #endif // TQSizeGrip -#if !defined(QT_NO_SIZEGRIP) && (defined(QT_NO_STYLE)) -#define QT_NO_SIZEGRIP +#if !defined(TQT_NO_SIZEGRIP) && (defined(TQT_NO_STYLE)) +#define TQT_NO_SIZEGRIP #endif // Motif style -#if !defined(QT_NO_STYLE_MOTIF) && (defined(QT_NO_STYLE)) -#define QT_NO_STYLE_MOTIF +#if !defined(TQT_NO_STYLE_MOTIF) && (defined(TQT_NO_STYLE)) +#define TQT_NO_STYLE_MOTIF #endif // Windows style -#if !defined(QT_NO_STYLE_WINDOWS) && (defined(QT_NO_STYLE)) -#define QT_NO_STYLE_WINDOWS +#if !defined(TQT_NO_STYLE_WINDOWS) && (defined(TQT_NO_STYLE)) +#define TQT_NO_STYLE_WINDOWS #endif // Internal titlebar widget -#if !defined(QT_NO_TITLEBAR) && (defined(QT_NO_STYLE)) -#define QT_NO_TITLEBAR +#if !defined(TQT_NO_TITLEBAR) && (defined(TQT_NO_STYLE)) +#define TQT_NO_TITLEBAR #endif // XML -#if !defined(QT_NO_XML) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_TEXTCODEC) || defined(QT_NO_REGEXP_CAPTURE)) -#define QT_NO_XML +#if !defined(TQT_NO_XML) && (defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_TEXTCODEC) || defined(TQT_NO_REGEXP_CAPTURE)) +#define TQT_NO_XML #endif // Check-boxes -#if !defined(QT_NO_CHECKBOX) && (defined(QT_NO_BUTTON) || defined(QT_NO_STYLE)) -#define QT_NO_CHECKBOX +#if !defined(TQT_NO_CHECKBOX) && (defined(TQT_NO_BUTTON) || defined(TQT_NO_STYLE)) +#define TQT_NO_CHECKBOX #endif // Dials -#if !defined(QT_NO_DIAL) && (defined(QT_NO_RANGECONTROL) || defined(QT_NO_STYLE)) -#define QT_NO_DIAL +#if !defined(TQT_NO_DIAL) && (defined(TQT_NO_RANGECONTROL) || defined(TQT_NO_STYLE)) +#define TQT_NO_DIAL #endif // TQLabel -#if !defined(QT_NO_LABEL) && (defined(QT_NO_FRAME)) -#define QT_NO_LABEL +#if !defined(TQT_NO_LABEL) && (defined(TQT_NO_FRAME)) +#define TQT_NO_LABEL #endif // TQLCDNumber -#if !defined(QT_NO_LCDNUMBER) && (defined(QT_NO_FRAME)) -#define QT_NO_LCDNUMBER +#if !defined(TQT_NO_LCDNUMBER) && (defined(TQT_NO_FRAME)) +#define TQT_NO_LCDNUMBER #endif // Single-line edits -#if !defined(QT_NO_LINEEDIT) && (defined(QT_NO_FRAME)) -#define QT_NO_LINEEDIT +#if !defined(TQT_NO_LINEEDIT) && (defined(TQT_NO_FRAME)) +#define TQT_NO_LINEEDIT #endif // MIME -#if !defined(QT_NO_MIME) && (defined(QT_NO_DIR) || defined(QT_NO_IMAGEIO) || defined(QT_NO_TEXTCODEC)) -#define QT_NO_MIME +#if !defined(TQT_NO_MIME) && (defined(TQT_NO_DIR) || defined(TQT_NO_IMAGEIO) || defined(TQT_NO_TEXTCODEC)) +#define TQT_NO_MIME #endif // Progress bars -#if !defined(QT_NO_PROGRESSBAR) && (defined(QT_NO_FRAME)) -#define QT_NO_PROGRESSBAR +#if !defined(TQT_NO_PROGRESSBAR) && (defined(TQT_NO_FRAME)) +#define TQT_NO_PROGRESSBAR #endif // Push-buttons -#if !defined(QT_NO_PUSHBUTTON) && (defined(QT_NO_BUTTON) || defined(QT_NO_STYLE)) -#define QT_NO_PUSHBUTTON +#if !defined(TQT_NO_PUSHBUTTON) && (defined(TQT_NO_BUTTON) || defined(TQT_NO_STYLE)) +#define TQT_NO_PUSHBUTTON #endif // Radio-buttons -#if !defined(QT_NO_RADIOBUTTON) && (defined(QT_NO_BUTTON) || defined(QT_NO_STYLE)) -#define QT_NO_RADIOBUTTON +#if !defined(TQT_NO_RADIOBUTTON) && (defined(TQT_NO_BUTTON) || defined(TQT_NO_STYLE)) +#define TQT_NO_RADIOBUTTON #endif // Internal resize handler -#if !defined(QT_NO_RESIZEHANDLER) && (defined(QT_NO_FRAME)) -#define QT_NO_RESIZEHANDLER +#if !defined(TQT_NO_RESIZEHANDLER) && (defined(TQT_NO_FRAME)) +#define TQT_NO_RESIZEHANDLER #endif // Scroll bars -#if !defined(QT_NO_SCROLLBAR) && (defined(QT_NO_RANGECONTROL) || defined(QT_NO_STYLE)) -#define QT_NO_SCROLLBAR +#if !defined(TQT_NO_SCROLLBAR) && (defined(TQT_NO_RANGECONTROL) || defined(TQT_NO_STYLE)) +#define TQT_NO_SCROLLBAR #endif // Sliders -#if !defined(QT_NO_SLIDER) && (defined(QT_NO_RANGECONTROL) || defined(QT_NO_STYLE)) -#define QT_NO_SLIDER +#if !defined(TQT_NO_SLIDER) && (defined(TQT_NO_RANGECONTROL) || defined(TQT_NO_STYLE)) +#define TQT_NO_SLIDER #endif // Spinbox control widget -#if !defined(QT_NO_SPINWIDGET) && (defined(QT_NO_FRAME)) -#define QT_NO_SPINWIDGET +#if !defined(TQT_NO_SPINWIDGET) && (defined(TQT_NO_FRAME)) +#define TQT_NO_SPINWIDGET #endif // Status bars -#if !defined(QT_NO_STATUSBAR) && (defined(QT_NO_LAYOUT) || defined(QT_NO_STYLE)) -#define QT_NO_STATUSBAR +#if !defined(TQT_NO_STATUSBAR) && (defined(TQT_NO_LAYOUT) || defined(TQT_NO_STYLE)) +#define TQT_NO_STATUSBAR #endif // Compact Windows style -#if !defined(QT_NO_STYLE_COMPACT) && (defined(QT_NO_STYLE_WINDOWS)) -#define QT_NO_STYLE_COMPACT +#if !defined(TQT_NO_STYLE_COMPACT) && (defined(TQT_NO_STYLE_WINDOWS)) +#define TQT_NO_STYLE_COMPACT #endif // Interlace-friendly style -#if !defined(QT_NO_STYLE_INTERLACE) && (defined(QT_NO_STYLE_MOTIF)) -#define QT_NO_STYLE_INTERLACE +#if !defined(TQT_NO_STYLE_INTERLACE) && (defined(TQT_NO_STYLE_MOTIF)) +#define TQT_NO_STYLE_INTERLACE #endif // Platinum style -#if !defined(QT_NO_STYLE_PLATINUM) && (defined(QT_NO_STYLE_WINDOWS)) -#define QT_NO_STYLE_PLATINUM +#if !defined(TQT_NO_STYLE_PLATINUM) && (defined(TQT_NO_STYLE_WINDOWS)) +#define TQT_NO_STYLE_PLATINUM #endif // Widget stacks -#if !defined(QT_NO_WIDGETSTACK) && (defined(QT_NO_FRAME)) -#define QT_NO_WIDGETSTACK +#if !defined(TQT_NO_WIDGETSTACK) && (defined(TQT_NO_FRAME)) +#define TQT_NO_WIDGETSTACK #endif // Grid layout widgets -#if !defined(QT_NO_GRID) && (defined(QT_NO_LAYOUT) || defined(QT_NO_FRAME)) -#define QT_NO_GRID +#if !defined(TQT_NO_GRID) && (defined(TQT_NO_LAYOUT) || defined(TQT_NO_FRAME)) +#define TQT_NO_GRID #endif // Group boxes -#if !defined(QT_NO_GROUPBOX) && (defined(QT_NO_FRAME) || defined(QT_NO_LAYOUT)) -#define QT_NO_GROUPBOX +#if !defined(TQT_NO_GROUPBOX) && (defined(TQT_NO_FRAME) || defined(TQT_NO_LAYOUT)) +#define TQT_NO_GROUPBOX #endif // Horizontal box layout widgets -#if !defined(QT_NO_HBOX) && (defined(QT_NO_LAYOUT) || defined(QT_NO_FRAME)) -#define QT_NO_HBOX +#if !defined(TQT_NO_HBOX) && (defined(TQT_NO_LAYOUT) || defined(TQT_NO_FRAME)) +#define TQT_NO_HBOX #endif // Menu-oriented widgets -#if !defined(QT_NO_MENUDATA) && (defined(QT_NO_ICONSET) || defined(QT_NO_VARIANT)) -#define QT_NO_MENUDATA +#if !defined(TQT_NO_MENUDATA) && (defined(TQT_NO_ICONSET) || defined(TQT_NO_VARIANT)) +#define TQT_NO_MENUDATA #endif // Persistent application settings -#if !defined(QT_NO_SETTINGS) && (defined(QT_NO_DIR) || defined(QT_NO_TEXTSTREAM) || defined(QT_NO_REGEXP_CAPTURE)) -#define QT_NO_SETTINGS +#if !defined(TQT_NO_SETTINGS) && (defined(TQT_NO_DIR) || defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_REGEXP_CAPTURE)) +#define TQT_NO_SETTINGS #endif // Splitters -#if !defined(QT_NO_SPLITTER) && (defined(QT_NO_FRAME) || defined(QT_NO_LAYOUT)) -#define QT_NO_SPLITTER +#if !defined(TQT_NO_SPLITTER) && (defined(TQT_NO_FRAME) || defined(TQT_NO_LAYOUT)) +#define TQT_NO_SPLITTER #endif // Table-like widgets -#if !defined(QT_NO_TABLEVIEW) && (defined(QT_NO_SCROLLBAR)) -#define QT_NO_TABLEVIEW +#if !defined(TQT_NO_TABLEVIEW) && (defined(TQT_NO_SCROLLBAR)) +#define TQT_NO_TABLEVIEW #endif // Tool tips -#if !defined(QT_NO_TOOLTIP) && (defined(QT_NO_LABEL)) -#define QT_NO_TOOLTIP +#if !defined(TQT_NO_TOOLTIP) && (defined(TQT_NO_LABEL)) +#define TQT_NO_TOOLTIP #endif // Cut and paste -#if !defined(QT_NO_CLIPBOARD) && (defined(QT_NO_QWS_PROPERTIES) || defined(QT_NO_MIME)) -#define QT_NO_CLIPBOARD +#if !defined(TQT_NO_CLIPBOARD) && (defined(TQT_NO_QWS_PROPERTIES) || defined(TQT_NO_MIME)) +#define TQT_NO_CLIPBOARD #endif // Horizontal group boxes -#if !defined(QT_NO_HGROUPBOX) && (defined(QT_NO_GROUPBOX)) -#define QT_NO_HGROUPBOX +#if !defined(TQT_NO_HGROUPBOX) && (defined(TQT_NO_GROUPBOX)) +#define TQT_NO_HGROUPBOX #endif // Properties -#if !defined(QT_NO_PROPERTIES) && (defined(QT_NO_VARIANT) || defined(QT_NO_STRINGLIST) || defined(QT_NO_ICONSET)) -#define QT_NO_PROPERTIES +#if !defined(TQT_NO_PROPERTIES) && (defined(TQT_NO_VARIANT) || defined(TQT_NO_STRINGLIST) || defined(TQT_NO_ICONSET)) +#define TQT_NO_PROPERTIES #endif // RichText (HTML) display -#if !defined(QT_NO_RICHTEXT) && (defined(QT_NO_STYLE) || defined(QT_NO_LAYOUT) || defined(QT_NO_STRINGLIST) || defined(QT_NO_TEXTSTREAM)) -#define QT_NO_RICHTEXT +#if !defined(TQT_NO_RICHTEXT) && (defined(TQT_NO_STYLE) || defined(TQT_NO_LAYOUT) || defined(TQT_NO_STRINGLIST) || defined(TQT_NO_TEXTSTREAM)) +#define TQT_NO_RICHTEXT #endif // SQL classes -#if !defined(QT_NO_SQL) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_REGEXP_CAPTURE) || defined(QT_NO_VARIANT) || defined(QT_NO_SPRINTF) || defined(QT_NO_DATESTRING)) -#define QT_NO_SQL +#if !defined(TQT_NO_SQL) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_REGEXP_CAPTURE) || defined(TQT_NO_VARIANT) || defined(TQT_NO_SPRINTF) || defined(TQT_NO_DATESTRING)) +#define TQT_NO_SQL #endif // CDE style -#if !defined(QT_NO_STYLE_CDE) && (defined(QT_NO_STYLE_MOTIF) || defined(QT_NO_TRANSFORMATIONS)) -#define QT_NO_STYLE_CDE +#if !defined(TQT_NO_STYLE_CDE) && (defined(TQT_NO_STYLE_MOTIF) || defined(TQT_NO_TRANSFORMATIONS)) +#define TQT_NO_STYLE_CDE #endif // Vertical box layout widgets -#if !defined(QT_NO_VBOX) && (defined(QT_NO_HBOX)) -#define QT_NO_VBOX +#if !defined(TQT_NO_VBOX) && (defined(TQT_NO_HBOX)) +#define TQT_NO_VBOX #endif // Button groups -#if !defined(QT_NO_BUTTONGROUP) && (defined(QT_NO_GROUPBOX) || defined(QT_NO_BUTTON)) -#define QT_NO_BUTTONGROUP +#if !defined(TQT_NO_BUTTONGROUP) && (defined(TQT_NO_GROUPBOX) || defined(TQT_NO_BUTTON)) +#define TQT_NO_BUTTONGROUP #endif // Complex scripts (eg. BiDi) -#if !defined(QT_NO_COMPLEXTEXT) && (defined(QT_NO_RICHTEXT)) -#define QT_NO_COMPLEXTEXT +#if !defined(TQT_NO_COMPLEXTEXT) && (defined(TQT_NO_RICHTEXT)) +#define TQT_NO_COMPLEXTEXT #endif // Cut and paste non-text -#if !defined(QT_NO_MIMECLIPBOARD) && (defined(QT_NO_CLIPBOARD)) -#define QT_NO_MIMECLIPBOARD +#if !defined(TQT_NO_MIMECLIPBOARD) && (defined(TQT_NO_CLIPBOARD)) +#define TQT_NO_MIMECLIPBOARD #endif // Printing -#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_SPRINTF) || defined(QT_NO_FONTDATABASE) || defined(QT_NO_DATESTRING) || defined(QT_NO_REGEXP_CAPTURE)) -#define QT_NO_PRINTER +#if !defined(TQT_NO_PRINTER) && (defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_SPRINTF) || defined(TQT_NO_FONTDATABASE) || defined(TQT_NO_DATESTRING) || defined(TQT_NO_REGEXP_CAPTURE)) +#define TQT_NO_PRINTER #endif // Aqua style -#if !defined(QT_NO_STYLE_AQUA) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGE_TRANSFORMATION)) -#define QT_NO_STYLE_AQUA +#if !defined(TQT_NO_STYLE_AQUA) && (defined(TQT_NO_STYLE_WINDOWS) || defined(TQT_NO_IMAGE_TRANSFORMATION)) +#define TQT_NO_STYLE_AQUA #endif // Vertical group boxes -#if !defined(QT_NO_VGROUPBOX) && (defined(QT_NO_HGROUPBOX)) -#define QT_NO_VGROUPBOX +#if !defined(TQT_NO_VGROUPBOX) && (defined(TQT_NO_HGROUPBOX)) +#define TQT_NO_VGROUPBOX #endif // Horizontal button groups -#if !defined(QT_NO_HBUTTONGROUP) && (defined(QT_NO_BUTTONGROUP)) -#define QT_NO_HBUTTONGROUP +#if !defined(TQT_NO_HBUTTONGROUP) && (defined(TQT_NO_BUTTONGROUP)) +#define TQT_NO_HBUTTONGROUP #endif // Server to play sound -#if !defined(QT_NO_QWS_SOUNDSERVER) && (defined(QT_NO_SOUND) || defined(QT_NO_DIR) || defined(QT_NO_DNS)) -#define QT_NO_QWS_SOUNDSERVER +#if !defined(TQT_NO_QWS_SOUNDSERVER) && (defined(TQT_NO_SOUND) || defined(TQT_NO_DIR) || defined(TQT_NO_DNS)) +#define TQT_NO_QWS_SOUNDSERVER #endif // TQHeader -#if !defined(QT_NO_HEADER) && (defined(QT_NO_STYLE) || defined(QT_NO_ICONSET)) -#define QT_NO_HEADER +#if !defined(TQT_NO_HEADER) && (defined(TQT_NO_STYLE) || defined(TQT_NO_ICONSET)) +#define TQT_NO_HEADER #endif // Vertical button groups -#if !defined(QT_NO_VBUTTONGROUP) && (defined(QT_NO_HBUTTONGROUP)) -#define QT_NO_VBUTTONGROUP +#if !defined(TQT_NO_VBUTTONGROUP) && (defined(TQT_NO_HBUTTONGROUP)) +#define TQT_NO_VBUTTONGROUP #endif // Hebrew Codec -#if !defined(QT_NO_CODEC_HEBREW) && (defined(QT_NO_CODECS) || defined(QT_NO_COMPLEXTEXT)) -#define QT_NO_CODEC_HEBREW +#if !defined(TQT_NO_CODEC_HEBREW) && (defined(TQT_NO_CODECS) || defined(TQT_NO_COMPLEXTEXT)) +#define TQT_NO_CODEC_HEBREW #endif // HTTP file access -#if !defined(QT_NO_NETWORKPROTOCOL_HTTP) && (defined(QT_NO_NETWORKPROTOCOL) || defined(QT_NO_DNS)) -#define QT_NO_NETWORKPROTOCOL_HTTP +#if !defined(TQT_NO_NETWORKPROTOCOL_HTTP) && (defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_DNS)) +#define TQT_NO_NETWORKPROTOCOL_HTTP #endif // Tool-buttons -#if !defined(QT_NO_TOOLBUTTON) && (defined(QT_NO_BUTTON) || defined(QT_NO_ICONSET) || defined(QT_NO_STYLE)) -#define QT_NO_TOOLBUTTON +#if !defined(TQT_NO_TOOLBUTTON) && (defined(TQT_NO_BUTTON) || defined(TQT_NO_ICONSET) || defined(TQT_NO_STYLE)) +#define TQT_NO_TOOLBUTTON #endif // Big Codecs (eg. CJK) -#if !defined(QT_NO_BIG_CODECS) && (defined(QT_NO_CODEC_HEBREW)) -#define QT_NO_BIG_CODECS +#if !defined(TQT_NO_BIG_CODECS) && (defined(TQT_NO_CODEC_HEBREW)) +#define TQT_NO_BIG_CODECS #endif // Experimental internal class -#if !defined(QT_NO_DIALOGBUTTONS) && (defined(QT_NO_LAYOUT) || defined(QT_NO_STYLE) || defined(QT_NO_PUSHBUTTON)) -#define QT_NO_DIALOGBUTTONS +#if !defined(TQT_NO_DIALOGBUTTONS) && (defined(TQT_NO_LAYOUT) || defined(TQT_NO_STYLE) || defined(TQT_NO_PUSHBUTTON)) +#define TQT_NO_DIALOGBUTTONS #endif // Document Object Model -#if !defined(QT_NO_DOM) && (defined(QT_NO_XML) || defined(QT_NO_MIME)) -#define QT_NO_DOM +#if !defined(TQT_NO_DOM) && (defined(TQT_NO_XML) || defined(TQT_NO_MIME)) +#define TQT_NO_DOM #endif // Scrollable view widgets -#if !defined(QT_NO_SCROLLVIEW) && (defined(QT_NO_SCROLLBAR) || defined(QT_NO_FRAME)) -#define QT_NO_SCROLLVIEW +#if !defined(TQT_NO_SCROLLVIEW) && (defined(TQT_NO_SCROLLBAR) || defined(TQT_NO_FRAME)) +#define TQT_NO_SCROLLVIEW #endif // Tab-bars -#if !defined(QT_NO_TABBAR) && (defined(QT_NO_TOOLBUTTON)) -#define QT_NO_TABBAR +#if !defined(TQT_NO_TABBAR) && (defined(TQT_NO_TOOLBUTTON)) +#define TQT_NO_TABBAR #endif // Drag and drop -#if !defined(QT_NO_DRAGANDDROP) && (defined(QT_NO_MIME) || defined(QT_NO_QWS_PROPERTIES) || defined(QT_NO_IMAGEIO_XPM)) -#define QT_NO_DRAGANDDROP +#if !defined(TQT_NO_DRAGANDDROP) && (defined(TQT_NO_MIME) || defined(TQT_NO_QWS_PROPERTIES) || defined(TQT_NO_IMAGEIO_XPM)) +#define TQT_NO_DRAGANDDROP #endif // TQGridView -#if !defined(QT_NO_GRIDVIEW) && (defined(QT_NO_SCROLLVIEW)) -#define QT_NO_GRIDVIEW +#if !defined(TQT_NO_GRIDVIEW) && (defined(TQT_NO_SCROLLVIEW)) +#define TQT_NO_GRIDVIEW #endif // Popup-menus -#if !defined(QT_NO_POPUPMENU) && (defined(QT_NO_MENUDATA) || defined(QT_NO_FRAME)) -#define QT_NO_POPUPMENU +#if !defined(TQT_NO_POPUPMENU) && (defined(TQT_NO_MENUDATA) || defined(TQT_NO_FRAME)) +#define TQT_NO_POPUPMENU #endif // TQCanvas -#if !defined(QT_NO_CANVAS) && (defined(QT_NO_SCROLLVIEW) || defined(QT_NO_BEZIER)) -#define QT_NO_CANVAS +#if !defined(TQT_NO_CANVAS) && (defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_BEZIER)) +#define TQT_NO_CANVAS #endif // Dynamic module linking -#if !defined(QT_NO_COMPONENT) && (defined(QT_NO_QUUID_STRING) || defined(QT_NO_SETTINGS) || defined(QT_NO_SPRINTF) || defined(QT_NO_LIBRARY) || defined(QT_NO_DATESTRING)) -#define QT_NO_COMPONENT +#if !defined(TQT_NO_COMPONENT) && (defined(TQT_NO_QUUID_STRING) || defined(TQT_NO_SETTINGS) || defined(TQT_NO_SPRINTF) || defined(TQT_NO_LIBRARY) || defined(TQT_NO_DATESTRING)) +#define TQT_NO_COMPONENT #endif // TQListBox -#if !defined(QT_NO_LISTBOX) && (defined(QT_NO_SCROLLVIEW) || defined(QT_NO_STRINGLIST)) -#define QT_NO_LISTBOX +#if !defined(TQT_NO_LISTBOX) && (defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_STRINGLIST)) +#define TQT_NO_LISTBOX #endif // Menu bars -#if !defined(QT_NO_MENUBAR) && (defined(QT_NO_POPUPMENU)) -#define QT_NO_MENUBAR +#if !defined(TQT_NO_MENUBAR) && (defined(TQT_NO_POPUPMENU)) +#define TQT_NO_MENUBAR #endif // TQMessageBox -#if !defined(QT_NO_MESSAGEBOX) && (defined(QT_NO_DIALOG) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LABEL)) -#define QT_NO_MESSAGEBOX +#if !defined(TQT_NO_MESSAGEBOX) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LABEL)) +#define TQT_NO_MESSAGEBOX #endif // FTP file access -#if !defined(QT_NO_NETWORKPROTOCOL_FTP) && (defined(QT_NO_NETWORKPROTOCOL) || defined(QT_NO_DNS) || defined(QT_NO_TEXTDATE)) -#define QT_NO_NETWORKPROTOCOL_FTP +#if !defined(TQT_NO_NETWORKPROTOCOL_FTP) && (defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_DNS) || defined(TQT_NO_TEXTDATE)) +#define TQT_NO_NETWORKPROTOCOL_FTP #endif // Spin boxes -#if !defined(QT_NO_SPINBOX) && (defined(QT_NO_RANGECONTROL) || defined(QT_NO_SPINWIDGET) || defined(QT_NO_LINEEDIT) || defined(QT_NO_VALIDATOR)) -#define QT_NO_SPINBOX +#if !defined(TQT_NO_SPINBOX) && (defined(TQT_NO_RANGECONTROL) || defined(TQT_NO_SPINWIDGET) || defined(TQT_NO_LINEEDIT) || defined(TQT_NO_VALIDATOR)) +#define TQT_NO_SPINBOX #endif // RichText (HTML) tables and images -#if !defined(QT_NO_TEXTCUSTOMITEM) && (defined(QT_NO_RICHTEXT) || defined(QT_NO_MIME)) -#define QT_NO_TEXTCUSTOMITEM +#if !defined(TQT_NO_TEXTCUSTOMITEM) && (defined(TQT_NO_RICHTEXT) || defined(TQT_NO_MIME)) +#define TQT_NO_TEXTCUSTOMITEM #endif // TQDateTimeEdit -#if !defined(QT_NO_DATETIMEEDIT) && (defined(QT_NO_RICHTEXT) || defined(QT_NO_SPINWIDGET) || defined(QT_NO_DATESTRING)) -#define QT_NO_DATETIMEEDIT +#if !defined(TQT_NO_DATETIMEEDIT) && (defined(TQT_NO_RICHTEXT) || defined(TQT_NO_SPINWIDGET) || defined(TQT_NO_DATESTRING)) +#define TQT_NO_DATETIMEEDIT #endif // TQTextCodecPlugin -#if !defined(QT_NO_TEXTCODECPLUGIN) && (defined(QT_NO_COMPONENT) || defined(QT_NO_TEXTCODEC)) -#define QT_NO_TEXTCODECPLUGIN +#if !defined(TQT_NO_TEXTCODECPLUGIN) && (defined(TQT_NO_COMPONENT) || defined(TQT_NO_TEXTCODEC)) +#define TQT_NO_TEXTCODECPLUGIN #endif // TQImageFormatPlugin -#if !defined(QT_NO_IMAGEFORMATPLUGIN) && (defined(QT_NO_COMPONENT) || defined(QT_NO_IMAGEIO)) -#define QT_NO_IMAGEFORMATPLUGIN +#if !defined(TQT_NO_IMAGEFORMATPLUGIN) && (defined(TQT_NO_COMPONENT) || defined(TQT_NO_IMAGEIO)) +#define TQT_NO_IMAGEFORMATPLUGIN #endif // TQSqlForm -#if !defined(QT_NO_SQL_FORM) && (defined(QT_NO_SQL) || defined(QT_NO_PROPERTIES)) -#define QT_NO_SQL_FORM +#if !defined(TQT_NO_SQL_FORM) && (defined(TQT_NO_SQL) || defined(TQT_NO_PROPERTIES)) +#define TQT_NO_SQL_FORM #endif // Scalable Vector Graphics (SVG) -#if !defined(QT_NO_SVG) && (defined(QT_NO_DOM) || defined(QT_NO_TRANSFORMATIONS) || defined(QT_NO_SPRINTF)) -#define QT_NO_SVG +#if !defined(TQT_NO_SVG) && (defined(TQT_NO_DOM) || defined(TQT_NO_TRANSFORMATIONS) || defined(TQT_NO_SPRINTF)) +#define TQT_NO_SVG #endif // TQIconView -#if !defined(QT_NO_ICONVIEW) && (defined(QT_NO_SCROLLVIEW) || defined(QT_NO_IMAGEIO_XPM) || defined(QT_NO_IMAGE_HEURISTIC_MASK)) -#define QT_NO_ICONVIEW +#if !defined(TQT_NO_ICONVIEW) && (defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_IMAGEIO_XPM) || defined(TQT_NO_IMAGE_HEURISTIC_MASK)) +#define TQT_NO_ICONVIEW #endif // Tab widgets -#if !defined(QT_NO_TABWIDGET) && (defined(QT_NO_TABBAR) || defined(QT_NO_WIDGETSTACK)) -#define QT_NO_TABWIDGET +#if !defined(TQT_NO_TABWIDGET) && (defined(TQT_NO_TABBAR) || defined(TQT_NO_WIDGETSTACK)) +#define TQT_NO_TABWIDGET #endif // "What's this" help -#if !defined(QT_NO_WHATSTHIS) && (defined(QT_NO_TOOLTIP) || defined(QT_NO_TOOLBUTTON)) -#define QT_NO_WHATSTHIS +#if !defined(TQT_NO_WHATSTHIS) && (defined(TQT_NO_TOOLTIP) || defined(TQT_NO_TOOLBUTTON)) +#define TQT_NO_WHATSTHIS #endif // TQWidgetPlugin -#if !defined(QT_NO_WIDGETPLUGIN) && (defined(QT_NO_COMPONENT) || defined(QT_NO_ICONSET)) -#define QT_NO_WIDGETPLUGIN +#if !defined(TQT_NO_WIDGETPLUGIN) && (defined(TQT_NO_COMPONENT) || defined(TQT_NO_ICONSET)) +#define TQT_NO_WIDGETPLUGIN #endif // TQProgressDialog -#if !defined(QT_NO_PROGRESSDIALOG) && (defined(QT_NO_SEMIMODAL) || defined(QT_NO_LABEL) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_PROGRESSBAR)) -#define QT_NO_PROGRESSDIALOG +#if !defined(TQT_NO_PROGRESSDIALOG) && (defined(TQT_NO_SEMIMODAL) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_PROGRESSBAR)) +#define TQT_NO_PROGRESSDIALOG #endif // Motif-plus style -#if !defined(QT_NO_STYLE_MOTIFPLUS) && (defined(QT_NO_STYLE_MOTIF) || defined(QT_NO_TRANSFORMATIONS) || defined(QT_NO_BUTTON) || defined(QT_NO_SCROLLBAR) || defined(QT_NO_SLIDER)) -#define QT_NO_STYLE_MOTIFPLUS +#if !defined(TQT_NO_STYLE_MOTIFPLUS) && (defined(TQT_NO_STYLE_MOTIF) || defined(TQT_NO_TRANSFORMATIONS) || defined(TQT_NO_BUTTON) || defined(TQT_NO_SCROLLBAR) || defined(TQT_NO_SLIDER)) +#define TQT_NO_STYLE_MOTIFPLUS #endif // Rich text edit -#if !defined(QT_NO_TEXTEDIT) && (defined(QT_NO_RICHTEXT) || defined(QT_NO_SCROLLVIEW)) -#define QT_NO_TEXTEDIT +#if !defined(TQT_NO_TEXTEDIT) && (defined(TQT_NO_RICHTEXT) || defined(TQT_NO_SCROLLVIEW)) +#define TQT_NO_TEXTEDIT #endif // TQWizard -#if !defined(QT_NO_WIZARD) && (defined(QT_NO_DIALOG) || defined(QT_NO_WIDGETSTACK) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LAYOUT) || defined(QT_NO_LABEL)) -#define QT_NO_WIZARD +#if !defined(TQT_NO_WIZARD) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LAYOUT) || defined(TQT_NO_LABEL)) +#define TQT_NO_WIZARD #endif // Multi-line edits -#if !defined(QT_NO_MULTILINEEDIT) && (defined(QT_NO_TEXTEDIT)) -#define QT_NO_MULTILINEEDIT +#if !defined(TQT_NO_MULTILINEEDIT) && (defined(TQT_NO_TEXTEDIT)) +#define TQT_NO_MULTILINEEDIT #endif // Rich text syntax highlighting -#if !defined(QT_NO_SYNTAXHIGHLIGHTER) && (defined(QT_NO_TEXTEDIT)) -#define QT_NO_SYNTAXHIGHLIGHTER +#if !defined(TQT_NO_SYNTAXHIGHLIGHTER) && (defined(TQT_NO_TEXTEDIT)) +#define TQT_NO_SYNTAXHIGHLIGHTER #endif // TQTextView -#if !defined(QT_NO_TEXTVIEW) && (defined(QT_NO_TEXTEDIT)) -#define QT_NO_TEXTVIEW +#if !defined(TQT_NO_TEXTVIEW) && (defined(TQT_NO_TEXTEDIT)) +#define TQT_NO_TEXTVIEW #endif // TQTabDialog -#if !defined(QT_NO_TABDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LAYOUT) || defined(QT_NO_TABWIDGET)) -#define QT_NO_TABDIALOG +#if !defined(TQT_NO_TABDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LAYOUT) || defined(TQT_NO_TABWIDGET)) +#define TQT_NO_TABDIALOG #endif // TQTextBrowser -#if !defined(QT_NO_TEXTBROWSER) && (defined(QT_NO_TEXTVIEW) || defined(QT_NO_MIME)) -#define QT_NO_TEXTBROWSER +#if !defined(TQT_NO_TEXTBROWSER) && (defined(TQT_NO_TEXTVIEW) || defined(TQT_NO_MIME)) +#define TQT_NO_TEXTBROWSER #endif // TQListView -#if !defined(QT_NO_LISTVIEW) && (defined(QT_NO_SCROLLVIEW) || defined(QT_NO_HEADER) || defined(QT_NO_LINEEDIT)) -#define QT_NO_LISTVIEW +#if !defined(TQT_NO_LISTVIEW) && (defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_HEADER) || defined(TQT_NO_LINEEDIT)) +#define TQT_NO_LISTVIEW #endif // TQComboBox -#if !defined(QT_NO_COMBOBOX) && (defined(QT_NO_LISTBOX) || defined(QT_NO_LINEEDIT) || defined(QT_NO_POPUPMENU)) -#define QT_NO_COMBOBOX +#if !defined(TQT_NO_COMBOBOX) && (defined(TQT_NO_LISTBOX) || defined(TQT_NO_LINEEDIT) || defined(TQT_NO_POPUPMENU)) +#define TQT_NO_COMBOBOX #endif // TQColorDialog -#if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_LABEL) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LINEEDIT) || defined(QT_NO_VALIDATOR) || defined(QT_NO_GRIDVIEW) || defined(QT_NO_LAYOUT)) -#define QT_NO_COLORDIALOG +#if !defined(TQT_NO_COLORDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LINEEDIT) || defined(TQT_NO_VALIDATOR) || defined(TQT_NO_GRIDVIEW) || defined(TQT_NO_LAYOUT)) +#define TQT_NO_COLORDIALOG #endif // Tool box -#if !defined(QT_NO_TOOLBOX) && (defined(QT_NO_ICONSET) || defined(QT_NO_SCROLLVIEW) || defined(QT_NO_TOOLTIP) || defined(QT_NO_LAYOUT) || defined(QT_NO_TOOLBUTTON)) -#define QT_NO_TOOLBOX +#if !defined(TQT_NO_TOOLBOX) && (defined(TQT_NO_ICONSET) || defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_TOOLTIP) || defined(TQT_NO_LAYOUT) || defined(TQT_NO_TOOLBUTTON)) +#define TQT_NO_TOOLBOX #endif // SGI style -#if !defined(QT_NO_STYLE_SGI) && (defined(QT_NO_STYLE_MOTIF) || defined(QT_NO_TRANSFORMATIONS) || defined(QT_NO_BUTTON) || defined(QT_NO_SCROLLBAR) || defined(QT_NO_SLIDER) || defined(QT_NO_LINEEDIT) || defined(QT_NO_MENUBAR)) -#define QT_NO_STYLE_SGI +#if !defined(TQT_NO_STYLE_SGI) && (defined(TQT_NO_STYLE_MOTIF) || defined(TQT_NO_TRANSFORMATIONS) || defined(TQT_NO_BUTTON) || defined(TQT_NO_SCROLLBAR) || defined(TQT_NO_SLIDER) || defined(TQT_NO_LINEEDIT) || defined(TQT_NO_MENUBAR)) +#define TQT_NO_STYLE_SGI #endif // TQErrorMessage -#if !defined(QT_NO_ERRORMESSAGE) && (defined(QT_NO_DIALOG) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LABEL) || defined(QT_NO_CHECKBOX) || defined(QT_NO_TEXTVIEW)) -#define QT_NO_ERRORMESSAGE +#if !defined(TQT_NO_ERRORMESSAGE) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LABEL) || defined(TQT_NO_CHECKBOX) || defined(TQT_NO_TEXTVIEW)) +#define TQT_NO_ERRORMESSAGE #endif // Main-windows -#if !defined(QT_NO_MAINWINDOW) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_POPUPMENU) || defined(QT_NO_TITLEBAR) || defined(QT_NO_RESIZEHANDLER) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_STATUSBAR)) -#define QT_NO_MAINWINDOW +#if !defined(TQT_NO_MAINWINDOW) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_POPUPMENU) || defined(TQT_NO_TITLEBAR) || defined(TQT_NO_RESIZEHANDLER) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_STATUSBAR)) +#define TQT_NO_MAINWINDOW #endif // Toolbars -#if !defined(QT_NO_TOOLBAR) && (defined(QT_NO_MAINWINDOW)) -#define QT_NO_TOOLBAR +#if !defined(TQT_NO_TOOLBAR) && (defined(TQT_NO_MAINWINDOW)) +#define TQT_NO_TOOLBAR #endif // TQAction -#if !defined(QT_NO_ACTION) && (defined(QT_NO_TOOLBUTTON) || defined(QT_NO_COMBOBOX)) -#define QT_NO_ACTION +#if !defined(TQT_NO_ACTION) && (defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_COMBOBOX)) +#define TQT_NO_ACTION #endif // TQTable -#if !defined(QT_NO_TABLE) && (defined(QT_NO_COMBOBOX) || defined(QT_NO_HEADER) || defined(QT_NO_CHECKBOX)) -#define QT_NO_TABLE +#if !defined(TQT_NO_TABLE) && (defined(TQT_NO_COMBOBOX) || defined(TQT_NO_HEADER) || defined(TQT_NO_CHECKBOX)) +#define TQT_NO_TABLE #endif // TQFontDialog -#if !defined(QT_NO_FONTDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_FONTDATABASE) || defined(QT_NO_COMBOBOX) || defined(QT_NO_LABEL) || defined(QT_NO_CHECKBOX) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_VGROUPBOX) || defined(QT_NO_VALIDATOR)) -#define QT_NO_FONTDIALOG +#if !defined(TQT_NO_FONTDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_FONTDATABASE) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_LABEL) || defined(TQT_NO_CHECKBOX) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_VGROUPBOX) || defined(TQT_NO_VALIDATOR)) +#define TQT_NO_FONTDIALOG #endif // TQInputDialog -#if !defined(QT_NO_INPUTDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_COMBOBOX) || defined(QT_NO_LABEL) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_SPINBOX) || defined(QT_NO_WIDGETSTACK) || defined(QT_NO_LAYOUT)) -#define QT_NO_INPUTDIALOG +#if !defined(TQT_NO_INPUTDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_SPINBOX) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_LAYOUT)) +#define TQT_NO_INPUTDIALOG #endif // SQL value editor widgets -#if !defined(QT_NO_SQL_EDIT_WIDGETS) && (defined(QT_NO_SQL) || defined(QT_NO_SPINBOX) || defined(QT_NO_COMBOBOX) || defined(QT_NO_CHECKBOX) || defined(QT_NO_DATETIMEEDIT)) -#define QT_NO_SQL_EDIT_WIDGETS +#if !defined(TQT_NO_SQL_EDIT_WIDGETS) && (defined(TQT_NO_SQL) || defined(TQT_NO_SPINBOX) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_CHECKBOX) || defined(TQT_NO_DATETIMEEDIT)) +#define TQT_NO_SQL_EDIT_WIDGETS #endif // TQPrintDialog -#if !defined(QT_NO_PRINTDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_LISTVIEW) || defined(QT_NO_PRINTER) || defined(QT_NO_COMBOBOX) || defined(QT_NO_LABEL) || defined(QT_NO_BUTTONGROUP) || defined(QT_NO_SPINBOX) || defined(QT_NO_RADIOBUTTON) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_DIR)) -#define QT_NO_PRINTDIALOG +#if !defined(TQT_NO_PRINTDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_LISTVIEW) || defined(TQT_NO_PRINTER) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_LABEL) || defined(TQT_NO_BUTTONGROUP) || defined(TQT_NO_SPINBOX) || defined(TQT_NO_RADIOBUTTON) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_DIR)) +#define TQT_NO_PRINTDIALOG #endif // TQFileDialog -#if !defined(QT_NO_FILEDIALOG) && (defined(QT_NO_MESSAGEBOX) || defined(QT_NO_LISTVIEW) || defined(QT_NO_NETWORKPROTOCOL) || defined(QT_NO_COMBOBOX) || defined(QT_NO_SEMIMODAL) || defined(QT_NO_REGEXP_CAPTURE) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_BUTTONGROUP) || defined(QT_NO_VBOX) || defined(QT_NO_SPLITTER) || defined(QT_NO_PROGRESSBAR) || defined(QT_NO_WIDGETSTACK) || defined(QT_NO_DATESTRING)) -#define QT_NO_FILEDIALOG +#if !defined(TQT_NO_FILEDIALOG) && (defined(TQT_NO_MESSAGEBOX) || defined(TQT_NO_LISTVIEW) || defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_SEMIMODAL) || defined(TQT_NO_REGEXP_CAPTURE) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_BUTTONGROUP) || defined(TQT_NO_VBOX) || defined(TQT_NO_SPLITTER) || defined(TQT_NO_PROGRESSBAR) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_DATESTRING)) +#define TQT_NO_FILEDIALOG #endif // SQL table widgets -#if !defined(QT_NO_SQL_VIEW_WIDGETS) && (defined(QT_NO_SQL_FORM) || defined(QT_NO_SQL_EDIT_WIDGETS) || defined(QT_NO_TABLE)) -#define QT_NO_SQL_VIEW_WIDGETS +#if !defined(TQT_NO_SQL_VIEW_WIDGETS) && (defined(TQT_NO_SQL_FORM) || defined(TQT_NO_SQL_EDIT_WIDGETS) || defined(TQT_NO_TABLE)) +#define TQT_NO_SQL_VIEW_WIDGETS #endif // TQWorkSpace -#if !defined(QT_NO_WORKSPACE) && (defined(QT_NO_SCROLLBAR) || defined(QT_NO_VBOX) || defined(QT_NO_TITLEBAR) || defined(QT_NO_RESIZEHANDLER) || defined(QT_NO_POPUPMENU) || defined(QT_NO_LABEL) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_MAINWINDOW) || defined(QT_NO_TOOLBAR) || defined(QT_NO_MENUBAR)) -#define QT_NO_WORKSPACE +#if !defined(TQT_NO_WORKSPACE) && (defined(TQT_NO_SCROLLBAR) || defined(TQT_NO_VBOX) || defined(TQT_NO_TITLEBAR) || defined(TQT_NO_RESIZEHANDLER) || defined(TQT_NO_POPUPMENU) || defined(TQT_NO_LABEL) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_MAINWINDOW) || defined(TQT_NO_TOOLBAR) || defined(TQT_NO_MENUBAR)) +#define TQT_NO_WORKSPACE #endif // Input method -#if !defined(QT_NO_IM) && (defined(QT_NO_STRINGLIST)) -#define QT_NO_IM +#if !defined(TQT_NO_IM) && (defined(TQT_NO_STRINGLIST)) +#define TQT_NO_IM #endif // Input method extensions -#if !defined(QT_NO_IM_EXTENSIONS) && (defined(QT_NO_IM) || defined(QT_NO_STRINGLIST)) -#define QT_NO_IM_EXTENSIONS +#if !defined(TQT_NO_IM_EXTENSIONS) && (defined(TQT_NO_IM) || defined(TQT_NO_STRINGLIST)) +#define TQT_NO_IM_EXTENSIONS #endif diff --git a/src/tools/ntqfileinfo.h b/src/tools/ntqfileinfo.h index 28f2aea98..3924a13fa 100644 --- a/src/tools/ntqfileinfo.h +++ b/src/tools/ntqfileinfo.h @@ -64,7 +64,7 @@ public: TQFileInfo(); TQFileInfo( const TQString &file ); TQFileInfo( const TQFile & ); -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQFileInfo( const TQDir &, const TQString &fileName ); #endif TQFileInfo( const TQFileInfo & ); @@ -74,7 +74,7 @@ public: void setFile( const TQString &file ); void setFile( const TQFile & ); -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR void setFile( const TQDir &, const TQString &fileName ); #endif bool exists() const; @@ -84,16 +84,16 @@ public: TQString filePath() const; TQString fileName() const; -#ifndef QT_NO_DIR //### +#ifndef TQT_NO_DIR //### TQString absFilePath() const; #endif TQString baseName( bool complete = FALSE ) const; TQString extension( bool complete = TRUE ) const; -#ifndef QT_NO_DIR //### +#ifndef TQT_NO_DIR //### TQString dirPath( bool absPath = FALSE ) const; #endif -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQDir dir( bool absPath = FALSE ) const; #endif bool isReadable() const; @@ -101,7 +101,7 @@ public: bool isExecutable() const; bool isHidden() const; -#ifndef QT_NO_DIR //### +#ifndef TQT_NO_DIR //### bool isRelative() const; bool convertToAbs(); #endif diff --git a/src/tools/ntqgdict.h b/src/tools/ntqgdict.h index 5465fd2f2..ace621ab3 100644 --- a/src/tools/ntqgdict.h +++ b/src/tools/ntqgdict.h @@ -114,7 +114,7 @@ public: TQPtrCollection::Item look_ascii( const char *key, TQPtrCollection::Item, int ); TQPtrCollection::Item look_int( long key, TQPtrCollection::Item, int ); TQPtrCollection::Item look_ptr( void *key, TQPtrCollection::Item, int ); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &read( TQDataStream & ); TQDataStream &write( TQDataStream & ) const; #endif @@ -144,7 +144,7 @@ protected: void statistics() const; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM virtual TQDataStream &read( TQDataStream &, TQPtrCollection::Item & ); virtual TQDataStream &write( TQDataStream &, TQPtrCollection::Item ) const; #endif diff --git a/src/tools/ntqglist.h b/src/tools/ntqglist.h index aaa0a4a3f..a3fce491e 100644 --- a/src/tools/ntqglist.h +++ b/src/tools/ntqglist.h @@ -71,7 +71,7 @@ friend class TQGVector; // needed by TQGVector::toList public: uint count() const; // return number of nodes -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &read( TQDataStream & ); // read list from stream TQDataStream &write( TQDataStream & ) const; // write list to stream #endif @@ -126,7 +126,7 @@ protected: virtual int compareItems( TQPtrCollection::Item, TQPtrCollection::Item ); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM virtual TQDataStream &read( TQDataStream &, TQPtrCollection::Item & ); virtual TQDataStream &write( TQDataStream &, TQPtrCollection::Item ) const; #endif @@ -211,7 +211,7 @@ inline TQPtrCollection::Item TQGList::clast() const TQGList stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQGList & ); Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGList & ); #endif diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index 282fecea2..e92c825fc 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -287,7 +287,7 @@ /* ??? */ # define Q_BROKEN_TEMPLATE_SPECIALIZATION /* no template classes in TQVariant */ -# define QT_NO_TEMPLATE_VARIANT +# define TQT_NO_TEMPLATE_VARIANT /* Wcc does not fill in functions needed by valuelists, maps, and valuestacks implicitly */ # define Q_FULL_TEMPLATE_INSTANTIATION @@ -295,9 +295,9 @@ # define Q_FULL_TEMPLATE_INSTANTIATION_MEMCMP /* these are not useful to our customers */ # define QT_QWS_NO_SHM -# define QT_NO_QWS_MULTIPROCESS -# define QT_NO_SQL -# define QT_NO_QWS_CURSOR +# define TQT_NO_QWS_MULTIPROCESS +# define TQT_NO_SQL +# define TQT_NO_QWS_CURSOR # endif #elif defined(__GNUC__) @@ -583,7 +583,7 @@ #elif defined(Q_OS_UNIX) # if defined(TQWS) # define Q_WS_QWS -# define QT_NO_QWS_IM +# define TQT_NO_QWS_IM # elif defined(Q_OS_MACX) # define Q_WS_MACX # else @@ -779,25 +779,25 @@ class TQDataStream; // prune to local config #include "ntqmodules.h" #ifndef TQT_MODULE_DIALOGS -# define QT_NO_DIALOG +# define TQT_NO_DIALOG #endif #ifndef TQT_MODULE_NETWORK -#define QT_NO_NETWORK +#define TQT_NO_NETWORK #endif #ifndef TQT_MODULE_CANVAS -# define QT_NO_CANVAS +# define TQT_NO_CANVAS #endif #ifndef TQT_MODULE_TABLE -#define QT_NO_TABLE +#define TQT_NO_TABLE #endif #ifndef TQT_MODULE_XML -# define QT_NO_XML +# define TQT_NO_XML #endif #ifndef TQT_MODULE_OPENGL -# define QT_NO_OPENGL +# define TQT_NO_OPENGL #endif #if !defined(TQT_MODULE_SQL) -# define QT_NO_SQL +# define TQT_NO_SQL #endif #if defined(Q_WS_MAC9) @@ -822,8 +822,8 @@ class TQDataStream; # endif #endif -#if !defined(Q_WS_QWS) && !defined(QT_NO_COP) -# define QT_NO_COP +#if !defined(Q_WS_QWS) && !defined(TQT_NO_COP) +# define TQT_NO_COP #endif #ifndef QT_H @@ -940,14 +940,14 @@ Q_EXPORT int qWinVersion(); // Debugging and error handling // -#if !defined(QT_NO_CHECK) +#if !defined(TQT_NO_CHECK) # define QT_CHECK_STATE // check state of objects etc. # define QT_CHECK_RANGE // check range of indexes etc. # define QT_CHECK_NULL // check null pointers # define QT_CHECK_MATH // check math functions #endif -#if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG) +#if !defined(TQT_NO_DEBUG) && !defined(QT_DEBUG) # define QT_DEBUG // display debug messages # if !defined(TQT_NO_COMPAT) // compatibility with TQt 2 # if !defined(NO_DEBUG) && !defined(DEBUG) @@ -1071,13 +1071,13 @@ Q_EXPORT const char *tqInstallPathSysconf(); /* Avoid some particularly useless warnings from some stupid compilers. To get ALL C++ compiler warnings, define QT_CC_WARNINGS or comment out - the line "#define QT_NO_WARNINGS" + the line "#define TQT_NO_WARNINGS" */ #if !defined(QT_CC_WARNINGS) -# define QT_NO_WARNINGS +# define TQT_NO_WARNINGS #endif -#if defined(QT_NO_WARNINGS) +#if defined(TQT_NO_WARNINGS) # if defined(Q_CC_MSVC) # pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data # pragma warning(disable: 4275) // non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier' diff --git a/src/tools/ntqgvector.h b/src/tools/ntqgvector.h index 40667c6aa..ad4b81f9e 100644 --- a/src/tools/ntqgvector.h +++ b/src/tools/ntqgvector.h @@ -50,7 +50,7 @@ class Q_EXPORT TQGVector : public TQPtrCollection // generic vector { friend class TQGList; // needed by TQGList::toVector public: -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &read( TQDataStream & ); // read vector from stream TQDataStream &write( TQDataStream & ) const; // write vector to stream #endif @@ -99,7 +99,7 @@ protected: void toList( TQGList * ) const; // put items in list -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM virtual TQDataStream &read( TQDataStream &, Item & ); virtual TQDataStream &write( TQDataStream &, Item ) const; #endif @@ -116,7 +116,7 @@ private: TQGVector stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQGVector & ); Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGVector & ); #endif diff --git a/src/tools/ntqlibrary.h b/src/tools/ntqlibrary.h index c6c92fd5c..046d86855 100644 --- a/src/tools/ntqlibrary.h +++ b/src/tools/ntqlibrary.h @@ -45,7 +45,7 @@ #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_LIBRARY +#ifndef TQT_NO_LIBRARY class TQLibraryPrivate; @@ -82,5 +82,5 @@ private: // Disabled copy constructor and operator= #define Q_DEFINED_QLIBRARY #include "ntqwinexport.h" -#endif //QT_NO_LIBRARY +#endif //TQT_NO_LIBRARY #endif //TQLIBRARY_H diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h index d098f79be..084fbd7cb 100644 --- a/src/tools/ntqmap.h +++ b/src/tools/ntqmap.h @@ -576,7 +576,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>: #ifdef QT_CHECK_RANGE -# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) +# if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) # define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" ) # define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() ); # else @@ -849,7 +849,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM template<class Key, class T> Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) { m.clear(); diff --git a/src/tools/ntqpair.h b/src/tools/ntqpair.h index 60f73f961..cc6cca22e 100644 --- a/src/tools/ntqpair.h +++ b/src/tools/ntqpair.h @@ -90,7 +90,7 @@ Q_INLINE_TEMPLATES TQPair<T1, T2> qMakePair( const T1& x, const T2& y ) return TQPair<T1, T2>( x, y ); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM template <class T1, class T2> inline TQDataStream& operator>>( TQDataStream& s, TQPair<T1, T2>& p ) { diff --git a/src/tools/ntqregexp.h b/src/tools/ntqregexp.h index d600e452f..c61437452 100644 --- a/src/tools/ntqregexp.h +++ b/src/tools/ntqregexp.h @@ -45,7 +45,7 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP class TQRegExpEngine; struct TQRegExpPrivate; @@ -70,7 +70,7 @@ public: void setPattern( const TQString& pattern ); bool caseSensitive() const; void setCaseSensitive( bool sensitive ); -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD bool wildcard() const; void setWildcard( bool wildcard ); #endif @@ -96,7 +96,7 @@ public: int searchRev( const TQString& str, int offset, CaretMode caretMode ) const; #endif int matchedLength() const; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int numCaptures() const; TQStringList capturedTexts(); TQString cap( int nth = 0 ); @@ -116,5 +116,5 @@ private: TQRegExpEngine *eng; TQRegExpPrivate *priv; }; -#endif // QT_NO_REGEXP +#endif // TQT_NO_REGEXP #endif // TQREGEXP_H diff --git a/src/tools/ntqsettings.h b/src/tools/ntqsettings.h index f6a30dacc..a788d35f2 100644 --- a/src/tools/ntqsettings.h +++ b/src/tools/ntqsettings.h @@ -46,7 +46,7 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_SETTINGS +#ifndef TQT_NO_SETTINGS class TQSettingsPrivate; @@ -155,5 +155,5 @@ private: friend class TQApplication; }; -#endif // QT_NO_SETTINGS +#endif // TQT_NO_SETTINGS #endif // TQSETTINGS_H diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h index b3c0a32cc..b1ad52b1a 100644 --- a/src/tools/ntqstring.h +++ b/src/tools/ntqstring.h @@ -46,7 +46,7 @@ #include "ntqcstring.h" #endif // QT_H -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII #include <limits.h> #endif @@ -64,7 +64,7 @@ #endif #endif -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF #include <stdarg.h> #endif @@ -206,7 +206,7 @@ public: #else ushort &unicode() { return ucs; } #endif -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII // like all ifdef'd code this is undocumented operator char() const { return latin1(); } #endif @@ -405,7 +405,7 @@ public: TQString( const TQString & ); // impl-shared copy TQString( const TQByteArray& ); // deep copy TQString( const TQChar* unicode, uint length ); // deep copy -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString( const char *str ); // deep copy #endif #ifndef TQT_NO_STL @@ -452,7 +452,7 @@ public: TQString arg( const TQString& a1, const TQString& a2, const TQString& a3, const TQString& a4 ) const; -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF TQString &sprintf( const char* format, ... ) #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 2, 3))) @@ -468,29 +468,29 @@ public: int find( TQChar c, int index=0, bool cs=TRUE ) const; int find( char c, int index=0, bool cs=TRUE ) const; int find( const TQString &str, int index=0, bool cs=TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int find( const TQRegExp &, int index=0 ) const; #endif -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII int find( const char* str, int index=0 ) const; #endif int findRev( TQChar c, int index=-1, bool cs=TRUE) const; int findRev( char c, int index=-1, bool cs=TRUE) const; int findRev( const TQString &str, int index=-1, bool cs=TRUE) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int findRev( const TQRegExp &, int index=-1 ) const; #endif -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII int findRev( const char* str, int index=-1 ) const; #endif int contains( TQChar c, bool cs=TRUE ) const; int contains( char c, bool cs=TRUE ) const { return contains(TQChar(c), cs); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII int contains( const char* str, bool cs=TRUE ) const; #endif int contains( const TQString &str, bool cs=TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int contains( const TQRegExp & ) const; #endif @@ -503,11 +503,11 @@ public: }; TQString section( TQChar sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const; TQString section( char sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const; -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString section( const char *in_sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const; #endif TQString section( const TQString &in_sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP TQString section( const TQRegExp ®, int start, int end = 0xffffffff, int flags = SectionDefault ) const; #endif @@ -525,7 +525,7 @@ public: TQString simplifyWhiteSpace() const; TQString &insert( uint index, const TQString & ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &insert( uint index, const TQByteArray & ); TQString &insert( uint index, const char * ); #endif @@ -535,21 +535,21 @@ public: TQString &append( char ); TQString &append( TQChar ); TQString &append( const TQString & ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &append( const TQByteArray & ); TQString &append( const char * ); #endif -#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII) TQString &append( const std::string& ); #endif TQString &prepend( char ); TQString &prepend( TQChar ); TQString &prepend( const TQString & ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &prepend( const TQByteArray & ); TQString &prepend( const char * ); #endif -#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII) TQString &prepend( const std::string& ); #endif TQString &remove( uint index, uint len ); @@ -563,10 +563,10 @@ public: TQString &remove( TQChar c ); TQString &remove( char c ) { return remove( TQChar(c) ); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &remove( const char * ); #endif -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP TQString &remove( const TQRegExp & ); #endif TQString &replace( uint index, uint len, const TQString & ); @@ -594,7 +594,7 @@ public: TQString &replace( const TQString &, const TQString & ); TQString &replace( const TQString &, const TQString &, bool ); #endif -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE TQString &replace( const TQRegExp &, const TQString & ); #endif TQString &replace( TQChar, TQChar ); @@ -632,11 +632,11 @@ public: void setExpand( uint index, TQChar c ); TQString &operator+=( const TQString &str ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &operator+=( const TQByteArray &str ); TQString &operator+=( const char *str ); #endif -#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII) TQString &operator+=( const std::string& ); #endif TQString &operator+=( TQChar c ); @@ -685,7 +685,7 @@ public: static int localeAwareCompare( const TQString& s1, const TQString& s2 ) { return s1.localeAwareCompare( s2 ); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif @@ -730,7 +730,7 @@ private: void checkSimpleText() const; void grow( uint newLength ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &insertHelper( uint index, const char *s, uint len=UINT_MAX ); TQString &operatorPlusEqHelper( const char *s, uint len2=UINT_MAX ); #endif @@ -828,7 +828,7 @@ public: /***************************************************************************** TQString stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif @@ -847,7 +847,7 @@ inline TQString TQString::section( TQChar sep, int start, int end, int flags ) c inline TQString TQString::section( char sep, int start, int end, int flags ) const { return section(TQChar(sep), start, end, flags); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString TQString::section( const char *in_sep, int start, int end, int flags ) const { return section(TQString(in_sep), start, end, flags); } #endif @@ -876,7 +876,7 @@ inline bool TQString::isEmpty() const inline TQString TQString::copy() const { return TQString( *this ); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::insert( uint index, const char *s ) { return insertHelper( index, s ); } @@ -896,12 +896,12 @@ inline TQString &TQString::prepend( TQChar c ) inline TQString &TQString::prepend( char c ) { return insert(0,c); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::prepend( const TQByteArray & s ) { return insert(0,s); } #endif -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::operator+=( const TQByteArray &s ) { int pos = s.find( 0 ); @@ -912,7 +912,7 @@ inline TQString &TQString::operator+=( const TQByteArray &s ) inline TQString &TQString::append( const TQString & s ) { return operator+=(s); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::append( const TQByteArray &s ) { return operator+=(s); } @@ -929,7 +929,7 @@ inline TQString &TQString::append( char c ) #ifndef TQT_NO_STL inline TQString &TQString::operator=( const std::string& str ) { return operator=(str.c_str()); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::operator+=( const std::string& s ) { return operator+=(s.c_str()); } inline TQString &TQString::append( const std::string& s ) @@ -986,7 +986,7 @@ inline int TQString::find( char c, int index, bool cs ) const inline int TQString::findRev( char c, int index, bool cs ) const { return findRev( TQChar(c), index, cs ); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline int TQString::find( const char* str, int index ) const { return find(TQString::fromAscii(str), index); } @@ -1005,7 +1005,7 @@ Q_EXPORT bool operator<=( const TQString &s1, const TQString &s2 ); Q_EXPORT bool operator==( const TQString &s1, const TQString &s2 ); Q_EXPORT bool operator>( const TQString &s1, const TQString &s2 ); Q_EXPORT bool operator>=( const TQString &s1, const TQString &s2 ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII Q_EXPORT bool operator!=( const TQString &s1, const char *s2 ); Q_EXPORT bool operator<( const TQString &s1, const char *s2 ); Q_EXPORT bool operator<=( const TQString &s1, const char *s2 ); @@ -1027,7 +1027,7 @@ Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 return tmp; } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII Q_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 ) { TQString tmp( s1 ); diff --git a/src/tools/ntqstringlist.h b/src/tools/ntqstringlist.h index b5f857d5c..5fc82435d 100644 --- a/src/tools/ntqstringlist.h +++ b/src/tools/ntqstringlist.h @@ -47,7 +47,7 @@ #include "ntqstrlist.h" #endif // QT_H -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST class TQRegExp; template <class T> class TQDeepCopy; @@ -65,7 +65,7 @@ public: TQStringList( const TQStringList& l ) : TQValueList<TQString>(l) { } TQStringList( const TQValueList<TQString>& l ) : TQValueList<TQString>(l) { } TQStringList( const TQString& i ) { append(i); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQStringList( const char* i ) { append(i); } #endif @@ -75,19 +75,19 @@ public: static TQStringList split( const TQString &sep, const TQString &str, bool allowEmptyEntries = FALSE ); static TQStringList split( const TQChar &sep, const TQString &str, bool allowEmptyEntries = FALSE ); -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP static TQStringList split( const TQRegExp &sep, const TQString &str, bool allowEmptyEntries = FALSE ); #endif TQString join( const TQString &sep ) const; TQStringList grep( const TQString &str, bool cs = TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP TQStringList grep( const TQRegExp &expr ) const; #endif TQStringList& gres( const TQString &before, const TQString &after, bool cs = TRUE ); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE TQStringList& gres( const TQRegExp &expr, const TQString &after ); #endif @@ -96,11 +96,11 @@ protected: friend class TQDeepCopy< TQStringList >; }; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM class TQDataStream; extern Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& ); extern Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& ); #endif -#endif // QT_NO_STRINGLIST +#endif // TQT_NO_STRINGLIST #endif // TQSTRINGLIST_H diff --git a/src/tools/ntqstrlist.h b/src/tools/ntqstrlist.h index 1f346ad5d..2d278a1e8 100644 --- a/src/tools/ntqstrlist.h +++ b/src/tools/ntqstrlist.h @@ -68,7 +68,7 @@ private: void deleteItem( TQPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) { return qstrcmp((const char*)s1, (const char*)s2); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &read( TQDataStream &s, TQPtrCollection::Item &d ) { s >> (char *&)d; return s; } TQDataStream &write( TQDataStream &s, TQPtrCollection::Item d ) const diff --git a/src/tools/ntqstrvec.h b/src/tools/ntqstrvec.h index f69f6273b..a1c538663 100644 --- a/src/tools/ntqstrvec.h +++ b/src/tools/ntqstrvec.h @@ -59,7 +59,7 @@ private: int compareItems( Item s1, Item s2 ) { return qstrcmp((const char*)s1, (const char*)s2); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &read( TQDataStream &s, Item &d ) { s >> (char *&)d; return s; } TQDataStream &write( TQDataStream &s, Item d ) const diff --git a/src/tools/ntqtextstream.h b/src/tools/ntqtextstream.h index 609cd0dcd..7e7345d91 100644 --- a/src/tools/ntqtextstream.h +++ b/src/tools/ntqtextstream.h @@ -47,7 +47,7 @@ #include <stdio.h> #endif // QT_H -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM class TQTextCodec; class TQTextDecoder; @@ -60,7 +60,7 @@ public: UnicodeReverse, RawUnicode, UnicodeUTF8 }; void setEncoding( Encoding ); -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC void setCodec( TQTextCodec* ); TQTextCodec *codec(); #endif @@ -337,5 +337,5 @@ Q_EXPORT inline TQTSManip qSetPrecision( int p ) return TQTSManip(func,p); } -#endif // QT_NO_TEXTSTREAM +#endif // TQT_NO_TEXTSTREAM #endif // TQTEXTSTREAM_H diff --git a/src/tools/ntqtl.h b/src/tools/ntqtl.h index ee601c157..a282b9c9c 100644 --- a/src/tools/ntqtl.h +++ b/src/tools/ntqtl.h @@ -47,7 +47,7 @@ #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM template <class T> class TQTextOStreamIterator { @@ -69,7 +69,7 @@ public: TQTextOStreamIterator<T>& operator++() { return *this; } TQTextOStreamIterator<T>& operator++(int) { return *this; } }; -#endif //QT_NO_TEXTSTREAM +#endif //TQT_NO_TEXTSTREAM template <class InputIterator, class OutputIterator> inline OutputIterator tqCopy( InputIterator _begin, InputIterator _end, diff --git a/src/tools/ntquuid.h b/src/tools/ntquuid.h index f518f3e75..317a0af82 100644 --- a/src/tools/ntquuid.h +++ b/src/tools/ntquuid.h @@ -101,7 +101,7 @@ struct Q_EXPORT TQUuid { memcpy( this, &uuid, sizeof(TQUuid) ); } -#ifndef QT_NO_QUUID_STRING +#ifndef TQT_NO_QUUID_STRING TQUuid( const TQString & ); TQUuid( const char * ); TQString toString() const; @@ -186,7 +186,7 @@ struct Q_EXPORT TQUuid uchar data4[ 8 ]; }; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & ); #endif diff --git a/src/tools/ntqvaluelist.h b/src/tools/ntqvaluelist.h index 677c0cf51..c6711830d 100644 --- a/src/tools/ntqvaluelist.h +++ b/src/tools/ntqvaluelist.h @@ -399,7 +399,7 @@ Q_INLINE_TEMPLATES void TQValueListPrivate<T>::clear() } #ifdef QT_CHECK_RANGE -# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE ) +# if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE ) # define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) tqWarning( "TQValueList: Warning invalid element" ) # define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() ); # else @@ -648,7 +648,7 @@ Q_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( const TQValueLis return *this; } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM template <class T> Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l ) { @@ -673,7 +673,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList< s << *it; return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #define Q_DEFINED_QVALUELIST #define Q_DEFINED_QVALUELIST diff --git a/src/tools/ntqvaluevector.h b/src/tools/ntqvaluevector.h index 7bc80c640..87dfd7482 100644 --- a/src/tools/ntqvaluevector.h +++ b/src/tools/ntqvaluevector.h @@ -542,7 +542,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::inser } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM template<class T> Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v ) { @@ -570,7 +570,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVecto s << *it; return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #define Q_DEFINED_QVALUEVECTOR #include "ntqwinexport.h" diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp index ec8503276..5fac8222b 100644 --- a/src/tools/qbitarray.cpp +++ b/src/tools/qbitarray.cpp @@ -629,7 +629,7 @@ TQBitArray operator^( const TQBitArray &a1, const TQBitArray &a2 ) \sa \link datastreamformat.html Format of the TQDataStream operators \endlink */ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &operator<<( TQDataStream &s, const TQBitArray &a ) { TQ_UINT32 len = a.size(); @@ -662,4 +662,4 @@ TQDataStream &operator>>( TQDataStream &s, TQBitArray &a ) return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h index afb122855..cc4e381f9 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/qcom_p.h @@ -60,7 +60,7 @@ #pragma GCC system_header #endif -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT class TQObject; struct TQUInterfaceDescription; @@ -339,6 +339,6 @@ public: \ # define Q_EXPORT_INTERFACE() Q_EXPORT_COMPONENT() #endif -#endif //QT_NO_COMPONENT +#endif //TQT_NO_COMPONENT #endif //TQCOM_P_H diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp index 60899a6ab..20366db9a 100644 --- a/src/tools/qcomlibrary.cpp +++ b/src/tools/qcomlibrary.cpp @@ -38,7 +38,7 @@ #include "qcomlibrary_p.h" -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT #include <ntqapplication.h> #include <ntqsettings.h> #include <ntqfileinfo.h> @@ -535,4 +535,4 @@ uint TQComLibrary::qtVersion() } -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT diff --git a/src/tools/qcomlibrary_p.h b/src/tools/qcomlibrary_p.h index 201ca476d..8d53e2952 100644 --- a/src/tools/qcomlibrary_p.h +++ b/src/tools/qcomlibrary_p.h @@ -56,7 +56,7 @@ #include "ntqlibrary.h" #endif // QT_H -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT class Q_EXPORT TQComLibrary : public TQLibrary { @@ -77,6 +77,6 @@ private: }; -#endif //QT_NO_COMPONENT +#endif //TQT_NO_COMPONENT #endif diff --git a/src/tools/qcomponentfactory.cpp b/src/tools/qcomponentfactory.cpp index 09bb358ad..12fe33e10 100644 --- a/src/tools/qcomponentfactory.cpp +++ b/src/tools/qcomponentfactory.cpp @@ -40,7 +40,7 @@ #include "qcomponentfactory_p.h" -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT #include "ntqsettings.h" #include <private/qcomlibrary_p.h> #include "ntqdir.h" @@ -352,4 +352,4 @@ bool TQComponentFactory::unregisterComponent( const TQUuid &cid ) return ok; } -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT diff --git a/src/tools/qcomponentfactory_p.h b/src/tools/qcomponentfactory_p.h index a157ffde8..0c343c74d 100644 --- a/src/tools/qcomponentfactory_p.h +++ b/src/tools/qcomponentfactory_p.h @@ -57,7 +57,7 @@ // // -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT class Q_EXPORT TQComponentFactory { @@ -71,6 +71,6 @@ public: static bool unregisterComponent( const TQUuid &cid ); }; -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT #endif // TQCOMPONENTFACTORY_P_H diff --git a/src/tools/qconfig-large.h b/src/tools/qconfig-large.h index 1ce4e78cc..1f169fe14 100644 --- a/src/tools/qconfig-large.h +++ b/src/tools/qconfig-large.h @@ -1,42 +1,42 @@ #ifndef QT_H #endif /* QT_H */ -#ifndef QT_NO_CODECS -#define QT_NO_CODECS +#ifndef TQT_NO_CODECS +#define TQT_NO_CODECS #endif -#define QT_NO_UNICODETABLES -#define QT_NO_IMAGEIO_BMP -#define QT_NO_IMAGEIO_PPM -#define QT_NO_ASYNC_IO -#define QT_NO_ASYNC_IMAGE_IO -/* #define QT_NO_FREETYPE */ -#define QT_NO_BDF -//#define QT_NO_FONTDATABASE +#define TQT_NO_UNICODETABLES +#define TQT_NO_IMAGEIO_BMP +#define TQT_NO_IMAGEIO_PPM +#define TQT_NO_ASYNC_IO +#define TQT_NO_ASYNC_IMAGE_IO +/* #define TQT_NO_FREETYPE */ +#define TQT_NO_BDF +//#define TQT_NO_FONTDATABASE #define TQT_NO_TRANSLATION -#define QT_NO_DRAGANDDROP -#define QT_NO_CLIPBOARD -#define QT_NO_SOUND -#define QT_NO_PROPERTIES -#define QT_NO_DNS -#define QT_NO_NETWORKPROTOCOL -#define QT_NO_URL -#define QT_NO_COLORNAMES -#define QT_NO_TRANSFORMATIONS -#define QT_NO_PRINTER -#define QT_NO_PICTURE -#define QT_NO_ICONVIEW -#define QT_NO_DIAL -#define QT_NO_WORKSPACE -#define QT_NO_TABLE -#define QT_NO_ACTION -#define QT_NO_STYLE_MOTIF -#define QT_NO_STYLE_PLATINUM -/* #define QT_NO_FILEDIALOG */ -#define QT_NO_FONTDIALOG -#define QT_NO_PRINTDIALOG -/* #define QT_NO_COLORDIALOG */ -#define QT_NO_INPUTDIALOG -/* #define QT_NO_MESSAGEBOX */ -#define QT_NO_PROGRESSDIALOG -/* #define QT_NO_TABDIALOG */ -#define QT_NO_WIZARD -#define QT_NO_EFFECTS +#define TQT_NO_DRAGANDDROP +#define TQT_NO_CLIPBOARD +#define TQT_NO_SOUND +#define TQT_NO_PROPERTIES +#define TQT_NO_DNS +#define TQT_NO_NETWORKPROTOCOL +#define TQT_NO_URL +#define TQT_NO_COLORNAMES +#define TQT_NO_TRANSFORMATIONS +#define TQT_NO_PRINTER +#define TQT_NO_PICTURE +#define TQT_NO_ICONVIEW +#define TQT_NO_DIAL +#define TQT_NO_WORKSPACE +#define TQT_NO_TABLE +#define TQT_NO_ACTION +#define TQT_NO_STYLE_MOTIF +#define TQT_NO_STYLE_PLATINUM +/* #define TQT_NO_FILEDIALOG */ +#define TQT_NO_FONTDIALOG +#define TQT_NO_PRINTDIALOG +/* #define TQT_NO_COLORDIALOG */ +#define TQT_NO_INPUTDIALOG +/* #define TQT_NO_MESSAGEBOX */ +#define TQT_NO_PROGRESSDIALOG +/* #define TQT_NO_TABDIALOG */ +#define TQT_NO_WIZARD +#define TQT_NO_EFFECTS diff --git a/src/tools/qconfig-medium.h b/src/tools/qconfig-medium.h index e10291188..23a305738 100644 --- a/src/tools/qconfig-medium.h +++ b/src/tools/qconfig-medium.h @@ -1,108 +1,108 @@ #ifndef QT_H #endif /* QT_H */ -#ifndef QT_NO_TEXTCODEC /* moc? */ -#define QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC /* moc? */ +#define TQT_NO_TEXTCODEC #endif -#define QT_NO_UNICODETABLES -#define QT_NO_IMAGEIO_BMP -#define QT_NO_IMAGEIO_PPM -/* #define QT_NO_IMAGEIO_PNG */ -#define QT_NO_ASYNC_IO -#define QT_NO_ASYNC_IMAGE_IO -/* #define QT_NO_FREETYPE */ -#define QT_NO_BDF -//#define QT_NO_FONTDATABASE +#define TQT_NO_UNICODETABLES +#define TQT_NO_IMAGEIO_BMP +#define TQT_NO_IMAGEIO_PPM +/* #define TQT_NO_IMAGEIO_PNG */ +#define TQT_NO_ASYNC_IO +#define TQT_NO_ASYNC_IMAGE_IO +/* #define TQT_NO_FREETYPE */ +#define TQT_NO_BDF +//#define TQT_NO_FONTDATABASE #define TQT_NO_TRANSLATION -#define QT_NO_DRAGANDDROP -#define QT_NO_CLIPBOARD -#define QT_NO_SOUND -#define QT_NO_PROPERTIES -#define QT_NO_DNS -#define QT_NO_NETWORKPROTOCOL -#define QT_NO_COLORNAMES -#define QT_NO_TRANSFORMATIONS -#define QT_NO_PRINTER -#define QT_NO_PICTURE -#define QT_NO_ICONVIEW -#define QT_NO_DIAL -#define QT_NO_WORKSPACE -#define QT_NO_TABLE -#define QT_NO_ACTION -#define QT_NO_STYLE_MOTIF -#define QT_NO_STYLE_PLATINUM -/* #define QT_NO_FILEDIALOG */ -#define QT_NO_FONTDIALOG -#define QT_NO_PRINTDIALOG -/* #define QT_NO_COLORDIALOG */ -#define QT_NO_INPUTDIALOG -/* #define QT_NO_MESSAGEBOX */ -#define QT_NO_PROGRESSDIALOG -/* #define QT_NO_TABDIALOG */ -#define QT_NO_WIZARD -#define QT_NO_EFFECTS - - -#define QT_NO_MIME -/* #define QT_NO_NETWORK //??? means single-process only */ - - -#define QT_NO_IMAGE_TRUECOLOR -/* #define QT_NO_IMAGE_SMOOTHSCALE //needed for iconset --> pushbutton */ -#define QT_NO_IMAGE_TEXT -#define QT_NO_DIR - -/* #define QT_NO_TEXTSTREAM */ -#define QT_NO_DATASTREAM -#define QT_NO_QWS_SAVEFONTS - -#define QT_NO_SESSIONMANAGER - - -/* #define QT_NO_DIALOG */ - -#define QT_NO_SEMIMODAL - -#define QT_NO_EFFECTS -#define QT_NO_COP - -#define QT_NO_QWS_PROPERTIES - -/* #define QT_NO_RANGECONTROL */ -/* #define QT_NO_SPLITTER */ -#define QT_NO_STATUSBAR -#define QT_NO_TABBAR -#define QT_NO_TOOLBAR -#define QT_NO_TOOLTIP -/* #define QT_NO_VALIDATOR */ -#define QT_NO_WHATSTHIS -#define QT_NO_WIDGETSTACK -#define QT_NO_ACCEL -#define QT_NO_SIZEGRIP -#define QT_NO_HEADER -#define QT_NO_WORKSPACE -#define QT_NO_LCDNUMBER -#define QT_NO_STYLE_MOTIF -#define QT_NO_STYLE_PLATINUM -#define QT_NO_PROGRESSBAR - -#define QT_NO_ICONVIEW -#define QT_NO_DIAL - -#define QT_NO_TABLE - -/* #define QT_NO_FILEDIALOG */ -#define QT_NO_FONTDIALOG -#define QT_NO_PRINTDIALOG -#define QT_NO_COLORDIALOG -#define QT_NO_INPUTDIALOG -/* #define QT_NO_MESSAGEBOX */ -#define QT_NO_PROGRESSDIALOG -/* #define QT_NO_TABDIALOG */ -#define QT_NO_WIZARD -#define QT_NO_EFFECTS - -/* #define QT_NO_QWS_HYDRO_WM_STYLE */ -#define QT_NO_QWS_BEOS_WM_STYLE -#define QT_NO_QWS_KDE2_WM_STYLE -#define QT_NO_QWS_KDE_WM_STYLE -/* #define QT_NO_QWS_WINDOWS_WM_STYLE */ +#define TQT_NO_DRAGANDDROP +#define TQT_NO_CLIPBOARD +#define TQT_NO_SOUND +#define TQT_NO_PROPERTIES +#define TQT_NO_DNS +#define TQT_NO_NETWORKPROTOCOL +#define TQT_NO_COLORNAMES +#define TQT_NO_TRANSFORMATIONS +#define TQT_NO_PRINTER +#define TQT_NO_PICTURE +#define TQT_NO_ICONVIEW +#define TQT_NO_DIAL +#define TQT_NO_WORKSPACE +#define TQT_NO_TABLE +#define TQT_NO_ACTION +#define TQT_NO_STYLE_MOTIF +#define TQT_NO_STYLE_PLATINUM +/* #define TQT_NO_FILEDIALOG */ +#define TQT_NO_FONTDIALOG +#define TQT_NO_PRINTDIALOG +/* #define TQT_NO_COLORDIALOG */ +#define TQT_NO_INPUTDIALOG +/* #define TQT_NO_MESSAGEBOX */ +#define TQT_NO_PROGRESSDIALOG +/* #define TQT_NO_TABDIALOG */ +#define TQT_NO_WIZARD +#define TQT_NO_EFFECTS + + +#define TQT_NO_MIME +/* #define TQT_NO_NETWORK //??? means single-process only */ + + +#define TQT_NO_IMAGE_TRUECOLOR +/* #define TQT_NO_IMAGE_SMOOTHSCALE //needed for iconset --> pushbutton */ +#define TQT_NO_IMAGE_TEXT +#define TQT_NO_DIR + +/* #define TQT_NO_TEXTSTREAM */ +#define TQT_NO_DATASTREAM +#define TQT_NO_QWS_SAVEFONTS + +#define TQT_NO_SESSIONMANAGER + + +/* #define TQT_NO_DIALOG */ + +#define TQT_NO_SEMIMODAL + +#define TQT_NO_EFFECTS +#define TQT_NO_COP + +#define TQT_NO_QWS_PROPERTIES + +/* #define TQT_NO_RANGECONTROL */ +/* #define TQT_NO_SPLITTER */ +#define TQT_NO_STATUSBAR +#define TQT_NO_TABBAR +#define TQT_NO_TOOLBAR +#define TQT_NO_TOOLTIP +/* #define TQT_NO_VALIDATOR */ +#define TQT_NO_WHATSTHIS +#define TQT_NO_WIDGETSTACK +#define TQT_NO_ACCEL +#define TQT_NO_SIZEGRIP +#define TQT_NO_HEADER +#define TQT_NO_WORKSPACE +#define TQT_NO_LCDNUMBER +#define TQT_NO_STYLE_MOTIF +#define TQT_NO_STYLE_PLATINUM +#define TQT_NO_PROGRESSBAR + +#define TQT_NO_ICONVIEW +#define TQT_NO_DIAL + +#define TQT_NO_TABLE + +/* #define TQT_NO_FILEDIALOG */ +#define TQT_NO_FONTDIALOG +#define TQT_NO_PRINTDIALOG +#define TQT_NO_COLORDIALOG +#define TQT_NO_INPUTDIALOG +/* #define TQT_NO_MESSAGEBOX */ +#define TQT_NO_PROGRESSDIALOG +/* #define TQT_NO_TABDIALOG */ +#define TQT_NO_WIZARD +#define TQT_NO_EFFECTS + +/* #define TQT_NO_QWS_HYDRO_WM_STYLE */ +#define TQT_NO_QWS_BEOS_WM_STYLE +#define TQT_NO_QWS_KDE2_WM_STYLE +#define TQT_NO_QWS_KDE_WM_STYLE +/* #define TQT_NO_QWS_WINDOWS_WM_STYLE */ diff --git a/src/tools/qconfig-minimal.h b/src/tools/qconfig-minimal.h index e08cd5e29..4a4b87899 100644 --- a/src/tools/qconfig-minimal.h +++ b/src/tools/qconfig-minimal.h @@ -1,97 +1,97 @@ #ifndef QT_H #endif /* QT_H */ -#ifndef QT_NO_CHECK -# define QT_NO_CHECK +#ifndef TQT_NO_CHECK +# define TQT_NO_CHECK #endif -#define QT_NO_PROCESS -#define QT_NO_PALETTE -#define QT_NO_ACTION -#ifndef QT_NO_TEXTCODEC /* moc? */ -#define QT_NO_TEXTCODEC +#define TQT_NO_PROCESS +#define TQT_NO_PALETTE +#define TQT_NO_ACTION +#ifndef TQT_NO_TEXTCODEC /* moc? */ +#define TQT_NO_TEXTCODEC #endif -#define QT_NO_UNICODETABLES -#define QT_NO_IMAGEIO_BMP -#define QT_NO_IMAGEIO_PPM -#define QT_NO_IMAGEIO_XBM -#define QT_NO_IMAGEIO_XPM -/* #define QT_NO_IMAGEIO_PNG //done by configure -no-png */ -#define QT_NO_ASYNC_IO -#define QT_NO_ASYNC_IMAGE_IO -/* //#define QT_NO_FREETYPE //done by configure -no-freetype */ -#define QT_NO_BDF -//#define QT_NO_FONTDATABASE +#define TQT_NO_UNICODETABLES +#define TQT_NO_IMAGEIO_BMP +#define TQT_NO_IMAGEIO_PPM +#define TQT_NO_IMAGEIO_XBM +#define TQT_NO_IMAGEIO_XPM +/* #define TQT_NO_IMAGEIO_PNG //done by configure -no-png */ +#define TQT_NO_ASYNC_IO +#define TQT_NO_ASYNC_IMAGE_IO +/* //#define TQT_NO_FREETYPE //done by configure -no-freetype */ +#define TQT_NO_BDF +//#define TQT_NO_FONTDATABASE #define TQT_NO_TRANSLATION -#define QT_NO_MIME -#define QT_NO_SOUND -/* #define QT_NO_PROPERTIES */ -#define QT_NO_QWS_CURSOR -#define QT_NO_CURSOR -#define QT_NO_QWS_GFX_SPEED -#define QT_NO_NETWORK -#define QT_NO_COLORNAMES -#define QT_NO_TRANSFORMATIONS -#define QT_NO_PRINTER -#define QT_NO_PICTURE -#define QT_NO_LAYOUT -#define QT_NO_DRAWUTIL -#define QT_NO_IMAGE_TRUECOLOR -#define QT_NO_IMAGE_SMOOTHSCALE -#define QT_NO_IMAGE_TEXT -#define QT_NO_DIR -#define QT_NO_QWS_MANAGER -#define QT_NO_TEXTSTREAM -#define QT_NO_DATASTREAM -#define QT_NO_QWS_SAVEFONTS -//#define QT_NO_STRINGLIST -#define QT_NO_TEMPLATE_VARIANT -#define QT_NO_SESSIONMANAGER -#define QT_NO_QWS_KEYBOARD -#define QT_NO_SYNTAXHIGHLIGHTER - -#define QT_NO_ACCEL -#define QT_NO_BUTTON -#define QT_NO_DIALOG -#define QT_NO_FRAME -#define QT_NO_SEMIMODAL - -#define QT_NO_STYLE -#define QT_NO_EFFECTS -#define QT_NO_COP - -#define QT_NO_SQL - -#define QT_NO_REGEXP_CAPTURE -#define QT_NO_REGEXP_WILDCARD - -#define QT_NO_VALIDATOR -#define QT_NO_SPRINTF - -#define QT_NO_REGEXP - -#define QT_NO_IMAGEIO - -/* #define QT_NO_VARIANT //needed for signals/slots */ - -#define QT_NO_RANGECONTROL -#define QT_NO_QUUID_STRING -#define QT_NO_SIGNALMAPPER - -#define QT_NO_WHEELEVENT -#define QT_NO_BEZIER - -#define QT_NO_QWS_MOUSE_AUTO -/* #define QT_NO_QWS_MOUSE_MANUAL */ - -#define QT_NO_IMAGE_DITHER_TO_1 -#define QT_NO_IMAGE_HEURISTIC_MASK -#define QT_NO_IMAGE_MIRROR +#define TQT_NO_MIME +#define TQT_NO_SOUND +/* #define TQT_NO_PROPERTIES */ +#define TQT_NO_QWS_CURSOR +#define TQT_NO_CURSOR +#define TQT_NO_QWS_GFX_SPEED +#define TQT_NO_NETWORK +#define TQT_NO_COLORNAMES +#define TQT_NO_TRANSFORMATIONS +#define TQT_NO_PRINTER +#define TQT_NO_PICTURE +#define TQT_NO_LAYOUT +#define TQT_NO_DRAWUTIL +#define TQT_NO_IMAGE_TRUECOLOR +#define TQT_NO_IMAGE_SMOOTHSCALE +#define TQT_NO_IMAGE_TEXT +#define TQT_NO_DIR +#define TQT_NO_QWS_MANAGER +#define TQT_NO_TEXTSTREAM +#define TQT_NO_DATASTREAM +#define TQT_NO_QWS_SAVEFONTS +//#define TQT_NO_STRINGLIST +#define TQT_NO_TEMPLATE_VARIANT +#define TQT_NO_SESSIONMANAGER +#define TQT_NO_QWS_KEYBOARD +#define TQT_NO_SYNTAXHIGHLIGHTER + +#define TQT_NO_ACCEL +#define TQT_NO_BUTTON +#define TQT_NO_DIALOG +#define TQT_NO_FRAME +#define TQT_NO_SEMIMODAL + +#define TQT_NO_STYLE +#define TQT_NO_EFFECTS +#define TQT_NO_COP + +#define TQT_NO_SQL + +#define TQT_NO_REGEXP_CAPTURE +#define TQT_NO_REGEXP_WILDCARD + +#define TQT_NO_VALIDATOR +#define TQT_NO_SPRINTF + +#define TQT_NO_REGEXP + +#define TQT_NO_IMAGEIO + +/* #define TQT_NO_VARIANT //needed for signals/slots */ + +#define TQT_NO_RANGECONTROL +#define TQT_NO_QUUID_STRING +#define TQT_NO_SIGNALMAPPER + +#define TQT_NO_WHEELEVENT +#define TQT_NO_BEZIER + +#define TQT_NO_QWS_MOUSE_AUTO +/* #define TQT_NO_QWS_MOUSE_MANUAL */ + +#define TQT_NO_IMAGE_DITHER_TO_1 +#define TQT_NO_IMAGE_HEURISTIC_MASK +#define TQT_NO_IMAGE_MIRROR #ifndef TQT_NO_STL # define TQT_NO_STL #endif -#define QT_NO_DATESTRING -#define QT_NO_WMATRIX +#define TQT_NO_DATESTRING +#define TQT_NO_WMATRIX -#define QT_NO_DIRECTPAINTER +#define TQT_NO_DIRECTPAINTER diff --git a/src/tools/qconfig-small.h b/src/tools/qconfig-small.h index 225098272..4190ec926 100644 --- a/src/tools/qconfig-small.h +++ b/src/tools/qconfig-small.h @@ -2,93 +2,93 @@ #ifndef QT_H #endif /* QT_H */ -#define QT_NO_ACTION -#ifndef QT_NO_TEXTCODEC /* moc? */ -#define QT_NO_TEXTCODEC +#define TQT_NO_ACTION +#ifndef TQT_NO_TEXTCODEC /* moc? */ +#define TQT_NO_TEXTCODEC #endif -#define QT_NO_UNICODETABLES -#define QT_NO_IMAGEIO_BMP -#define QT_NO_IMAGEIO_PPM -#define QT_NO_IMAGEIO_XBM -#define QT_NO_IMAGEIO_XPM -/* #define QT_NO_IMAGEIO_PNG //done by configure -no-png */ -#define QT_NO_ASYNC_IO -#define QT_NO_ASYNC_IMAGE_IO -/* #define QT_NO_FREETYPE //done by configure -no-freetype */ -#define QT_NO_BDF -//#define QT_NO_FONTDATABASE +#define TQT_NO_UNICODETABLES +#define TQT_NO_IMAGEIO_BMP +#define TQT_NO_IMAGEIO_PPM +#define TQT_NO_IMAGEIO_XBM +#define TQT_NO_IMAGEIO_XPM +/* #define TQT_NO_IMAGEIO_PNG //done by configure -no-png */ +#define TQT_NO_ASYNC_IO +#define TQT_NO_ASYNC_IMAGE_IO +/* #define TQT_NO_FREETYPE //done by configure -no-freetype */ +#define TQT_NO_BDF +//#define TQT_NO_FONTDATABASE #define TQT_NO_TRANSLATION -#define QT_NO_MIME -#define QT_NO_SOUND -#define QT_NO_PROPERTIES -#define QT_NO_SYNTAXHIGHLIGHTER - -#define QT_NO_QWS_GFX_SPEED -#define QT_NO_NETWORK /* ?????????????? */ -#define QT_NO_COLORNAMES -#define QT_NO_TRANSFORMATIONS -#define QT_NO_PRINTER -#define QT_NO_PICTURE - -#define QT_NO_IMAGE_TRUECOLOR -/* #define QT_NO_IMAGE_SMOOTHSCALE //needed for iconset --> pushbutton */ -#define QT_NO_IMAGE_TEXT -#define QT_NO_DIR - -#define QT_NO_TEXTSTREAM -#define QT_NO_DATASTREAM -#define QT_NO_QWS_SAVEFONTS -//#define QT_NO_STRINGLIST -#define QT_NO_SESSIONMANAGER - - -#define QT_NO_DIALOG - -#define QT_NO_SEMIMODAL - -/* #define QT_NO_STYLE //will require substantial work... */ - -#define QT_NO_EFFECTS -#define QT_NO_COP - -#define QT_NO_QWS_PROPERTIES - -#define QT_NO_RANGECONTROL -#define QT_NO_SPLITTER -#define QT_NO_STATUSBAR -#define QT_NO_TABBAR -#define QT_NO_TOOLBAR -#define QT_NO_TOOLTIP -#define QT_NO_VALIDATOR -#define QT_NO_WHATSTHIS -#define QT_NO_WIDGETSTACK -#define QT_NO_ACCEL -#define QT_NO_SIZEGRIP -#define QT_NO_HEADER -#define QT_NO_WORKSPACE -#define QT_NO_LCDNUMBER -#define QT_NO_STYLE_MOTIF -#define QT_NO_STYLE_PLATINUM -#define QT_NO_PROGRESSBAR - - -#define QT_NO_QWS_HYDRO_WM_STYLE -#define QT_NO_QWS_BEOS_WM_STYLE -#define QT_NO_QWS_KDE2_WM_STYLE -#define QT_NO_QWS_KDE_WM_STYLE -#define QT_NO_QWS_WINDOWS_WM_STYLE +#define TQT_NO_MIME +#define TQT_NO_SOUND +#define TQT_NO_PROPERTIES +#define TQT_NO_SYNTAXHIGHLIGHTER + +#define TQT_NO_QWS_GFX_SPEED +#define TQT_NO_NETWORK /* ?????????????? */ +#define TQT_NO_COLORNAMES +#define TQT_NO_TRANSFORMATIONS +#define TQT_NO_PRINTER +#define TQT_NO_PICTURE + +#define TQT_NO_IMAGE_TRUECOLOR +/* #define TQT_NO_IMAGE_SMOOTHSCALE //needed for iconset --> pushbutton */ +#define TQT_NO_IMAGE_TEXT +#define TQT_NO_DIR + +#define TQT_NO_TEXTSTREAM +#define TQT_NO_DATASTREAM +#define TQT_NO_QWS_SAVEFONTS +//#define TQT_NO_STRINGLIST +#define TQT_NO_SESSIONMANAGER + + +#define TQT_NO_DIALOG + +#define TQT_NO_SEMIMODAL + +/* #define TQT_NO_STYLE //will require substantial work... */ + +#define TQT_NO_EFFECTS +#define TQT_NO_COP + +#define TQT_NO_QWS_PROPERTIES + +#define TQT_NO_RANGECONTROL +#define TQT_NO_SPLITTER +#define TQT_NO_STATUSBAR +#define TQT_NO_TABBAR +#define TQT_NO_TOOLBAR +#define TQT_NO_TOOLTIP +#define TQT_NO_VALIDATOR +#define TQT_NO_WHATSTHIS +#define TQT_NO_WIDGETSTACK +#define TQT_NO_ACCEL +#define TQT_NO_SIZEGRIP +#define TQT_NO_HEADER +#define TQT_NO_WORKSPACE +#define TQT_NO_LCDNUMBER +#define TQT_NO_STYLE_MOTIF +#define TQT_NO_STYLE_PLATINUM +#define TQT_NO_PROGRESSBAR + + +#define TQT_NO_QWS_HYDRO_WM_STYLE +#define TQT_NO_QWS_BEOS_WM_STYLE +#define TQT_NO_QWS_KDE2_WM_STYLE +#define TQT_NO_QWS_KDE_WM_STYLE +#define TQT_NO_QWS_WINDOWS_WM_STYLE /* other widgets that could be removed: */ /* -#define QT_NO_MENUDATA +#define TQT_NO_MENUDATA */ /* possible options: */ /* -#define QT_NO_CURSOR -#define QT_NO_LAYOUT -#define QT_NO_QWS_MANAGER -#define QT_NO_QWS_KEYBOARD +#define TQT_NO_CURSOR +#define TQT_NO_LAYOUT +#define TQT_NO_QWS_MANAGER +#define TQT_NO_QWS_KEYBOARD */ diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp index 6bfaa9c36..b875e3017 100644 --- a/src/tools/qcstring.cpp +++ b/src/tools/qcstring.cpp @@ -52,7 +52,7 @@ #include <stdlib.h> #include <ctype.h> #include <limits.h> -#ifndef QT_NO_COMPRESS +#ifndef TQT_NO_COMPRESS #include "../3rdparty/zlib/zlib.h" #endif @@ -354,7 +354,7 @@ TQ_UINT16 tqChecksum( const char *data, uint len ) compressed byte array. */ -#ifndef QT_NO_COMPRESS +#ifndef TQT_NO_COMPRESS TQByteArray tqCompress( const uchar* data, int nbytes ) { if ( nbytes == 0 ) { @@ -428,7 +428,7 @@ TQByteArray tqCompress( const uchar* data, int nbytes ) the uncompressed byte array. */ -#ifndef QT_NO_COMPRESS +#ifndef TQT_NO_COMPRESS TQByteArray tqUncompress( const uchar* data, int nbytes ) { if ( !data ) { @@ -526,7 +526,7 @@ TQByteArray tqUncompress( const uchar* data, int nbytes ) \sa \link datastreamformat.html Format of the TQDataStream operators \endlink */ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &operator<<( TQDataStream &s, const TQByteArray &a ) { @@ -561,7 +561,7 @@ TQDataStream &operator>>( TQDataStream &s, TQByteArray &a ) return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM /***************************************************************************** TQCString member functions @@ -1793,7 +1793,7 @@ TQCString &TQCString::replace( char c1, char c2 ) } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /*! \overload @@ -1891,7 +1891,7 @@ TQCString &TQCString::replace( const TQRegExp &rx, const char *str ) setStr( d.ascii() ); return *this; } -#endif //QT_NO_REGEXP +#endif //TQT_NO_REGEXP /*! Returns the string converted to a \c long value. @@ -2291,7 +2291,7 @@ TQCString &TQCString::operator+=( char c ) /***************************************************************************** TQCString stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQCString @@ -2331,7 +2331,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCString &str ) s.readRawBytes( str.data(), (uint)len ); return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM /***************************************************************************** Documentation for related functions diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp index 7b4f605a7..aced16e9e 100644 --- a/src/tools/qdatastream.cpp +++ b/src/tools/qdatastream.cpp @@ -40,7 +40,7 @@ #include "ntqdatastream.h" -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM #include "ntqbuffer.h" #include <stdio.h> #include <ctype.h> @@ -1177,4 +1177,4 @@ TQDataStream &TQDataStream::writeRawBytes( const char *s, uint len ) return *this; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp index 235ba7457..e30f3e75c 100644 --- a/src/tools/qdatetime.cpp +++ b/src/tools/qdatetime.cpp @@ -69,7 +69,7 @@ static const char * const qt_shortMonthNames[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING /***************************************************************************** Some static function used by TQDate, TQTime and TQDateTime *****************************************************************************/ @@ -125,7 +125,7 @@ static TQString getFmtString( const TQString& f, const TQTime* dt = 0, const TQD buf = TQString::number( dd->month() ); } else if ( f == "MM" ) { buf = TQString::number( dd->month() ).rightJustify( 2, '0', TRUE ); -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE } else if ( f == "ddd" ) { buf = dd->shortDayName( dd->dayOfWeek() ); } else if ( f == "dddd" ) { @@ -195,7 +195,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa return buf; } -#endif // QT_NO_DATESTRING +#endif // TQT_NO_DATESTRING /***************************************************************************** TQDate member functions @@ -497,7 +497,7 @@ int TQDate::weekNumber( int *yearNumber ) const Use shortMonthName() instead. */ -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE /*! Returns the name of the \a month. @@ -693,11 +693,11 @@ TQString TQDate::longDayName( int weekday ) return TQString::null; } -#endif //QT_NO_TEXTDATE +#endif //TQT_NO_TEXTDATE -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING -#if !defined(QT_NO_SPRINTF) +#if !defined(TQT_NO_SPRINTF) /*! \overload @@ -761,7 +761,7 @@ TQString TQDate::toString( TQt::DateFormat f ) const return TQString::null; } default: -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE case TQt::TextDate: { TQString buf = shortDayName( dayOfWeek() ); @@ -781,7 +781,7 @@ TQString TQDate::toString( TQt::DateFormat f ) const } } } -#endif //QT_NO_SPRINTF +#endif //TQT_NO_SPRINTF /*! Returns the date as a string. The \a format parameter determines @@ -830,7 +830,7 @@ TQString TQDate::toString( const TQString& format ) const { return fmtDateTime( format, 0, this ); } -#endif //QT_NO_DATESTRING +#endif //TQT_NO_DATESTRING /*! Sets the date's year \a y, month \a m and day \a d. @@ -1058,7 +1058,7 @@ TQDate TQDate::currentDate( TQt::TimeSpec ts ) return d; } -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING /*! Returns the TQDate represented by the string \a s, using the format \a f, or an invalid date if the string cannot be parsed. @@ -1090,7 +1090,7 @@ TQDate TQDate::fromString( const TQString& s, TQt::DateFormat f ) } break; default: -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE case TQt::TextDate: { /* @@ -1138,7 +1138,7 @@ TQDate TQDate::fromString( const TQString& s, TQt::DateFormat f ) } return TQDate(); } -#endif //QT_NO_DATESTRING +#endif //TQT_NO_DATESTRING /*! \overload @@ -1368,8 +1368,8 @@ int TQTime::msec() const return ds % 1000; } -#ifndef QT_NO_DATESTRING -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_DATESTRING +#ifndef TQT_NO_SPRINTF /*! \overload @@ -1477,7 +1477,7 @@ TQString TQTime::toString( const TQString& format ) const { return fmtDateTime( format, this, 0 ); } -#endif //QT_NO_DATESTRING +#endif //TQT_NO_DATESTRING /*! Sets the time to hour \a h, minute \a m, seconds \a s and milliseconds \a ms. @@ -1653,7 +1653,7 @@ TQTime TQTime::currentTime( TQt::TimeSpec ts ) return t; } -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING /*! Returns the representation \a s as a TQTime using the format \a f, or an invalid time if this is not possible. @@ -2076,8 +2076,8 @@ void TQDateTime::setTime_t( time_t secsSince1Jan1970UTC, TQt::TimeSpec ts ) MSECS_PER_MIN * brokenDown->tm_min + 1000 * brokenDown->tm_sec; } -#ifndef QT_NO_DATESTRING -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_DATESTRING +#ifndef TQT_NO_SPRINTF /*! \overload @@ -2110,7 +2110,7 @@ TQString TQDateTime::toString( TQt::DateFormat f ) const if ( f == TQt::ISODate ) { return d.toString( TQt::ISODate ) + "T" + t.toString( TQt::ISODate ); } -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE else if ( f == TQt::TextDate ) { #ifndef Q_WS_WIN TQString buf = d.shortDayName( d.dayOfWeek() ); @@ -2222,7 +2222,7 @@ TQString TQDateTime::toString( const TQString& format ) const { return fmtDateTime( format, &t, &d ); } -#endif //QT_NO_DATESTRING +#endif //TQT_NO_DATESTRING /*! Returns a TQDateTime object containing a datetime \a ndays days @@ -2434,7 +2434,7 @@ TQDateTime TQDateTime::currentDateTime( TQt::TimeSpec ts ) return dt; } -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING /*! Returns the TQDateTime represented by the string \a s, using the format \a f, or an invalid datetime if this is not possible. @@ -2459,7 +2459,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f ) return TQDateTime( TQDate::fromString( s.mid(0,10), TQt::ISODate ), TQTime::fromString( s.mid(11), TQt::ISODate ) ); } -#if !defined(QT_NO_REGEXP) && !defined(QT_NO_TEXTDATE) +#if !defined(TQT_NO_REGEXP) && !defined(TQT_NO_TEXTDATE) else if ( f == TQt::TextDate ) { const int firstSpace = s.find(' '); TQString monthName( s.mid( firstSpace + 1, 3 ) ); @@ -2502,17 +2502,17 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f ) } return TQDateTime( date, time ); } -#endif //QT_NO_REGEXP +#endif //TQT_NO_REGEXP return TQDateTime(); } -#endif //QT_NO_DATESTRING +#endif //TQT_NO_DATESTRING /***************************************************************************** Date/time stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQDate @@ -2597,4 +2597,4 @@ TQDataStream &operator>>( TQDataStream &s, TQDateTime &dt ) s >> dt.d >> dt.t; return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp index 4079b7ea5..5b0c4c674 100644 --- a/src/tools/qdir.cpp +++ b/src/tools/qdir.cpp @@ -41,7 +41,7 @@ #include "qplatformdefs.h" #include "ntqdir.h" -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR #include <private/qdir_p.h> #include "ntqfileinfo.h" #include "ntqregexp.h" @@ -1387,4 +1387,4 @@ void TQDir::detach() } } -#endif // QT_NO_DIR +#endif // TQT_NO_DIR diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp index 5c421a3e3..87976bddd 100644 --- a/src/tools/qdir_unix.cpp +++ b/src/tools/qdir_unix.cpp @@ -41,7 +41,7 @@ #include "qplatformdefs.h" #include "ntqdir.h" -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR #include "qdir_p.h" #include "ntqfileinfo.h" @@ -325,4 +325,4 @@ const TQFileInfoList * TQDir::drives() return knownMemoryLeak; } -#endif //QT_NO_DIR +#endif //TQT_NO_DIR diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp index 288df5b67..763324d15 100644 --- a/src/tools/qfileinfo.cpp +++ b/src/tools/qfileinfo.cpp @@ -199,7 +199,7 @@ TQFileInfo::TQFileInfo( const TQFile &file ) \sa isRelative() */ -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQFileInfo::TQFileInfo( const TQDir &d, const TQString &fileName ) { fn = d.filePath( fileName ); @@ -332,7 +332,7 @@ void TQFileInfo::setFile( const TQFile &file ) \sa isRelative() */ -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR void TQFileInfo::setFile( const TQDir &d, const TQString &fileName ) { fn = d.filePath( fileName ); @@ -481,7 +481,7 @@ TQString TQFileInfo::extension( bool complete ) const \sa dirPath(), filePath(), fileName(), isRelative() */ -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQDir TQFileInfo::dir( bool absPath ) const { return TQDir( dirPath(absPath) ); @@ -550,7 +550,7 @@ bool TQFileInfo::isHidden() const the path is absolute (e.g. under Unix a path is absolute if it begins with a "/"). */ -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR bool TQFileInfo::isRelative() const { return TQDir::isRelativePath( fn ); @@ -656,7 +656,7 @@ TQDateTime TQFileInfo::lastRead() const } } -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR /*! Returns the absolute path including the file name. diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp index a78452fdf..0bf143845 100644 --- a/src/tools/qfileinfo_unix.cpp +++ b/src/tools/qfileinfo_unix.cpp @@ -358,7 +358,7 @@ void TQFileInfo::doStat() const \sa dir(), filePath(), fileName(), isRelative() */ -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQString TQFileInfo::dirPath( bool absPath ) const { TQString s; diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp index e794a43f1..e459eb35d 100644 --- a/src/tools/qgdict.cpp +++ b/src/tools/qgdict.cpp @@ -154,7 +154,7 @@ int TQGDict::hashKeyAscii( const char *key ) return index; } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \overload @@ -184,7 +184,7 @@ TQDataStream& TQGDict::write( TQDataStream &s, TQPtrCollection::Item ) const { return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM /***************************************************************************** TQGDict member functions @@ -887,7 +887,7 @@ void TQGDict::statistics() const /***************************************************************************** TQGDict stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &operator>>( TQDataStream &s, TQGDict &dict ) { return dict.read( s ); @@ -990,7 +990,7 @@ TQDataStream& TQGDict::write( TQDataStream &s ) const } return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM /***************************************************************************** TQGDictIterator member functions diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp index 3ed8bd93b..5456c7416 100644 --- a/src/tools/qglist.cpp +++ b/src/tools/qglist.cpp @@ -182,7 +182,7 @@ int TQGList::compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item it return item1 != item2; // compare pointers } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \overload Reads a collection/list item from the stream \a s and returns a reference @@ -213,7 +213,7 @@ TQDataStream &TQGList::write( TQDataStream &s, TQPtrCollection::Item ) const { return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM /***************************************************************************** TQGList member functions @@ -1283,7 +1283,7 @@ void TQGList::sort() TQGList stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &operator>>( TQDataStream &s, TQGList &list ) { // read list return list.read( s ); @@ -1353,7 +1353,7 @@ TQDataStream &TQGList::write( TQDataStream &s ) const return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp index 07074c9fd..8d7edf1d3 100644 --- a/src/tools/qglobal.cpp +++ b/src/tools/qglobal.cpp @@ -643,12 +643,12 @@ void fatal( const char *msg, ... ) error code will be used if possible. Use this method to handle failures in platform specific API calls. - This function does nothing when TQt is built with \c QT_NO_DEBUG + This function does nothing when TQt is built with \c TQT_NO_DEBUG defined. */ void tqSystemWarning( const char* msg, int code ) { -#ifndef QT_NO_DEBUG +#ifndef TQT_NO_DEBUG #if defined(Q_OS_WIN32) if ( code == -1 ) code = GetLastError(); diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp index 1e96cf8fe..c1d6e15f0 100644 --- a/src/tools/qgpluginmanager.cpp +++ b/src/tools/qgpluginmanager.cpp @@ -37,7 +37,7 @@ **********************************************************************/ #include "qgpluginmanager_p.h" -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT #include "qcomlibrary_p.h" #include "ntqmap.h" #include "ntqdir.h" @@ -549,4 +549,4 @@ TQRESULT TQGPluginManager::queryUnknownInterface(const TQString& feature, TQUnkn return plugin ? plugin->queryInterface( interfaceId, (TQUnknownInterface**)iface ) : TQE_NOINTERFACE; } -#endif //QT_NO_COMPONENT +#endif //TQT_NO_COMPONENT diff --git a/src/tools/qgpluginmanager_p.h b/src/tools/qgpluginmanager_p.h index 82bfdf053..371299e9a 100644 --- a/src/tools/qgpluginmanager_p.h +++ b/src/tools/qgpluginmanager_p.h @@ -59,7 +59,7 @@ // // -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp index 2c8b13d68..0253151a3 100644 --- a/src/tools/qgvector.cpp +++ b/src/tools/qgvector.cpp @@ -126,7 +126,7 @@ int TQGVector::compareItems( Item d1, Item d2 ) return d1 != d2; // compare pointers } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! Reads a collection/vector item from the stream \a s and returns a reference to the stream. @@ -155,7 +155,7 @@ TQDataStream &TQGVector::write( TQDataStream &s, Item ) const { // write item to stream return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM /***************************************************************************** TQGVector member functions @@ -540,7 +540,7 @@ void TQGVector::warningIndexRange( uint i ) /***************************************************************************** TQGVector stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &operator>>( TQDataStream &s, TQGVector &vec ) { // read vector return vec.read( s ); @@ -595,4 +595,4 @@ bool TQGVector::operator==( const TQGVector &v ) const return TRUE; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp index 80a328d8b..2181f7fc5 100644 --- a/src/tools/qlibrary.cpp +++ b/src/tools/qlibrary.cpp @@ -43,7 +43,7 @@ #include <ntqstringlist.h> #include <ntqfile.h> -#ifndef QT_NO_LIBRARY +#ifndef TQT_NO_LIBRARY // uncomment this to get error messages //#define QT_DEBUG_COMPONENT 1 @@ -59,7 +59,7 @@ #if (defined(Q_WS_WIN) && !defined(QT_MAKEDLL)) \ || (defined(Q_OS_FREEBSD) && defined(Q_CC_INTEL)) \ || (defined(Q_OS_IRIX) && defined(Q_CC_GNU)) -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #endif TQLibraryPrivate::TQLibraryPrivate( TQLibrary *lib ) @@ -339,7 +339,7 @@ bool TQLibrary::unload() if ( !d->pHnd ) return TRUE; -#if !defined(QT_NO_LIBRARY_UNLOAD) +#if !defined(TQT_NO_LIBRARY_UNLOAD) if ( !d->freeLibrary() ) { # if defined(QT_DEBUG_COMPONENT) tqWarning( "%s could not be unloaded", (const char*) TQFile::encodeName(library()) ); @@ -440,4 +440,4 @@ TQString TQLibrary::library() const #endif return filename; } -#endif //QT_NO_LIBRARY +#endif //TQT_NO_LIBRARY diff --git a/src/tools/qlibrary_p.h b/src/tools/qlibrary_p.h index c2e4166b1..c494f16a3 100644 --- a/src/tools/qlibrary_p.h +++ b/src/tools/qlibrary_p.h @@ -55,7 +55,7 @@ #include "ntqlibrary.h" -#ifndef QT_NO_LIBRARY +#ifndef TQT_NO_LIBRARY #ifndef QT_H #include "ntqwindowdefs.h" @@ -80,5 +80,5 @@ private: TQLibrary *library; }; -#endif // QT_NO_LIBRARY +#endif // TQT_NO_LIBRARY #endif // TQLIBRARY_P_H diff --git a/src/tools/qlibrary_unix.cpp b/src/tools/qlibrary_unix.cpp index 09962d283..8c08772ac 100644 --- a/src/tools/qlibrary_unix.cpp +++ b/src/tools/qlibrary_unix.cpp @@ -41,7 +41,7 @@ #include "qplatformdefs.h" #include "private/qlibrary_p.h" -#ifndef QT_NO_LIBRARY +#ifndef TQT_NO_LIBRARY #if defined(QT_AOUT_UNDERSCORE) #include <string.h> diff --git a/src/tools/qpluginmanager_p.h b/src/tools/qpluginmanager_p.h index 23dc4b8e9..8c29aaf84 100644 --- a/src/tools/qpluginmanager_p.h +++ b/src/tools/qpluginmanager_p.h @@ -57,7 +57,7 @@ #include "qgpluginmanager_p.h" #endif // QT_H -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT template<class Type> class TQPluginManager : public TQGPluginManager @@ -71,6 +71,6 @@ public: } }; -#endif //QT_NO_COMPONENT +#endif //TQT_NO_COMPONENT #endif //TQPLUGINMANAGER_P_H diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp index 7adf03768..9d3653969 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -40,7 +40,7 @@ #include "ntqregexp.h" -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP #include "ntqmemarray.h" #include "ntqbitarray.h" @@ -746,7 +746,7 @@ static void mergeInto( TQMemArray<int> *a, const TQMemArray<int>& b ) int bsize = b.size(); if ( asize == 0 ) { *a = b.copy(); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM } else if ( bsize == 1 && (*a)[asize - 1] < b[0] ) { a->resize( asize + 1 ); (*a)[asize] = b[0]; @@ -802,7 +802,7 @@ static int at( const TQMap<int, int>& m, int k ) return *it; } -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD /* Translates a wildcard pattern to an equivalent regular expression pattern (e.g., *.cpp to .*\.cpp). @@ -864,7 +864,7 @@ static TQString wc2rx( const TQString& wc_str ) class TQRegExpEngine : public TQShared { public: -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS /* The class CharClass represents a set of characters, such as can be found in regular expressions (e.g., [a-z] denotes the set @@ -886,7 +886,7 @@ public: void addSingleton( ushort ch ) { addRange( ch, ch ); } bool in( TQChar ch ) const; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM const TQMemArray<int>& firstOccurrence() const { return occ1; } #endif @@ -908,7 +908,7 @@ public: int c; // character classes TQMemArray<Range> r; // character ranges bool n; // negative? -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM TQMemArray<int> occ1; // first-occurrence array #endif }; @@ -917,7 +917,7 @@ public: { int dummy; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM CharClass() { occ1.fill( 0, NumBadChars ); } const TQMemArray<int>& firstOccurrence() const { return occ1; } @@ -928,7 +928,7 @@ public: TQRegExpEngine( bool caseSensitive ) { setup( caseSensitive ); } TQRegExpEngine( const TQString& rx, bool caseSensitive ); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM ~TQRegExpEngine(); #endif @@ -942,18 +942,18 @@ public: int createState( TQChar ch ); int createState( const CharClass& cc ); -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF int createState( int bref ); #endif void addCatTransitions( const TQMemArray<int>& from, const TQMemArray<int>& to ); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE void addPlusTransitions( const TQMemArray<int>& from, const TQMemArray<int>& to, int atom ); #endif -#ifndef QT_NO_REGEXP_ANCHOR_ALT +#ifndef TQT_NO_REGEXP_ANCHOR_ALT int anchorAlternation( int a, int b ); int anchorConcatenation( int a, int b ); #else @@ -962,7 +962,7 @@ public: #endif void addAnchors( int from, int to, int a ); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM void heuristicallyChooseHeuristic(); #endif @@ -981,7 +981,7 @@ private: */ struct State { -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int atom; // which atom does this state belong to? #endif int match; // what does it match? (see CharClassBit and BackRefBit) @@ -989,7 +989,7 @@ private: TQMap<int, int> *reenter; // atoms reentered when transiting out TQMap<int, int> *anchors; // anchors met when transiting out -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE State( int a, int m ) : atom( a ), match( m ), reenter( 0 ), anchors( 0 ) { } #else @@ -999,7 +999,7 @@ private: ~State() { delete reenter; delete anchors; } }; -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD /* The struct Lookahead represents a lookahead a la Perl (e.g., (?=foo) and (?!bar)). @@ -1015,7 +1015,7 @@ private: }; #endif -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /* The struct Atom represents one node in the hierarchy of regular expression atoms. @@ -1027,7 +1027,7 @@ private: }; #endif -#ifndef QT_NO_REGEXP_ANCHOR_ALT +#ifndef TQT_NO_REGEXP_ANCHOR_ALT /* The struct AnchorAlternation represents a pair of anchors with OR semantics. @@ -1057,22 +1057,22 @@ private: Anchor_LookaheadMask = ( Anchor_FirstLookahead - 1 ) ^ ( (Anchor_FirstLookahead << MaxLookaheads) - 1 ) }; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int startAtom( bool capture ); void finishAtom( int atom ) { cf = f[atom].parent; } #endif -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD int addLookahead( TQRegExpEngine *eng, bool negative ); #endif -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE bool isBetterCapture( const int *begin1, const int *end1, const int *begin2, const int *end2 ); #endif bool testAnchor( int i, int a, const int *capBegin ); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM bool goodStringMatch(); bool badCharMatch(); #else @@ -1082,33 +1082,33 @@ private: TQPtrVector<State> s; // array of states int ns; // number of states -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE TQMemArray<Atom> f; // atom hierarchy int nf; // number of atoms int cf; // current atom #endif int officialncap; // number of captures, seen from the outside int ncap; // number of captures, seen from the inside -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS TQPtrVector<CharClass> cl; // array of character classes #endif -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD TQPtrVector<Lookahead> ahead; // array of lookaheads #endif -#ifndef QT_NO_REGEXP_ANCHOR_ALT +#ifndef TQT_NO_REGEXP_ANCHOR_ALT TQMemArray<AnchorAlternation> aa; // array of (a, b) pairs of anchors #endif -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM bool caretAnchored; // does the regexp start with ^? bool trivial; // is the good-string all that needs to match? #endif bool valid; // is the regular expression valid? bool cs; // case sensitive? -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF int nbrefs; // number of back-references #endif -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM bool useGoodStringHeuristic; // use goodStringMatch? otherwise badCharMatch int goodEarlyStart; // the index where goodStr can first occur in a match @@ -1137,7 +1137,7 @@ private: void clear() { operator=( Box(eng) ); } void set( TQChar ch ); void set( const CharClass& cc ); -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF void set( int bref ); #endif @@ -1146,7 +1146,7 @@ private: void plus( int atom ); void opt(); void catAnchor( int a ); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM void setupHeuristics(); #endif @@ -1164,7 +1164,7 @@ private: TQMap<int, int> ranchors; // the right anchors int skipanchors; // the anchors to match if the box is skipped -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM int earlyStart; // the index where str can first occur int lateStart; // the index where str can last occur TQString str; // a string that has to occur in any match @@ -1174,7 +1174,7 @@ private: #endif int minl; // the minimum length of this box -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM TQMemArray<int> occ1; // first-occurrence array #endif }; @@ -1189,10 +1189,10 @@ private: Tok_Char = 0x10000, Tok_BackRef = 0x20000 }; int getChar(); int getEscape(); -#ifndef QT_NO_REGEXP_INTERVAL +#ifndef TQT_NO_REGEXP_INTERVAL int getRep( int def ); #endif -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD void skipChars( int n ); #endif void error( const char *msg ); @@ -1244,7 +1244,7 @@ private: int *mmCapEnd; // end of captures for a next state int *mmSlideTab; // bump-along slide table for bad-character heuristic int mmSlideTabSize; // size of slide table -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF TQIntDict<int> mmSleeping; // dictionary of back-reference sleepers #endif int mmMatchLen; // length of match @@ -1252,21 +1252,21 @@ private: }; TQRegExpEngine::TQRegExpEngine( const TQString& rx, bool caseSensitive ) -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF : mmSleeping( 101 ) #endif { setup( caseSensitive ); valid = ( parse(rx.unicode(), rx.length()) == (int) rx.length() ); if ( !valid ) { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM trivial = FALSE; #endif error( RXERR_LEFTDELIM ); } } -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM TQRegExpEngine::~TQRegExpEngine() { } @@ -1282,7 +1282,7 @@ void TQRegExpEngine::match( const TQString& str, int pos, bool minimal, { bool matched = FALSE; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM if ( trivial && !oneTest ) { mmPos = str.find( goodStr, pos, cs ); mmMatchLen = goodStr.length(); @@ -1302,7 +1302,7 @@ void TQRegExpEngine::match( const TQString& str, int pos, bool minimal, mmOneTestMatchedLen = 0; if ( valid && mmPos >= 0 && mmPos <= mmLen ) { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM if ( oneTest ) { matched = matchHere(); } else { @@ -1351,7 +1351,7 @@ int TQRegExpEngine::createState( TQChar ch ) int TQRegExpEngine::createState( const CharClass& cc ) { -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS int n = cl.size(); cl.resize( n + 1 ); cl.insert( n, new CharClass(cc) ); @@ -1362,7 +1362,7 @@ int TQRegExpEngine::createState( const CharClass& cc ) #endif } -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF int TQRegExpEngine::createState( int bref ) { if ( bref > nbrefs ) { @@ -1393,7 +1393,7 @@ void TQRegExpEngine::addCatTransitions( const TQMemArray<int>& from, } } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE void TQRegExpEngine::addPlusTransitions( const TQMemArray<int>& from, const TQMemArray<int>& to, int atom ) { @@ -1414,7 +1414,7 @@ void TQRegExpEngine::addPlusTransitions( const TQMemArray<int>& from, } #endif -#ifndef QT_NO_REGEXP_ANCHOR_ALT +#ifndef TQT_NO_REGEXP_ANCHOR_ALT /* Returns an anchor that means a OR b. */ @@ -1424,7 +1424,7 @@ int TQRegExpEngine::anchorAlternation( int a, int b ) return a & b; int n = aa.size(); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM if ( n > 0 && aa[n - 1].a == a && aa[n - 1].b == b ) return Anchor_Alternation | ( n - 1 ); #endif @@ -1465,7 +1465,7 @@ void TQRegExpEngine::addAnchors( int from, int to, int a ) st->anchors->insert( to, a ); } -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM /* This function chooses between the good-string and the bad-character heuristics. It computes two scores and chooses the heuristic with @@ -1522,13 +1522,13 @@ void TQRegExpEngine::dump() const tqDebug( " %d%s", i, i == InitialState ? " (initial)" : i == FinalState ? " (final)" : "" ); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE tqDebug( " in atom %d", s[i]->atom ); #endif int m = s[i]->match; if ( (m & CharClassBit) != 0 ) { tqDebug( " match character class %d", m ^ CharClassBit ); -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS cl[m ^ CharClassBit]->dump(); #else tqDebug( " negative character class" ); @@ -1549,14 +1549,14 @@ void TQRegExpEngine::dump() const tqDebug( " [anchors 0x%.8x]", (*s[i]->anchors)[next] ); } } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE if ( nf > 0 ) { tqDebug( " Atom Parent Capture" ); for ( i = 0; i < nf; i++ ) tqDebug( " %6d %6d %6d", i, f[i].parent, f[i].capture ); } #endif -#ifndef QT_NO_REGEXP_ANCHOR_ALT +#ifndef TQT_NO_REGEXP_ANCHOR_ALT for ( i = 0; i < (int) aa.size(); i++ ) tqDebug( " Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a, aa[i].b ); @@ -1569,29 +1569,29 @@ void TQRegExpEngine::setup( bool caseSensitive ) s.setAutoDelete( TRUE ); s.resize( 32 ); ns = 0; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE f.resize( 32 ); nf = 0; cf = -1; #endif officialncap = 0; ncap = 0; -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS cl.setAutoDelete( TRUE ); #endif -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD ahead.setAutoDelete( TRUE ); #endif -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM caretAnchored = TRUE; trivial = TRUE; #endif valid = FALSE; cs = caseSensitive; -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF nbrefs = 0; #endif -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM useGoodStringHeuristic = TRUE; minl = 0; occ1.fill( 0, NumBadChars ); @@ -1602,7 +1602,7 @@ int TQRegExpEngine::setupState( int match ) { if ( (ns & (ns + 1)) == 0 && ns + 1 >= (int) s.size() ) s.resize( (ns + 1) << 1 ); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE s.insert( ns, new State(cf, match) ); #else s.insert( ns, new State(match) ); @@ -1610,7 +1610,7 @@ int TQRegExpEngine::setupState( int match ) return ns++; } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /* Functions startAtom() and finishAtom() should be called to delimit atoms. When a state is created, it is assigned to the current atom. @@ -1627,7 +1627,7 @@ int TQRegExpEngine::startAtom( bool capture ) } #endif -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD /* Creates a lookahead anchor. */ @@ -1644,7 +1644,7 @@ int TQRegExpEngine::addLookahead( TQRegExpEngine *eng, bool negative ) } #endif -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /* We want the longest leftmost captures. */ @@ -1671,7 +1671,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin ) { int j; -#ifndef QT_NO_REGEXP_ANCHOR_ALT +#ifndef TQT_NO_REGEXP_ANCHOR_ALT if ( (a & Anchor_Alternation) != 0 ) { return testAnchor( i, aa[a ^ Anchor_Alternation].a, capBegin ) || testAnchor( i, aa[a ^ Anchor_Alternation].b, capBegin ); @@ -1686,7 +1686,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin ) if ( mmPos + i != mmLen ) return FALSE; } -#ifndef QT_NO_REGEXP_ESCAPE +#ifndef TQT_NO_REGEXP_ESCAPE if ( (a & (Anchor_Word | Anchor_NonWord)) != 0 ) { bool before = FALSE; bool after = FALSE; @@ -1700,7 +1700,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin ) return FALSE; } #endif -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD if ( (a & Anchor_LookaheadMask) != 0 ) { TQConstString cstr = TQConstString( (TQChar *) mmIn + mmPos + i, mmLen - mmPos - i ); @@ -1715,8 +1715,8 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin ) } } #endif -#ifndef QT_NO_REGEXP_CAPTURE -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_BACKREF for ( j = 0; j < nbrefs; j++ ) { if ( (a & (Anchor_BackRef1Empty << j)) != 0 ) { if ( capBegin[j] != EmptyCapture ) @@ -1728,7 +1728,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin ) return TRUE; } -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM /* The three following functions are what Jeffrey Friedl would call transmissions (or bump-alongs). Using one or the other should make @@ -1843,7 +1843,7 @@ bool TQRegExpEngine::matchHere() mmOneTestMatchedLen = -1; mmCurStack[0] = InitialState; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE if ( ncap > 0 ) { for ( j = 0; j < ncap; j++ ) { mmCurCapBegin[j] = EmptyCapture; @@ -1852,7 +1852,7 @@ bool TQRegExpEngine::matchHere() } #endif -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF int *zzZ = 0; while ( (ncur > 0 || !mmSleeping.isEmpty()) && i <= mmLen - mmPos && @@ -1870,7 +1870,7 @@ bool TQRegExpEngine::matchHere() int next = outs[k]; State *snext = s[next]; bool in = TRUE; -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF int needSomeSleep = 0; #endif @@ -1898,7 +1898,7 @@ bool TQRegExpEngine::matchHere() stop = mmMinimal; in = TRUE; } else if ( (m & CharClassBit) != 0 ) { -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS const CharClass *cc = cl[m ^ CharClassBit]; if ( cs ) in = cc->in( ch ); @@ -1909,7 +1909,7 @@ bool TQRegExpEngine::matchHere() in = cc->in( TQChar(ch).lower() ) || cc->in( TQChar(ch).upper() ); #endif -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF } else { /* ( (m & BackRefBit) != 0 ) */ int bref = m ^ BackRefBit; int ell = j * ncap + ( bref - 1 ); @@ -1965,7 +1965,7 @@ bool TQRegExpEngine::matchHere() We must now update our data structures. */ if ( in ) { -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int *capBegin, *capEnd; #endif /* @@ -1976,7 +1976,7 @@ bool TQRegExpEngine::matchHere() m = nnext++; mmNextStack[m] = next; mmInNextStack[next] = m; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE capBegin = mmNextCapBegin + m * ncap; capEnd = mmNextCapEnd + m * ncap; @@ -1992,7 +1992,7 @@ bool TQRegExpEngine::matchHere() #endif } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /* Updating the capture zones is much of a task. */ @@ -2097,7 +2097,7 @@ bool TQRegExpEngine::matchHere() ncap * sizeof(int) ); } } -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF /* We are done with updating the capture zones. It's now time to put the next state to sleep, @@ -2120,7 +2120,7 @@ bool TQRegExpEngine::matchHere() } } } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /* If we reached the final state, hurray! Copy the captured zone. @@ -2129,7 +2129,7 @@ bool TQRegExpEngine::matchHere() memcpy( mmCapBegin, mmNextCapBegin + m * ncap, ncap * sizeof(int) ); memcpy( mmCapEnd, mmNextCapEnd + m * ncap, ncap * sizeof(int) ); } -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF /* It's time to wake up the sleepers. */ @@ -2165,14 +2165,14 @@ bool TQRegExpEngine::matchHere() // avoid needless iteration that confuses mmOneTestMatchedLen if ( nnext == 1 && mmNextStack[0] == FinalState -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF && mmSleeping.isEmpty() #endif ) stop = TRUE; tqSwap( mmCurStack, mmNextStack ); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE tqSwap( mmCurCapBegin, mmNextCapBegin ); tqSwap( mmCurCapEnd, mmNextCapEnd ); #endif @@ -2181,7 +2181,7 @@ bool TQRegExpEngine::matchHere() i++; } -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF /* If minimal matching is enabled, we might have some sleepers left. @@ -2196,12 +2196,12 @@ bool TQRegExpEngine::matchHere() return ( mmMatchLen >= 0 ); } -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS TQRegExpEngine::CharClass::CharClass() : c( 0 ), n( FALSE ) { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM occ1.fill( NoOccurrence, NumBadChars ); #endif } @@ -2212,7 +2212,7 @@ TQRegExpEngine::CharClass& TQRegExpEngine::CharClass::operator=( c = cc.c; r = cc.r.copy(); n = cc.n; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM occ1 = cc.occ1; #endif return *this; @@ -2228,7 +2228,7 @@ void TQRegExpEngine::CharClass::clear() void TQRegExpEngine::CharClass::setNegative( bool negative ) { n = negative; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM occ1.fill( 0, NumBadChars ); #endif } @@ -2236,7 +2236,7 @@ void TQRegExpEngine::CharClass::setNegative( bool negative ) void TQRegExpEngine::CharClass::addCategories( int cats ) { c |= cats; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM occ1.fill( 0, NumBadChars ); #endif } @@ -2250,7 +2250,7 @@ void TQRegExpEngine::CharClass::addRange( ushort from, ushort to ) r[m].from = from; r[m].to = to; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM int i; if ( to - from < NumBadChars ) { @@ -2272,7 +2272,7 @@ void TQRegExpEngine::CharClass::addRange( ushort from, ushort to ) bool TQRegExpEngine::CharClass::in( TQChar ch ) const { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM if ( occ1[BadChar(ch)] == NoOccurrence ) return n; #endif @@ -2291,7 +2291,7 @@ void TQRegExpEngine::CharClass::dump() const { int i; tqDebug( " %stive character class", n ? "nega" : "posi" ); -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS if ( c != 0 ) tqDebug( " categories 0x%.8x", c ); #endif @@ -2303,11 +2303,11 @@ void TQRegExpEngine::CharClass::dump() const TQRegExpEngine::Box::Box( TQRegExpEngine *engine ) : eng( engine ), skipanchors( 0 ) -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM , earlyStart( 0 ), lateStart( 0 ), maxl( 0 ) #endif { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM occ1.fill( NoOccurrence, NumBadChars ); #endif minl = 0; @@ -2321,7 +2321,7 @@ TQRegExpEngine::Box& TQRegExpEngine::Box::operator=( const Box& b ) lanchors = b.lanchors; ranchors = b.ranchors; skipanchors = b.skipanchors; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM earlyStart = b.earlyStart; lateStart = b.lateStart; str = b.str; @@ -2340,7 +2340,7 @@ void TQRegExpEngine::Box::set( TQChar ch ) ls[0] = eng->createState( ch ); rs = ls; rs.detach(); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM str = ch; leftStr = ch; rightStr = ch; @@ -2357,14 +2357,14 @@ void TQRegExpEngine::Box::set( const CharClass& cc ) ls[0] = eng->createState( cc ); rs = ls; rs.detach(); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM maxl = 1; occ1 = cc.firstOccurrence(); #endif minl = 1; } -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF void TQRegExpEngine::Box::set( int bref ) { ls.resize( 1 ); @@ -2373,7 +2373,7 @@ void TQRegExpEngine::Box::set( int bref ) rs.detach(); if ( bref >= 1 && bref <= MaxBackRefs ) skipanchors = Anchor_BackRef0Empty << bref; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM maxl = InftyLen; #endif minl = 0; @@ -2410,7 +2410,7 @@ void TQRegExpEngine::Box::cat( const Box& b ) rs = b.rs; } -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM if ( maxl != InftyLen ) { if ( rightStr.length() + b.leftStr.length() > TQMAX(str.length(), b.str.length()) ) { @@ -2467,7 +2467,7 @@ void TQRegExpEngine::Box::orx( const Box& b ) skipanchors = b.skipanchors; } -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM occ1.detach(); for ( int i = 0; i < NumBadChars; i++ ) { if ( occ1[i] > b.occ1[i] ) @@ -2487,21 +2487,21 @@ void TQRegExpEngine::Box::orx( const Box& b ) void TQRegExpEngine::Box::plus( int atom ) { -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE eng->addPlusTransitions( rs, ls, atom ); #else Q_UNUSED( atom ); eng->addCatTransitions( rs, ls ); #endif addAnchorsToEngine( *this ); -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM maxl = InftyLen; #endif } void TQRegExpEngine::Box::opt() { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM earlyStart = 0; lateStart = 0; str = TQString(); @@ -2524,7 +2524,7 @@ void TQRegExpEngine::Box::catAnchor( int a ) } } -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM void TQRegExpEngine::Box::setupHeuristics() { eng->goodEarlyStart = earlyStart; @@ -2596,7 +2596,7 @@ int TQRegExpEngine::getChar() int TQRegExpEngine::getEscape() { -#ifndef QT_NO_REGEXP_ESCAPE +#ifndef TQT_NO_REGEXP_ESCAPE const char tab[] = "afnrtv"; // no b, as \b means word boundary const char backTab[] = "\a\f\n\r\t\v"; ushort low; @@ -2610,7 +2610,7 @@ int TQRegExpEngine::getEscape() return Tok_Char | '\\'; } yyCh = getChar(); -#ifndef QT_NO_REGEXP_ESCAPE +#ifndef TQT_NO_REGEXP_ESCAPE if ( (prevCh & ~0xff) == 0 ) { const char *p = strchr( tab, prevCh ); if ( p != 0 ) @@ -2619,7 +2619,7 @@ int TQRegExpEngine::getEscape() #endif switch ( prevCh ) { -#ifndef QT_NO_REGEXP_ESCAPE +#ifndef TQT_NO_REGEXP_ESCAPE case '0': val = 0; for ( i = 0; i < 3; i++ ) { @@ -2633,11 +2633,11 @@ int TQRegExpEngine::getEscape() error( RXERR_OCTAL ); return Tok_Char | val; #endif -#ifndef QT_NO_REGEXP_ESCAPE +#ifndef TQT_NO_REGEXP_ESCAPE case 'B': return Tok_NonWord; #endif -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS case 'D': // see TQChar::isDigit() yyCharClass->addCategories( 0x7fffffef ); @@ -2661,11 +2661,11 @@ int TQRegExpEngine::getEscape() yyCharClass->addSingleton( 0xff65 ); return Tok_CharClass; #endif -#ifndef QT_NO_REGEXP_ESCAPE +#ifndef TQT_NO_REGEXP_ESCAPE case 'b': return Tok_Word; #endif -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS case 'd': // see TQChar::isDigit() yyCharClass->addCategories( 0x00000010 ); @@ -2681,7 +2681,7 @@ int TQRegExpEngine::getEscape() yyCharClass->addSingleton( 0x005f ); // '_' return Tok_CharClass; #endif -#ifndef QT_NO_REGEXP_ESCAPE +#ifndef TQT_NO_REGEXP_ESCAPE case 'x': val = 0; for ( i = 0; i < 4; i++ ) { @@ -2698,7 +2698,7 @@ int TQRegExpEngine::getEscape() #endif default: if ( prevCh >= '1' && prevCh <= '9' ) { -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF val = prevCh - '0'; while ( yyCh >= '0' && yyCh <= '9' ) { val = ( val * 10 ) + ( yyCh - '0' ); @@ -2713,7 +2713,7 @@ int TQRegExpEngine::getEscape() } } -#ifndef QT_NO_REGEXP_INTERVAL +#ifndef TQT_NO_REGEXP_INTERVAL int TQRegExpEngine::getRep( int def ) { if ( yyCh >= '0' && yyCh <= '9' ) { @@ -2733,7 +2733,7 @@ int TQRegExpEngine::getRep( int def ) } #endif -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD void TQRegExpEngine::skipChars( int n ) { if ( n > 0 ) { @@ -2764,7 +2764,7 @@ void TQRegExpEngine::startTokenizer( const TQChar *rx, int len ) int TQRegExpEngine::getToken() { -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS ushort pendingCh = 0; bool charPending; bool rangePending; @@ -2773,7 +2773,7 @@ int TQRegExpEngine::getToken() int prevCh = yyCh; yyPos0 = yyPos - 1; -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS yyCharClass->clear(); #endif yyMinRep = 0; @@ -2791,7 +2791,7 @@ int TQRegExpEngine::getToken() prevCh = getChar(); yyCh = getChar(); switch ( prevCh ) { -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD case '!': return Tok_NegLookahead; case '=': @@ -2817,7 +2817,7 @@ int TQRegExpEngine::getToken() yyMaxRep = InftyRep; return Tok_Quantifier; case '.': -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS yyCharClass->setNegative( TRUE ); #endif return Tok_CharClass; @@ -2826,7 +2826,7 @@ int TQRegExpEngine::getToken() yyMaxRep = 1; return Tok_Quantifier; case '[': -#ifndef QT_NO_REGEXP_CCLASS +#ifndef TQT_NO_REGEXP_CCLASS if ( yyCh == '^' ) { yyCharClass->setNegative( TRUE ); yyCh = getChar(); @@ -2893,7 +2893,7 @@ int TQRegExpEngine::getToken() case '^': return Tok_Caret; case '{': -#ifndef QT_NO_REGEXP_INTERVAL +#ifndef TQT_NO_REGEXP_INTERVAL yyMinRep = getRep( 0 ); yyMaxRep = yyMinRep; if ( yyCh == ',' ) { @@ -2925,13 +2925,13 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len ) valid = TRUE; startTokenizer( pattern, len ); yyTok = getToken(); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE yyMayCapture = TRUE; #else yyMayCapture = FALSE; #endif -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int atom = startAtom( FALSE ); #endif CharClass anything; @@ -2942,10 +2942,10 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len ) Box middleBox( this ); parseExpression( &middleBox ); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE finishAtom( atom ); #endif -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM middleBox.setupHeuristics(); #endif box.cat( middleBox ); @@ -2954,7 +2954,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len ) yyCharClass = 0; officialncap = ncap; -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF if ( nbrefs > ncap ) ncap = nbrefs; #endif @@ -2963,7 +2963,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len ) We use one TQMemArray<int> for all the big data used a lot in matchHere() and friends. */ -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM mmSlideTabSize = TQMAX( minl + 1, 16 ); #else mmSlideTabSize = 0; @@ -2990,7 +2990,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len ) if ( !yyError.isEmpty() ) return -1; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM State *sinit = s[InitialState]; caretAnchored = ( sinit->anchors != 0 ); if ( caretAnchored ) { @@ -2998,7 +2998,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len ) TQMap<int, int>::ConstIterator a; for ( a = anchors.begin(); a != anchors.end(); ++a ) { if ( -#ifndef QT_NO_REGEXP_ANCHOR_ALT +#ifndef TQT_NO_REGEXP_ANCHOR_ALT (*a & Anchor_Alternation) != 0 || #endif (*a & Anchor_Caret) == 0 ) { @@ -3013,7 +3013,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len ) void TQRegExpEngine::parseAtom( Box *box ) { -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD TQRegExpEngine *eng = 0; bool neg; int len; @@ -3022,7 +3022,7 @@ void TQRegExpEngine::parseAtom( Box *box ) if ( (yyTok & Tok_Char) != 0 ) { box->set( TQChar(yyTok ^ Tok_Char) ); } else { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM trivial = FALSE; #endif switch ( yyTok ) { @@ -3032,7 +3032,7 @@ void TQRegExpEngine::parseAtom( Box *box ) case Tok_Caret: box->catAnchor( Anchor_Caret ); break; -#ifndef QT_NO_REGEXP_LOOKAHEAD +#ifndef TQT_NO_REGEXP_LOOKAHEAD case Tok_PosLookahead: case Tok_NegLookahead: neg = ( yyTok == Tok_NegLookahead ); @@ -3048,7 +3048,7 @@ void TQRegExpEngine::parseAtom( Box *box ) error( RXERR_LOOKAHEAD ); break; #endif -#ifndef QT_NO_REGEXP_ESCAPE +#ifndef TQT_NO_REGEXP_ESCAPE case Tok_Word: box->catAnchor( Anchor_Word ); break; @@ -3070,7 +3070,7 @@ void TQRegExpEngine::parseAtom( Box *box ) error( RXERR_REPETITION ); break; default: -#ifndef QT_NO_REGEXP_BACKREF +#ifndef TQT_NO_REGEXP_BACKREF if ( (yyTok & Tok_BackRef) != 0 ) box->set( yyTok ^ Tok_BackRef ); else @@ -3083,13 +3083,13 @@ void TQRegExpEngine::parseAtom( Box *box ) void TQRegExpEngine::parseFactor( Box *box ) { -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int atom = startAtom( yyMayCapture && yyTok == Tok_LeftParen ); #else static const int atom = 0; #endif -#ifndef QT_NO_REGEXP_INTERVAL +#ifndef TQT_NO_REGEXP_INTERVAL #define YYREDO() \ yyIn = in, yyPos0 = pos0, yyPos = pos, yyLen = len, yyCh = ch, \ *yyCharClass = charClass, yyMinRep = 0, yyMaxRep = 0, yyTok = tok @@ -3107,17 +3107,17 @@ void TQRegExpEngine::parseFactor( Box *box ) #endif parseAtom( box ); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE finishAtom( atom ); #endif if ( yyTok == Tok_Quantifier ) { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM trivial = FALSE; #endif if ( yyMaxRep == InftyRep ) { box->plus( atom ); -#ifndef QT_NO_REGEXP_INTERVAL +#ifndef TQT_NO_REGEXP_INTERVAL } else if ( yyMaxRep == 0 ) { box->clear(); #endif @@ -3125,7 +3125,7 @@ void TQRegExpEngine::parseFactor( Box *box ) if ( yyMinRep == 0 ) box->opt(); -#ifndef QT_NO_REGEXP_INTERVAL +#ifndef TQT_NO_REGEXP_INTERVAL yyMayCapture = FALSE; int alpha = ( yyMinRep == 0 ) ? 0 : yyMinRep - 1; int beta = ( yyMaxRep == InftyRep ) ? 0 : yyMaxRep - ( alpha + 1 ); @@ -3152,7 +3152,7 @@ void TQRegExpEngine::parseFactor( Box *box ) *box = rightBox; #endif yyTok = getToken(); -#ifndef QT_NO_REGEXP_INTERVAL +#ifndef TQT_NO_REGEXP_INTERVAL yyMayCapture = mayCapture; #endif } @@ -3161,7 +3161,7 @@ void TQRegExpEngine::parseFactor( Box *box ) void TQRegExpEngine::parseTerm( Box *box ) { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM if ( yyTok != Tok_Eos && yyTok != Tok_RightParen && yyTok != Tok_Bar ) parseFactor( box ); #endif @@ -3176,7 +3176,7 @@ void TQRegExpEngine::parseExpression( Box *box ) { parseTerm( box ); while ( yyTok == Tok_Bar ) { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM trivial = FALSE; #endif Box rightBox( this ); @@ -3196,12 +3196,12 @@ struct TQRegExpPrivate { TQString pattern; // regular-expression or wildcard pattern TQString rxpattern; // regular-expression pattern -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD bool wc : 1; // wildcard mode? #endif bool min : 1; // minimal matching? (instead of maximal) bool cs : 1; // case sensitive? -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE TQString t; // last string passed to TQRegExp::search() or searchRev() TQStringList capturedCache; // what TQRegExp::capturedTexts() returned last #endif @@ -3210,12 +3210,12 @@ struct TQRegExpPrivate TQRegExpPrivate() { captured.fill( -1, 2 ); } }; -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM static TQSingleCleanupHandler<TQCache<TQRegExpEngine> > cleanup_cache; # ifndef TQT_THREAD_SUPPORT static TQCache<TQRegExpEngine> *engineCache = 0; # endif // TQT_THREAD_SUPPORT -#endif // QT_NO_REGEXP_OPTIM +#endif // TQT_NO_REGEXP_OPTIM static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern, bool caseSensitive, bool deref ) @@ -3229,7 +3229,7 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern, #endif // TQT_THREAD_SUPPORT if ( !deref ) { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM # ifdef TQT_THREAD_SUPPORT if ( currentThread ) # endif @@ -3244,13 +3244,13 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern, } } } -#endif // QT_NO_REGEXP_OPTIM +#endif // TQT_NO_REGEXP_OPTIM eng = new TQRegExpEngine( pattern, caseSensitive ); return; } if ( eng->deref() ) { -#ifndef QT_NO_REGEXP_OPTIM +#ifndef TQT_NO_REGEXP_OPTIM # ifdef TQT_THREAD_SUPPORT if ( currentThread ) # endif @@ -3270,7 +3270,7 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern, } #else Q_UNUSED( pattern ); -#endif // QT_NO_REGEXP_OPTIM +#endif // TQT_NO_REGEXP_OPTIM delete eng; eng = 0; } @@ -3301,7 +3301,7 @@ TQRegExp::TQRegExp() : eng( 0 ) { priv = new TQRegExpPrivate; -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD priv->wc = FALSE; #endif priv->min = FALSE; @@ -3322,7 +3322,7 @@ TQRegExp::TQRegExp( const TQString& pattern, bool caseSensitive, bool wildcard ) { priv = new TQRegExpPrivate; priv->pattern = pattern; -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD priv->wc = wildcard; #endif priv->min = FALSE; @@ -3364,12 +3364,12 @@ TQRegExp& TQRegExp::operator=( const TQRegExp& rx ) eng = otherEng; priv->pattern = rx.priv->pattern; priv->rxpattern = rx.priv->rxpattern; -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD priv->wc = rx.priv->wc; #endif priv->min = rx.priv->min; priv->cs = rx.priv->cs; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE priv->t = rx.priv->t; priv->capturedCache = rx.priv->capturedCache; #endif @@ -3388,7 +3388,7 @@ TQRegExp& TQRegExp::operator=( const TQRegExp& rx ) bool TQRegExp::operator==( const TQRegExp& rx ) const { return priv->pattern == rx.priv->pattern && -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD priv->wc == rx.priv->wc && #endif priv->min == rx.priv->min && @@ -3500,7 +3500,7 @@ void TQRegExp::setCaseSensitive( bool sensitive ) } } -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD /*! Returns TRUE if wildcard mode is enabled; otherwise returns FALSE. The default is FALSE. @@ -3735,7 +3735,7 @@ int TQRegExp::matchedLength() const return priv->captured[1]; } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /*! Returns the number of captures contained in the regular expression. */ @@ -3947,7 +3947,7 @@ TQString TQRegExp::escape( const TQString& str ) void TQRegExp::prepareEngine() const { if ( eng == 0 ) { -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD if ( priv->wc ) priv->rxpattern = wc2rx( priv->pattern ); else @@ -3965,7 +3965,7 @@ void TQRegExp::prepareEngine() const void TQRegExp::prepareEngineForMatch( const TQString& str ) const { prepareEngine(); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE priv->t = str; priv->capturedCache.clear(); #else @@ -3993,4 +3993,4 @@ int TQRegExp::caretIndex( int offset, CaretMode caretMode ) } } -#endif // QT_NO_REGEXP +#endif // TQT_NO_REGEXP diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp index 929f7960b..fa44ff054 100644 --- a/src/tools/qsettings.cpp +++ b/src/tools/qsettings.cpp @@ -55,7 +55,7 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode ) #include "ntqsettings.h" -#ifndef QT_NO_SETTINGS +#ifndef TQT_NO_SETTINGS #include "ntqdir.h" #include "ntqfile.h" diff --git a/src/tools/qsettings_p.h b/src/tools/qsettings_p.h index 73c92ff3b..7ea1ac8de 100644 --- a/src/tools/qsettings_p.h +++ b/src/tools/qsettings_p.h @@ -59,7 +59,7 @@ #include "ntqvaluestack.h" #endif // QT_H -#ifndef QT_NO_SETTINGS +#ifndef TQT_NO_SETTINGS class TQSettingsSysPrivate; // TQSettingsGroup is a map of key/value pairs @@ -144,5 +144,5 @@ public: #endif }; -#endif //QT_NO_SETTINGS +#endif //TQT_NO_SETTINGS #endif // TQSETTINGS_P_H diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 6afe0687a..421ef009f 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -41,8 +41,8 @@ // Don't define it while compiling this module, or USERS of TQt will // not be able to link. -#ifdef QT_NO_CAST_ASCII -#undef QT_NO_CAST_ASCII +#ifdef TQT_NO_CAST_ASCII +#undef TQT_NO_CAST_ASCII #endif // WARNING @@ -53,7 +53,7 @@ #include "ntqstring.h" #include "ntqregexp.h" #include "ntqdatastream.h" -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC #include "ntqtextcodec.h" #endif #include "ntqlocale.h" @@ -74,7 +74,7 @@ #if defined(Q_OS_LINUX) #include <sys/mman.h> #endif -#if !defined( QT_NO_COMPONENT ) && !defined( QT_LITE_COMPONENT ) +#if !defined( TQT_NO_COMPONENT ) && !defined( QT_LITE_COMPONENT ) #include "ntqcleanuphandler.h" #endif @@ -575,7 +575,7 @@ bool TQChar::isSymbol() const */ int TQChar::digitValue() const { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES register int pos = TQUnicodeTables::decimal_info[row()]; if( !pos ) return -1; @@ -641,7 +641,7 @@ TQChar TQChar::mirroredChar() const return ::mirroredChar( *this ); } -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES // ### REMOVE ME 4.0 static TQString shared_decomp; #endif @@ -653,7 +653,7 @@ static TQString shared_decomp; */ const TQString &TQChar::decomposition() const { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES register int pos = TQUnicodeTables::decomposition_info[row()]; if(!pos) return TQString::null; @@ -680,7 +680,7 @@ const TQString &TQChar::decomposition() const */ TQChar::Decomposition TQChar::decompositionTag() const { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES register int pos = TQUnicodeTables::decomposition_info[row()]; if(!pos) return TQChar::Single; @@ -938,7 +938,7 @@ TQChar TQChar::upper() const FALSE. */ -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES // small class used internally in TQString::Compose() class TQLigature @@ -1119,7 +1119,7 @@ void TQStringData::setDirty() { */ void TQString::compose() { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES unsigned int index=0, len; unsigned int cindex = 0; @@ -1557,7 +1557,7 @@ TQString::TQString( int size, bool /*dummy*/ ) TQString::TQString( const TQByteArray& ba ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) { d = 0; *this = fromAscii( ba.data(), ba.size() ); @@ -1607,7 +1607,7 @@ TQString::TQString( const TQChar* unicode, uint length ) This is a cast constructor, but it is perfectly safe: converting a Latin-1 \c{const char *} to TQString preserves all the information. You - can disable this constructor by defining \c QT_NO_CAST_ASCII when + can disable this constructor by defining \c TQT_NO_CAST_ASCII when you compile your applications. You can also make TQString objects by using setLatin1(), fromLatin1(), fromLocal8Bit(), and fromUtf8(). Or whatever encoding is appropriate for the 8-bit data @@ -1618,7 +1618,7 @@ TQString::TQString( const TQChar* unicode, uint length ) TQString::TQString( const char *str ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) { d = 0; *this = fromAscii( str ); @@ -1639,7 +1639,7 @@ TQString::TQString( const char *str ) TQString::TQString( const std::string &str ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) { d = 0; *this = fromAscii( str.c_str() ); @@ -2604,7 +2604,7 @@ TQString TQString::multiArg( int numArgs, const TQString& a1, const TQString& a2 \sa arg() */ -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF TQString &TQString::sprintf(const char *cformat, ...) { va_list ap; @@ -3509,7 +3509,7 @@ TQString TQString::section( const TQString &sep, int start, int end, int flags ) return ret; } -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP class section_chunk { public: section_chunk(int l, TQString s) { length = l; string = s; } @@ -4107,11 +4107,11 @@ TQString &TQString::insert( uint index, const TQString &s ) a reference to the string. */ -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &TQString::insertHelper( uint index, const char *s, uint len ) { if ( s ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) return insert( index, fromAscii( s, len ) ); #endif @@ -4399,7 +4399,7 @@ TQString &TQString::replace( TQChar c1, TQChar c2 ) return *this; } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /*! \overload @@ -4657,7 +4657,7 @@ TQString &TQString::replace( const TQString & before, const TQString & after ) return replace( before, after, TRUE ); } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /*! \overload Replaces every occurrence of the regexp \a rx in the string with @@ -4816,7 +4816,7 @@ TQString &TQString::replace( const TQRegExp &rx, const TQString &after ) } #endif -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP /*! Finds the first match of the regular expression \a rx, starting from position \a index. If \a index is -1, the search starts at @@ -4894,7 +4894,7 @@ int TQString::contains( const TQRegExp &rx ) const return count; } -#endif //QT_NO_REGEXP +#endif //TQT_NO_REGEXP /*! Returns the string converted to a \c long using base \a @@ -5798,11 +5798,11 @@ TQString& TQString::operator+=( const TQString &str ) return *this; } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &TQString::operatorPlusEqHelper( const char *s, uint len2 ) { if ( s ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) return operator+=( fromAscii( s, len2 ) ); #endif @@ -5828,7 +5828,7 @@ TQString &TQString::operatorPlusEqHelper( const char *s, uint len2 ) Appends \a str to the string and returns a reference to the string. */ -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString& TQString::operator+=( const char *str ) { // ### TQt 4: make this function inline @@ -5856,7 +5856,7 @@ TQString &TQString::operator+=( TQChar c ) TQString &TQString::operator+=( char c ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) return operator+=( fromAscii( &c, 1 ) ); #endif @@ -5929,7 +5929,7 @@ const char* TQString::latin1() const */ const char* TQString::ascii() const { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) { if ( !d->ascii || d->islatin1 ) { if (d->security_unpaged) { @@ -5956,7 +5956,7 @@ const char* TQString::ascii() const } return d->ascii; } -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC return latin1(); } @@ -6167,7 +6167,7 @@ TQString TQString::fromUtf8( const char* utf8, int len ) This is the same as the TQString(const char*) constructor, but you can make that constructor invisible if you compile with the define - \c QT_NO_CAST_ASCII, in which case you can explicitly create a + \c TQT_NO_CAST_ASCII, in which case you can explicitly create a TQString from 8-bit ASCII text using this function. \code @@ -6177,7 +6177,7 @@ TQString TQString::fromUtf8( const char* utf8, int len ) */ TQString TQString::fromAscii( const char* ascii, int len ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) { if ( !ascii ) return TQString::null; @@ -6235,7 +6235,7 @@ TQString TQString::fromLatin1( const char* chars, int len ) TQCString TQString::local8Bit() const { -#ifdef QT_NO_TEXTCODEC +#ifdef TQT_NO_TEXTCODEC return latin1(); #else #ifdef Q_WS_X11 @@ -6277,7 +6277,7 @@ TQCString TQString::local8Bit() const */ TQString TQString::fromLocal8Bit( const char* local8Bit, int len ) { -#ifdef QT_NO_TEXTCODEC +#ifdef TQT_NO_TEXTCODEC return fromLatin1( local8Bit, len ); #else @@ -6305,7 +6305,7 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len ) #ifdef Q_WS_QWS return fromUtf8(local8Bit,len); #endif -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC } /*! @@ -6584,12 +6584,12 @@ TQString& TQString::setUnicodeCodes( const ushort* unicode_as_ushorts, uint len TQString &TQString::setAscii( const char *str, int len ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( TQTextCodec::codecForCStrings() ) { *this = TQString::fromAscii( str, len ); return *this; } -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC return setLatin1( str, len ); } @@ -6755,7 +6755,7 @@ int TQString::localeAwareCompare( const TQString& s ) const } #elif defined(Q_WS_MACX) int delta = 0; -#if !defined(QT_NO_TEXTCODEC) +#if !defined(TQT_NO_TEXTCODEC) TQTextCodec *codec = TQTextCodec::codecForLocale(); if (codec) delta = strcoll(codec->fromUnicode(*this), codec->fromUnicode(s)); @@ -7107,7 +7107,7 @@ bool operator>=( const char *s1, const TQString &s2 ) /***************************************************************************** TQString stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQString @@ -7212,7 +7212,7 @@ TQDataStream &operator>>( TQDataStream &s, TQString &str ) } return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM /***************************************************************************** TQConstString member functions @@ -7439,7 +7439,7 @@ TQCString qt_winTQString2MB( const TQString& s, int uclen ) 0, 0, 0, &used_def)); // and try again... } else { -#ifndef QT_NO_DEBUG +#ifndef TQT_NO_DEBUG // Fail. tqWarning("WideCharToMultiByte cannot convert multibyte text (error %d): %s (UTF8)", r, s.utf8().data()); diff --git a/src/tools/qstringlist.cpp b/src/tools/qstringlist.cpp index 3f77cc52d..71427d4e7 100644 --- a/src/tools/qstringlist.cpp +++ b/src/tools/qstringlist.cpp @@ -40,7 +40,7 @@ #include "ntqstringlist.h" -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST #include "ntqregexp.h" #include "ntqstrlist.h" #include "ntqdatastream.h" @@ -244,7 +244,7 @@ TQStringList TQStringList::split( const TQString &sep, const TQString &str, return lst; } -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP /*! Splits the string \a str into strings wherever the regular expression \a sep occurs, and returns the list of those strings. @@ -323,7 +323,7 @@ TQStringList TQStringList::grep( const TQString &str, bool cs ) const return res; } -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP /*! \overload @@ -373,7 +373,7 @@ TQStringList& TQStringList::gres( const TQString &before, const TQString &after, return *this; } -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE /*! \overload @@ -435,7 +435,7 @@ TQString TQStringList::join( const TQString &sep ) const return res; } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator>>( TQDataStream & s, TQStringList& l ) { return s >> (TQValueList<TQString>&)l; @@ -464,4 +464,4 @@ TQStringList TQStringList::fromStrList(const TQStrList& ascii) */ -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp index 213581b82..36a74c4e7 100644 --- a/src/tools/qtextstream.cpp +++ b/src/tools/qtextstream.cpp @@ -40,7 +40,7 @@ #include "ntqtextstream.h" -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM #include "ntqtextcodec.h" #include "ntqregexp.h" #include "ntqbuffer.h" @@ -222,7 +222,7 @@ const int TQTextStream::floatfield = ( TQTextStream::scientific | class TQTextStreamPrivate { public: -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC TQTextStreamPrivate() : decoder( 0 ), encoder( 0 ), sourceType( NotSet ) { } ~TQTextStreamPrivate() { @@ -705,7 +705,7 @@ uint TQTextStream::ts_getbuf( TQChar* buf, uint len ) } } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( mapper ) { bool shortRead = FALSE; if ( !d->decoder ) @@ -893,7 +893,7 @@ uint TQTextStream::ts_getline( TQChar* buf ) return rnum; } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( mapper ) { if ( !d->decoder ) d->decoder = mapper->makeDecoder(); @@ -964,7 +964,7 @@ uint TQTextStream::ts_getline( TQChar* buf ) */ void TQTextStream::ts_putc( TQChar c ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( mapper ) { if ( !d->encoder ) d->encoder = mapper->makeEncoder(); @@ -1078,7 +1078,7 @@ TQTextStream &TQTextStream::writeBlock( const char* p, uint len ) dev->writeBlock( (char*)u, len * sizeof(TQChar) ); delete [] u; } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC else if (mapper) { if (!d->encoder) d->encoder = mapper->makeEncoder(); @@ -1097,7 +1097,7 @@ TQTextStream &TQTextStream::writeBlock( const char* p, uint len ) TQTextStream &TQTextStream::writeBlock( const TQChar* p, uint len ) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( mapper ) { if ( !d->encoder ) d->encoder = mapper->makeEncoder(); @@ -2533,7 +2533,7 @@ void TQTextStream::setEncoding( Encoding e ) networkOrder = TQChar::networkOrdered(); break; case UnicodeUTF8: -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC mapper = TQTextCodec::codecForMib( 106 ); latin1 = FALSE; doUnicodeHeader = TRUE; @@ -2568,7 +2568,7 @@ void TQTextStream::setEncoding( Encoding e ) break; case Locale: latin1 = TRUE; // fallback to Latin-1 -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC mapper = TQTextCodec::codecForLocale(); // optimized Latin-1 processing #if defined(Q_OS_WIN32) @@ -2590,7 +2590,7 @@ void TQTextStream::setEncoding( Encoding e ) } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC /*! Sets the codec for this stream to \a codec. Will not try to autodetect Unicode. @@ -2633,4 +2633,4 @@ TQTextCodec *TQTextStream::codec() #endif -#endif // QT_NO_TEXTSTREAM +#endif // TQT_NO_TEXTSTREAM diff --git a/src/tools/qucom.cpp b/src/tools/qucom.cpp index 905c1feb2..28d41387f 100644 --- a/src/tools/qucom.cpp +++ b/src/tools/qucom.cpp @@ -226,7 +226,7 @@ bool TQUType_idisp::convertFrom( TQUObject *o, TQUType *t ) bool TQUType_idisp::convertTo( TQUObject *o, TQUType *t ) { -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT if ( isEqual( t, &static_QUType_iface ) ) { o->payload.iface = (TQUnknownInterface*)o->payload.idisp; o->type = &static_QUType_iface; diff --git a/src/tools/qunicodetables.cpp b/src/tools/qunicodetables.cpp index 8e9b5c1d3..d4d7fc2a1 100644 --- a/src/tools/qunicodetables.cpp +++ b/src/tools/qunicodetables.cpp @@ -234,7 +234,7 @@ for $row ( 0..255 ) { } print "// START OF GENERATED DATA\n\n"; -print "#ifndef QT_NO_UNICODETABLES\n\n"; +print "#ifndef TQT_NO_UNICODETABLES\n\n"; # Print pages... # @@ -579,7 +579,7 @@ __END__ // START OF GENERATED DATA -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES const TQ_UINT8 TQUnicodeTables::unicode_info[] = { 1, 2, 3, 4, 5, 6, 7, 8, @@ -11403,7 +11403,7 @@ const TQ_INT8 TQUnicodeTables::decimal_info[] = { #endif -#ifdef QT_NO_UNICODETABLES +#ifdef TQT_NO_UNICODETABLES const TQ_UINT8 TQUnicodeTables::latin1_line_break_info[] = { 19, 19, 19, 19, 19, 19, 19, 19, @@ -12936,7 +12936,7 @@ const TQ_UINT8 TQUnicodeTables::line_break_info[] = { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES const TQ_UINT16 TQUnicodeTables::symmetricPairs[] = { 0x0028, 0x0029, 0x003C, 0x003E, 0x005B, 0x005D, 0x007B, 0x007D, 0x00AB, 0x00BB, 0x2039, 0x203A, 0x2045, 0x2046, 0x207D, 0x207E, diff --git a/src/tools/qunicodetables_p.h b/src/tools/qunicodetables_p.h index 7cc4cc6ec..4adbc1f67 100644 --- a/src/tools/qunicodetables_p.h +++ b/src/tools/qunicodetables_p.h @@ -55,14 +55,14 @@ #include "ntqstring.h" #endif // QT_H -#ifdef QT_NO_UNICODETABLES +#ifdef TQT_NO_UNICODETABLES # include <ctype.h> #endif class TQUnicodeTables { public: static const TQ_UINT8 unicode_info[]; -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES static const TQ_UINT16 decomposition_map[]; static const TQ_UINT16 decomposition_info[]; static const TQ_UINT16 ligature_map[]; @@ -97,19 +97,19 @@ public: inline TQChar::Category category( const TQChar &c ) { -#ifdef QT_NO_UNICODETABLES +#ifdef TQT_NO_UNICODETABLES if ( c.unicode() > 0xff ) return TQChar::Letter_Uppercase; //######## return (TQChar::Category)TQUnicodeTables::unicode_info[c.unicode()]; #else register int uc = ((int)TQUnicodeTables::unicode_info[c.row()]) << 8; uc += c.cell(); return (TQChar::Category)TQUnicodeTables::unicode_info[uc]; -#endif // QT_NO_UNICODETABLES +#endif // TQT_NO_UNICODETABLES } inline TQChar lower( const TQChar &c ) { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES int row = c.row(); int cell = c.cell(); register int ci = TQUnicodeTables::case_info[row]; @@ -128,7 +128,7 @@ inline TQChar lower( const TQChar &c ) inline TQChar upper( const TQChar &c ) { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES int row = c.row(); int cell = c.cell(); register int ci = TQUnicodeTables::case_info[row]; @@ -147,7 +147,7 @@ inline TQChar upper( const TQChar &c ) inline TQChar::Direction direction( const TQChar &c ) { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES register int pos = TQUnicodeTables::direction_info[c.row()]; return (TQChar::Direction) (TQUnicodeTables::direction_info[(pos<<8)+c.cell()] & 0x1f); #else @@ -158,7 +158,7 @@ inline TQChar::Direction direction( const TQChar &c ) inline bool mirrored( const TQChar &c ) { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES register int pos = TQUnicodeTables::direction_info[c.row()]; return TQUnicodeTables::direction_info[(pos<<8)+c.cell()] > 128; #else @@ -170,7 +170,7 @@ inline bool mirrored( const TQChar &c ) inline TQChar mirroredChar( const TQChar &ch ) { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES if(!::mirrored( ch )) return ch; @@ -186,7 +186,7 @@ inline TQChar mirroredChar( const TQChar &ch ) inline TQChar::Joining joining( const TQChar &ch ) { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES register int pos = TQUnicodeTables::direction_info[ch.row()]; return (TQChar::Joining) ((TQUnicodeTables::direction_info[(pos<<8)+ch.cell()] >> 5) &0x3); #else @@ -203,7 +203,7 @@ inline bool isMark( const TQChar &ch ) inline unsigned char combiningClass( const TQChar &ch ) { -#ifndef QT_NO_UNICODETABLES +#ifndef TQT_NO_UNICODETABLES const int pos = TQUnicodeTables::combining_info[ch.row()]; return TQUnicodeTables::combining_info[(pos<<8) + ch.cell()]; #else @@ -221,7 +221,7 @@ inline bool isSpace( const TQChar &ch ) inline int lineBreakClass( const TQChar &ch ) { -#ifdef QT_NO_UNICODETABLES +#ifdef TQT_NO_UNICODETABLES return ch.row() ? TQUnicodeTables::LineBreak_AL : TQUnicodeTables::latin1_line_break_info[ch.cell()]; #else diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp index 11468a7ec..15e3b3c6e 100644 --- a/src/tools/quuid.cpp +++ b/src/tools/quuid.cpp @@ -90,7 +90,7 @@ Creates a copy of the TQUuid \a orig. */ -#ifndef QT_NO_QUUID_STRING +#ifndef TQT_NO_QUUID_STRING /*! Creates a TQUuid object from the string \a text. The function can only convert a string in the format @@ -172,7 +172,7 @@ TQUuid::TQUuid( const char *text ) Returns TRUE if this TQUuid and the \a other TQUuid are different; otherwise returns FALSE. */ -#ifndef QT_NO_QUUID_STRING +#ifndef TQT_NO_QUUID_STRING /*! \fn TQUuid::operator TQString() const @@ -202,7 +202,7 @@ TQString TQUuid::toString() const } #endif -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQUuid Writes the uuid \a id to the datastream \a s. |