| TQColor
diff --git a/doc/html/qbuffer-h.html b/doc/html/qbuffer-h.html
index 4b4e9f6f..fd7a0814 100644
--- a/doc/html/qbuffer-h.html
+++ b/doc/html/qbuffer-h.html
@@ -101,11 +101,11 @@ public:
Offset at() const;
bool at( Offset );
- Q_LONG readBlock( char *p, Q_ULONG );
- Q_LONG writeBlock( const char *p, Q_ULONG );
- Q_LONG writeBlock( const TQByteArray& data )
+ TQ_LONG readBlock( char *p, TQ_ULONG );
+ TQ_LONG writeBlock( const char *p, TQ_ULONG );
+ TQ_LONG writeBlock( const TQByteArray& data )
{ return TQIODevice::writeBlock(data); }
- Q_LONG readLine( char *p, Q_ULONG );
+ TQ_LONG readLine( char *p, TQ_ULONG );
int getch();
int putch( int );
diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html
index 8d777fb6..c38665f6 100644
--- a/doc/html/qcstring-h.html
+++ b/doc/html/qcstring-h.html
@@ -134,7 +134,7 @@ Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len )
// tqChecksum: Internet checksum
-Q_EXPORT Q_UINT16 tqChecksum( const char *s, uint len );
+Q_EXPORT TQ_UINT16 tqChecksum( const char *s, uint len );
/*****************************************************************************
TQByteArray class
diff --git a/doc/html/qdatastream-h.html b/doc/html/qdatastream-h.html
index 3f3fd641..4043590e 100644
--- a/doc/html/qdatastream-h.html
+++ b/doc/html/qdatastream-h.html
@@ -108,34 +108,34 @@ public:
int version() const;
void setVersion( int );
- TQDataStream &operator>>( Q_INT8 &i );
- TQDataStream &operator>>( Q_UINT8 &i );
- TQDataStream &operator>>( Q_INT16 &i );
- TQDataStream &operator>>( Q_UINT16 &i );
- TQDataStream &operator>>( Q_INT32 &i );
- TQDataStream &operator>>( Q_UINT32 &i );
- TQDataStream &operator>>( Q_INT64 &i );
- TQDataStream &operator>>( Q_UINT64 &i );
+ TQDataStream &operator>>( TQ_INT8 &i );
+ TQDataStream &operator>>( TQ_UINT8 &i );
+ TQDataStream &operator>>( TQ_INT16 &i );
+ TQDataStream &operator>>( TQ_UINT16 &i );
+ TQDataStream &operator>>( TQ_INT32 &i );
+ TQDataStream &operator>>( TQ_UINT32 &i );
+ TQDataStream &operator>>( TQ_INT64 &i );
+ TQDataStream &operator>>( TQ_UINT64 &i );
#if !defined(Q_OS_WIN64)
- TQDataStream &operator>>( Q_LONG &i );
- TQDataStream &operator>>( Q_ULONG &i );
+ TQDataStream &operator>>( TQ_LONG &i );
+ TQDataStream &operator>>( TQ_ULONG &i );
#endif
TQDataStream &operator>>( float &f );
TQDataStream &operator>>( double &f );
TQDataStream &operator>>( char *&str );
- TQDataStream &operator<<( Q_INT8 i );
- TQDataStream &operator<<( Q_UINT8 i );
- TQDataStream &operator<<( Q_INT16 i );
- TQDataStream &operator<<( Q_UINT16 i );
- TQDataStream &operator<<( Q_INT32 i );
- TQDataStream &operator<<( Q_UINT32 i );
- TQDataStream &operator<<( Q_INT64 i );
- TQDataStream &operator<<( Q_UINT64 i );
+ TQDataStream &operator<<( TQ_INT8 i );
+ TQDataStream &operator<<( TQ_UINT8 i );
+ TQDataStream &operator<<( TQ_INT16 i );
+ TQDataStream &operator<<( TQ_UINT16 i );
+ TQDataStream &operator<<( TQ_INT32 i );
+ TQDataStream &operator<<( TQ_UINT32 i );
+ TQDataStream &operator<<( TQ_INT64 i );
+ TQDataStream &operator<<( TQ_UINT64 i );
#if !defined(Q_OS_WIN64)
- TQDataStream &operator<<( Q_LONG i );
- TQDataStream &operator<<( Q_ULONG i );
+ TQDataStream &operator<<( TQ_LONG i );
+ TQDataStream &operator<<( TQ_ULONG i );
#endif
TQDataStream &operator<<( float f );
TQDataStream &operator<<( double f );
@@ -191,38 +191,38 @@ inline int TQDataStream::version() const
inline void TQDataStream::setVersion( int v )
{ ver = v; }
-inline TQDataStream &TQDataStream::operator>>( Q_UINT8 &i )
-{ return *this >> (Q_INT8&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_UINT8 &i )
+{ return *this >> (TQ_INT8&)i; }
-inline TQDataStream &TQDataStream::operator>>( Q_UINT16 &i )
-{ return *this >> (Q_INT16&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_UINT16 &i )
+{ return *this >> (TQ_INT16&)i; }
-inline TQDataStream &TQDataStream::operator>>( Q_UINT32 &i )
-{ return *this >> (Q_INT32&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_UINT32 &i )
+{ return *this >> (TQ_INT32&)i; }
-inline TQDataStream &TQDataStream::operator>>( Q_UINT64 &i )
-{ return *this >> (Q_INT64&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_UINT64 &i )
+{ return *this >> (TQ_INT64&)i; }
#if !defined(Q_OS_WIN64)
-inline TQDataStream &TQDataStream::operator>>( Q_ULONG &i )
-{ return *this >> (Q_LONG&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_ULONG &i )
+{ return *this >> (TQ_LONG&)i; }
#endif
-inline TQDataStream &TQDataStream::operator<<( Q_UINT8 i )
-{ return *this << (Q_INT8)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_UINT8 i )
+{ return *this << (TQ_INT8)i; }
-inline TQDataStream &TQDataStream::operator<<( Q_UINT16 i )
-{ return *this << (Q_INT16)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_UINT16 i )
+{ return *this << (TQ_INT16)i; }
-inline TQDataStream &TQDataStream::operator<<( Q_UINT32 i )
-{ return *this << (Q_INT32)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_UINT32 i )
+{ return *this << (TQ_INT32)i; }
-inline TQDataStream &TQDataStream::operator<<( Q_UINT64 i )
-{ return *this << (Q_INT64)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_UINT64 i )
+{ return *this << (TQ_INT64)i; }
#if !defined(Q_OS_WIN64)
-inline TQDataStream &TQDataStream::operator<<( Q_ULONG i )
-{ return *this << (Q_LONG)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_ULONG i )
+{ return *this << (TQ_LONG)i; }
#endif
#endif // QT_NO_DATASTREAM
diff --git a/doc/html/qdns-h.html b/doc/html/qdns-h.html
index 9df9446b..4110a238 100644
--- a/doc/html/qdns-h.html
+++ b/doc/html/qdns-h.html
@@ -129,22 +129,22 @@ public:
class TQM_EXPORT_DNS MailServer {
public:
- MailServer( const TQString & n=TQString::null, Q_UINT16 p=0 )
+ MailServer( const TQString & n=TQString::null, TQ_UINT16 p=0 )
:name(n), priority(p) {}
TQString name;
- Q_UINT16 priority;
+ TQ_UINT16 priority;
Q_DUMMY_COMPARISON_OPERATOR(MailServer)
};
TQValueList<MailServer> mailServers() const;
class TQM_EXPORT_DNS Server {
public:
- Server(const TQString & n=TQString::null, Q_UINT16 p=0, Q_UINT16 w=0, Q_UINT16 po=0 )
+ Server(const TQString & n=TQString::null, TQ_UINT16 p=0, TQ_UINT16 w=0, TQ_UINT16 po=0 )
: name(n), priority(p), weight(w), port(po) {}
TQString name;
- Q_UINT16 priority;
- Q_UINT16 weight;
- Q_UINT16 port;
+ TQ_UINT16 priority;
+ TQ_UINT16 weight;
+ TQ_UINT16 port;
Q_DUMMY_COMPARISON_OPERATOR(Server)
};
TQValueList<Server> servers() const;
diff --git a/doc/html/qfile-h.html b/doc/html/qfile-h.html
index 5a45c947..763c4c5e 100644
--- a/doc/html/qfile-h.html
+++ b/doc/html/qfile-h.html
@@ -120,12 +120,12 @@ public:
bool at( Offset );
bool atEnd() const;
- Q_LONG readBlock( char *data, Q_ULONG len );
- Q_LONG writeBlock( const char *data, Q_ULONG len );
- Q_LONG writeBlock( const TQByteArray& data )
+ TQ_LONG readBlock( char *data, TQ_ULONG len );
+ TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+ TQ_LONG writeBlock( const TQByteArray& data )
{ return TQIODevice::writeBlock(data); }
- Q_LONG readLine( char *data, Q_ULONG maxlen );
- Q_LONG readLine( TQString &, Q_ULONG maxlen );
+ TQ_LONG readLine( char *data, TQ_ULONG maxlen );
+ TQ_LONG readLine( TQString &, TQ_ULONG maxlen );
int getch();
int putch( int );
diff --git a/doc/html/qfontmanager_qws-h.html b/doc/html/qfontmanager_qws-h.html
index 8c8da752..1ea95d14 100644
--- a/doc/html/qfontmanager_qws-h.html
+++ b/doc/html/qfontmanager_qws-h.html
@@ -91,16 +91,16 @@ class TQFontDef;
class TQ_PACKED TQGlyphMetrics {
public:
- Q_UINT8 linestep;
- Q_UINT8 width;
- Q_UINT8 height;
- Q_UINT8 flags;
+ TQ_UINT8 linestep;
+ TQ_UINT8 width;
+ TQ_UINT8 height;
+ TQ_UINT8 flags;
- Q_INT8 bearingx; // Difference from pen position to glyph's left bbox
- Q_UINT8 advance; // Difference between pen positions
- Q_INT8 bearingy; // Used for putting characters on baseline
+ TQ_INT8 bearingx; // Difference from pen position to glyph's left bbox
+ TQ_UINT8 advance; // Difference between pen positions
+ TQ_INT8 bearingy; // Used for putting characters on baseline
- Q_INT8 reserved; // Do not use
+ TQ_INT8 reserved; // Do not use
// Flags:
// RendererOwnsData - the renderer is responsible for glyph data
diff --git a/doc/html/qftp-h.html b/doc/html/qftp-h.html
index d38aeb58..21d9a29b 100644
--- a/doc/html/qftp-h.html
+++ b/doc/html/qftp-h.html
@@ -138,7 +138,7 @@ public:
RawCommand
};
- int connectToHost( const TQString &host, Q_UINT16 port=21 );
+ int connectToHost( const TQString &host, TQ_UINT16 port=21 );
int login( const TQString &user=TQString::null, const TQString &password=TQString::null );
int close();
int list( const TQString &dir=TQString::null );
@@ -153,8 +153,8 @@ public:
int rawCommand( const TQString &command );
- Q_ULONG bytesAvailable() const;
- Q_LONG readBlock( char *data, Q_ULONG maxlen );
+ TQ_ULONG bytesAvailable() const;
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
TQByteArray readAll();
int currentId() const;
diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html
index 048af28b..3309d1f1 100644
--- a/doc/html/qgl-h.html
+++ b/doc/html/qgl-h.html
@@ -271,7 +271,7 @@ protected:
void* vi;
void* cx;
#if defined(Q_WS_X11)
- Q_UINT32 gpm;
+ TQ_UINT32 gpm;
#endif
#endif
TQGLFormat glFormat;
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 14ea0fe5..9f399867 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -744,40 +744,40 @@ typedef int INT32; // 32 bit signed
typedef unsigned int UINT32; // 32 bit unsigned
#endif
-typedef signed char Q_INT8; // 8 bit signed
-typedef unsigned char Q_UINT8; // 8 bit unsigned
-typedef short Q_INT16; // 16 bit signed
-typedef unsigned short Q_UINT16; // 16 bit unsigned
-typedef int Q_INT32; // 32 bit signed
-typedef unsigned int Q_UINT32; // 32 bit unsigned
+typedef signed char TQ_INT8; // 8 bit signed
+typedef unsigned char TQ_UINT8; // 8 bit unsigned
+typedef short TQ_INT16; // 16 bit signed
+typedef unsigned short TQ_UINT16; // 16 bit unsigned
+typedef int TQ_INT32; // 32 bit signed
+typedef unsigned int TQ_UINT32; // 32 bit unsigned
#if defined(Q_OS_WIN64)
-typedef __int64 Q_LONG; // word up to 64 bit signed
-typedef unsigned __int64 Q_ULONG; // word up to 64 bit unsigned
+typedef __int64 TQ_LONG; // word up to 64 bit signed
+typedef unsigned __int64 TQ_ULONG; // word up to 64 bit unsigned
#else
-typedef long Q_LONG; // word up to 64 bit signed
-typedef unsigned long Q_ULONG; // word up to 64 bit unsigned
+typedef long TQ_LONG; // word up to 64 bit signed
+typedef unsigned long TQ_ULONG; // word up to 64 bit unsigned
#endif
#if defined(Q_OS_WIN) && !defined(Q_CC_GNU)
# define TQ_INT64_C(c) c ## i64 // signed 64 bit constant
# define TQ_UINT64_C(c) c ## ui64 // unsigned 64 bit constant
-typedef __int64 Q_INT64; // 64 bit signed
-typedef unsigned __int64 Q_UINT64; // 64 bit unsigned
+typedef __int64 TQ_INT64; // 64 bit signed
+typedef unsigned __int64 TQ_UINT64; // 64 bit unsigned
#else
# define TQ_INT64_C(c) c ## LL // signed 64 bit constant
# define TQ_UINT64_C(c) c ## ULL // unsigned 64 bit constant
-typedef long long Q_INT64; // 64 bit signed
-typedef unsigned long long Q_UINT64; // 64 bit unsigned
+typedef long long TQ_INT64; // 64 bit signed
+typedef unsigned long long TQ_UINT64; // 64 bit unsigned
#endif
-typedef Q_INT64 Q_LLONG; // signed long long
-typedef Q_UINT64 Q_ULLONG; // unsigned long long
+typedef TQ_INT64 TQ_LLONG; // signed long long
+typedef TQ_UINT64 TQ_ULLONG; // unsigned long long
#if defined(Q_OS_MACX) && !defined(QT_LARGEFILE_SUPPORT)
# define QT_LARGEFILE_SUPPORT 64
#endif
#if defined(QT_LARGEFILE_SUPPORT)
- typedef Q_ULLONG TQtOffset;
+ typedef TQ_ULLONG TQtOffset;
#else
- typedef Q_ULONG TQtOffset;
+ typedef TQ_ULONG TQtOffset;
#endif
diff --git a/doc/html/qhostaddress-h.html b/doc/html/qhostaddress-h.html
index f5fa62dc..e5b8c31e 100644
--- a/doc/html/qhostaddress-h.html
+++ b/doc/html/qhostaddress-h.html
@@ -91,15 +91,15 @@ body { background: #ffffff; color: black; }
class TQHostAddressPrivate;
typedef struct {
- Q_UINT8 c[16];
+ TQ_UINT8 c[16];
} Q_IPV6ADDR;
class TQM_EXPORT_NETWORK TQHostAddress
{
public:
TQHostAddress();
- TQHostAddress( Q_UINT32 ip4Addr );
- TQHostAddress( Q_UINT8 *ip6Addr );
+ TQHostAddress( TQ_UINT32 ip4Addr );
+ TQHostAddress( TQ_UINT8 *ip6Addr );
TQHostAddress(const Q_IPV6ADDR &ip6Addr);
#ifndef QT_NO_STRINGLIST
TQHostAddress(const TQString &address);
@@ -109,16 +109,16 @@ public:
TQHostAddress & operator=( const TQHostAddress & );
- void setAddress( Q_UINT32 ip4Addr );
- void setAddress( Q_UINT8 *ip6Addr );
+ void setAddress( TQ_UINT32 ip4Addr );
+ void setAddress( TQ_UINT8 *ip6Addr );
#ifndef QT_NO_STRINGLIST
bool setAddress( const TQString& address );
#endif
bool isIp4Addr() const; // obsolete
- Q_UINT32 ip4Addr() const; // obsolete
+ TQ_UINT32 ip4Addr() const; // obsolete
bool isIPv4Address() const;
- Q_UINT32 toIPv4Address() const;
+ TQ_UINT32 toIPv4Address() const;
bool isIPv6Address() const;
Q_IPV6ADDR toIPv6Address() const;
diff --git a/doc/html/qhttp-h.html b/doc/html/qhttp-h.html
index e05fe103..62acd87b 100644
--- a/doc/html/qhttp-h.html
+++ b/doc/html/qhttp-h.html
@@ -209,7 +209,7 @@ class TQM_EXPORT_HTTP TQHttp : public TQNetworkProtocol
public:
TQHttp();
TQHttp( TQObject* parent, const char* name = 0 ); // ### TQt 4.0: make parent=0 and get rid of the TQHttp() constructor
- TQHttp( const TQString &hostname, Q_UINT16 port=80, TQObject* parent=0, const char* name = 0 );
+ TQHttp( const TQString &hostname, TQ_UINT16 port=80, TQObject* parent=0, const char* name = 0 );
virtual ~TQHttp();
int supportedOperations() const;
@@ -226,7 +226,7 @@ public:
Aborted
};
- int setHost(const TQString &hostname, Q_UINT16 port=80 );
+ int setHost(const TQString &hostname, TQ_UINT16 port=80 );
int get( const TQString& path, TQIODevice* to=0 );
int post( const TQString& path, TQIODevice* data, TQIODevice* to=0 );
@@ -237,8 +237,8 @@ public:
int closeConnection();
- Q_ULONG bytesAvailable() const;
- Q_LONG readBlock( char *data, Q_ULONG maxlen );
+ TQ_ULONG bytesAvailable() const;
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
TQByteArray readAll();
int currentId() const;
diff --git a/doc/html/qiodevice-h.html b/doc/html/qiodevice-h.html
index dfe36a22..4cad06b6 100644
--- a/doc/html/qiodevice-h.html
+++ b/doc/html/qiodevice-h.html
@@ -128,9 +128,9 @@ class Q_EXPORT TQIODevice
{
public:
#if defined(QT_ABI_QT4)
- typedef Q_LLONG Offset;
+ typedef TQ_LLONG Offset;
#else
- typedef Q_ULONG Offset;
+ typedef TQ_ULONG Offset;
#endif
TQIODevice();
@@ -167,10 +167,10 @@ public:
virtual bool atEnd() const;
bool reset() { return at(0); }
- virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ) = 0;
- virtual Q_LONG writeBlock( const char *data, Q_ULONG len ) = 0;
- virtual Q_LONG readLine( char *data, Q_ULONG maxlen );
- Q_LONG writeBlock( const TQByteArray& data );
+ virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ) = 0;
+ virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ) = 0;
+ virtual TQ_LONG readLine( char *data, TQ_ULONG maxlen );
+ TQ_LONG writeBlock( const TQByteArray& data );
virtual TQByteArray readAll();
virtual int getch() = 0;
diff --git a/doc/html/qlocale-h.html b/doc/html/qlocale-h.html
index 8d36eff6..1df5e3a2 100644
--- a/doc/html/qlocale-h.html
+++ b/doc/html/qlocale-h.html
@@ -488,29 +488,29 @@ public:
ushort toUShort(const TQString &s, bool *ok = 0) const;
int toInt(const TQString &s, bool *ok = 0) const;
uint toUInt(const TQString &s, bool *ok = 0) const;
- Q_LONG toLong(const TQString &s, bool *ok = 0) const;
- Q_ULONG toULong(const TQString &s, bool *ok = 0) const;
- Q_LLONG toLongLong(const TQString &s, bool *ok = 0) const;
- Q_ULLONG toULongLong(const TQString &s, bool *ok = 0) const;
+ TQ_LONG toLong(const TQString &s, bool *ok = 0) const;
+ TQ_ULONG toULong(const TQString &s, bool *ok = 0) const;
+ TQ_LLONG toLongLong(const TQString &s, bool *ok = 0) const;
+ TQ_ULLONG toULongLong(const TQString &s, bool *ok = 0) const;
float toFloat(const TQString &s, bool *ok = 0) const;
double toDouble(const TQString &s, bool *ok = 0) const;
TQString toString(short i) const
- { return toString((Q_LLONG)i); }
+ { return toString((TQ_LLONG)i); }
TQString toString(ushort i) const
- { return toString((Q_ULLONG)i); }
+ { return toString((TQ_ULLONG)i); }
TQString toString(int i) const
- { return toString((Q_LLONG)i); }
+ { return toString((TQ_LLONG)i); }
TQString toString(uint i) const
- { return toString((Q_ULLONG)i); }
+ { return toString((TQ_ULLONG)i); }
#if !defined(Q_OS_WIN64)
- TQString toString(Q_LONG i) const
- { return toString((Q_LLONG)i); }
- TQString toString(Q_ULONG i) const
- { return toString((Q_ULLONG)i); }
+ TQString toString(TQ_LONG i) const
+ { return toString((TQ_LLONG)i); }
+ TQString toString(TQ_ULONG i) const
+ { return toString((TQ_ULLONG)i); }
#endif
- TQString toString(Q_LLONG i) const;
- TQString toString(Q_ULLONG i) const;
+ TQString toString(TQ_LLONG i) const;
+ TQString toString(TQ_ULLONG i) const;
TQString toString(float i, char f = 'g', int prec = 6) const
{ return toString((double) i, f, prec); }
TQString toString(double i, char f = 'g', int prec = 6) const;
diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html
index d6e5319a..aa67795e 100644
--- a/doc/html/qmap-h.html
+++ b/doc/html/qmap-h.html
@@ -884,9 +884,9 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal()
template<class Key, class T>
Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) {
m.clear();
- Q_UINT32 c;
+ TQ_UINT32 c;
s >> c;
- for( Q_UINT32 i = 0; i < c; ++i ) {
+ for( TQ_UINT32 i = 0; i < c; ++i ) {
Key k; T t;
s >> k >> t;
m.insert( k, t );
@@ -899,7 +899,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMa
template<class Key, class T>
Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) {
- s << (Q_UINT32)m.size();
+ s << (TQ_UINT32)m.size();
TQMapConstIterator<Key,T> it = m.begin();
for( ; it != m.end(); ++it )
s << it.key() << it.data();
diff --git a/doc/html/qpen-h.html b/doc/html/qpen-h.html
index 9081d708..534c7bcd 100644
--- a/doc/html/qpen-h.html
+++ b/doc/html/qpen-h.html
@@ -122,7 +122,7 @@ private:
PenStyle style;
uint width;
TQColor color;
- Q_UINT16 linest;
+ TQ_UINT16 linest;
} *data;
};
diff --git a/doc/html/qprocess-h.html b/doc/html/qprocess-h.html
index d95cfd31..a49803ef 100644
--- a/doc/html/qprocess-h.html
+++ b/doc/html/qprocess-h.html
@@ -135,7 +135,7 @@ public:
#if defined(Q_OS_WIN32)
typedef void* PID;
#else
- typedef Q_LONG PID;
+ typedef TQ_LONG PID;
#endif
PID processIdentifier();
diff --git a/doc/html/qserversocket-h.html b/doc/html/qserversocket-h.html
index 0d676013..0d02f322 100644
--- a/doc/html/qserversocket-h.html
+++ b/doc/html/qserversocket-h.html
@@ -97,16 +97,16 @@ class TQM_EXPORT_NETWORK TQServerSocket : public TQObject
{
TQ_OBJECT
public:
- TQServerSocket( Q_UINT16 port, int backlog = 1,
+ TQServerSocket( TQ_UINT16 port, int backlog = 1,
TQObject *parent=0, const char *name=0 );
- TQServerSocket( const TQHostAddress & address, Q_UINT16 port, int backlog = 1,
+ TQServerSocket( const TQHostAddress & address, TQ_UINT16 port, int backlog = 1,
TQObject *parent=0, const char *name=0 );
TQServerSocket( TQObject *parent=0, const char *name=0 );
virtual ~TQServerSocket();
bool ok() const;
- Q_UINT16 port() const ;
+ TQ_UINT16 port() const ;
int socket() const ;
virtual void setSocket( int socket );
@@ -123,7 +123,7 @@ private slots:
private:
TQServerSocketPrivate *d;
- void init( const TQHostAddress & address, Q_UINT16 port, int backlog );
+ void init( const TQHostAddress & address, TQ_UINT16 port, int backlog );
};
#endif // QT_NO_NETWORK
diff --git a/doc/html/qsizepolicy-h.html b/doc/html/qsizepolicy-h.html
index 6298cde4..363df216 100644
--- a/doc/html/qsizepolicy-h.html
+++ b/doc/html/qsizepolicy-h.html
@@ -109,7 +109,7 @@ public:
TQSizePolicy() : data( 0 ) { }
TQSizePolicy( SizeType hor, SizeType ver, bool hfw = FALSE )
- : data( hor | (ver<<HSize) | (hfw ? (Q_UINT32)(1<<2*HSize) : 0) ) { }
+ : data( hor | (ver<<HSize) | (hfw ? (TQ_UINT32)(1<<2*HSize) : 0) ) { }
TQSizePolicy( SizeType hor, SizeType ver, uchar hors, uchar vers, bool hfw = FALSE );
SizeType horData() const { return (SizeType)( data & HMask ); }
@@ -126,12 +126,12 @@ public:
(int)(horData() & ExpMask ? Horizontally : 0) );
}
- void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; }
- void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask << HSize)) |
+ void setHorData( SizeType d ) { data = (TQ_UINT32)(data & ~HMask) | d; }
+ void setVerData( SizeType d ) { data = (TQ_UINT32)(data & ~(HMask << HSize)) |
(d << HSize); }
- void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 << 2*HSize ) )
- : (Q_UINT32)( data & ~( 1 << 2*HSize ) ); }
+ void setHeightForWidth( bool b ) { data = b ? (TQ_UINT32)( data | ( 1 << 2*HSize ) )
+ : (TQ_UINT32)( data & ~( 1 << 2*HSize ) ); }
bool hasHeightForWidth() const { return data & ( 1 << 2*HSize ); }
bool operator==( const TQSizePolicy& s ) const { return data == s.data; }
@@ -145,13 +145,13 @@ public:
inline void transpose();
private:
- TQSizePolicy( int i ) : data( (Q_UINT32)i ) { }
+ TQSizePolicy( int i ) : data( (TQ_UINT32)i ) { }
- Q_UINT32 data;
+ TQ_UINT32 data;
};
inline TQSizePolicy::TQSizePolicy( SizeType hor, SizeType ver, uchar hors, uchar vers, bool hfw )
- : data( hor | (ver<<HSize) | (hfw ? (Q_UINT32)(1<<2*HSize) : 0) ) {
+ : data( hor | (ver<<HSize) | (hfw ? (TQ_UINT32)(1<<2*HSize) : 0) ) {
setHorStretch( hors );
setVerStretch( vers );
}
diff --git a/doc/html/qsocket-h.html b/doc/html/qsocket-h.html
index 63d83726..8c38e4b3 100644
--- a/doc/html/qsocket-h.html
+++ b/doc/html/qsocket-h.html
@@ -119,7 +119,7 @@ public:
virtual void setSocketDevice( TQSocketDevice * );
#ifndef QT_NO_DNS
- virtual void connectToHost( const TQString &host, Q_UINT16 port );
+ virtual void connectToHost( const TQString &host, TQ_UINT16 port );
#endif
TQString peerName() const;
@@ -132,15 +132,15 @@ public:
bool at( Offset );
bool atEnd() const;
- Q_ULONG bytesAvailable() const; // ### TQIODevice::Offset instead?
- Q_ULONG waitForMore( int msecs, bool *timeout ) const;
- Q_ULONG waitForMore( int msecs ) const; // ### TQt 4.0: merge the two overloads
- Q_ULONG bytesToWrite() const;
+ TQ_ULONG bytesAvailable() const; // ### TQIODevice::Offset instead?
+ TQ_ULONG waitForMore( int msecs, bool *timeout ) const;
+ TQ_ULONG waitForMore( int msecs ) const; // ### TQt 4.0: merge the two overloads
+ TQ_ULONG bytesToWrite() const;
void clearPendingData();
- Q_LONG readBlock( char *data, Q_ULONG maxlen );
- Q_LONG writeBlock( const char *data, Q_ULONG len );
- Q_LONG readLine( char *data, Q_ULONG maxlen );
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
+ TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+ TQ_LONG readLine( char *data, TQ_ULONG maxlen );
int getch();
int putch( int );
@@ -149,13 +149,13 @@ public:
bool canReadLine() const;
virtual TQString readLine();
- Q_UINT16 port() const;
- Q_UINT16 peerPort() const;
+ TQ_UINT16 port() const;
+ TQ_UINT16 peerPort() const;
TQHostAddress address() const;
TQHostAddress peerAddress() const;
- void setReadBufferSize( Q_ULONG );
- Q_ULONG readBufferSize() const;
+ void setReadBufferSize( TQ_ULONG );
+ TQ_ULONG readBufferSize() const;
signals:
void hostFound();
@@ -177,7 +177,7 @@ private slots:
private:
TQSocketPrivate *d;
- bool consumeWriteBuf( Q_ULONG nbytes );
+ bool consumeWriteBuf( TQ_ULONG nbytes );
void tryConnection();
void setSocketIntern( int socket );
diff --git a/doc/html/qsocketdevice-h.html b/doc/html/qsocketdevice-h.html
index 9af059ab..ec25468a 100644
--- a/doc/html/qsocketdevice-h.html
+++ b/doc/html/qsocketdevice-h.html
@@ -131,25 +131,25 @@ public:
int sendBufferSize() const;
virtual void setSendBufferSize( uint );
- virtual bool connect( const TQHostAddress &, Q_UINT16 );
+ virtual bool connect( const TQHostAddress &, TQ_UINT16 );
- virtual bool bind( const TQHostAddress &, Q_UINT16 );
+ virtual bool bind( const TQHostAddress &, TQ_UINT16 );
virtual bool listen( int backlog );
virtual int accept();
- Q_LONG bytesAvailable() const;
- Q_LONG waitForMore( int msecs, bool *timeout=0 ) const;
- Q_LONG readBlock( char *data, Q_ULONG maxlen );
- Q_LONG writeBlock( const char *data, Q_ULONG len );
- virtual Q_LONG writeBlock( const char *data, Q_ULONG len,
- const TQHostAddress & host, Q_UINT16 port );
+ TQ_LONG bytesAvailable() const;
+ TQ_LONG waitForMore( int msecs, bool *timeout=0 ) const;
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
+ TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+ virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len,
+ const TQHostAddress & host, TQ_UINT16 port );
int getch();
int putch( int );
int ungetch(int);
- Q_UINT16 port() const;
- Q_UINT16 peerPort() const;
+ TQ_UINT16 port() const;
+ TQ_UINT16 peerPort() const;
TQHostAddress address() const;
TQHostAddress peerAddress() const;
@@ -174,9 +174,9 @@ protected:
private:
int fd;
Type t;
- Q_UINT16 p;
+ TQ_UINT16 p;
TQHostAddress a;
- Q_UINT16 pp;
+ TQ_UINT16 pp;
TQHostAddress pa;
TQSocketDevice::Error e;
TQSocketDevicePrivate * d;
diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html
index dfa12ef0..2776b250 100644
--- a/doc/html/qstring-h.html
+++ b/doc/html/qstring-h.html
@@ -471,8 +471,8 @@ public:
TQString arg( long a, int fieldWidth = 0, int base = 10 ) const;
TQString arg( ulong a, int fieldWidth = 0, int base = 10 ) const;
- TQString arg( Q_LLONG a, int fieldwidth=0, int base=10 ) const;
- TQString arg( Q_ULLONG a, int fieldwidth=0, int base=10 ) const;
+ TQString arg( TQ_LLONG a, int fieldwidth=0, int base=10 ) const;
+ TQString arg( TQ_ULLONG a, int fieldwidth=0, int base=10 ) const;
TQString arg( int a, int fieldWidth = 0, int base = 10 ) const;
TQString arg( uint a, int fieldWidth = 0, int base = 10 ) const;
TQString arg( short a, int fieldWidth = 0, int base = 10 ) const;
@@ -636,8 +636,8 @@ public:
uint toUInt( bool *ok=0, int base=10 ) const;
long toLong( bool *ok=0, int base=10 ) const;
ulong toULong( bool *ok=0, int base=10 ) const;
- Q_LLONG toLongLong( bool *ok=0, int base=10 ) const;
- Q_ULLONG toULongLong( bool *ok=0, int base=10 ) const;
+ TQ_LLONG toLongLong( bool *ok=0, int base=10 ) const;
+ TQ_ULLONG toULongLong( bool *ok=0, int base=10 ) const;
float toFloat( bool *ok=0 ) const;
double toDouble( bool *ok=0 ) const;
@@ -647,15 +647,15 @@ public:
TQString &setNum( uint, int base=10 );
TQString &setNum( long, int base=10 );
TQString &setNum( ulong, int base=10 );
- TQString &setNum( Q_LLONG, int base=10 );
- TQString &setNum( Q_ULLONG, int base=10 );
+ TQString &setNum( TQ_LLONG, int base=10 );
+ TQString &setNum( TQ_ULLONG, int base=10 );
TQString &setNum( float, char f='g', int prec=6 );
TQString &setNum( double, char f='g', int prec=6 );
static TQString number( long, int base=10 );
static TQString number( ulong, int base=10);
- static TQString number( Q_LLONG, int base=10 );
- static TQString number( Q_ULLONG, int base=10);
+ static TQString number( TQ_LLONG, int base=10 );
+ static TQString number( TQ_ULLONG, int base=10);
static TQString number( int, int base=10 );
static TQString number( uint, int base=10);
static TQString number( double, char f='g', int prec=6 );
@@ -991,31 +991,31 @@ inline TQString &TQString::prepend( const std::string& s )
#endif
inline TQString &TQString::setNum( short n, int base )
-{ return setNum((Q_LLONG)n, base); }
+{ return setNum((TQ_LLONG)n, base); }
inline TQString &TQString::setNum( ushort n, int base )
-{ return setNum((Q_ULLONG)n, base); }
+{ return setNum((TQ_ULLONG)n, base); }
inline TQString &TQString::setNum( int n, int base )
-{ return setNum((Q_LLONG)n, base); }
+{ return setNum((TQ_LLONG)n, base); }
inline TQString &TQString::setNum( uint n, int base )
-{ return setNum((Q_ULLONG)n, base); }
+{ return setNum((TQ_ULLONG)n, base); }
inline TQString &TQString::setNum( float n, char f, int prec )
{ return setNum((double)n,f,prec); }
inline TQString TQString::arg( int a, int fieldWidth, int base ) const
-{ return arg( (Q_LLONG)a, fieldWidth, base ); }
+{ return arg( (TQ_LLONG)a, fieldWidth, base ); }
inline TQString TQString::arg( uint a, int fieldWidth, int base ) const
-{ return arg( (Q_ULLONG)a, fieldWidth, base ); }
+{ return arg( (TQ_ULLONG)a, fieldWidth, base ); }
inline TQString TQString::arg( short a, int fieldWidth, int base ) const
-{ return arg( (Q_LLONG)a, fieldWidth, base ); }
+{ return arg( (TQ_LLONG)a, fieldWidth, base ); }
inline TQString TQString::arg( ushort a, int fieldWidth, int base ) const
-{ return arg( (Q_ULLONG)a, fieldWidth, base ); }
+{ return arg( (TQ_ULLONG)a, fieldWidth, base ); }
inline TQString TQString::arg( const TQString& a1, const TQString& a2 ) const {
return multiArg( 2, a1, a2 );
diff --git a/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html
index c88d0ca6..82bdca0d 100644
--- a/doc/html/qvaluelist-h.html
+++ b/doc/html/qvaluelist-h.html
@@ -675,9 +675,9 @@ template <class T>
Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l )
{
l.clear();
- Q_UINT32 c;
+ TQ_UINT32 c;
s >> c;
- for( Q_UINT32 i = 0; i < c; ++i )
+ for( TQ_UINT32 i = 0; i < c; ++i )
{
T t;
s >> t;
@@ -691,7 +691,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQVa
template <class T>
Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l )
{
- s << (Q_UINT32)l.size();
+ s << (TQ_UINT32)l.size();
TQValueListConstIterator<T> it = l.begin();
for( ; it != l.end(); ++it )
s << *it;
diff --git a/doc/html/qvaluevector-h.html b/doc/html/qvaluevector-h.html
index a51eb524..61e65322 100644
--- a/doc/html/qvaluevector-h.html
+++ b/doc/html/qvaluevector-h.html
@@ -581,10 +581,10 @@ template<class T>
Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v )
{
v.clear();
- Q_UINT32 c;
+ TQ_UINT32 c;
s >> c;
v.resize( c );
- for( Q_UINT32 i = 0; i < c; ++i )
+ for( TQ_UINT32 i = 0; i < c; ++i )
{
T t;
s >> t;
@@ -596,7 +596,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQVa
template<class T>
Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v )
{
- s << (Q_UINT32)v.size();
+ s << (TQ_UINT32)v.size();
// ### use typename TQValueVector<T>::const_iterator once all supported
// ### compilers know about the 'typename' keyword.
const T* it = v.begin();
diff --git a/doc/html/qvariant-h.html b/doc/html/qvariant-h.html
index f25a6c9d..76f80d09 100644
--- a/doc/html/qvariant-h.html
+++ b/doc/html/qvariant-h.html
@@ -201,8 +201,8 @@ public:
#endif
TQVariant( int );
TQVariant( uint );
- TQVariant( Q_LLONG );
- TQVariant( Q_ULLONG );
+ TQVariant( TQ_LLONG );
+ TQVariant( TQ_ULLONG );
// ### Problems on some compilers ?
TQVariant( bool, int );
TQVariant( double );
@@ -254,8 +254,8 @@ public:
const TQPen toPen() const;
int toInt( bool * ok=0 ) const;
uint toUInt( bool * ok=0 ) const;
- Q_LLONG toLongLong( bool * ok=0 ) const;
- Q_ULLONG toULongLong( bool * ok=0 ) const;
+ TQ_LLONG toLongLong( bool * ok=0 ) const;
+ TQ_ULLONG toULongLong( bool * ok=0 ) const;
bool toBool() const;
double toDouble( bool * ok=0 ) const;
#ifndef QT_NO_TEMPLATE_VARIANT
@@ -304,8 +304,8 @@ public:
TQPen& asPen();
int& asInt();
uint& asUInt();
- Q_LLONG& asLongLong();
- Q_ULLONG& asULongLong();
+ TQ_LLONG& asLongLong();
+ TQ_ULLONG& asULongLong();
bool& asBool();
double& asDouble();
#ifndef QT_NO_TEMPLATE_VARIANT
@@ -338,8 +338,8 @@ private:
{
uint u;
int i;
- Q_LLONG ll;
- Q_ULLONG ull;
+ TQ_LLONG ll;
+ TQ_ULLONG ull;
bool b;
double d;
void *ptr;
diff --git a/doc/html/qwidget-h.html b/doc/html/qwidget-h.html
index a4a092cf..4c674877 100644
--- a/doc/html/qwidget-h.html
+++ b/doc/html/qwidget-h.html
@@ -1014,8 +1014,8 @@ struct Q_EXPORT TQTLWExtra {
// dear user: you can see this struct, but it is internal. do not touch.
struct Q_EXPORT TQWExtra {
- Q_INT16 minw, minh; // minimum size
- Q_INT16 maxw, maxh; // maximum size
+ TQ_INT16 minw, minh; // minimum size
+ TQ_INT16 maxw, maxh; // maximum size
TQPixmap *bg_pix; // background pixmap
TQWidget *focus_proxy;
#ifndef QT_NO_CURSOR
diff --git a/doc/html/qwidgetfactory-h.html b/doc/html/qwidgetfactory-h.html
index 1c73e124..3bd1805b 100644
--- a/doc/html/qwidgetfactory-h.html
+++ b/doc/html/qwidgetfactory-h.html
@@ -142,8 +142,8 @@ private:
TQString translate( const char *sourceText, const char *comment = "" );
TQString translate( const TQString& sourceText, const TQString& comment = TQString::null );
- void unpackUInt16( TQDataStream& in, Q_UINT16& n );
- void unpackUInt32( TQDataStream& in, Q_UINT32& n );
+ void unpackUInt16( TQDataStream& in, TQ_UINT16& n );
+ void unpackUInt32( TQDataStream& in, TQ_UINT32& n );
void unpackByteArray( TQDataStream& in, TQByteArray& array );
void unpackCString( const UibStrTable& strings, TQDataStream& in,
TQCString& cstr );
diff --git a/doc/html/qwindowdefs-h.html b/doc/html/qwindowdefs-h.html
index 0a7f4828..7b3d22c8 100644
--- a/doc/html/qwindowdefs-h.html
+++ b/doc/html/qwindowdefs-h.html
@@ -210,7 +210,7 @@ class TQApplication;
// Global platform-independent types and functions
-typedef Q_INT32 TQCOORD; // coordinate type
+typedef TQ_INT32 TQCOORD; // coordinate type
const TQCOORD TQCOORD_MAX = 2147483647;
const TQCOORD TQCOORD_MIN = -TQCOORD_MAX - 1;
diff --git a/doc/man/man3/qaxbase.3qt b/doc/man/man3/qaxbase.3qt
index 154031b5..22326f9a 100644
--- a/doc/man/man3/qaxbase.3qt
+++ b/doc/man/man3/qaxbase.3qt
@@ -156,7 +156,7 @@ QAxBase transparently converts between COM data types and the equivalent Qt data
.PP
Supported COM datatypes are listed in the first column of following table. The second column is the Qt type that can be used with the QObject property functions. The third column is the Qt type that is used in the prototype of generated signals and slots for in-parameters, and the last column is the Qt type that is used in the prototype of signals and slots for out-parameters. .nf
.TS
-l - l. COM type Qt property in-parameter out-parameter VARIANT_BOOL bool bool bool& BSTR QString const QString& QString& char, short, int, long int int int& uchar, ushort, uint, ulong uint uint uint& float, double double double double& DATE QDateTime const QDateTime& QDateTime& CY Q_LLONG Q_LLONG Q_LLONG& OLE_COLOR QColor const QColor& QColor& SAFEARRAY(VARIANT) QValueList const QValueList& QValueList& SAFEARRAY(BYTE) QByteArray const QByteArray& QByteArray& SAFEARRAY(BSTR) QStringList const QStringList& QStringList& VARIANT type-dependent const QVariant& QVariant& IFontDisp* QFont const QFont& QFont& IPictureDisp* QPixmap const QPixmap& QPixmap& IDispatch* QAxObject* (read-only) QAxBase::asVariant() QAxObject* (return value) IUnknown* QAxObject* (read-only) QAxBase::asVariant() QAxObject* (return value) SCODE, DECIMAL \fIunsupported\fR \fIunsupported\fR
+l - l. COM type Qt property in-parameter out-parameter VARIANT_BOOL bool bool bool& BSTR QString const QString& QString& char, short, int, long int int int& uchar, ushort, uint, ulong uint uint uint& float, double double double double& DATE QDateTime const QDateTime& QDateTime& CY TQ_LLONG TQ_LLONG TQ_LLONG& OLE_COLOR QColor const QColor& QColor& SAFEARRAY(VARIANT) QValueList const QValueList& QValueList& SAFEARRAY(BYTE) QByteArray const QByteArray& QByteArray& SAFEARRAY(BSTR) QStringList const QStringList& QStringList& VARIANT type-dependent const QVariant& QVariant& IFontDisp* QFont const QFont& QFont& IPictureDisp* QPixmap const QPixmap& QPixmap& IDispatch* QAxObject* (read-only) QAxBase::asVariant() QAxObject* (return value) IUnknown* QAxObject* (read-only) QAxBase::asVariant() QAxObject* (return value) SCODE, DECIMAL \fIunsupported\fR \fIunsupported\fR
.TE
.fi
diff --git a/doc/man/man3/qbuffer.3qt b/doc/man/man3/qbuffer.3qt
index c696de24..82d78bb0 100644
--- a/doc/man/man3/qbuffer.3qt
+++ b/doc/man/man3/qbuffer.3qt
@@ -33,10 +33,10 @@ Inherits QIODevice.
.BI "bool \fBsetBuffer\fR ( QByteArray buf )"
.br
.ti -1c
-.BI "virtual Q_LONG \fBwriteBlock\fR ( const char * p, Q_ULONG len )"
+.BI "virtual TQ_LONG \fBwriteBlock\fR ( const char * p, TQ_ULONG len )"
.br
.ti -1c
-.BI "Q_LONG \fBwriteBlock\fR ( const QByteArray & data )"
+.BI "TQ_LONG \fBwriteBlock\fR ( const QByteArray & data )"
.br
.in -1c
.SH DESCRIPTION
@@ -98,7 +98,7 @@ Does nothing (and returns FALSE) if isOpen() is TRUE.
Note that if you open the buffer in write mode (IO_WriteOnly or IO_ReadWrite) and write something into the buffer, \fIbuf\fR is also modified because QByteArray is an explicitly shared class.
.PP
See also buffer(), open(), and close().
-.SH "Q_LONG QBuffer::writeBlock ( const char * p, Q_ULONG len )\fC [virtual]\fR"
+.SH "TQ_LONG QBuffer::writeBlock ( const char * p, TQ_ULONG len )\fC [virtual]\fR"
Writes \fIlen\fR bytes from \fIp\fR into the buffer at the current index position, overwriting any characters there and extending the buffer if necessary. Returns the number of bytes actually written.
.PP
Returns -1 if an error occurred.
@@ -106,7 +106,7 @@ Returns -1 if an error occurred.
See also readBlock().
.PP
Reimplemented from QIODevice.
-.SH "Q_LONG QBuffer::writeBlock ( const QByteArray & data )"
+.SH "TQ_LONG QBuffer::writeBlock ( const QByteArray & data )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
This convenience function is the same as calling
diff --git a/doc/man/man3/qdatastream.3qt b/doc/man/man3/qdatastream.3qt
index c2627a8b..b4c5222e 100644
--- a/doc/man/man3/qdatastream.3qt
+++ b/doc/man/man3/qdatastream.3qt
@@ -64,34 +64,34 @@ All the functions in this class are reentrant when Qt is built with thread suppo
.BI "void \fBsetVersion\fR ( int v )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_INT8 & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_INT8 & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_UINT8 & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_UINT8 & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_INT16 & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_INT16 & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_UINT16 & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_UINT16 & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_INT32 & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_INT32 & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_UINT32 & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_UINT32 & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_INT64 & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_INT64 & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_UINT64 & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_UINT64 & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_LONG & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_LONG & i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator>>\fR ( Q_ULONG & i )"
+.BI "QDataStream & \fBoperator>>\fR ( TQ_ULONG & i )"
.br
.ti -1c
.BI "QDataStream & \fBoperator>>\fR ( float & f )"
@@ -103,34 +103,34 @@ All the functions in this class are reentrant when Qt is built with thread suppo
.BI "QDataStream & \fBoperator>>\fR ( char *& s )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_INT8 i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_INT8 i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_UINT8 i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_UINT8 i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_INT16 i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_INT16 i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_UINT16 i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_UINT16 i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_INT32 i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_INT32 i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_UINT32 i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_UINT32 i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_INT64 i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_INT64 i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_UINT64 i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_UINT64 i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_LONG i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_LONG i )"
.br
.ti -1c
-.BI "QDataStream & \fBoperator<<\fR ( Q_ULONG i )"
+.BI "QDataStream & \fBoperator<<\fR ( TQ_ULONG i )"
.br
.ti -1c
.BI "QDataStream & \fBoperator<<\fR ( float f )"
@@ -177,7 +177,7 @@ Example (write binary data to a stream):
.br
stream << "the answer is"; // serialize a string
.br
- stream << (Q_INT32)42; // serialize an integer
+ stream << (TQ_INT32)42; // serialize an integer
.br
.fi
.PP
@@ -193,7 +193,7 @@ Example (read binary data from a stream):
.br
QString str;
.br
- Q_INT32 a;
+ TQ_INT32 a;
.br
stream >> str >> a; // extract "the answer is" and 42
.br
@@ -224,9 +224,9 @@ If you are producing a new binary data format, such as a file format for documen
.br
// Write a header with a "magic number" and a version
.br
- stream << (Q_UINT32)0xA0B0C0D0;
+ stream << (TQ_UINT32)0xA0B0C0D0;
.br
- stream << (Q_INT32)123;
+ stream << (TQ_INT32)123;
.br
.br
// Write the data
@@ -248,7 +248,7 @@ Then read it in with:
.br
// Read and check the header
.br
- Q_UINT32 magic;
+ TQ_UINT32 magic;
.br
stream >> magic;
.br
@@ -259,7 +259,7 @@ Then read it in with:
.br
// Read the version
.br
- Q_INT32 version;
+ TQ_INT32 version;
.br
stream >> version;
.br
@@ -292,7 +292,7 @@ You can select which byte order to use when serializing data. The default settin
.SH "Reading and writing raw binary data"
You may wish to read/write your own raw binary data to/from the data stream directly. Data may be read from the stream into a preallocated char* using readRawBytes(). Similarly data can be written to the stream using writeRawBytes(). Notice that any encoding/decoding of the data must be done by you.
.PP
-A similar pair of functions is readBytes() and writeBytes(). These differ from their \fIraw\fR counterparts as follows: readBytes() reads a Q_UINT32 which is taken to be the length of the data to be read, then that number of bytes is read into the preallocated char*; writeBytes() writes a Q_UINT32 containing the length of the data, followed by the data. Notice that any encoding/decoding of the data (apart from the length Q_UINT32) must be done by you.
+A similar pair of functions is readBytes() and writeBytes(). These differ from their \fIraw\fR counterparts as follows: readBytes() reads a TQ_UINT32 which is taken to be the length of the data to be read, then that number of bytes is read into the preallocated char*; writeBytes() writes a TQ_UINT32 containing the length of the data, followed by the data. Notice that any encoding/decoding of the data (apart from the length TQ_UINT32) must be done by you.
.PP
See also QTextStream, QVariant, and Input/Output and Networking.
.SS "Member Type Documentation"
@@ -363,41 +363,41 @@ See also QIODevice::atEnd().
Returns TRUE if the printable data flag has been set; otherwise returns FALSE.
.PP
See also setPrintableData().
-.SH "QDataStream & QDataStream::operator<< ( Q_INT8 i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_INT8 i )"
Writes a signed byte, \fIi\fR, to the stream and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_UINT8 i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_UINT8 i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes an unsigned byte, \fIi\fR, to the stream and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_INT16 i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_INT16 i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes a signed 16-bit integer, \fIi\fR, to the stream and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_UINT16 i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_UINT16 i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes an unsigned 16-bit integer, \fIi\fR, to the stream and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_INT32 i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_INT32 i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes a signed 32-bit integer, \fIi\fR, to the stream and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_UINT32 i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_UINT32 i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
-Writes an unsigned integer, \fIi\fR, to the stream as a 32-bit unsigned integer (Q_UINT32). Returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_INT64 i )"
+Writes an unsigned integer, \fIi\fR, to the stream as a 32-bit unsigned integer (TQ_UINT32). Returns a reference to the stream.
+.SH "QDataStream & QDataStream::operator<< ( TQ_INT64 i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes a signed 64-bit integer, \fIi\fR, to the stream and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_UINT64 i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_UINT64 i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes an unsigned 64-bit integer, \fIi\fR, to the stream and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_LONG i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_LONG i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes a signed integer \fIi\fR, of the system's word length, to the stream and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator<< ( Q_ULONG i )"
+.SH "QDataStream & QDataStream::operator<< ( TQ_ULONG i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes an unsigned integer \fIi\fR, of the system's word length, to the stream and returns a reference to the stream.
@@ -415,41 +415,41 @@ This is an overloaded member function, provided for convenience. It behaves esse
Writes the '\0'-terminated string \fIs\fR to the stream and returns a reference to the stream.
.PP
The string is serialized using writeBytes().
-.SH "QDataStream & QDataStream::operator>> ( Q_INT8 & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_INT8 & i )"
Reads a signed byte from the stream into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_UINT8 & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_UINT8 & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads an unsigned byte from the stream into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_INT16 & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_INT16 & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads a signed 16-bit integer from the stream into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_UINT16 & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_UINT16 & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads an unsigned 16-bit integer from the stream into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_INT32 & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_INT32 & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads a signed 32-bit integer from the stream into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_UINT32 & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_UINT32 & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads an unsigned 32-bit integer from the stream into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_INT64 & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_INT64 & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads a signed 64-bit integer from the stream into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_UINT64 & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_UINT64 & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads an unsigned 64-bit integer from the stream, into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_LONG & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_LONG & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads a signed integer of the system's word length from the stream into \fIi\fR, and returns a reference to the stream.
-.SH "QDataStream & QDataStream::operator>> ( Q_ULONG & i )"
+.SH "QDataStream & QDataStream::operator>> ( TQ_ULONG & i )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads an unsigned integer of the system's word length from the stream, into \fIi\fR, and returns a reference to the stream.
@@ -474,7 +474,7 @@ The buffer \fIs\fR is allocated using \fCnew\fR. Destroy it with the \fCdelete[]
.PP
The \fIl\fR parameter will be set to the length of the buffer.
.PP
-The serialization format is a Q_UINT32 length specifier first, then \fIl\fR bytes of data. Note that the data is \fInot\fR encoded.
+The serialization format is a TQ_UINT32 length specifier first, then \fIl\fR bytes of data. Note that the data is \fInot\fR encoded.
.PP
See also readRawBytes() and writeBytes().
.SH "QDataStream & QDataStream::readRawBytes ( char * s, uint len )"
@@ -529,7 +529,7 @@ See also setVersion().
.SH "QDataStream & QDataStream::writeBytes ( const char * s, uint len )"
Writes the length specifier \fIlen\fR and the buffer \fIs\fR to the stream and returns a reference to the stream.
.PP
-The \fIlen\fR is serialized as a Q_UINT32, followed by \fIlen\fR bytes from \fIs\fR. Note that the data is \fInot\fR encoded.
+The \fIlen\fR is serialized as a TQ_UINT32, followed by \fIlen\fR bytes from \fIs\fR. Note that the data is \fInot\fR encoded.
.PP
See also writeRawBytes() and readBytes().
.SH "QDataStream & QDataStream::writeRawBytes ( const char * s, uint len )"
diff --git a/doc/man/man3/qdns.3qt b/doc/man/man3/qdns.3qt
index 55d7e9a4..fab7a5fa 100644
--- a/doc/man/man3/qdns.3qt
+++ b/doc/man/man3/qdns.3qt
@@ -191,7 +191,7 @@ Returns a list of mail servers if the record type is Mx. The class \fCQDns::Mail
.TP
QString QDns::MailServer::name
.TP
-Q_UINT16 QDns::MailServer::priority
+TQ_UINT16 QDns::MailServer::priority
.PP
Note that if you want to iterate over the list, you should iterate over a copy, e.g.
.PP
@@ -245,11 +245,11 @@ Returns a list of servers if the record type is Srv. The class \fCQDns::Server\f
.TP
QString QDns::Server::name
.TP
-Q_UINT16 QDns::Server::priority
+TQ_UINT16 QDns::Server::priority
.TP
-Q_UINT16 QDns::Server::weight
+TQ_UINT16 QDns::Server::weight
.TP
-Q_UINT16 QDns::Server::port
+TQ_UINT16 QDns::Server::port
.PP
Note that if you want to iterate over the list, you should iterate over a copy, e.g.
.PP
diff --git a/doc/man/man3/qfile.3qt b/doc/man/man3/qfile.3qt
index b06be825..aab1c83a 100644
--- a/doc/man/man3/qfile.3qt
+++ b/doc/man/man3/qfile.3qt
@@ -66,10 +66,10 @@ Inherits QIODevice.
.BI "virtual bool \fBatEnd\fR () const"
.br
.ti -1c
-.BI "virtual Q_LONG \fBreadLine\fR ( char * p, Q_ULONG maxlen )"
+.BI "virtual TQ_LONG \fBreadLine\fR ( char * p, TQ_ULONG maxlen )"
.br
.ti -1c
-.BI "Q_LONG \fBreadLine\fR ( QString & s, Q_ULONG maxlen )"
+.BI "TQ_LONG \fBreadLine\fR ( QString & s, TQ_ULONG maxlen )"
.br
.ti -1c
.BI "virtual int \fBgetch\fR ()"
@@ -407,7 +407,7 @@ See also getch() and ungetch().
Reimplemented from QIODevice.
.SH "QByteArray QIODevice::readAll ()\fC [virtual]\fR"
This convenience function returns all of the remaining data in the device.
-.SH "Q_LONG QFile::readLine ( char * p, Q_ULONG maxlen )\fC [virtual]\fR"
+.SH "TQ_LONG QFile::readLine ( char * p, TQ_ULONG maxlen )\fC [virtual]\fR"
Reads a line of text.
.PP
Reads bytes from the file into the char* \fIp\fR, until end-of-line or \fImaxlen\fR bytes have been read, whichever occurs first. Returns the number of bytes read, or -1 if there was an error. Any terminating newline is not stripped.
@@ -417,7 +417,7 @@ This function is only efficient for buffered files. Avoid readLine() for files t
See also readBlock() and QTextStream::readLine().
.PP
Reimplemented from QIODevice.
-.SH "Q_LONG QFile::readLine ( QString & s, Q_ULONG maxlen )"
+.SH "TQ_LONG QFile::readLine ( QString & s, TQ_ULONG maxlen )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Reads a line of text.
diff --git a/doc/man/man3/qftp.3qt b/doc/man/man3/qftp.3qt
index a1b5c450..94e82248 100644
--- a/doc/man/man3/qftp.3qt
+++ b/doc/man/man3/qftp.3qt
@@ -34,7 +34,7 @@ Inherits QNetworkProtocol.
.BI "enum \fBCommand\fR { None, ConnectToHost, Login, Close, List, Cd, Get, Put, Remove, Mkdir, Rmdir, Rename, RawCommand }"
.br
.ti -1c
-.BI "int \fBconnectToHost\fR ( const QString & host, Q_UINT16 port = 21 )"
+.BI "int \fBconnectToHost\fR ( const QString & host, TQ_UINT16 port = 21 )"
.br
.ti -1c
.BI "int \fBlogin\fR ( const QString & user = QString::null, const QString & password = QString::null )"
@@ -73,10 +73,10 @@ Inherits QNetworkProtocol.
.BI "int \fBrawCommand\fR ( const QString & command )"
.br
.ti -1c
-.BI "Q_ULONG \fBbytesAvailable\fR () const"
+.BI "TQ_ULONG \fBbytesAvailable\fR () const"
.br
.ti -1c
-.BI "Q_LONG \fBreadBlock\fR ( char * data, Q_ULONG maxlen )"
+.BI "TQ_LONG \fBreadBlock\fR ( char * data, TQ_ULONG maxlen )"
.br
.ti -1c
.BI "QByteArray \fBreadAll\fR ()"
@@ -372,7 +372,7 @@ If you don't start further FTP commands directly after the abort(), there won't
See also clearPendingCommands().
.PP
Example: network/ftpclient/ftpmainwindow.ui.h.
-.SH "Q_ULONG QFtp::bytesAvailable () const"
+.SH "TQ_ULONG QFtp::bytesAvailable () const"
Returns the number of bytes that can be read from the data socket at the moment.
.PP
See also get(), readyRead(), readBlock(), and readAll().
@@ -414,7 +414,7 @@ This signal is emitted when processing the command identified by \fIid\fR starts
See also commandFinished() and done().
.PP
Example: network/ftpclient/ftpmainwindow.ui.h.
-.SH "int QFtp::connectToHost ( const QString & host, Q_UINT16 port = 21 )"
+.SH "int QFtp::connectToHost ( const QString & host, TQ_UINT16 port = 21 )"
Connects to the FTP server \fIhost\fR using port \fIport\fR.
.PP
The stateChanged() signal is emitted when the state of the connecting process changes, e.g. to HostLookup, then Connecting, then Connected.
@@ -568,7 +568,7 @@ Example: network/ftpclient/ftpmainwindow.ui.h.
Reads all the bytes available from the data socket and returns them.
.PP
See also get(), readyRead(), bytesAvailable(), and readBlock().
-.SH "Q_LONG QFtp::readBlock ( char * data, Q_ULONG maxlen )"
+.SH "TQ_LONG QFtp::readBlock ( char * data, TQ_ULONG maxlen )"
Reads \fImaxlen\fR bytes from the data socket into \fIdata\fR and returns the number of bytes read. Returns -1 if an error occurred.
.PP
See also get(), readyRead(), bytesAvailable(), and readAll().
diff --git a/doc/man/man3/qhostaddress.3qt b/doc/man/man3/qhostaddress.3qt
index 3835e421..2666b7d3 100644
--- a/doc/man/man3/qhostaddress.3qt
+++ b/doc/man/man3/qhostaddress.3qt
@@ -17,10 +17,10 @@ QHostAddress \- IP address
.BI "\fBQHostAddress\fR ()"
.br
.ti -1c
-.BI "\fBQHostAddress\fR ( Q_UINT32 ip4Addr )"
+.BI "\fBQHostAddress\fR ( TQ_UINT32 ip4Addr )"
.br
.ti -1c
-.BI "\fBQHostAddress\fR ( Q_UINT8 * ip6Addr )"
+.BI "\fBQHostAddress\fR ( TQ_UINT8 * ip6Addr )"
.br
.ti -1c
.BI "\fBQHostAddress\fR ( const Q_IPV6ADDR & ip6Addr )"
@@ -35,10 +35,10 @@ QHostAddress \- IP address
.BI "QHostAddress & \fBoperator=\fR ( const QHostAddress & address )"
.br
.ti -1c
-.BI "void \fBsetAddress\fR ( Q_UINT32 ip4Addr )"
+.BI "void \fBsetAddress\fR ( TQ_UINT32 ip4Addr )"
.br
.ti -1c
-.BI "void \fBsetAddress\fR ( Q_UINT8 * ip6Addr )"
+.BI "void \fBsetAddress\fR ( TQ_UINT8 * ip6Addr )"
.br
.ti -1c
.BI "bool \fBsetAddress\fR ( const QString & address )"
@@ -47,13 +47,13 @@ QHostAddress \- IP address
.BI "bool isIp4Addr () const \fI(obsolete)\fR"
.br
.ti -1c
-.BI "Q_UINT32 ip4Addr () const \fI(obsolete)\fR"
+.BI "TQ_UINT32 ip4Addr () const \fI(obsolete)\fR"
.br
.ti -1c
.BI "bool \fBisIPv4Address\fR () const"
.br
.ti -1c
-.BI "Q_UINT32 \fBtoIPv4Address\fR () const"
+.BI "TQ_UINT32 \fBtoIPv4Address\fR () const"
.br
.ti -1c
.BI "bool \fBisIPv6Address\fR () const"
@@ -84,9 +84,9 @@ See also QSocket, QServerSocket, QSocketDevice, and Input/Output and Networking.
.SH MEMBER FUNCTION DOCUMENTATION
.SH "QHostAddress::QHostAddress ()"
Creates a host address object with the IP address 0.0.0.0.
-.SH "QHostAddress::QHostAddress ( Q_UINT32 ip4Addr )"
+.SH "QHostAddress::QHostAddress ( TQ_UINT32 ip4Addr )"
Creates a host address object for the IPv4 address \fIip4Addr\fR.
-.SH "QHostAddress::QHostAddress ( Q_UINT8 * ip6Addr )"
+.SH "QHostAddress::QHostAddress ( TQ_UINT8 * ip6Addr )"
Creates a host address object with the specified IPv6 address.
.PP
\fIip6Addr\fR must be a 16 byte array in network byte order (high-order byte first).
@@ -96,7 +96,7 @@ Creates a host address object with the IPv6 address, \fIip6Addr\fR.
Creates a copy of \fIaddress\fR.
.SH "QHostAddress::~QHostAddress ()\fC [virtual]\fR"
Destroys the host address object.
-.SH "Q_UINT32 QHostAddress::ip4Addr () const"
+.SH "TQ_UINT32 QHostAddress::ip4Addr () const"
\fBThis function is obsolete.\fR It is provided to keep old source working. We strongly advise against using it in new code.
.PP
Use toIPv4Address() instead.
@@ -114,9 +114,9 @@ Returns TRUE if this host address is null (INADDR_ANY or in6addr_any). The defau
Assigns another host address object \fIaddress\fR to this object and returns a reference to this object.
.SH "bool QHostAddress::operator== ( const QHostAddress & other ) const"
Returns TRUE if this host address is the same as \fIother\fR; otherwise returns FALSE.
-.SH "void QHostAddress::setAddress ( Q_UINT32 ip4Addr )"
+.SH "void QHostAddress::setAddress ( TQ_UINT32 ip4Addr )"
Set the IPv4 address specified by \fIip4Addr\fR.
-.SH "void QHostAddress::setAddress ( Q_UINT8 * ip6Addr )"
+.SH "void QHostAddress::setAddress ( TQ_UINT8 * ip6Addr )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Set the IPv6 address specified by \fIip6Addr\fR.
@@ -126,7 +126,7 @@ Set the IPv6 address specified by \fIip6Addr\fR.
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Sets the IPv4 or IPv6 address specified by the string representation \fIaddress\fR (e.g. "127.0.0.1"). Returns TRUE and sets the address if the address was successfully parsed; otherwise returns FALSE and leaves the address unchanged.
-.SH "Q_UINT32 QHostAddress::toIPv4Address () const"
+.SH "TQ_UINT32 QHostAddress::toIPv4Address () const"
Returns the IPv4 address as a number.
.PP
For example, if the address is 127.0.0.1, the returned value is 2130706433 (i.e. 0x7f000001).
diff --git a/doc/man/man3/qhttp.3qt b/doc/man/man3/qhttp.3qt
index 0710e05e..39573eb7 100644
--- a/doc/man/man3/qhttp.3qt
+++ b/doc/man/man3/qhttp.3qt
@@ -22,7 +22,7 @@ Inherits QNetworkProtocol.
.BI "\fBQHttp\fR ( QObject * parent, const char * name = 0 )"
.br
.ti -1c
-.BI "\fBQHttp\fR ( const QString & hostname, Q_UINT16 port = 80, QObject * parent = 0, const char * name = 0 )"
+.BI "\fBQHttp\fR ( const QString & hostname, TQ_UINT16 port = 80, QObject * parent = 0, const char * name = 0 )"
.br
.ti -1c
.BI "virtual \fB~QHttp\fR ()"
@@ -34,7 +34,7 @@ Inherits QNetworkProtocol.
.BI "enum \fBError\fR { NoError, UnknownError, HostNotFound, ConnectionRefused, UnexpectedClose, InvalidResponseHeader, WrongContentLength, Aborted }"
.br
.ti -1c
-.BI "int \fBsetHost\fR ( const QString & hostname, Q_UINT16 port = 80 )"
+.BI "int \fBsetHost\fR ( const QString & hostname, TQ_UINT16 port = 80 )"
.br
.ti -1c
.BI "int \fBget\fR ( const QString & path, QIODevice * to = 0 )"
@@ -58,10 +58,10 @@ Inherits QNetworkProtocol.
.BI "int \fBcloseConnection\fR ()"
.br
.ti -1c
-.BI "Q_ULONG \fBbytesAvailable\fR () const"
+.BI "TQ_ULONG \fBbytesAvailable\fR () const"
.br
.ti -1c
-.BI "Q_LONG \fBreadBlock\fR ( char * data, Q_ULONG maxlen )"
+.BI "TQ_LONG \fBreadBlock\fR ( char * data, TQ_ULONG maxlen )"
.br
.ti -1c
.BI "QByteArray \fBreadAll\fR ()"
@@ -317,7 +317,7 @@ See also stateChanged() and state().
Constructs a QHttp object.
.SH "QHttp::QHttp ( QObject * parent, const char * name = 0 )"
Constructs a QHttp object. The parameters \fIparent\fR and \fIname\fR are passed on to the QObject constructor.
-.SH "QHttp::QHttp ( const QString & hostname, Q_UINT16 port = 80, QObject * parent = 0, const char * name = 0 )"
+.SH "QHttp::QHttp ( const QString & hostname, TQ_UINT16 port = 80, QObject * parent = 0, const char * name = 0 )"
Constructs a QHttp object. Subsequent requests are done by connecting to the server \fIhostname\fR on port \fIport\fR. The parameters \fIparent\fR and \fIname\fR are passed on to the QObject constructor.
.PP
See also setHost().
@@ -331,7 +331,7 @@ For the current request, the requestFinished() signal with the \fCerror\fR argum
Since this slot also deletes the scheduled requests, there are no requests left and the done() signal is emitted (with the \fCerror\fR argument \fCTRUE\fR).
.PP
See also clearPendingRequests().
-.SH "Q_ULONG QHttp::bytesAvailable () const"
+.SH "TQ_ULONG QHttp::bytesAvailable () const"
Returns the number of bytes that can be read from the response content at the moment.
.PP
See also get(), post(), request(), readyRead(), readBlock(), and readAll().
@@ -451,7 +451,7 @@ This is an overloaded member function, provided for convenience. It behaves esse
Reads all the bytes from the response content and returns them.
.PP
See also get(), post(), request(), readyRead(), bytesAvailable(), and readBlock().
-.SH "Q_LONG QHttp::readBlock ( char * data, Q_ULONG maxlen )"
+.SH "TQ_LONG QHttp::readBlock ( char * data, TQ_ULONG maxlen )"
Reads \fImaxlen\fR bytes from the response content into \fIdata\fR and returns the number of bytes read. Returns -1 if an error occurred.
.PP
See also get(), post(), request(), readyRead(), bytesAvailable(), and readAll().
@@ -497,7 +497,7 @@ See also requestFinished() and done().
This signal is emitted when the HTTP header of a server response is available. The header is passed in \fIresp\fR.
.PP
See also get(), post(), head(), request(), and readyRead().
-.SH "int QHttp::setHost ( const QString & hostname, Q_UINT16 port = 80 )"
+.SH "int QHttp::setHost ( const QString & hostname, TQ_UINT16 port = 80 )"
Sets the HTTP server that is used for requests to \fIhostname\fR on port \fIport\fR.
.PP
The function does not block and returns immediately. The request is scheduled, and its execution is performed asynchronously. The function returns a unique identifier which is passed by requestStarted() and requestFinished().
diff --git a/doc/man/man3/qiodevice.3qt b/doc/man/man3/qiodevice.3qt
index 05a550fb..6d087c34 100644
--- a/doc/man/man3/qiodevice.3qt
+++ b/doc/man/man3/qiodevice.3qt
@@ -18,7 +18,7 @@ Inherited by QBuffer, QFile, QSocket, and QSocketDevice.
.SS "Public Members"
.in +1c
.ti -1c
-.BI "typedef Q_ULONG \fBOffset\fR"
+.BI "typedef TQ_ULONG \fBOffset\fR"
.br
.ti -1c
.BI "\fBQIODevice\fR ()"
@@ -105,16 +105,16 @@ Inherited by QBuffer, QFile, QSocket, and QSocketDevice.
.BI "bool \fBreset\fR ()"
.br
.ti -1c
-.BI "virtual Q_LONG \fBreadBlock\fR ( char * data, Q_ULONG maxlen ) = 0"
+.BI "virtual TQ_LONG \fBreadBlock\fR ( char * data, TQ_ULONG maxlen ) = 0"
.br
.ti -1c
-.BI "virtual Q_LONG \fBwriteBlock\fR ( const char * data, Q_ULONG len ) = 0"
+.BI "virtual TQ_LONG \fBwriteBlock\fR ( const char * data, TQ_ULONG len ) = 0"
.br
.ti -1c
-.BI "virtual Q_LONG \fBreadLine\fR ( char * data, Q_ULONG maxlen )"
+.BI "virtual TQ_LONG \fBreadLine\fR ( char * data, TQ_ULONG maxlen )"
.br
.ti -1c
-.BI "Q_LONG \fBwriteBlock\fR ( const QByteArray & data )"
+.BI "TQ_LONG \fBwriteBlock\fR ( const QByteArray & data )"
.br
.ti -1c
.BI "virtual QByteArray \fBreadAll\fR ()"
@@ -426,7 +426,7 @@ Example: grapher/grapher.cpp.
Reimplemented in QFile and QSocket.
.SH "QByteArray QIODevice::readAll ()\fC [virtual]\fR"
This convenience function returns all of the remaining data in the device.
-.SH "Q_LONG QIODevice::readBlock ( char * data, Q_ULONG maxlen )\fC [pure virtual]\fR"
+.SH "TQ_LONG QIODevice::readBlock ( char * data, TQ_ULONG maxlen )\fC [pure virtual]\fR"
Reads at most \fImaxlen\fR bytes from the I/O device into \fIdata\fR and returns the number of bytes actually read.
.PP
This function should return -1 if a fatal error occurs and should return 0 if there are no bytes to read.
@@ -440,7 +440,7 @@ See also writeBlock(), isOpen(), and isReadable().
Example: distributor/distributor.ui.h.
.PP
Reimplemented in QSocket and QSocketDevice.
-.SH "Q_LONG QIODevice::readLine ( char * data, Q_ULONG maxlen )\fC [virtual]\fR"
+.SH "TQ_LONG QIODevice::readLine ( char * data, TQ_ULONG maxlen )\fC [virtual]\fR"
Reads a line of text, (or up to \fImaxlen\fR bytes if a newline isn't encountered) plus a terminating '\0' into \fIdata\fR. If there is a newline at the end if the line, it is not stripped.
.PP
Returns the number of bytes read including the terminating '\0', or -1 if an error occurred.
@@ -507,7 +507,7 @@ This virtual function must be reimplemented by all subclasses.
See also getch() and putch().
.PP
Reimplemented in QFile and QSocket.
-.SH "Q_LONG QIODevice::writeBlock ( const char * data, Q_ULONG len )\fC [pure virtual]\fR"
+.SH "TQ_LONG QIODevice::writeBlock ( const char * data, TQ_ULONG len )\fC [pure virtual]\fR"
Writes \fIlen\fR bytes from \fIdata\fR to the I/O device and returns the number of bytes actually written.
.PP
This function should return -1 if a fatal error occurs.
@@ -519,7 +519,7 @@ See also readBlock().
Example: distributor/distributor.ui.h.
.PP
Reimplemented in QBuffer, QSocket, and QSocketDevice.
-.SH "Q_LONG QIODevice::writeBlock ( const QByteArray & data )"
+.SH "TQ_LONG QIODevice::writeBlock ( const QByteArray & data )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
This convenience function is the same as calling writeBlock(
diff --git a/doc/man/man3/qlocale.3qt b/doc/man/man3/qlocale.3qt
index fb6208e4..b1ff1ad3 100644
--- a/doc/man/man3/qlocale.3qt
+++ b/doc/man/man3/qlocale.3qt
@@ -58,16 +58,16 @@ Almost all the functions in this class are reentrant when Qt is built with threa
.BI "uint \fBtoUInt\fR ( const QString & s, bool * ok = 0 ) const"
.br
.ti -1c
-.BI "Q_LONG \fBtoLong\fR ( const QString & s, bool * ok = 0 ) const"
+.BI "TQ_LONG \fBtoLong\fR ( const QString & s, bool * ok = 0 ) const"
.br
.ti -1c
-.BI "Q_ULONG \fBtoULong\fR ( const QString & s, bool * ok = 0 ) const"
+.BI "TQ_ULONG \fBtoULong\fR ( const QString & s, bool * ok = 0 ) const"
.br
.ti -1c
-.BI "Q_LLONG \fBtoLongLong\fR ( const QString & s, bool * ok = 0 ) const"
+.BI "TQ_LLONG \fBtoLongLong\fR ( const QString & s, bool * ok = 0 ) const"
.br
.ti -1c
-.BI "Q_ULLONG \fBtoULongLong\fR ( const QString & s, bool * ok = 0 ) const"
+.BI "TQ_ULLONG \fBtoULongLong\fR ( const QString & s, bool * ok = 0 ) const"
.br
.ti -1c
.BI "float \fBtoFloat\fR ( const QString & s, bool * ok = 0 ) const"
@@ -88,16 +88,16 @@ Almost all the functions in this class are reentrant when Qt is built with threa
.BI "QString \fBtoString\fR ( uint i ) const"
.br
.ti -1c
-.BI "QString \fBtoString\fR ( Q_LONG i ) const"
+.BI "QString \fBtoString\fR ( TQ_LONG i ) const"
.br
.ti -1c
-.BI "QString \fBtoString\fR ( Q_ULONG i ) const"
+.BI "QString \fBtoString\fR ( TQ_ULONG i ) const"
.br
.ti -1c
-.BI "QString \fBtoString\fR ( Q_LLONG i ) const"
+.BI "QString \fBtoString\fR ( TQ_LLONG i ) const"
.br
.ti -1c
-.BI "QString \fBtoString\fR ( Q_ULLONG i ) const"
+.BI "QString \fBtoString\fR ( TQ_ULLONG i ) const"
.br
.ti -1c
.BI "QString \fBtoString\fR ( float i, char f = 'g', int prec = 6 ) const"
@@ -1122,7 +1122,7 @@ If \fIok\fR is not 0, reports failure by setting *ok to false and success by set
This function ignores leading and trailing whitespace.
.PP
See also toString().
-.SH "Q_LONG QLocale::toLong ( const QString & s, bool * ok = 0 ) const"
+.SH "TQ_LONG QLocale::toLong ( const QString & s, bool * ok = 0 ) const"
Returns the long int represented by the localized string \fIs\fR, or 0 if the conversion failed.
.PP
If \fIok\fR is not 0, reports failure by setting *ok to false and success by setting *ok to true.
@@ -1130,7 +1130,7 @@ If \fIok\fR is not 0, reports failure by setting *ok to false and success by set
This function ignores leading and trailing whitespace.
.PP
See also toString().
-.SH "Q_LLONG QLocale::toLongLong ( const QString & s, bool * ok = 0 ) const"
+.SH "TQ_LLONG QLocale::toLongLong ( const QString & s, bool * ok = 0 ) const"
Returns the long long int represented by the localized string \fIs\fR, or 0 if the conversion failed.
.PP
If \fIok\fR is not 0, reports failure by setting *ok to false and success by setting *ok to true.
@@ -1146,7 +1146,7 @@ If \fIok\fR is not 0, reports failure by setting *ok to false and success by set
This function ignores leading and trailing whitespace.
.PP
See also toString().
-.SH "QString QLocale::toString ( Q_LLONG i ) const"
+.SH "QString QLocale::toString ( TQ_LLONG i ) const"
Returns a localized string representation of \fIi\fR.
.PP
See also toLongLong().
@@ -1166,15 +1166,15 @@ See also toInt().
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
See also toUInt().
-.SH "QString QLocale::toString ( Q_LONG i ) const"
+.SH "QString QLocale::toString ( TQ_LONG i ) const"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
See also toLong().
-.SH "QString QLocale::toString ( Q_ULONG i ) const"
+.SH "QString QLocale::toString ( TQ_ULONG i ) const"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
See also toULong().
-.SH "QString QLocale::toString ( Q_ULLONG i ) const"
+.SH "QString QLocale::toString ( TQ_ULLONG i ) const"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
See also toULongLong().
@@ -1198,7 +1198,7 @@ If \fIok\fR is not 0, reports failure by setting *ok to false and success by set
This function ignores leading and trailing whitespace.
.PP
See also toString().
-.SH "Q_ULONG QLocale::toULong ( const QString & s, bool * ok = 0 ) const"
+.SH "TQ_ULONG QLocale::toULong ( const QString & s, bool * ok = 0 ) const"
Returns the unsigned long int represented by the localized string \fIs\fR, or 0 if the conversion failed.
.PP
If \fIok\fR is not 0, reports failure by setting *ok to false and success by setting *ok to true.
@@ -1206,7 +1206,7 @@ If \fIok\fR is not 0, reports failure by setting *ok to false and success by set
This function ignores leading and trailing whitespace.
.PP
See also toString().
-.SH "Q_ULLONG QLocale::toULongLong ( const QString & s, bool * ok = 0 ) const"
+.SH "TQ_ULLONG QLocale::toULongLong ( const QString & s, bool * ok = 0 ) const"
Returns the unsigned long long int represented by the localized string \fIs\fR, or 0 if the conversion failed.
.PP
If \fIok\fR is not 0, reports failure by setting *ok to false and success by setting *ok to true.
diff --git a/doc/man/man3/qmemarray.3qt b/doc/man/man3/qmemarray.3qt
index 5a26651d..ef3c0871 100644
--- a/doc/man/man3/qmemarray.3qt
+++ b/doc/man/man3/qmemarray.3qt
@@ -141,7 +141,7 @@ Inherited by QByteArray and QPointArray.
.SH RELATED FUNCTION DOCUMENTATION
.in +1c
.ti -1c
-.BI "Q_UINT16 \fBqChecksum\fR ( const char * data, uint len )"
+.BI "TQ_UINT16 \fBqChecksum\fR ( const char * data, uint len )"
.br
.ti -1c
.BI "QDataStream & \fBoperator<<\fR ( QDataStream & s, const QByteArray & a )"
@@ -540,7 +540,7 @@ See also Format of the QDataStream operators.
Reads a byte array into \fIa\fR from the stream \fIs\fR and returns a reference to the stream.
.PP
See also Format of the QDataStream operators.
-.SH "Q_UINT16 tqChecksum ( const char * data, uint len )"
+.SH "TQ_UINT16 tqChecksum ( const char * data, uint len )"
Returns the CRC-16 checksum of \fIlen\fR bytes starting at \fIdata\fR.
.PP
The checksum is independent of the byte order (endianness).
diff --git a/doc/man/man3/qserversocket.3qt b/doc/man/man3/qserversocket.3qt
index 3d019e42..7fbb9757 100644
--- a/doc/man/man3/qserversocket.3qt
+++ b/doc/man/man3/qserversocket.3qt
@@ -16,10 +16,10 @@ Inherits QObject.
.SS "Public Members"
.in +1c
.ti -1c
-.BI "\fBQServerSocket\fR ( Q_UINT16 port, int backlog = 1, QObject * parent = 0, const char * name = 0 )"
+.BI "\fBQServerSocket\fR ( TQ_UINT16 port, int backlog = 1, QObject * parent = 0, const char * name = 0 )"
.br
.ti -1c
-.BI "\fBQServerSocket\fR ( const QHostAddress & address, Q_UINT16 port, int backlog = 1, QObject * parent = 0, const char * name = 0 )"
+.BI "\fBQServerSocket\fR ( const QHostAddress & address, TQ_UINT16 port, int backlog = 1, QObject * parent = 0, const char * name = 0 )"
.br
.ti -1c
.BI "\fBQServerSocket\fR ( QObject * parent = 0, const char * name = 0 )"
@@ -31,7 +31,7 @@ Inherits QObject.
.BI "bool \fBok\fR () const"
.br
.ti -1c
-.BI "Q_UINT16 \fBport\fR () const"
+.BI "TQ_UINT16 \fBport\fR () const"
.br
.ti -1c
.BI "int \fBsocket\fR () const"
@@ -63,13 +63,13 @@ Using the API is very simple: subclass QServerSocket, call the constructor of yo
.PP
See also QSocket, QSocketDevice, QHostAddress, QSocketNotifier, and Input/Output and Networking.
.SH MEMBER FUNCTION DOCUMENTATION
-.SH "QServerSocket::QServerSocket ( Q_UINT16 port, int backlog = 1, QObject * parent = 0, const char * name = 0 )"
+.SH "QServerSocket::QServerSocket ( TQ_UINT16 port, int backlog = 1, QObject * parent = 0, const char * name = 0 )"
Creates a server socket object, that will serve the given \fIport\fR on all the addresses of this host. If \fIport\fR is 0, QServerSocket will pick a suitable port in a system-dependent manner. Use \fIbacklog\fR to specify how many pending connections the server can have.
.PP
The \fIparent\fR and \fIname\fR arguments are passed on to the QObject constructor.
.PP
\fBWarning:\fR On Tru64 Unix systems a value of 0 for \fIbacklog\fR means that you don't accept any connections at all; you should specify a value larger than 0.
-.SH "QServerSocket::QServerSocket ( const QHostAddress & address, Q_UINT16 port, int backlog = 1, QObject * parent = 0, const char * name = 0 )"
+.SH "QServerSocket::QServerSocket ( const QHostAddress & address, TQ_UINT16 port, int backlog = 1, QObject * parent = 0, const char * name = 0 )"
Creates a server socket object, that will serve the given \fIport\fR only on the given \fIaddress\fR. Use \fIbacklog\fR to specify how many pending connections the server can have.
.PP
The \fIparent\fR and \fIname\fR arguments are passed on to the QObject constructor.
@@ -97,7 +97,7 @@ See also port() and QSocketDevice::address().
This pure virtual function is responsible for setting up a new incoming connection. \fIsocket\fR is the fd (file descriptor) for the newly accepted connection.
.SH "bool QServerSocket::ok () const"
Returns TRUE if the construction succeeded; otherwise returns FALSE.
-.SH "Q_UINT16 QServerSocket::port () const"
+.SH "TQ_UINT16 QServerSocket::port () const"
Returns the port number on which this server socket listens. This is always non-zero; if you specify 0 in the constructor, QServerSocket will pick a non-zero port itself. ok() must be TRUE before calling this function.
.PP
See also address() and QSocketDevice::port().
diff --git a/doc/man/man3/qsocket.3qt b/doc/man/man3/qsocket.3qt
index c552ba46..2a643b61 100644
--- a/doc/man/man3/qsocket.3qt
+++ b/doc/man/man3/qsocket.3qt
@@ -43,7 +43,7 @@ Inherits QObject and QIODevice.
.BI "virtual void \fBsetSocketDevice\fR ( QSocketDevice * device )"
.br
.ti -1c
-.BI "virtual void \fBconnectToHost\fR ( const QString & host, Q_UINT16 port )"
+.BI "virtual void \fBconnectToHost\fR ( const QString & host, TQ_UINT16 port )"
.br
.ti -1c
.BI "QString \fBpeerName\fR () const"
@@ -70,25 +70,25 @@ Inherits QObject and QIODevice.
.BI "virtual bool \fBatEnd\fR () const"
.br
.ti -1c
-.BI "Q_ULONG \fBbytesAvailable\fR () const"
+.BI "TQ_ULONG \fBbytesAvailable\fR () const"
.br
.ti -1c
-.BI "Q_ULONG \fBwaitForMore\fR ( int msecs, bool * timeout ) const"
+.BI "TQ_ULONG \fBwaitForMore\fR ( int msecs, bool * timeout ) const"
.br
.ti -1c
-.BI "Q_ULONG \fBwaitForMore\fR ( int msecs ) const"
+.BI "TQ_ULONG \fBwaitForMore\fR ( int msecs ) const"
.br
.ti -1c
-.BI "Q_ULONG \fBbytesToWrite\fR () const"
+.BI "TQ_ULONG \fBbytesToWrite\fR () const"
.br
.ti -1c
.BI "void \fBclearPendingData\fR ()"
.br
.ti -1c
-.BI "virtual Q_LONG \fBreadBlock\fR ( char * data, Q_ULONG maxlen )"
+.BI "virtual TQ_LONG \fBreadBlock\fR ( char * data, TQ_ULONG maxlen )"
.br
.ti -1c
-.BI "virtual Q_LONG \fBwriteBlock\fR ( const char * data, Q_ULONG len )"
+.BI "virtual TQ_LONG \fBwriteBlock\fR ( const char * data, TQ_ULONG len )"
.br
.ti -1c
.BI "virtual int \fBgetch\fR ()"
@@ -106,10 +106,10 @@ Inherits QObject and QIODevice.
.BI "virtual QString \fBreadLine\fR ()"
.br
.ti -1c
-.BI "Q_UINT16 \fBport\fR () const"
+.BI "TQ_UINT16 \fBport\fR () const"
.br
.ti -1c
-.BI "Q_UINT16 \fBpeerPort\fR () const"
+.BI "TQ_UINT16 \fBpeerPort\fR () const"
.br
.ti -1c
.BI "QHostAddress \fBaddress\fR () const"
@@ -118,10 +118,10 @@ Inherits QObject and QIODevice.
.BI "QHostAddress \fBpeerAddress\fR () const"
.br
.ti -1c
-.BI "void \fBsetReadBufferSize\fR ( Q_ULONG bufSize )"
+.BI "void \fBsetReadBufferSize\fR ( TQ_ULONG bufSize )"
.br
.ti -1c
-.BI "Q_ULONG \fBreadBufferSize\fR () const"
+.BI "TQ_ULONG \fBreadBufferSize\fR () const"
.br
.in -1c
.SS "Signals"
@@ -220,7 +220,7 @@ Reimplemented from QIODevice.
Returns TRUE if there is no more data to read; otherwise returns FALSE.
.PP
Reimplemented from QIODevice.
-.SH "Q_ULONG QSocket::bytesAvailable () const"
+.SH "TQ_ULONG QSocket::bytesAvailable () const"
Returns the number of incoming bytes that can be read, i.e. the size of the input buffer. Equivalent to size().
.PP
This function can trigger the readyRead() signal, if more data has arrived on the socket.
@@ -228,7 +228,7 @@ This function can trigger the readyRead() signal, if more data has arrived on th
See also bytesToWrite().
.PP
Example: network/networkprotocol/nntp.cpp.
-.SH "Q_ULONG QSocket::bytesToWrite () const"
+.SH "TQ_ULONG QSocket::bytesToWrite () const"
Returns the number of bytes that are waiting to be written, i.e. the size of the output buffer.
.PP
See also bytesAvailable() and clearPendingData().
@@ -274,7 +274,7 @@ Examples:
.)l network/clientserver/client/client.cpp, network/httpd/httpd.cpp, and network/networkprotocol/nntp.cpp.
.PP
Reimplemented from QIODevice.
-.SH "void QSocket::connectToHost ( const QString & host, Q_UINT16 port )\fC [virtual]\fR"
+.SH "void QSocket::connectToHost ( const QString & host, TQ_UINT16 port )\fC [virtual]\fR"
Attempts to make a connection to \fIhost\fR on the specified \fIport\fR and return immediately.
.PP
Any connection or pending connection is closed immediately, and QSocket goes into the HostLookup state. When the lookup succeeds, it emits hostFound(), starts a TCP connection and goes into the Connecting state. Finally, when the connection succeeds, it emits connected() and goes into the Connected state. If there is an error at any point, it emits error().
@@ -341,11 +341,11 @@ Returns the address of the connected peer if the socket is in Connected state; o
Returns the host name as specified to the connectToHost() function. An empty string is returned if none has been set.
.PP
Example: network/mail/smtp.cpp.
-.SH "Q_UINT16 QSocket::peerPort () const"
+.SH "TQ_UINT16 QSocket::peerPort () const"
Returns the peer's host port number, normally as specified to the connectToHost() function. If none has been set, this function returns 0.
.PP
Note that Qt always uses native byte order, i.e. 67 is 67 in Qt; there is no need to call htons().
-.SH "Q_UINT16 QSocket::port () const"
+.SH "TQ_UINT16 QSocket::port () const"
Returns the host port number of this socket, in native byte order.
.SH "int QSocket::putch ( int ch )\fC [virtual]\fR"
Writes the character \fIch\fR to the output buffer.
@@ -355,13 +355,13 @@ Returns \fIch\fR, or -1 if an error occurred.
See also getch().
.PP
Reimplemented from QIODevice.
-.SH "Q_LONG QSocket::readBlock ( char * data, Q_ULONG maxlen )\fC [virtual]\fR"
+.SH "TQ_LONG QSocket::readBlock ( char * data, TQ_ULONG maxlen )\fC [virtual]\fR"
Reads \fImaxlen\fR bytes from the socket into \fIdata\fR and returns the number of bytes read. Returns -1 if an error occurred.
.PP
Example: network/networkprotocol/nntp.cpp.
.PP
Reimplemented from QIODevice.
-.SH "Q_ULONG QSocket::readBufferSize () const"
+.SH "TQ_ULONG QSocket::readBufferSize () const"
Returns the size of the read buffer.
.PP
See also setReadBufferSize().
@@ -381,7 +381,7 @@ See also readBlock(), readLine(), and bytesAvailable().
.PP
Examples:
.)l network/clientserver/client/client.cpp, network/httpd/httpd.cpp, network/mail/smtp.cpp, and network/networkprotocol/nntp.cpp.
-.SH "void QSocket::setReadBufferSize ( Q_ULONG bufSize )"
+.SH "void QSocket::setReadBufferSize ( TQ_ULONG bufSize )"
Sets the size of the QSocket's internal read buffer to \fIbufSize\fR.
.PP
Usually QSocket reads all data that is available from the operating system's socket. If the buffer size is limited to a certain size, this means that the QSocket class doesn't buffer more than this size of data.
@@ -424,7 +424,7 @@ Examples:
This implementation of the virtual function QIODevice::ungetch() prepends the character \fIch\fR to the read buffer so that the next read returns this character as the first character of the output.
.PP
Reimplemented from QIODevice.
-.SH "Q_ULONG QSocket::waitForMore ( int msecs, bool * timeout ) const"
+.SH "TQ_ULONG QSocket::waitForMore ( int msecs, bool * timeout ) const"
Wait up to \fImsecs\fR milliseconds for more data to be available.
.PP
If \fImsecs\fR is -1 the call will block indefinitely.
@@ -436,9 +436,9 @@ If \fItimeout\fR is non-null and no error occurred (i.e. it does not return -1):
\fBWarning:\fR This is a blocking call and should be avoided in event driven applications.
.PP
See also bytesAvailable().
-.SH "Q_ULONG QSocket::waitForMore ( int msecs ) const"
+.SH "TQ_ULONG QSocket::waitForMore ( int msecs ) const"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
-.SH "Q_LONG QSocket::writeBlock ( const char * data, Q_ULONG len )\fC [virtual]\fR"
+.SH "TQ_LONG QSocket::writeBlock ( const char * data, TQ_ULONG len )\fC [virtual]\fR"
Writes \fIlen\fR bytes to the socket from \fIdata\fR and returns the number of bytes written. Returns -1 if an error occurred.
.PP
Example: network/networkprotocol/nntp.cpp.
diff --git a/doc/man/man3/qsocketdevice.3qt b/doc/man/man3/qsocketdevice.3qt
index 2a922fa1..aaf0c39c 100644
--- a/doc/man/man3/qsocketdevice.3qt
+++ b/doc/man/man3/qsocketdevice.3qt
@@ -73,10 +73,10 @@ Inherits QIODevice.
.BI "virtual void \fBsetSendBufferSize\fR ( uint size )"
.br
.ti -1c
-.BI "virtual bool \fBconnect\fR ( const QHostAddress & addr, Q_UINT16 port )"
+.BI "virtual bool \fBconnect\fR ( const QHostAddress & addr, TQ_UINT16 port )"
.br
.ti -1c
-.BI "virtual bool \fBbind\fR ( const QHostAddress & address, Q_UINT16 port )"
+.BI "virtual bool \fBbind\fR ( const QHostAddress & address, TQ_UINT16 port )"
.br
.ti -1c
.BI "virtual bool \fBlisten\fR ( int backlog )"
@@ -85,25 +85,25 @@ Inherits QIODevice.
.BI "virtual int \fBaccept\fR ()"
.br
.ti -1c
-.BI "Q_LONG \fBbytesAvailable\fR () const"
+.BI "TQ_LONG \fBbytesAvailable\fR () const"
.br
.ti -1c
-.BI "Q_LONG \fBwaitForMore\fR ( int msecs, bool * timeout = 0 ) const"
+.BI "TQ_LONG \fBwaitForMore\fR ( int msecs, bool * timeout = 0 ) const"
.br
.ti -1c
-.BI "virtual Q_LONG \fBreadBlock\fR ( char * data, Q_ULONG maxlen )"
+.BI "virtual TQ_LONG \fBreadBlock\fR ( char * data, TQ_ULONG maxlen )"
.br
.ti -1c
-.BI "virtual Q_LONG \fBwriteBlock\fR ( const char * data, Q_ULONG len )"
+.BI "virtual TQ_LONG \fBwriteBlock\fR ( const char * data, TQ_ULONG len )"
.br
.ti -1c
-.BI "virtual Q_LONG \fBwriteBlock\fR ( const char * data, Q_ULONG len, const QHostAddress & host, Q_UINT16 port )"
+.BI "virtual TQ_LONG \fBwriteBlock\fR ( const char * data, TQ_ULONG len, const QHostAddress & host, TQ_UINT16 port )"
.br
.ti -1c
-.BI "Q_UINT16 \fBport\fR () const"
+.BI "TQ_UINT16 \fBport\fR () const"
.br
.ti -1c
-.BI "Q_UINT16 \fBpeerPort\fR () const"
+.BI "TQ_UINT16 \fBpeerPort\fR () const"
.br
.ti -1c
.BI "QHostAddress \fBaddress\fR () const"
@@ -217,7 +217,7 @@ Returns the address of this socket device. This may be 0.0.0.0 for a while, but
Returns TRUE if the address of this socket can be used by other sockets at the same time, and FALSE if this socket claims exclusive ownership.
.PP
See also setAddressReusable().
-.SH "bool QSocketDevice::bind ( const QHostAddress & address, Q_UINT16 port )\fC [virtual]\fR"
+.SH "bool QSocketDevice::bind ( const QHostAddress & address, TQ_UINT16 port )\fC [virtual]\fR"
Assigns a name to an unnamed socket. The name is the host address \fIaddress\fR and the port number \fIport\fR. If the operation succeeds, bind() returns TRUE; otherwise it returns FALSE without changing what port() and address() return.
.PP
bind() is used by servers for setting up incoming connections. Call bind() before listen().
@@ -229,11 +229,11 @@ Note that this function does not set error().
\fBWarning:\fR On Windows, this function always returns TRUE since the ioctlsocket() function is broken.
.PP
See also setBlocking() and isValid().
-.SH "Q_LONG QSocketDevice::bytesAvailable () const"
+.SH "TQ_LONG QSocketDevice::bytesAvailable () const"
Returns the number of bytes available for reading, or -1 if an error occurred.
.PP
\fBWarning:\fR On Microsoft Windows, we use the ioctlsocket() function to determine the number of bytes queued on the socket. According to Microsoft (KB Q125486), ioctlsocket() sometimes returns an incorrect number. The only safe way to determine the amount of data on the socket is to read it using readBlock(). QSocket has workarounds to deal with this problem.
-.SH "bool QSocketDevice::connect ( const QHostAddress & addr, Q_UINT16 port )\fC [virtual]\fR"
+.SH "bool QSocketDevice::connect ( const QHostAddress & addr, TQ_UINT16 port )\fC [virtual]\fR"
Connects to the IP address and port specified by \fIaddr\fR and \fIport\fR. Returns TRUE if it establishes a connection; otherwise returns FALSE. If it returns FALSE, error() explains why.
.PP
Note that error() commonly returns NoError for non-blocking sockets; this just means that you can call connect() again in a little while and it'll probably succeed.
@@ -253,11 +253,11 @@ See also bind() and accept().
Returns the address of the port this socket device is connected to. This may be 0.0.0.0 for a while, but is set to something sensible as soon as a sensible value is available.
.PP
Note that for Datagram sockets, this is the source port of the last packet received.
-.SH "Q_UINT16 QSocketDevice::peerPort () const"
+.SH "TQ_UINT16 QSocketDevice::peerPort () const"
Returns the port number of the port this socket device is connected to. This may be 0 for a while, but is set to something sensible as soon as a sensible value is available.
.PP
Note that for Datagram sockets, this is the source port of the last packet received, and that it is in native byte order.
-.SH "Q_UINT16 QSocketDevice::port () const"
+.SH "TQ_UINT16 QSocketDevice::port () const"
Returns the port number of this socket device. This may be 0 for a while, but is set to something sensible as soon as a sensible value is available.
.PP
Note that Qt always uses native byte order, i.e. 67 is 67 in Qt; there is no need to call htons().
@@ -267,7 +267,7 @@ Returns the socket's protocol family, which is one of Unknown, IPv4, or IPv6.
QSocketDevice either creates a socket with a well known protocol family or it uses an already existing socket. In the first case, this function returns the protocol family it was constructed with. In the second case, it tries to determine the protocol family of the socket; if this fails, it returns Unknown.
.PP
See also Protocol and setSocket().
-.SH "Q_LONG QSocketDevice::readBlock ( char * data, Q_ULONG maxlen )\fC [virtual]\fR"
+.SH "TQ_LONG QSocketDevice::readBlock ( char * data, TQ_ULONG maxlen )\fC [virtual]\fR"
Reads \fImaxlen\fR bytes from the socket into \fIdata\fR and returns the number of bytes read. Returns -1 if an error occurred. Returning 0 is not an error. For Stream sockets, 0 is returned when the remote host closes the connection. For Datagram sockets, 0 is a valid datagram size.
.PP
Reimplemented from QIODevice.
@@ -323,7 +323,7 @@ See also isValid() and type().
Returns the socket type which is either QSocketDevice::Stream or QSocketDevice::Datagram.
.PP
See also socket().
-.SH "Q_LONG QSocketDevice::waitForMore ( int msecs, bool * timeout = 0 ) const"
+.SH "TQ_LONG QSocketDevice::waitForMore ( int msecs, bool * timeout = 0 ) const"
Wait up to \fImsecs\fR milliseconds for more data to be available. If \fImsecs\fR is -1 the call will block indefinitely.
.PP
Returns the number of bytes available for reading, or -1 if an error occurred.
@@ -333,13 +333,13 @@ If \fItimeout\fR is non-null and no error occurred (i.e. it does not return -1):
\fBWarning:\fR This is a blocking call and should be avoided in event driven applications.
.PP
See also bytesAvailable().
-.SH "Q_LONG QSocketDevice::writeBlock ( const char * data, Q_ULONG len )\fC [virtual]\fR"
+.SH "TQ_LONG QSocketDevice::writeBlock ( const char * data, TQ_ULONG len )\fC [virtual]\fR"
Writes \fIlen\fR bytes to the socket from \fIdata\fR and returns the number of bytes written. Returns -1 if an error occurred.
.PP
This is used for QSocketDevice::Stream sockets.
.PP
Reimplemented from QIODevice.
-.SH "Q_LONG QSocketDevice::writeBlock ( const char * data, Q_ULONG len, const QHostAddress & host, Q_UINT16 port )\fC [virtual]\fR"
+.SH "TQ_LONG QSocketDevice::writeBlock ( const char * data, TQ_ULONG len, const QHostAddress & host, TQ_UINT16 port )\fC [virtual]\fR"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Writes \fIlen\fR bytes to the socket from \fIdata\fR and returns the number of bytes written. Returns -1 if an error occurred.
diff --git a/doc/man/man3/qstring.3qt b/doc/man/man3/qstring.3qt
index 1395b5fa..00f73630 100644
--- a/doc/man/man3/qstring.3qt
+++ b/doc/man/man3/qstring.3qt
@@ -82,10 +82,10 @@ All the functions in this class are reentrant when Qt is built with thread suppo
.BI "QString \fBarg\fR ( ulong a, int fieldWidth = 0, int base = 10 ) const"
.br
.ti -1c
-.BI "QString \fBarg\fR ( Q_LLONG a, int fieldWidth = 0, int base = 10 ) const"
+.BI "QString \fBarg\fR ( TQ_LLONG a, int fieldWidth = 0, int base = 10 ) const"
.br
.ti -1c
-.BI "QString \fBarg\fR ( Q_ULLONG a, int fieldWidth = 0, int base = 10 ) const"
+.BI "QString \fBarg\fR ( TQ_ULLONG a, int fieldWidth = 0, int base = 10 ) const"
.br
.ti -1c
.BI "QString \fBarg\fR ( int a, int fieldWidth = 0, int base = 10 ) const"
@@ -331,10 +331,10 @@ All the functions in this class are reentrant when Qt is built with thread suppo
.BI "ulong \fBtoULong\fR ( bool * ok = 0, int base = 10 ) const"
.br
.ti -1c
-.BI "Q_LLONG \fBtoLongLong\fR ( bool * ok = 0, int base = 10 ) const"
+.BI "TQ_LLONG \fBtoLongLong\fR ( bool * ok = 0, int base = 10 ) const"
.br
.ti -1c
-.BI "Q_ULLONG \fBtoULongLong\fR ( bool * ok = 0, int base = 10 ) const"
+.BI "TQ_ULLONG \fBtoULongLong\fR ( bool * ok = 0, int base = 10 ) const"
.br
.ti -1c
.BI "float \fBtoFloat\fR ( bool * ok = 0 ) const"
@@ -361,10 +361,10 @@ All the functions in this class are reentrant when Qt is built with thread suppo
.BI "QString & \fBsetNum\fR ( ulong n, int base = 10 )"
.br
.ti -1c
-.BI "QString & \fBsetNum\fR ( Q_LLONG n, int base = 10 )"
+.BI "QString & \fBsetNum\fR ( TQ_LLONG n, int base = 10 )"
.br
.ti -1c
-.BI "QString & \fBsetNum\fR ( Q_ULLONG n, int base = 10 )"
+.BI "QString & \fBsetNum\fR ( TQ_ULLONG n, int base = 10 )"
.br
.ti -1c
.BI "QString & \fBsetNum\fR ( float n, char f = 'g', int prec = 6 )"
@@ -490,10 +490,10 @@ All the functions in this class are reentrant when Qt is built with thread suppo
.BI "QString \fBnumber\fR ( ulong n, int base = 10 )"
.br
.ti -1c
-.BI "QString \fBnumber\fR ( Q_LLONG n, int base = 10 )"
+.BI "QString \fBnumber\fR ( TQ_LLONG n, int base = 10 )"
.br
.ti -1c
-.BI "QString \fBnumber\fR ( Q_ULLONG n, int base = 10 )"
+.BI "QString \fBnumber\fR ( TQ_ULLONG n, int base = 10 )"
.br
.ti -1c
.BI "QString \fBnumber\fR ( int n, int base = 10 )"
@@ -810,11 +810,11 @@ The '%' can be followed by an 'L', in which case the sequence is replaced with a
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
\fIa\fR is expressed in base \fIbase\fR, which is 10 by default and must be between 2 and 36. If \fIbase\fR is 10, the '%L' syntax can be used to produce localized strings.
-.SH "QString QString::arg ( Q_LLONG a, int fieldWidth = 0, int base = 10 ) const"
+.SH "QString QString::arg ( TQ_LLONG a, int fieldWidth = 0, int base = 10 ) const"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
\fIa\fR is expressed in base \fIbase\fR, which is 10 by default and must be between 2 and 36. If \fIbase\fR is 10, the '%L' syntax can be used to produce localized strings.
-.SH "QString QString::arg ( Q_ULLONG a, int fieldWidth = 0, int base = 10 ) const"
+.SH "QString QString::arg ( TQ_ULLONG a, int fieldWidth = 0, int base = 10 ) const"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
\fIa\fR is expressed in base \fIbase\fR, which is 10 by default and must be between 2 and 36. If \fIbase\fR is 10, the '%L' syntax can be used to produce localized strings.
@@ -1410,11 +1410,11 @@ Examples:
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
See also setNum().
-.SH "QString QString::number ( Q_LLONG n, int base = 10 )\fC [static]\fR"
+.SH "QString QString::number ( TQ_LLONG n, int base = 10 )\fC [static]\fR"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
See also setNum().
-.SH "QString QString::number ( Q_ULLONG n, int base = 10 )\fC [static]\fR"
+.SH "QString QString::number ( TQ_ULLONG n, int base = 10 )\fC [static]\fR"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
See also setNum().
@@ -1971,7 +1971,7 @@ See also isNull() and isEmpty().
Ensures that at least \fInewLen\fR characters are allocated to the string, and sets the length of the string to \fInewLen\fR. Any new space allocated contains arbitrary data.
.PP
See also reserve() and truncate().
-.SH "QString & QString::setNum ( Q_LLONG n, int base = 10 )"
+.SH "QString & QString::setNum ( TQ_LLONG n, int base = 10 )"
Sets the string to the printed value of \fIn\fR in base \fIbase\fR and returns a reference to the string. The returned string is in "C" locale.
.PP
The base is 10 by default and must be between 2 and 36.
@@ -2011,7 +2011,7 @@ The base is 10 by default and must be between 2 and 36.
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.SH "QString & QString::setNum ( ulong n, int base = 10 )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
-.SH "QString & QString::setNum ( Q_ULLONG n, int base = 10 )"
+.SH "QString & QString::setNum ( TQ_ULLONG n, int base = 10 )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Sets the string to the printed value of \fIn\fR in base \fIbase\fR and returns a reference to the string.
@@ -2246,7 +2246,7 @@ Leading and trailing whitespace is ignored by this function.
For information on how string-to-number functions in QString handle localized input, see toDouble().
.PP
See also number().
-.SH "Q_LLONG QString::toLongLong ( bool * ok = 0, int base = 10 ) const"
+.SH "TQ_LLONG QString::toLongLong ( bool * ok = 0, int base = 10 ) const"
Returns the string converted to a \fClong long\fR using base \fIbase\fR, which is 10 by default and must be between 2 and 36 or 0. If \fIbase\fR is 0, the base is determined automatically using the following rules:
.TP
If the string begins with "0x", it is assumed to be hexadecimal;
@@ -2318,7 +2318,7 @@ Leading and trailing whitespace is ignored by this function.
For information on how string-to-number functions in QString handle localized input, see toDouble().
.PP
See also number().
-.SH "Q_ULLONG QString::toULongLong ( bool * ok = 0, int base = 10 ) const"
+.SH "TQ_ULLONG QString::toULongLong ( bool * ok = 0, int base = 10 ) const"
Returns the string converted to an \fCunsigned long long\fR using base \fIbase\fR, which is 10 by default and must be between 2 and 36 or 0. If \fIbase\fR is 0, the base is determined automatically using the following rules:
.TP
If the string begins with "0x", it is assumed to be hexadecimal;
diff --git a/doc/man/man3/qvariant.3qt b/doc/man/man3/qvariant.3qt
index cc1c0b38..99bd38a8 100644
--- a/doc/man/man3/qvariant.3qt
+++ b/doc/man/man3/qvariant.3qt
@@ -119,10 +119,10 @@ QVariant \- Acts like a union for the most common Qt data types
.BI "\fBQVariant\fR ( uint val )"
.br
.ti -1c
-.BI "\fBQVariant\fR ( Q_LLONG val )"
+.BI "\fBQVariant\fR ( TQ_LLONG val )"
.br
.ti -1c
-.BI "\fBQVariant\fR ( Q_ULLONG val )"
+.BI "\fBQVariant\fR ( TQ_ULLONG val )"
.br
.ti -1c
.BI "\fBQVariant\fR ( bool val, int )"
@@ -245,10 +245,10 @@ QVariant \- Acts like a union for the most common Qt data types
.BI "uint \fBtoUInt\fR ( bool * ok = 0 ) const"
.br
.ti -1c
-.BI "Q_LLONG \fBtoLongLong\fR ( bool * ok = 0 ) const"
+.BI "TQ_LLONG \fBtoLongLong\fR ( bool * ok = 0 ) const"
.br
.ti -1c
-.BI "Q_ULLONG \fBtoULongLong\fR ( bool * ok = 0 ) const"
+.BI "TQ_ULLONG \fBtoULongLong\fR ( bool * ok = 0 ) const"
.br
.ti -1c
.BI "bool \fBtoBool\fR () const"
@@ -368,10 +368,10 @@ QVariant \- Acts like a union for the most common Qt data types
.BI "uint & \fBasUInt\fR ()"
.br
.ti -1c
-.BI "Q_LLONG & \fBasLongLong\fR ()"
+.BI "TQ_LLONG & \fBasLongLong\fR ()"
.br
.ti -1c
-.BI "Q_ULLONG & \fBasULongLong\fR ()"
+.BI "TQ_ULLONG & \fBasULongLong\fR ()"
.br
.ti -1c
.BI "bool & \fBasBool\fR ()"
@@ -626,9 +626,9 @@ Constructs a new variant with a map of QVariants, \fIval\fR.
Constructs a new variant with an integer value, \fIval\fR.
.SH "QVariant::QVariant ( uint val )"
Constructs a new variant with an unsigned integer value, \fIval\fR.
-.SH "QVariant::QVariant ( Q_LLONG val )"
+.SH "QVariant::QVariant ( TQ_LLONG val )"
Constructs a new variant with a long long integer value, \fIval\fR.
-.SH "QVariant::QVariant ( Q_ULLONG val )"
+.SH "QVariant::QVariant ( TQ_ULLONG val )"
Constructs a new variant with an unsigned long long integer value, \fIval\fR.
.SH "QVariant::~QVariant ()"
Destroys the QVariant and the contained object.
@@ -744,7 +744,7 @@ Note that if you want to iterate over the list, you should iterate over a copy,
}
.br
.fi
-.SH "Q_LLONG & QVariant::asLongLong ()"
+.SH "TQ_LLONG & QVariant::asLongLong ()"
Returns the variant's value as long long reference.
.SH "QMap & QVariant::asMap ()"
Returns the variant's value as variant map reference.
@@ -854,7 +854,7 @@ Returns a reference to the stored time.
See also toTime().
.SH "uint & QVariant::asUInt ()"
Returns the variant's value as unsigned int reference.
-.SH "Q_ULLONG & QVariant::asULongLong ()"
+.SH "TQ_ULLONG & QVariant::asULongLong ()"
Returns the variant's value as unsigned long long reference.
.SH "bool QVariant::canCast ( Type t ) const"
Returns TRUE if the variant's type can be cast to the requested type, \fIt\fR. Such casting is done automatically when calling the toInt(), toBool(), ... or asInt(), asBool(), ... methods.
@@ -1015,7 +1015,7 @@ Note that if you want to iterate over the list, you should iterate over a copy,
.fi
.PP
See also asList().
-.SH "Q_LLONG QVariant::toLongLong ( bool * ok = 0 ) const"
+.SH "TQ_LLONG QVariant::toLongLong ( bool * ok = 0 ) const"
Returns the variant as a long long int if the variant can be cast to LongLong; otherwise returns 0.
.PP
If \fIok\fR is non-null: \fI*ok\fR is set to TRUE if the value could be converted to an int; otherwise \fI*ok\fR is set to FALSE.
@@ -1115,7 +1115,7 @@ Returns the variant as an unsigned int if the variant can be cast to UInt; other
If \fIok\fR is non-null: \fI*ok\fR is set to TRUE if the value could be converted to an unsigned int; otherwise \fI*ok\fR is set to FALSE.
.PP
See also asUInt() and canCast().
-.SH "Q_ULLONG QVariant::toULongLong ( bool * ok = 0 ) const"
+.SH "TQ_ULLONG QVariant::toULongLong ( bool * ok = 0 ) const"
Returns the variant as as an unsigned long long int if the variant can be cast to ULongLong; otherwise returns 0.
.PP
If \fIok\fR is non-null: \fI*ok\fR is set to TRUE if the value could be converted to an int; otherwise \fI*ok\fR is set to FALSE.
diff --git a/examples/network/clientserver/client/client.cpp b/examples/network/clientserver/client/client.cpp
index 7d9ba68e..cda1f571 100644
--- a/examples/network/clientserver/client/client.cpp
+++ b/examples/network/clientserver/client/client.cpp
@@ -22,7 +22,7 @@ class Client : public TQVBox
{
TQ_OBJECT
public:
- Client( const TQString &host, Q_UINT16 port )
+ Client( const TQString &host, TQ_UINT16 port )
{
// GUI layout
infoText = new TQTextView( this );
diff --git a/examples/network/infoprotocol/infoclient/client.h b/examples/network/infoprotocol/infoclient/client.h
index e2590686..544d28ae 100644
--- a/examples/network/infoprotocol/infoclient/client.h
+++ b/examples/network/infoprotocol/infoclient/client.h
@@ -18,7 +18,7 @@ class TQLineEdit;
class TQListBox;
class TQLabel;
-static const Q_UINT16 infoPort = 42417;
+static const TQ_UINT16 infoPort = 42417;
class ClientInfo : public ClientInfoBase
{
diff --git a/examples/network/infoprotocol/infoserver/main.cpp b/examples/network/infoprotocol/infoserver/main.cpp
index 0cfcf58c..ecb2a361 100644
--- a/examples/network/infoprotocol/infoserver/main.cpp
+++ b/examples/network/infoprotocol/infoserver/main.cpp
@@ -14,7 +14,7 @@
int main( int argc, char** argv )
{
TQApplication app( argc, argv );
- Q_UINT16 port = ( argc > 1 ) ? TQString( argv[ 1 ] ).toInt() : infoPort;
+ TQ_UINT16 port = ( argc > 1 ) ? TQString( argv[ 1 ] ).toInt() : infoPort;
ServerInfo info( port, 0, "server info" );
app.setMainWidget( &info );
info.show();
diff --git a/examples/network/infoprotocol/infoserver/server.cpp b/examples/network/infoprotocol/infoserver/server.cpp
index 116ac0cb..a405fd8b 100644
--- a/examples/network/infoprotocol/infoserver/server.cpp
+++ b/examples/network/infoprotocol/infoserver/server.cpp
@@ -18,7 +18,7 @@
-ServerInfo::ServerInfo( Q_UINT16 port, TQWidget *parent, const char *name ) :
+ServerInfo::ServerInfo( TQ_UINT16 port, TQWidget *parent, const char *name ) :
ServerInfoBase( parent, name )
{
SimpleServer *server = new SimpleServer( port, this, "simple server" );
@@ -32,7 +32,7 @@ void ServerInfo::newConnect()
}
-SimpleServer::SimpleServer( Q_UINT16 port, TQObject* parent, const char *name ) :
+SimpleServer::SimpleServer( TQ_UINT16 port, TQObject* parent, const char *name ) :
TQServerSocket( port, 1, parent, name )
{
if ( !ok() ) {
diff --git a/examples/network/infoprotocol/infoserver/server.h b/examples/network/infoprotocol/infoserver/server.h
index 33fb6782..637a4996 100644
--- a/examples/network/infoprotocol/infoserver/server.h
+++ b/examples/network/infoprotocol/infoserver/server.h
@@ -16,7 +16,7 @@
#include "infodata.h"
#include "serverbase.h"
-static const Q_UINT16 infoPort = 42417;
+static const TQ_UINT16 infoPort = 42417;
/*
@@ -27,7 +27,7 @@ class ServerInfo : public ServerInfoBase
{
TQ_OBJECT
public:
- ServerInfo( Q_UINT16 port = infoPort, TQWidget *parent = 0, const char *name = 0 );
+ ServerInfo( TQ_UINT16 port = infoPort, TQWidget *parent = 0, const char *name = 0 );
private slots:
void newConnect();
@@ -38,7 +38,7 @@ class SimpleServer : public TQServerSocket
{
TQ_OBJECT
public:
- SimpleServer( Q_UINT16 port = infoPort, TQObject* parent = 0, const char *name = 0 );
+ SimpleServer( TQ_UINT16 port = infoPort, TQObject* parent = 0, const char *name = 0 );
void newConnection( int socket );
signals:
diff --git a/examples/network/infoprotocol/infourlclient/qip.h b/examples/network/infoprotocol/infourlclient/qip.h
index ee70383d..c88ed8a0 100644
--- a/examples/network/infoprotocol/infourlclient/qip.h
+++ b/examples/network/infoprotocol/infourlclient/qip.h
@@ -14,7 +14,7 @@
class TQSocket;
-static const Q_UINT16 infoPort = 42417;
+static const TQ_UINT16 infoPort = 42417;
class Qip : public TQNetworkProtocol
diff --git a/examples/network/remotecontrol/ipcserver.cpp b/examples/network/remotecontrol/ipcserver.cpp
index f7f52ab4..e7cbc2c5 100644
--- a/examples/network/remotecontrol/ipcserver.cpp
+++ b/examples/network/remotecontrol/ipcserver.cpp
@@ -24,7 +24,7 @@ signals:
private slots:
void read()
{
- Q_ULONG bytesAvail = bytesAvailable();
+ TQ_ULONG bytesAvail = bytesAvailable();
for ( ;; ) {
if ( packetSize == 0 ) {
TQDataStream ds( this );
@@ -63,10 +63,10 @@ private slots:
}
private:
- Q_UINT32 packetSize;
+ TQ_UINT32 packetSize;
};
-IpcServer::IpcServer( Q_UINT16 port, TQObject *parent ) :
+IpcServer::IpcServer( TQ_UINT16 port, TQObject *parent ) :
TQServerSocket( 0x7f000001, port, 1, parent )
{
}
diff --git a/examples/network/remotecontrol/ipcserver.h b/examples/network/remotecontrol/ipcserver.h
index b2b17f61..81b6c9c9 100644
--- a/examples/network/remotecontrol/ipcserver.h
+++ b/examples/network/remotecontrol/ipcserver.h
@@ -8,7 +8,7 @@ class IpcServer : public TQServerSocket
TQ_OBJECT
public:
- IpcServer( Q_UINT16 port, TQObject *parent );
+ IpcServer( TQ_UINT16 port, TQObject *parent );
void newConnection( int socket );
diff --git a/examples/network/remotecontrol/remotectrlimpl.cpp b/examples/network/remotecontrol/remotectrlimpl.cpp
index 4859d3b8..ac1f0167 100644
--- a/examples/network/remotecontrol/remotectrlimpl.cpp
+++ b/examples/network/remotecontrol/remotectrlimpl.cpp
@@ -22,7 +22,7 @@ void RemoteCtrlImpl::sendPacket( const TQVariant &v )
varDs << v;
TQDataStream ds( socket );
- ds << (Q_UINT32) ba.size();
+ ds << (TQ_UINT32) ba.size();
socket->writeBlock( ba.data(), ba.size() );
}
diff --git a/examples/network/remotecontrol/startup.cpp b/examples/network/remotecontrol/startup.cpp
index bc16f19f..11b9d227 100644
--- a/examples/network/remotecontrol/startup.cpp
+++ b/examples/network/remotecontrol/startup.cpp
@@ -6,7 +6,7 @@
#include
#include
-static const Q_UINT16 ipcPort = 54923;
+static const TQ_UINT16 ipcPort = 54923;
StartUp::StartUp()
{
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index b5148dfb..ae0657ac 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -245,11 +245,11 @@ TQUuid VcprojGenerator::getProjectUUID(const TQString &filename)
TQUuid VcprojGenerator::increaseUUID( const TQUuid &id )
{
TQUuid result( id );
- Q_LONG dataFirst = (result.data4[0] << 24) +
+ TQ_LONG dataFirst = (result.data4[0] << 24) +
(result.data4[1] << 16) +
(result.data4[2] << 8) +
result.data4[3];
- Q_LONG dataLast = (result.data4[4] << 24) +
+ TQ_LONG dataLast = (result.data4[4] << 24) +
(result.data4[5] << 16) +
(result.data4[6] << 8) +
result.data4[7];
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index 8ed96fc7..e6aca796 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -143,10 +143,10 @@
#define IsUDA3(a, b) (InRange((a), 0xA1, 0xA7) && InRange((b), 0x40, 0xA0) && ((b) != 0x7F))
typedef struct {
- Q_UINT8 tblBegin;
- Q_UINT8 tblEnd;
- Q_UINT16 tblOffset;
- Q_UINT16 algOffset;
+ TQ_UINT8 tblBegin;
+ TQ_UINT8 tblEnd;
+ TQ_UINT16 tblOffset;
+ TQ_UINT16 algOffset;
} indexTbl_t;
static uint qt_Gb18030ToUnicode(const uchar *gbstr, int& len);
@@ -1055,7 +1055,7 @@ static const indexTbl_t ucs_to_gb18030_index[256] = {
/* 0xFE__ */ {0x30, 0xFF, 0x8F3F, 0x9894}, {0x00, 0xE5, 0x8F3F, 0x98FC},
};
-static Q_UINT16 const ucs_to_gb18030[28839] = {
+static TQ_UINT16 const ucs_to_gb18030[28839] = {
/* Contiguous area: U+0080 .. U+0451 */
/* U+0080 */ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
/* U+0088 */ 0x0008, 0x0009, 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015,
@@ -4685,7 +4685,7 @@ static Q_UINT16 const ucs_to_gb18030[28839] = {
/* U+FFE0 */ 0xA1E9, 0xA1EA, 0xA956, 0xA3FE, 0xA957, 0xA3A4,
};
-static Q_UINT16 const gb18030_2byte_to_ucs[22046] = {
+static TQ_UINT16 const gb18030_2byte_to_ucs[22046] = {
/* GB 0x8140..0x817E */
0x4E02, 0x4E04, 0x4E05, 0x4E06, 0x4E0F, 0x4E12, 0x4E17, 0x4E1F,
0x4E20, 0x4E21, 0x4E23, 0x4E26, 0x4E29, 0x4E2E, 0x4E2F, 0x4E31,
@@ -7737,7 +7737,7 @@ static Q_UINT16 const gb18030_2byte_to_ucs[22046] = {
0xE864, /* Skip: GB 0xFEA1..0xFEFE (UDA 2) */
};
-static Q_UINT16 const gb18030_4byte_to_ucs[6793] = {
+static TQ_UINT16 const gb18030_4byte_to_ucs[6793] = {
/* Contiguous area: GB+81 30 81 30 .. GB+81 30 D2 39 */
/* GB+81 30 81 30 */ 0x0080, 0x0081, 0x0082, 0x0083, 0x0084,
/* GB+81 30 81 35 */ 0x0085, 0x0086, 0x0087, 0x0088, 0x0089,
@@ -9190,8 +9190,8 @@ static uint qt_Gb18030ToUnicode(const uchar *gbstr, int& len) {
/* GB+81308130 - GB+8431A439 */
g2u = gb18030_to_ucs_index[gb4lin >> 8];
- if ((Q_UINT8)(gb4lin & 0xFF) >= g2u.tblBegin &&
- (Q_UINT8)(gb4lin & 0xFF) <= g2u.tblEnd) {
+ if ((TQ_UINT8)(gb4lin & 0xFF) >= g2u.tblBegin &&
+ (TQ_UINT8)(gb4lin & 0xFF) <= g2u.tblEnd) {
uni = (uint)gb18030_4byte_to_ucs[gb4lin - g2u.tblOffset];
}
@@ -9237,7 +9237,7 @@ int qt_UnicodeToGb18030(uint uni, uchar *gbchar) {
else if (uni <= 0xD7FF || InRange(uni, 0xE766, 0xFFFF)) {
u2g = ucs_to_gb18030_index[uni >> 8];
- if ((Q_UINT8)(uni & 0xFF) >= u2g.tblBegin && (Q_UINT8)(uni & 0xFF) <= u2g.tblEnd) {
+ if ((TQ_UINT8)(uni & 0xFF) >= u2g.tblBegin && (TQ_UINT8)(uni & 0xFF) <= u2g.tblEnd) {
// Use mapping table (2-byte or 4-byte GB18030)
uint tblEntry;
@@ -9331,7 +9331,7 @@ int qt_UnicodeToGbk(uint uni, uchar *gbchar) {
else if (uni <= 0xD7FF || InRange(uni, 0xE766, 0xFFFF)) {
u2g = ucs_to_gb18030_index[uni >> 8];
- if ( (Q_UINT8)(uni & 0xFF) >= u2g.tblBegin && (Q_UINT8)(uni & 0xFF) <= u2g.tblEnd ) {
+ if ( (TQ_UINT8)(uni & 0xFF) >= u2g.tblBegin && (TQ_UINT8)(uni & 0xFF) <= u2g.tblEnd ) {
// Use mapping table (2-byte GBK or 4-byte GB18030)
uint tblEntry;
diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp
index 42917b28..bf2a94be 100644
--- a/src/codecs/qrtlcodec.cpp
+++ b/src/codecs/qrtlcodec.cpp
@@ -426,13 +426,13 @@ static TQString visualOrder(TQString logical, TQChar::Direction basicDir)
TQTextEngine e(logical, 0);
e.direction = basicDir;
e.itemize();
- Q_UINT8 l[256];
- Q_UINT8 *levels = l;
+ TQ_UINT8 l[256];
+ TQ_UINT8 *levels = l;
int vo[256];
int *visualOrder = vo;
int nitems = e.items.size();
if (nitems > 255) {
- levels = new Q_UINT8[nitems];
+ levels = new TQ_UINT8[nitems];
visualOrder = new int[nitems];
}
int i;
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index 5f962118..331688da 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -1682,7 +1682,7 @@ static const struct {
const char *mime;
const char * cs;
int mib;
- Q_UINT16 values[128];
+ TQ_UINT16 values[128];
} unicodevalues[] = {
// from RFC 1489, ftp://ftp.isi.edu/in-notes/rfc1489.txt
{ "KOI8-R", "KOI8-R", 2084,
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index 53b03015..e624545f 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -2019,7 +2019,7 @@ TQString TQFileDialogPrivate::File::text( int column ) const
if ( size > INT_MAX ) {
struct stat buffer;
if ( ::stat( TQFile::encodeName(info.name()), &buffer ) == 0 ) {
- Q_ULLONG size64 = (Q_ULLONG)buffer.st_size;
+ TQ_ULLONG size64 = (TQ_ULLONG)buffer.st_size;
return TQString::number(size64);
}
}
diff --git a/src/kernel/ntqpen.h b/src/kernel/ntqpen.h
index e92a7cc0..dc839dc7 100644
--- a/src/kernel/ntqpen.h
+++ b/src/kernel/ntqpen.h
@@ -86,7 +86,7 @@ private:
PenStyle style;
uint width;
TQColor color;
- Q_UINT16 linest;
+ TQ_UINT16 linest;
} *data;
};
diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h
index 2e76223d..5638517e 100644
--- a/src/kernel/ntqprocess.h
+++ b/src/kernel/ntqprocess.h
@@ -99,7 +99,7 @@ public:
#if defined(Q_OS_WIN32)
typedef void* PID;
#else
- typedef Q_LONG PID;
+ typedef TQ_LONG PID;
#endif
PID processIdentifier();
diff --git a/src/kernel/ntqsizepolicy.h b/src/kernel/ntqsizepolicy.h
index 85b087a5..ef13db7c 100644
--- a/src/kernel/ntqsizepolicy.h
+++ b/src/kernel/ntqsizepolicy.h
@@ -73,7 +73,7 @@ public:
TQSizePolicy() : data( 0 ) { }
TQSizePolicy( SizeType hor, SizeType ver, bool hfw = FALSE )
- : data( hor | (ver<> 16) & 0xff) | (p & 0xff00ff00);
return s << p;
@@ -945,7 +945,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQColor &c )
TQDataStream &operator>>( TQDataStream &s, TQColor &c )
{
- Q_UINT32 p;
+ TQ_UINT32 p;
s >> p;
if ( s.version() == 1 ) // Swap red and blue
p = ((p << 16) & 0xff0000) | ((p >> 16) & 0xff) | (p & 0xff00ff00);
diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp
index 5db1ffe1..97a3e488 100644
--- a/src/kernel/qcolor_p.cpp
+++ b/src/kernel/qcolor_p.cpp
@@ -737,9 +737,9 @@ static int rgb_cmp( const void *d1, const void *d2 )
bool qt_get_named_rgb( const char *name, TQRgb* rgb )
{
- Q_LONG len = strlen(name)+1;
+ TQ_LONG len = strlen(name)+1;
char *name_no_space = (char *)malloc(len);
- for(Q_LONG o=0,i=0; i < len; i++) {
+ for(TQ_LONG o=0,i=0; i < len; i++) {
if(name[i] != '\t' && name[i] != ' ')
name_no_space[o++] = name[i];
}
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index 2a4cfd18..ecb21333 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -159,7 +159,7 @@
TQDataStream &operator<<( TQDataStream &s, const TQCursor &c )
{
- s << (Q_INT16)c.shape(); // write shape id to stream
+ s << (TQ_INT16)c.shape(); // write shape id to stream
if ( c.shape() == TQt::BitmapCursor ) { // bitmap cursor
#if !defined(QT_NO_IMAGEIO)
s << *c.bitmap() << *c.mask();
@@ -180,7 +180,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCursor &c )
TQDataStream &operator>>( TQDataStream &s, TQCursor &c )
{
- Q_INT16 shape;
+ TQ_INT16 shape;
s >> shape; // read shape id from stream
if ( shape == TQt::BitmapCursor ) { // read bitmap cursor
#if !defined(QT_NO_IMAGEIO)
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index be027515..a49dd349 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -1547,13 +1547,13 @@ TQStringList TQFont::substitutions()
Internal function. Converts boolean font settings to an unsigned
8-bit number. Used for serialization etc.
*/
-static Q_UINT8 get_font_bits( const TQFontPrivate *f )
+static TQ_UINT8 get_font_bits( const TQFontPrivate *f )
{
#ifdef QT_CHECK_STATE
Q_ASSERT( f != 0 );
#endif
- Q_UINT8 bits = 0;
+ TQ_UINT8 bits = 0;
if ( f->request.italic )
bits |= 0x01;
if ( f->underline )
@@ -1578,7 +1578,7 @@ static Q_UINT8 get_font_bits( const TQFontPrivate *f )
Internal function. Sets boolean font settings from an unsigned
8-bit number. Used for serialization etc.
*/
-static void set_font_bits( Q_UINT8 bits, TQFontPrivate *f )
+static void set_font_bits( TQ_UINT8 bits, TQFontPrivate *f )
{
#ifdef QT_CHECK_STATE
Q_ASSERT( f != 0 );
@@ -1728,25 +1728,25 @@ TQDataStream &operator<<( TQDataStream &s, const TQFont &font )
}
if ( s.version() <= 3 ) {
- Q_INT16 pointSize = (Q_INT16) font.d->request.pointSize;
+ TQ_INT16 pointSize = (TQ_INT16) font.d->request.pointSize;
if ( pointSize == -1 ) {
#ifdef Q_WS_X11
- pointSize = (Q_INT16)(font.d->request.pixelSize*720/TQPaintDevice::x11AppDpiY());
+ pointSize = (TQ_INT16)(font.d->request.pixelSize*720/TQPaintDevice::x11AppDpiY());
#else
- pointSize = (Q_INT16)TQFontInfo( font ).pointSize() * 10;
+ pointSize = (TQ_INT16)TQFontInfo( font ).pointSize() * 10;
#endif
}
s << pointSize;
} else {
- s << (Q_INT16) font.d->request.pointSize;
- s << (Q_INT16) font.d->request.pixelSize;
+ s << (TQ_INT16) font.d->request.pointSize;
+ s << (TQ_INT16) font.d->request.pixelSize;
}
- s << (Q_UINT8) font.d->request.styleHint;
+ s << (TQ_UINT8) font.d->request.styleHint;
if ( s.version() >= 5 )
- s << (Q_UINT8 ) font.d->request.styleStrategy;
- return s << (Q_UINT8) 0
- << (Q_UINT8) font.d->request.weight
+ s << (TQ_UINT8 ) font.d->request.styleStrategy;
+ return s << (TQ_UINT8) 0
+ << (TQ_UINT8) font.d->request.weight
<< get_font_bits(font.d);
}
@@ -1766,8 +1766,8 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font )
font.d = new TQFontPrivate;
font.d->mask = TQFontPrivate::Complete;
- Q_INT16 pointSize, pixelSize = -1;
- Q_UINT8 styleHint, styleStrategy = TQFont::PreferDefault, charSet, weight, bits;
+ TQ_INT16 pointSize, pixelSize = -1;
+ TQ_UINT8 styleHint, styleStrategy = TQFont::PreferDefault, charSet, weight, bits;
if ( s.version() == 1 ) {
TQCString fam;
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index ba768d81..286bd08e 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -1054,15 +1054,15 @@ static bool loadXftFont( FcPattern* font )
#ifndef QT_XFT2
#define MAKE_TAG( _x1, _x2, _x3, _x4 ) \
- ( ( (Q_UINT32)_x1 << 24 ) | \
- ( (Q_UINT32)_x2 << 16 ) | \
- ( (Q_UINT32)_x3 << 8 ) | \
- (Q_UINT32)_x4 )
+ ( ( (TQ_UINT32)_x1 << 24 ) | \
+ ( (TQ_UINT32)_x2 << 16 ) | \
+ ( (TQ_UINT32)_x3 << 8 ) | \
+ (TQ_UINT32)_x4 )
#ifdef _POSIX_MAPPED_FILES
-static inline Q_UINT32 getUInt(unsigned char *p)
+static inline TQ_UINT32 getUInt(unsigned char *p)
{
- Q_UINT32 val;
+ TQ_UINT32 val;
val = *p++ << 24;
val |= *p++ << 16;
val |= *p++ << 8;
@@ -1071,16 +1071,16 @@ static inline Q_UINT32 getUInt(unsigned char *p)
return val;
}
-static inline Q_UINT16 getUShort(unsigned char *p)
+static inline TQ_UINT16 getUShort(unsigned char *p)
{
- Q_UINT16 val;
+ TQ_UINT16 val;
val = *p++ << 8;
val |= *p;
return val;
}
-static inline void tag_to_string( char *string, Q_UINT32 tag )
+static inline void tag_to_string( char *string, TQ_UINT32 tag )
{
string[0] = (tag >> 24)&0xff;
string[1] = (tag >> 16)&0xff;
@@ -1089,7 +1089,7 @@ static inline void tag_to_string( char *string, Q_UINT32 tag )
string[4] = 0;
}
-static Q_UINT16 getGlyphIndex( unsigned char *table, Q_UINT16 format, unsigned short unicode )
+static TQ_UINT16 getGlyphIndex( unsigned char *table, TQ_UINT16 format, unsigned short unicode )
{
if ( format == 0 ) {
if ( unicode < 256 )
@@ -1097,26 +1097,26 @@ static Q_UINT16 getGlyphIndex( unsigned char *table, Q_UINT16 format, unsigned s
} else if ( format == 2 ) {
tqWarning("format 2 encoding table for Unicode, not implemented!");
} else if ( format == 4 ) {
- Q_UINT16 segCountX2 = getUShort( table + 6 );
+ TQ_UINT16 segCountX2 = getUShort( table + 6 );
unsigned char *ends = table + 14;
- Q_UINT16 endIndex = 0;
+ TQ_UINT16 endIndex = 0;
int i = 0;
for ( ; i < segCountX2/2 && (endIndex = getUShort( ends + 2*i )) < unicode; i++ );
unsigned char *idx = ends + segCountX2 + 2 + 2*i;
- Q_UINT16 startIndex = getUShort( idx );
+ TQ_UINT16 startIndex = getUShort( idx );
if ( startIndex > unicode )
return 0;
idx += segCountX2;
- Q_INT16 idDelta = (Q_INT16)getUShort( idx );
+ TQ_INT16 idDelta = (TQ_INT16)getUShort( idx );
idx += segCountX2;
- Q_UINT16 idRangeoffset_t = (Q_UINT16)getUShort( idx );
+ TQ_UINT16 idRangeoffset_t = (TQ_UINT16)getUShort( idx );
- Q_UINT16 glyphIndex;
+ TQ_UINT16 glyphIndex;
if ( idRangeoffset_t ) {
- Q_UINT16 id = getUShort( idRangeoffset_t + 2*(unicode - startIndex) + idx);
+ TQ_UINT16 id = getUShort( idRangeoffset_t + 2*(unicode - startIndex) + idx);
if ( id )
glyphIndex = ( idDelta + id ) % 0x10000;
else
@@ -1150,18 +1150,18 @@ static inline void checkXftCoverage( TQtFontFamily *family )
goto error;
unsigned char *ttf = (unsigned char *)map;
- Q_UINT32 version = getUInt( ttf );
+ TQ_UINT32 version = getUInt( ttf );
if ( version != 0x00010000 ) {
// tqDebug("file has wrong version %x", version );
goto error1;
}
- Q_UINT16 numTables = getUShort( ttf+4 );
+ TQ_UINT16 numTables = getUShort( ttf+4 );
unsigned char *table_dir = ttf + 12;
- Q_UINT32 cmap_offset = 0;
- Q_UINT32 cmap_length = 0;
+ TQ_UINT32 cmap_offset = 0;
+ TQ_UINT32 cmap_length = 0;
for ( int n = 0; n < numTables; n++ ) {
- Q_UINT32 tag = getUInt( table_dir + 16*n );
+ TQ_UINT32 tag = getUInt( table_dir + 16*n );
if ( tag == MAKE_TAG( 'c', 'm', 'a', 'p' ) ) {
cmap_offset = getUInt( table_dir + 16*n + 8 );
cmap_length = getUInt( table_dir + 16*n + 12 );
@@ -1193,7 +1193,7 @@ static inline void checkXftCoverage( TQtFontFamily *family )
unsigned char *unicode_table = 0;
bool symbol_table = TRUE;
for ( int n = 0; n < numTables; n++ ) {
- Q_UINT32 version = getUInt( cmap + 4 + 8*n );
+ TQ_UINT32 version = getUInt( cmap + 4 + 8*n );
// accept both symbol and Unicode encodings. prefer unicode.
if ( version == 0x00030001 || version == 0x00030000 ) {
unicode_table = cmap + getUInt( cmap + 4 + 8*n + 4 );
@@ -1209,7 +1209,7 @@ static inline void checkXftCoverage( TQtFontFamily *family )
goto error1;
}
- Q_UINT16 format = getUShort( unicode_table );
+ TQ_UINT16 format = getUShort( unicode_table );
if ( format != 4 )
goto error1;
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index fad12bfa..59ed9f10 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -1062,15 +1062,15 @@ void TQImage::fill( uint pixel )
void TQImage::invertPixels( bool invertAlpha )
{
- Q_UINT32 n = numBytes();
+ TQ_UINT32 n = numBytes();
if ( n % 4 ) {
- Q_UINT8 *p = (Q_UINT8*)bits();
- Q_UINT8 *end = p + n;
+ TQ_UINT8 *p = (TQ_UINT8*)bits();
+ TQ_UINT8 *end = p + n;
while ( p < end )
*p++ ^= 0xff;
} else {
- Q_UINT32 *p = (Q_UINT32*)bits();
- Q_UINT32 *end = p + n/4;
+ TQ_UINT32 *p = (TQ_UINT32*)bits();
+ TQ_UINT32 *end = p + n/4;
uint xorbits = invertAlpha && depth() == 32 ? 0x00ffffff : 0xffffffff;
while ( p < end )
*p++ ^= xorbits;
@@ -3231,8 +3231,8 @@ TQImage TQImage::mirror(bool horizontal, bool vertical) const
// 1 bit, 8 bit
if (depth() == 1 || depth() == 8) {
for (int sy = 0; sy < h; sy++, dy += dyi) {
- Q_UINT8* ssl = (Q_UINT8*)(data->bits[sy]);
- Q_UINT8* dsl = (Q_UINT8*)(result.data->bits[dy]);
+ TQ_UINT8* ssl = (TQ_UINT8*)(data->bits[sy]);
+ TQ_UINT8* dsl = (TQ_UINT8*)(result.data->bits[dy]);
int dx = dxs;
for (int sx = 0; sx < w; sx++, dx += dxi)
dsl[dx] = ssl[sx];
@@ -3243,8 +3243,8 @@ TQImage TQImage::mirror(bool horizontal, bool vertical) const
// 16 bit
else if (depth() == 16) {
for (int sy = 0; sy < h; sy++, dy += dyi) {
- Q_UINT16* ssl = (Q_UINT16*)(data->bits[sy]);
- Q_UINT16* dsl = (Q_UINT16*)(result.data->bits[dy]);
+ TQ_UINT16* ssl = (TQ_UINT16*)(data->bits[sy]);
+ TQ_UINT16* dsl = (TQ_UINT16*)(result.data->bits[dy]);
int dx = dxs;
for (int sx = 0; sx < w; sx++, dx += dxi)
dsl[dx] = ssl[sx];
@@ -3254,8 +3254,8 @@ TQImage TQImage::mirror(bool horizontal, bool vertical) const
// 32 bit
else if (depth() == 32) {
for (int sy = 0; sy < h; sy++, dy += dyi) {
- Q_UINT32* ssl = (Q_UINT32*)(data->bits[sy]);
- Q_UINT32* dsl = (Q_UINT32*)(result.data->bits[dy]);
+ TQ_UINT32* ssl = (TQ_UINT32*)(data->bits[sy]);
+ TQ_UINT32* dsl = (TQ_UINT32*)(result.data->bits[dy]);
int dx = dxs;
for (int sx = 0; sx < w; sx++, dx += dxi)
dsl[dx] = ssl[sx];
@@ -3267,9 +3267,9 @@ TQImage TQImage::mirror(bool horizontal, bool vertical) const
if (horizontal && depth() == 1) {
int shift = width() % 8;
for (int y = h-1; y >= 0; y--) {
- Q_UINT8* a0 = (Q_UINT8*)(result.data->bits[y]);
+ TQ_UINT8* a0 = (TQ_UINT8*)(result.data->bits[y]);
// Swap bytes
- Q_UINT8* a = a0+dxs;
+ TQ_UINT8* a = a0+dxs;
while (a >= a0) {
*a = bitflip[*a];
a--;
@@ -3277,17 +3277,17 @@ TQImage TQImage::mirror(bool horizontal, bool vertical) const
// Shift bits if unaligned
if (shift != 0) {
a = a0+dxs;
- Q_UINT8 c = 0;
+ TQ_UINT8 c = 0;
if (bitOrder() == TQImage::LittleEndian) {
while (a >= a0) {
- Q_UINT8 nc = *a << shift;
+ TQ_UINT8 nc = *a << shift;
*a = (*a >> (8-shift)) | c;
--a;
c = nc;
}
} else {
while (a >= a0) {
- Q_UINT8 nc = *a >> shift;
+ TQ_UINT8 nc = *a >> shift;
*a = (*a << (8-shift)) | c;
--a;
c = nc;
@@ -3590,10 +3590,10 @@ TQDataStream &operator<<( TQDataStream &s, const TQImage &image )
{
if ( s.version() >= 5 ) {
if ( image.isNull() ) {
- s << (Q_INT32) 0; // null image marker
+ s << (TQ_INT32) 0; // null image marker
return s;
} else {
- s << (Q_INT32) 1;
+ s << (TQ_INT32) 1;
// continue ...
}
}
@@ -3621,7 +3621,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQImage &image )
TQDataStream &operator>>( TQDataStream &s, TQImage &image )
{
if ( s.version() >= 5 ) {
- Q_INT32 nullMarker;
+ TQ_INT32 nullMarker;
s >> nullMarker;
if ( !nullMarker ) {
image = TQImage(); // null image
@@ -4536,10 +4536,10 @@ const int BMP_FILEHDR_SIZE = 14; // size of BMP_FILEHDR data
struct BMP_FILEHDR { // BMP file header
char bfType[2]; // "BM"
- Q_INT32 bfSize; // size of file
- Q_INT16 bfReserved1;
- Q_INT16 bfReserved2;
- Q_INT32 bfOffBits; // pointer to the pixmap bits
+ TQ_INT32 bfSize; // size of file
+ TQ_INT16 bfReserved1;
+ TQ_INT16 bfReserved2;
+ TQ_INT32 bfOffBits; // pointer to the pixmap bits
};
TQDataStream &operator>>( TQDataStream &s, BMP_FILEHDR &bf )
@@ -4567,17 +4567,17 @@ const int BMP_RLE4 = 2; // run-length encoded, 4 bits
const int BMP_BITFIELDS = 3; // RGB values encoded in data as bit-fields
struct BMP_INFOHDR { // BMP information header
- Q_INT32 biSize; // size of this struct
- Q_INT32 biWidth; // pixmap width
- Q_INT32 biHeight; // pixmap height
- Q_INT16 biPlanes; // should be 1
- Q_INT16 biBitCount; // number of bits per pixel
- Q_INT32 biCompression; // compression method
- Q_INT32 biSizeImage; // size of image
- Q_INT32 biXPelsPerMeter; // horizontal resolution
- Q_INT32 biYPelsPerMeter; // vertical resolution
- Q_INT32 biClrUsed; // number of colors used
- Q_INT32 biClrImportant; // number of important colors
+ TQ_INT32 biSize; // size of this struct
+ TQ_INT32 biWidth; // pixmap width
+ TQ_INT32 biHeight; // pixmap height
+ TQ_INT16 biPlanes; // should be 1
+ TQ_INT16 biBitCount; // number of bits per pixel
+ TQ_INT32 biCompression; // compression method
+ TQ_INT32 biSizeImage; // size of image
+ TQ_INT32 biXPelsPerMeter; // horizontal resolution
+ TQ_INT32 biYPelsPerMeter; // vertical resolution
+ TQ_INT32 biClrUsed; // number of colors used
+ TQ_INT32 biClrImportant; // number of important colors
};
@@ -4591,7 +4591,7 @@ TQDataStream &operator>>( TQDataStream &s, BMP_INFOHDR &bi )
s >> bi.biClrUsed >> bi.biClrImportant;
}
else { // probably old Windows format
- Q_INT16 w, h;
+ TQ_INT16 w, h;
s >> w >> h >> bi.biPlanes >> bi.biBitCount;
bi.biWidth = w;
bi.biHeight = h;
@@ -4709,11 +4709,11 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
return FALSE;
}
} else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
- if ( (Q_ULONG)d->readBlock( (char *)&red_mask, sizeof(red_mask) ) != sizeof(red_mask) )
+ if ( (TQ_ULONG)d->readBlock( (char *)&red_mask, sizeof(red_mask) ) != sizeof(red_mask) )
return FALSE;
- if ( (Q_ULONG)d->readBlock( (char *)&green_mask, sizeof(green_mask) ) != sizeof(green_mask) )
+ if ( (TQ_ULONG)d->readBlock( (char *)&green_mask, sizeof(green_mask) ) != sizeof(green_mask) )
return FALSE;
- if ( (Q_ULONG)d->readBlock( (char *)&blue_mask, sizeof(blue_mask) ) != sizeof(blue_mask) )
+ if ( (TQ_ULONG)d->readBlock( (char *)&blue_mask, sizeof(blue_mask) ) != sizeof(blue_mask) )
return FALSE;
red_shift = calc_shift(red_mask);
red_scale = 256 / ((red_mask >> red_shift) + 1);
@@ -4733,7 +4733,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
return FALSE;
// offset can be bogus, be careful
- if (offset>=0 && startpos + offset > (Q_LONG)d->at() )
+ if (offset>=0 && startpos + offset > (TQ_LONG)d->at() )
d->at( startpos + offset ); // start of image data
int bpl = image.bytesPerLine();
diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
index 0b64c69c..453ff05b 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/qinternal.cpp
@@ -679,7 +679,7 @@ TQMembuf::~TQMembuf()
buffer and copies it into \a sink. If \a sink is a 0 pointer
the data goes into the nirvana.
*/
-bool TQMembuf::consumeBytes( Q_ULONG nbytes, char *sink )
+bool TQMembuf::consumeBytes( TQ_ULONG nbytes, char *sink )
{
if ( nbytes <= 0 || nbytes > _size )
return FALSE;
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 875263dd..57c5dcd1 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -179,7 +179,7 @@ public:
void append( TQByteArray *ba );
void clear();
- bool consumeBytes( Q_ULONG nbytes, char *sink );
+ bool consumeBytes( TQ_ULONG nbytes, char *sink );
TQByteArray readAll();
bool scanNewline( TQByteArray *store );
bool canReadLine() const;
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index 8e2f3e2e..153a3cee 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -415,7 +415,7 @@ void qt_term_destination(j_compress_ptr cinfo)
{
my_jpeg_destination_mgr* dest = (my_jpeg_destination_mgr*)cinfo->dest;
TQIODevice* dev = dest->iio->ioDevice();
- Q_LONG n = max_buf - dest->free_in_buffer;
+ TQ_LONG n = max_buf - dest->free_in_buffer;
if ( dev->writeBlock( (char*)dest->buffer, n ) != n )
qt_exit_on_error(cinfo, dev);
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index e3841b4d..0dad6836 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -3538,10 +3538,10 @@ TQDataStream &operator<<( TQDataStream &s, const TQPen &p )
{
// ### width() should not be restricted to 8-bit values
if ( s.version() < 3 )
- return s << (Q_UINT8)p.style() << (Q_UINT8)p.width() << p.color();
+ return s << (TQ_UINT8)p.style() << (TQ_UINT8)p.width() << p.color();
else
- return s << (Q_UINT8)( p.style() | p.capStyle() | p.joinStyle() )
- << (Q_UINT8)p.width() << p.color();
+ return s << (TQ_UINT8)( p.style() | p.capStyle() | p.joinStyle() )
+ << (TQ_UINT8)p.width() << p.color();
}
/*!
@@ -3555,7 +3555,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQPen &p )
TQDataStream &operator>>( TQDataStream &s, TQPen &p )
{
- Q_UINT8 style, width;
+ TQ_UINT8 style, width;
TQColor color;
s >> style;
s >> width;
@@ -3927,7 +3927,7 @@ bool TQBrush::operator==( const TQBrush &b ) const
TQDataStream &operator<<( TQDataStream &s, const TQBrush &b )
{
- s << (Q_UINT8)b.style() << b.color();
+ s << (TQ_UINT8)b.style() << b.color();
if ( b.style() == TQt::CustomPattern )
#ifndef QT_NO_IMAGEIO
s << *b.pixmap();
@@ -3948,7 +3948,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQBrush &b )
TQDataStream &operator>>( TQDataStream &s, TQBrush &b )
{
- Q_UINT8 style;
+ TQ_UINT8 style;
TQColor color;
s >> style;
s >> color;
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index 64245179..b9d350a0 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -104,8 +104,8 @@
static const char *mfhdr_tag = "TQPIC"; // header tag
-static const Q_UINT16 mfhdr_maj = 5; // major version #
-static const Q_UINT16 mfhdr_min = 0; // minor version #
+static const TQ_UINT16 mfhdr_maj = 5; // major version #
+static const TQ_UINT16 mfhdr_min = 0; // minor version #
/*!
@@ -397,13 +397,13 @@ bool TQPicture::play( TQPainter *painter )
s.device()->at( 10 ); // go directly to the data
s.setVersion( d->formatMajor == 4 ? 3 : d->formatMajor );
- Q_UINT8 c, clen;
- Q_UINT32 nrecords;
+ TQ_UINT8 c, clen;
+ TQ_UINT32 nrecords;
s >> c >> clen;
Q_ASSERT( c == PdcBegin );
// bounding rect was introduced in ver 4. Read in checkFormat().
if ( d->formatMajor >= 4 ) {
- Q_INT32 dummy;
+ TQ_INT32 dummy;
s >> dummy >> dummy >> dummy >> dummy;
}
s >> nrecords;
@@ -430,12 +430,12 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords )
#if defined(QT_DEBUG)
int strm_pos;
#endif
- Q_UINT8 c; // command id
- Q_UINT8 tiny_len; // 8-bit length descriptor
- Q_INT32 len; // 32-bit length descriptor
- Q_INT16 i_16, i1_16, i2_16; // parameters...
- Q_INT8 i_8;
- Q_UINT32 ul;
+ TQ_UINT8 c; // command id
+ TQ_UINT8 tiny_len; // 8-bit length descriptor
+ TQ_INT32 len; // 32-bit length descriptor
+ TQ_INT16 i_16, i1_16, i2_16; // parameters...
+ TQ_INT8 i_8;
+ TQ_UINT32 ul;
TQCString str1;
TQString str;
TQPoint p, p1, p2;
@@ -676,7 +676,7 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords )
}
#if defined(QT_DEBUG)
//tqDebug( "device->at(): %i, strm_pos: %i len: %i", s.device()->at(), strm_pos, len );
- Q_ASSERT( Q_INT32(s.device()->at() - strm_pos) == len );
+ Q_ASSERT( TQ_INT32(s.device()->at() - strm_pos) == len );
#endif
}
return FALSE;
@@ -710,40 +710,40 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
pictb.setBuffer( empty ); // reset byte array in buffer
pictb.open( IO_WriteOnly );
s.writeRawBytes( mfhdr_tag, 4 );
- s << (Q_UINT16)0 << (Q_UINT16)formatMajor << (Q_UINT16)formatMinor;
- s << (Q_UINT8)c << (Q_UINT8)sizeof(Q_INT32);
+ s << (TQ_UINT16)0 << (TQ_UINT16)formatMajor << (TQ_UINT16)formatMinor;
+ s << (TQ_UINT8)c << (TQ_UINT8)sizeof(TQ_INT32);
brect = TQRect();
if ( formatMajor >= 4 ) {
- s << (Q_INT32)brect.left() << (Q_INT32)brect.top()
- << (Q_INT32)brect.width() << (Q_INT32)brect.height();
+ s << (TQ_INT32)brect.left() << (TQ_INT32)brect.top()
+ << (TQ_INT32)brect.width() << (TQ_INT32)brect.height();
}
trecs = 0;
- s << (Q_UINT32)trecs; // total number of records
+ s << (TQ_UINT32)trecs; // total number of records
formatOk = FALSE;
return TRUE;
} else if ( c == PdcEnd ) { // end; calc checksum and close
trecs++;
- s << (Q_UINT8)c << (Q_UINT8)0;
+ s << (TQ_UINT8)c << (TQ_UINT8)0;
TQByteArray buf = pictb.buffer();
- int cs_start = sizeof(Q_UINT32); // pos of checksum word
- int data_start = cs_start + sizeof(Q_UINT16);
- int brect_start = data_start + 2*sizeof(Q_INT16) + 2*sizeof(Q_UINT8);
+ int cs_start = sizeof(TQ_UINT32); // pos of checksum word
+ int data_start = cs_start + sizeof(TQ_UINT16);
+ int brect_start = data_start + 2*sizeof(TQ_INT16) + 2*sizeof(TQ_UINT8);
int pos = pictb.at();
pictb.at( brect_start );
if ( formatMajor >= 4 ) { // bounding rectangle
- s << (Q_INT32)brect.left() << (Q_INT32)brect.top()
- << (Q_INT32)brect.width() << (Q_INT32)brect.height();
+ s << (TQ_INT32)brect.left() << (TQ_INT32)brect.top()
+ << (TQ_INT32)brect.width() << (TQ_INT32)brect.height();
}
- s << (Q_UINT32)trecs; // write number of records
+ s << (TQ_UINT32)trecs; // write number of records
pictb.at( cs_start );
- Q_UINT16 cs = (Q_UINT16)tqChecksum( buf.data()+data_start, pos-data_start );
+ TQ_UINT16 cs = (TQ_UINT16)tqChecksum( buf.data()+data_start, pos-data_start );
s << cs; // write checksum
pictb.close();
return TRUE;
}
trecs++;
- s << (Q_UINT8)c; // write cmd to stream
- s << (Q_UINT8)0; // write dummy length info
+ s << (TQ_UINT8)c; // write cmd to stream
+ s << (TQ_UINT8)0; // write dummy length info
int pos = (int)pictb.at(); // save position
TQRect br; // bounding rect addition
bool corr = FALSE; // correction for pen width
@@ -772,7 +772,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
case PdcDrawArc:
case PdcDrawPie:
case PdcDrawChord:
- s << *p[0].rect << (Q_INT16)p[1].ival << (Q_INT16)p[2].ival;
+ s << *p[0].rect << (TQ_INT16)p[1].ival << (TQ_INT16)p[2].ival;
br = *p[0].rect;
corr = TRUE;
break;
@@ -790,14 +790,14 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
break;
#endif
case PdcDrawPolygon:
- s << *p[0].ptarr << (Q_INT8)p[1].ival;
+ s << *p[0].ptarr << (TQ_INT8)p[1].ival;
br = p[0].ptarr->boundingRect();
corr = TRUE;
break;
case PdcDrawText2:
if ( formatMajor == 1 ) {
pictb.at( pos - 2 );
- s << (Q_UINT8)PdcDrawText << (Q_UINT8)0;
+ s << (TQ_UINT8)PdcDrawText << (TQ_UINT8)0;
TQCString str1( (*p[1].str).latin1() );
s << *p[0].point << str1;
}
@@ -810,12 +810,12 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
case PdcDrawText2Formatted:
if ( formatMajor == 1 ) {
pictb.at( pos - 2 );
- s << (Q_UINT8)PdcDrawTextFormatted << (Q_UINT8)0;
+ s << (TQ_UINT8)PdcDrawTextFormatted << (TQ_UINT8)0;
TQCString str1( (*p[2].str).latin1() );
- s << *p[0].rect << (Q_INT16)p[1].ival << str1;
+ s << *p[0].rect << (TQ_INT16)p[1].ival << str1;
}
else {
- s << *p[0].rect << (Q_INT16)p[1].ival << *p[2].str;
+ s << *p[0].rect << (TQ_INT16)p[1].ival << *p[2].str;
}
br = *p[0].rect;
break;
@@ -850,7 +850,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
break;
case PdcSetBkMode:
case PdcSetROP:
- s << (Q_INT8)p[0].ival;
+ s << (TQ_INT8)p[0].ival;
break;
case PdcSetFont: {
TQFont fnt = *p[0].font;
@@ -868,21 +868,21 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
s << *p[0].brush;
break;
case PdcSetTabStops:
- s << (Q_INT16)p[0].ival;
+ s << (TQ_INT16)p[0].ival;
break;
case PdcSetTabArray:
- s << (Q_INT16)p[0].ival;
+ s << (TQ_INT16)p[0].ival;
if ( p[0].ival ) {
int *ta = p[1].ivec;
for ( int i=0; i> cs; // read checksum
ccs = tqChecksum( buf.data() + data_start, buf.size() - data_start );
@@ -1141,7 +1141,7 @@ bool TQPicture::TQPicturePrivate::checkFormat()
return FALSE;
}
- Q_UINT16 major, minor;
+ TQ_UINT16 major, minor;
s >> major >> minor; // read version number
if ( major > mfhdr_maj ) { // new, incompatible version
#if defined(QT_CHECK_RANGE)
@@ -1153,11 +1153,11 @@ bool TQPicture::TQPicturePrivate::checkFormat()
}
s.setVersion( major != 4 ? major : 3 );
- Q_UINT8 c, clen;
+ TQ_UINT8 c, clen;
s >> c >> clen;
if ( c == PdcBegin ) {
if ( !( major >= 1 && major <= 3 )) {
- Q_INT32 l, t, w, h;
+ TQ_INT32 l, t, w, h;
s >> l >> t >> w >> h;
brect = TQRect( l, t, w, h );
}
@@ -1189,7 +1189,7 @@ bool TQPicture::TQPicturePrivate::checkFormat()
TQDataStream &operator<<( TQDataStream &s, const TQPicture &r )
{
- Q_UINT32 size = r.d->pictb.buffer().size();
+ TQ_UINT32 size = r.d->pictb.buffer().size();
s << size;
// null picture ?
if ( size == 0 )
@@ -1213,7 +1213,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPicture &r )
// "init"; this code is similar to the beginning of TQPicture::cmd()
sr.setDevice( &r.d->pictb );
sr.setVersion( r.d->formatMajor );
- Q_UINT32 len;
+ TQ_UINT32 len;
s >> len;
TQByteArray data( len );
if ( len > 0 )
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index fb4168aa..06fcaabf 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -1459,7 +1459,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
switch ( mode ) {
case BPP16_8_3_M3:
CYCLE(
- Q_INT16* dst16 = (Q_INT16*)dst;
+ TQ_INT16* dst16 = (TQ_INT16*)dst;
for ( uint x=0; x>3,0xf800,0x7e0,0x1f,5,6,5)
*dst16++ = pixel;
@@ -1468,7 +1468,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
break;
case BPP16_7_2_M3:
CYCLE(
- Q_INT16* dst16 = (Q_INT16*)dst;
+ TQ_INT16* dst16 = (TQ_INT16*)dst;
for ( uint x=0; x>3,0x7c00,0x3e0,0x1f,5,5,5)
*dst16++ = pixel;
@@ -1509,7 +1509,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
break;
case BPP16_8_3_M3:
CYCLE(
- Q_INT16* dst16 = (Q_INT16*)dst;
+ TQ_INT16* dst16 = (TQ_INT16*)dst;
for ( uint x=0; x>3,0xf800,0x7e0,0x1f)
*dst16++ = pixel;
@@ -1518,7 +1518,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
break;
case BPP16_7_2_M3:
CYCLE(
- Q_INT16* dst16 = (Q_INT16*)dst;
+ TQ_INT16* dst16 = (TQ_INT16*)dst;
for ( uint x=0; x>3,0x7c00,0x3e0,0x1f)
*dst16++ = pixel;
diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp
index e75134a2..98dc7257 100644
--- a/src/kernel/qpoint.cpp
+++ b/src/kernel/qpoint.cpp
@@ -397,9 +397,9 @@ void TQPoint::warningDivByZero()
TQDataStream &operator<<( TQDataStream &s, const TQPoint &p )
{
if ( s.version() == 1 )
- s << (Q_INT16)p.x() << (Q_INT16)p.y();
+ s << (TQ_INT16)p.x() << (TQ_INT16)p.y();
else
- s << (Q_INT32)p.x() << (Q_INT32)p.y();
+ s << (TQ_INT32)p.x() << (TQ_INT32)p.y();
return s;
}
@@ -415,12 +415,12 @@ TQDataStream &operator<<( TQDataStream &s, const TQPoint &p )
TQDataStream &operator>>( TQDataStream &s, TQPoint &p )
{
if ( s.version() == 1 ) {
- Q_INT16 x, y;
+ TQ_INT16 x, y;
s >> x; p.rx() = x;
s >> y; p.ry() = y;
}
else {
- Q_INT32 x, y;
+ TQ_INT32 x, y;
s >> x; p.rx() = x;
s >> y; p.ry() = y;
}
diff --git a/src/kernel/qprinter_p.h b/src/kernel/qprinter_p.h
index 17d52898..b8733bec 100644
--- a/src/kernel/qprinter_p.h
+++ b/src/kernel/qprinter_p.h
@@ -51,7 +51,7 @@
class TQPrinterPrivate
{
public:
- Q_UINT32 printerOptions;
+ TQ_UINT32 printerOptions;
TQPrinter::PrintRange printRange;
};
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index c2b9aad7..1b4553b6 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -214,7 +214,7 @@ static const char *const ps_header =
// the list contains glyphs in the private use area of unicode. These should get removed when regenerating the glyphlist.
// also 0 shout be mapped to .notdef
static const struct {
- Q_UINT16 u;
+ TQ_UINT16 u;
const char * g;
} unicodetoglyph[] = {
// grep '^[0-9A-F][0-9A-F][0-9A-F][0-9A-F];' < /tmp/glyphlist.txt | sed -e 's/;/, "/' -e 's-;-" }, // -' -e 's/^/ { 0x/' | sort
@@ -2077,17 +2077,17 @@ void TQPSPrinterFontPrivate::downloadMapping( TQTextStream &s, bool global )
// ================== TTF ====================
-typedef Q_UINT8 BYTE;
-typedef Q_UINT16 USHORT;
-typedef Q_UINT16 uFWord;
-typedef Q_INT16 SHORT;
-typedef Q_INT16 FWord;
-typedef Q_UINT32 ULONG;
-typedef Q_INT32 FIXED;
+typedef TQ_UINT8 BYTE;
+typedef TQ_UINT16 USHORT;
+typedef TQ_UINT16 uFWord;
+typedef TQ_INT16 SHORT;
+typedef TQ_INT16 FWord;
+typedef TQ_UINT32 ULONG;
+typedef TQ_INT32 FIXED;
typedef struct {
- Q_INT16 whole;
- Q_UINT16 fraction;
+ TQ_INT16 whole;
+ TQ_UINT16 fraction;
} Fixed; // 16.16 bit fixed-point number
static float f2dot14( ushort s )
diff --git a/src/kernel/qrect.cpp b/src/kernel/qrect.cpp
index 3a8bd2fb..2ca88a4c 100644
--- a/src/kernel/qrect.cpp
+++ b/src/kernel/qrect.cpp
@@ -926,11 +926,11 @@ bool operator!=( const TQRect &r1, const TQRect &r2 )
TQDataStream &operator<<( TQDataStream &s, const TQRect &r )
{
if ( s.version() == 1 )
- s << (Q_INT16)r.left() << (Q_INT16)r.top()
- << (Q_INT16)r.right() << (Q_INT16)r.bottom();
+ s << (TQ_INT16)r.left() << (TQ_INT16)r.top()
+ << (TQ_INT16)r.right() << (TQ_INT16)r.bottom();
else
- s << (Q_INT32)r.left() << (Q_INT32)r.top()
- << (Q_INT32)r.right() << (Q_INT32)r.bottom();
+ s << (TQ_INT32)r.left() << (TQ_INT32)r.top()
+ << (TQ_INT32)r.right() << (TQ_INT32)r.bottom();
return s;
}
@@ -946,12 +946,12 @@ TQDataStream &operator<<( TQDataStream &s, const TQRect &r )
TQDataStream &operator>>( TQDataStream &s, TQRect &r )
{
if ( s.version() == 1 ) {
- Q_INT16 x1, y1, x2, y2;
+ TQ_INT16 x1, y1, x2, y2;
s >> x1; s >> y1; s >> x2; s >> y2;
r.setCoords( x1, y1, x2, y2 );
}
else {
- Q_INT32 x1, y1, x2, y2;
+ TQ_INT32 x1, y1, x2, y2;
s >> x1; s >> y1; s >> x2; s >> y2;
r.setCoords( x1, y1, x2, y2 );
}
diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp
index 014f0fad..deb0ffa4 100644
--- a/src/kernel/qregion.cpp
+++ b/src/kernel/qregion.cpp
@@ -164,7 +164,7 @@ void TQRegion::exec( const TQByteArray &buffer, int ver )
int test_cnt = 0;
#endif
while ( !s.eof() ) {
- Q_INT32 id;
+ TQ_INT32 id;
if ( s.version() == 1 ) {
int id_int;
s >> id_int;
@@ -210,7 +210,7 @@ void TQRegion::exec( const TQByteArray &buffer, int ver )
}
} else if ( id == TQRGN_RECTS ) {
// (This is the only form used in TQt 2.0)
- Q_UINT32 n;
+ TQ_UINT32 n;
s >> n;
TQRect r;
for ( int i=0; i<(int)n; i++ ) {
@@ -241,22 +241,22 @@ TQDataStream &operator<<( TQDataStream &s, const TQRegion &r )
{
TQMemArray a = r.rects();
if ( a.isEmpty() ) {
- s << (Q_UINT32)0;
+ s << (TQ_UINT32)0;
} else {
if ( s.version() == 1 ) {
int i;
for ( i=(int)a.size()-1; i>0; i-- ) {
- s << (Q_UINT32)(12+i*24);
+ s << (TQ_UINT32)(12+i*24);
s << (int)TQRGN_OR;
}
for ( i=0; i<(int)a.size(); i++ ) {
- s << (Q_UINT32)(4+8) << (int)TQRGN_SETRECT << a[i];
+ s << (TQ_UINT32)(4+8) << (int)TQRGN_SETRECT << a[i];
}
}
else {
- s << (Q_UINT32)(4+4+16*a.size()); // 16: storage size of TQRect
- s << (Q_INT32)TQRGN_RECTS;
- s << (Q_UINT32)a.size();
+ s << (TQ_UINT32)(4+4+16*a.size()); // 16: storage size of TQRect
+ s << (TQ_INT32)TQRGN_RECTS;
+ s << (TQ_UINT32)a.size();
for ( int i=0; i<(int)a.size(); i++ )
s << a[i];
}
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 42bcc9d2..1b7d5375 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -6949,7 +6949,7 @@ bool TQTextDocument::eat(const TQChar* doc, int length, int& pos, TQChar c)
struct Entity {
const char * name;
- Q_UINT16 code;
+ TQ_UINT16 code;
};
static const Entity entitylist [] = {
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 14adbcf0..20240255 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -94,7 +94,7 @@ private:
int a;
int s;
T *ptr;
- Q_UINT64 array[((Prealloc * sizeof(T)) / sizeof(Q_UINT64)) + 1];
+ TQ_UINT64 array[((Prealloc * sizeof(T)) / sizeof(TQ_UINT64)) + 1];
};
template
diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp
index d871aa74..2fbe1f4e 100644
--- a/src/kernel/qsize.cpp
+++ b/src/kernel/qsize.cpp
@@ -401,9 +401,9 @@ void TQSize::warningDivByZero()
TQDataStream &operator<<( TQDataStream &s, const TQSize &sz )
{
if ( s.version() == 1 )
- s << (Q_INT16)sz.width() << (Q_INT16)sz.height();
+ s << (TQ_INT16)sz.width() << (TQ_INT16)sz.height();
else
- s << (Q_INT32)sz.width() << (Q_INT32)sz.height();
+ s << (TQ_INT32)sz.width() << (TQ_INT32)sz.height();
return s;
}
@@ -418,12 +418,12 @@ TQDataStream &operator<<( TQDataStream &s, const TQSize &sz )
TQDataStream &operator>>( TQDataStream &s, TQSize &sz )
{
if ( s.version() == 1 ) {
- Q_INT16 w, h;
+ TQ_INT16 w, h;
s >> w; sz.rwidth() = w;
s >> h; sz.rheight() = h;
}
else {
- Q_INT32 w, h;
+ TQ_INT32 w, h;
s >> w; sz.rwidth() = w;
s >> h; sz.rheight() = h;
}
diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp
index adeafb88..d23f21e9 100644
--- a/src/kernel/qtextengine.cpp
+++ b/src/kernel/qtextengine.cpp
@@ -670,7 +670,7 @@ static void bidiItemize( TQTextEngine *engine, bool rightToLeft, int mode )
}
-void TQTextEngine::bidiReorder( int numItems, const Q_UINT8 *levels, int *visualOrder )
+void TQTextEngine::bidiReorder( int numItems, const TQ_UINT8 *levels, int *visualOrder )
{
// first find highest and lowest levels
@@ -775,7 +775,7 @@ enum break_action {
// The following line break classes are not treated by the table:
// SA, BK, CR, LF, SG, CB, SP
-static const Q_UINT8 breakTable[TQUnicodeTables::LineBreak_CM+1][TQUnicodeTables::LineBreak_CM+1] =
+static const TQ_UINT8 breakTable[TQUnicodeTables::LineBreak_CM+1][TQUnicodeTables::LineBreak_CM+1] =
{
// OP, CL, QU, GL, NS, EX, SY, IS, PR, PO, NU, AL, ID, IN, HY, BA, BB, B2, ZW, CM
{ Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk, Pbk }, // OP
diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h
index 74cca189..701db02c 100644
--- a/src/kernel/qtextengine_p.h
+++ b/src/kernel/qtextengine_p.h
@@ -306,7 +306,7 @@ public:
void itemize( int mode = Full );
- static void bidiReorder( int numRuns, const Q_UINT8 *levels, int *visualOrder );
+ static void bidiReorder( int numRuns, const TQ_UINT8 *levels, int *visualOrder );
const TQCharAttributes *attributes();
void shape( int item ) const;
diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/qtextlayout.cpp
index ed5641a7..777e61ad 100644
--- a/src/kernel/qtextlayout.cpp
+++ b/src/kernel/qtextlayout.cpp
@@ -369,9 +369,9 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment,
int available = d->lineWidth;
int numRuns = 0;
int numSpaceItems = 0;
- Q_UINT8 _levels[128];
+ TQ_UINT8 _levels[128];
int _visual[128];
- Q_UINT8 *levels = _levels;
+ TQ_UINT8 *levels = _levels;
int *visual = _visual;
int i;
TQTextLayout::Result result = LineEmpty;
@@ -504,7 +504,7 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment,
numRuns = d->currentItem - d->firstItemInLine - numSpaceItems;
if ( numRuns > 127 ) {
- levels = new Q_UINT8[numRuns];
+ levels = new TQ_UINT8[numRuns];
visual = new int[numRuns];
}
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 6a66947b..5f3eec77 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -563,11 +563,11 @@ bool TQTranslator::do_load( const uchar *data, int len )
s.device()->at( MagicLength );
- Q_UINT8 tag = 0;
- Q_UINT32 blockLen = 0;
+ TQ_UINT8 tag = 0;
+ TQ_UINT32 blockLen = 0;
s >> tag >> blockLen;
while ( tag && blockLen ) {
- if ( (Q_UINT32) s.device()->at() + blockLen > (Q_UINT32) len ) {
+ if ( (TQ_UINT32) s.device()->at() + blockLen > (TQ_UINT32) len ) {
ok = FALSE;
break;
}
@@ -622,23 +622,23 @@ bool TQTranslator::save( const TQString & filename, SaveMode mode )
TQDataStream s( &f );
s.writeRawBytes( (const char *)magic, MagicLength );
- Q_UINT8 tag;
+ TQ_UINT8 tag;
if ( d->offsetArray != 0 ) {
- tag = (Q_UINT8) TQTranslatorPrivate::Hashes;
- Q_UINT32 oas = (Q_UINT32) d->offsetArray->size();
+ tag = (TQ_UINT8) TQTranslatorPrivate::Hashes;
+ TQ_UINT32 oas = (TQ_UINT32) d->offsetArray->size();
s << tag << oas;
s.writeRawBytes( d->offsetArray->data(), oas );
}
if ( d->messageArray != 0 ) {
- tag = (Q_UINT8) TQTranslatorPrivate::Messages;
- Q_UINT32 mas = (Q_UINT32) d->messageArray->size();
+ tag = (TQ_UINT8) TQTranslatorPrivate::Messages;
+ TQ_UINT32 mas = (TQ_UINT32) d->messageArray->size();
s << tag << mas;
s.writeRawBytes( d->messageArray->data(), mas );
}
if ( d->contextArray != 0 ) {
- tag = (Q_UINT8) TQTranslatorPrivate::Contexts;
- Q_UINT32 cas = (Q_UINT32) d->contextArray->size();
+ tag = (TQ_UINT8) TQTranslatorPrivate::Contexts;
+ TQ_UINT32 cas = (TQ_UINT32) d->contextArray->size();
s << tag << cas;
s.writeRawBytes( d->contextArray->data(), cas );
}
@@ -760,7 +760,7 @@ void TQTranslator::squeeze( SaveMode mode )
while ( offset != offsets.end() ) {
TQTranslatorPrivate::Offset k = offset.key();
++offset;
- ds << (Q_UINT32)k.h << (Q_UINT32)k.o;
+ ds << (TQ_UINT32)k.h << (TQ_UINT32)k.o;
}
if ( mode == Stripped ) {
@@ -770,7 +770,7 @@ void TQTranslator::squeeze( SaveMode mode )
for ( it = messages->begin(); it != messages->end(); ++it )
contextSet.replace( it.key().context(), &baudelaire );
- Q_UINT16 hTableSize;
+ TQ_UINT16 hTableSize;
if ( contextSet.count() < 200 )
hTableSize = ( contextSet.count() < 60 ) ? 151 : 503;
else if ( contextSet.count() < 2500 )
@@ -791,14 +791,14 @@ void TQTranslator::squeeze( SaveMode mode )
table to provide fast lookup. The context array has the
following format:
- Q_UINT16 hTableSize;
- Q_UINT16 hTable[hTableSize];
- Q_UINT8 contextPool[...];
+ TQ_UINT16 hTableSize;
+ TQ_UINT16 hTable[hTableSize];
+ TQ_UINT8 contextPool[...];
The context pool stores the contexts as Pascal strings:
- Q_UINT8 len;
- Q_UINT8 data[len];
+ TQ_UINT8 len;
+ TQ_UINT8 data[len];
Let's consider the look-up of context "FunnyDialog". A
hash value between 0 and hTableSize - 1 is computed, say h.
@@ -811,12 +811,12 @@ void TQTranslator::squeeze( SaveMode mode )
d->contextArray = new TQByteArray;
d->contextArray->resize( 2 + (hTableSize << 1) );
TQDataStream t( *d->contextArray, IO_WriteOnly );
- Q_UINT16 *hTable = new Q_UINT16[hTableSize];
- memset( hTable, 0, hTableSize * sizeof(Q_UINT16) );
+ TQ_UINT16 *hTable = new TQ_UINT16[hTableSize];
+ memset( hTable, 0, hTableSize * sizeof(TQ_UINT16) );
t << hTableSize;
t.device()->at( 2 + (hTableSize << 1) );
- t << (Q_UINT16) 0; // the entry at offset 0 cannot be used
+ t << (TQ_UINT16) 0; // the entry at offset 0 cannot be used
uint upto = 2;
for ( int i = 0; i < hTableSize; i++ ) {
@@ -824,17 +824,17 @@ void TQTranslator::squeeze( SaveMode mode )
if ( con == 0 ) {
hTable[i] = 0;
} else {
- hTable[i] = (Q_UINT16) ( upto >> 1 );
+ hTable[i] = (TQ_UINT16) ( upto >> 1 );
do {
uint len = (uint) tqstrlen( con );
len = TQMIN( len, 255 );
- t << (Q_UINT8) len;
+ t << (TQ_UINT8) len;
t.writeRawBytes( con, len );
upto += 1 + len;
hDict.remove( i );
} while ( (con = hDict.find(i)) != 0 );
do {
- t << (Q_UINT8) 0; // empty string (at least one)
+ t << (TQ_UINT8) 0; // empty string (at least one)
upto++;
} while ( (upto & 0x1) != 0 ); // offsets have to be even
}
@@ -1000,18 +1000,18 @@ TQTranslatorMessage TQTranslator::findMessage( const char* context,
installed, this step is necessary.
*/
if ( d->contextArray ) {
- Q_UINT16 hTableSize = 0;
+ TQ_UINT16 hTableSize = 0;
TQDataStream t( *d->contextArray, IO_ReadOnly );
t >> hTableSize;
uint g = elfHash( context ) % hTableSize;
t.device()->at( 2 + (g << 1) );
- Q_UINT16 off;
+ TQ_UINT16 off;
t >> off;
if ( off == 0 )
return TQTranslatorMessage();
t.device()->at( 2 + (hTableSize << 1) + (off << 1) );
- Q_UINT8 len;
+ TQ_UINT8 len;
char con[256];
for ( ;; ) {
t >> len;
@@ -1024,7 +1024,7 @@ TQTranslatorMessage TQTranslator::findMessage( const char* context,
}
}
- size_t numItems = d->offsetArray->size() / ( 2 * sizeof(Q_UINT32) );
+ size_t numItems = d->offsetArray->size() / ( 2 * sizeof(TQ_UINT32) );
if ( !numItems )
return TQTranslatorMessage();
@@ -1032,10 +1032,10 @@ TQTranslatorMessage TQTranslator::findMessage( const char* context,
tqSysInfo( &systemWordSize, &systemBigEndian );
for ( ;; ) {
- Q_UINT32 h = elfHash( TQCString(sourceText) + comment );
+ TQ_UINT32 h = elfHash( TQCString(sourceText) + comment );
char *r = (char *) bsearch( &h, d->offsetArray->data(), numItems,
- 2 * sizeof(Q_UINT32),
+ 2 * sizeof(TQ_UINT32),
systemBigEndian ? cmp_uint32_big
: cmp_uint32_little );
if ( r != 0 ) {
@@ -1047,7 +1047,7 @@ TQTranslatorMessage TQTranslator::findMessage( const char* context,
TQDataStream s( *d->offsetArray, IO_ReadOnly );
s.device()->at( r - d->offsetArray->data() );
- Q_UINT32 rh, ro;
+ TQ_UINT32 rh, ro;
s >> rh >> ro;
TQDataStream ms( *d->messageArray, IO_ReadOnly );
@@ -1191,7 +1191,7 @@ TQTranslatorMessage::TQTranslatorMessage( TQDataStream & stream )
{
TQString str16;
char tag;
- Q_UINT8 obs1;
+ TQ_UINT8 obs1;
for ( ;; ) {
tag = 0;
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 3f4fe430..6c7372b0 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -856,7 +856,7 @@ TQVariant::TQVariant( uint val )
/*!
Constructs a new variant with a long long integer value, \a val.
*/
-TQVariant::TQVariant( Q_LLONG val )
+TQVariant::TQVariant( TQ_LLONG val )
{
d = new Private;
d->typ = LongLong;
@@ -868,7 +868,7 @@ TQVariant::TQVariant( Q_LLONG val )
Constructs a new variant with an unsigned long long integer value, \a val.
*/
-TQVariant::TQVariant( Q_ULLONG val )
+TQVariant::TQVariant( TQ_ULLONG val )
{
d = new Private;
d->typ = ULongLong;
@@ -1027,8 +1027,8 @@ static const char* const type_map[ntypes] =
"TQBitArray",
"TQKeySequence",
"TQPen",
- "Q_LLONG",
- "Q_ULLONG"
+ "TQ_LLONG",
+ "TQ_ULLONG"
};
@@ -1070,7 +1070,7 @@ TQVariant::Type TQVariant::nameToType( const char* name )
void TQVariant::load( TQDataStream& s )
{
clear();
- Q_UINT32 u;
+ TQ_UINT32 u;
s >> u;
Type t = (Type)u;
@@ -1267,21 +1267,21 @@ void TQVariant::load( TQDataStream& s )
break;
case LongLong:
{
- Q_LLONG x;
+ TQ_LLONG x;
s >> x;
d->value.ll = x;
}
break;
case ULongLong:
{
- Q_ULLONG x;
+ TQ_ULLONG x;
s >> x;
d->value.ull = x;
}
break;
case Bool:
{
- Q_INT8 x;
+ TQ_INT8 x;
s >> x;
d->value.b = x;
d->is_null = FALSE;
@@ -1298,7 +1298,7 @@ void TQVariant::load( TQDataStream& s )
case SizePolicy:
{
int h,v;
- Q_INT8 hfw;
+ TQ_INT8 hfw;
s >> h >> v >> hfw;
d->value.ptr = new TQSizePolicy( (TQSizePolicy::SizeType)h,
(TQSizePolicy::SizeType)v,
@@ -1371,7 +1371,7 @@ void TQVariant::load( TQDataStream& s )
*/
void TQVariant::save( TQDataStream& s ) const
{
- s << (Q_UINT32)type();
+ s << (TQ_UINT32)type();
switch( d->typ ) {
case Cursor:
@@ -1462,7 +1462,7 @@ void TQVariant::save( TQDataStream& s ) const
s << d->value.ull;
break;
case Bool:
- s << (Q_INT8)d->value.b;
+ s << (TQ_INT8)d->value.b;
break;
case Double:
s << d->value.d;
@@ -1471,7 +1471,7 @@ void TQVariant::save( TQDataStream& s ) const
{
TQSizePolicy p = toSizePolicy();
s << (int) p.horData() << (int) p.verData()
- << (Q_INT8) p.hasHeightForWidth();
+ << (TQ_INT8) p.hasHeightForWidth();
}
break;
case Date:
@@ -1532,7 +1532,7 @@ TQDataStream& operator<< ( TQDataStream& s, const TQVariant& p )
*/
TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p )
{
- Q_UINT32 u;
+ TQ_UINT32 u;
s >> u;
p = (TQVariant::Type) u;
@@ -1544,7 +1544,7 @@ TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p )
*/
TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p )
{
- s << (Q_UINT32)p;
+ s << (TQ_UINT32)p;
return s;
}
@@ -2247,7 +2247,7 @@ uint TQVariant::toUInt( bool * ok ) const
\sa asLongLong(), canCast()
*/
-Q_LLONG TQVariant::toLongLong( bool * ok ) const
+TQ_LLONG TQVariant::toLongLong( bool * ok ) const
{
if ( ok )
*ok = canCast( LongLong );
@@ -2259,17 +2259,17 @@ Q_LLONG TQVariant::toLongLong( bool * ok ) const
case ByteArray:
return TQString(*(TQCString*)d->value.ptr).toLongLong(ok);
case Int:
- return (Q_LLONG)d->value.i;
+ return (TQ_LLONG)d->value.i;
case UInt:
- return (Q_LLONG)d->value.u;
+ return (TQ_LLONG)d->value.u;
case LongLong:
return d->value.ll;
case ULongLong:
- return (Q_LLONG)d->value.ull;
+ return (TQ_LLONG)d->value.ull;
case Double:
- return (Q_LLONG)d->value.d;
+ return (TQ_LLONG)d->value.d;
case Bool:
- return (Q_LLONG)d->value.b;
+ return (TQ_LLONG)d->value.b;
default:
return 0;
}
@@ -2284,24 +2284,24 @@ Q_LLONG TQVariant::toLongLong( bool * ok ) const
\sa asULongLong(), canCast()
*/
-Q_ULLONG TQVariant::toULongLong( bool * ok ) const
+TQ_ULLONG TQVariant::toULongLong( bool * ok ) const
{
if ( ok )
*ok = canCast( ULongLong );
switch ( d->typ ) {
case Int:
- return (Q_ULLONG)d->value.i;
+ return (TQ_ULLONG)d->value.i;
case UInt:
- return (Q_ULLONG)d->value.u;
+ return (TQ_ULLONG)d->value.u;
case LongLong:
- return (Q_ULLONG)d->value.ll;
+ return (TQ_ULLONG)d->value.ll;
case ULongLong:
return d->value.ull;
case Double:
- return (Q_ULLONG)d->value.d;
+ return (TQ_ULLONG)d->value.d;
case Bool:
- return (Q_ULLONG)d->value.b;
+ return (TQ_ULLONG)d->value.b;
case String:
return ((TQString*)d->value.ptr)->toULongLong( ok );
case CString:
@@ -2382,7 +2382,7 @@ double TQVariant::toDouble( bool * ok ) const
return (double)d->value.ll;
case ULongLong:
#if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET)
- return (double)(Q_LLONG)d->value.ull;
+ return (double)(TQ_LLONG)d->value.ull;
#else
return (double)d->value.ull;
#endif
@@ -2819,11 +2819,11 @@ uint& TQVariant::asUInt()
/*!
Returns the variant's value as long long reference.
*/
-Q_LLONG& TQVariant::asLongLong()
+TQ_LLONG& TQVariant::asLongLong()
{
detach();
if ( d->typ != LongLong ) {
- Q_LLONG ll = toLongLong();
+ TQ_LLONG ll = toLongLong();
bool b = isNull();
d->clear();
d->value.ll = ll;
@@ -2836,11 +2836,11 @@ Q_LLONG& TQVariant::asLongLong()
/*!
Returns the variant's value as unsigned long long reference.
*/
-Q_ULLONG& TQVariant::asULongLong()
+TQ_ULLONG& TQVariant::asULongLong()
{
detach();
if ( d->typ != ULongLong ) {
- Q_ULLONG ull = toULongLong();
+ TQ_ULLONG ull = toULongLong();
bool b = isNull();
d->clear();
d->value.ull = ull;
@@ -3264,13 +3264,13 @@ bool TQVariant::operator==( const TQVariant &v ) const
case LongLong:
{
- Q_LLONG val = toLongLong(&ok);
+ TQ_LLONG val = toLongLong(&ok);
return (ok && val == v.toLongLong());
}
case ULongLong:
{
- Q_ULLONG val = toULongLong(&ok);
+ TQ_ULLONG val = toULongLong(&ok);
return (ok && val == v.toULongLong());
}
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 0026ef2c..afbf3988 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -288,8 +288,8 @@ static const char* const type_map[ntypes] =
"TQBitArray",
"TQKeySequence",
"TQPen",
- "Q_LLONG",
- "Q_ULLONG"
+ "TQ_LLONG",
+ "TQ_ULLONG"
};
int qvariant_nameToType( const char* name )
@@ -478,9 +478,9 @@ struct Property
} else if ( type == "TQValueList" ) {
type = "TQValueList";
} else if ( type == "LongLong" ) {
- type = "Q_LLONG";
+ type = "TQ_LLONG";
} else if ( type == "ULongLong" ) {
- type = "Q_ULLONG";
+ type = "TQ_ULLONG";
}
}
@@ -3417,9 +3417,9 @@ void generateClass() // generate C++ source code for a class
fprintf( out, "v->asMap()" );
else if ( type == "TQValueList" )
fprintf( out, "v->asList()" );
- else if ( type == "Q_LLONG" )
+ else if ( type == "TQ_LLONG" )
fprintf( out, "v->asLongLong()" );
- else if ( type == "Q_ULLONG" )
+ else if ( type == "TQ_ULLONG" )
fprintf( out, "v->asULongLong()" );
else if ( isVariantType( type ) ) {
if (( type[0] == 'T' ) && ( type[1] == 'Q' ))
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index d7f661fe..46a5cfe2 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -303,8 +303,8 @@ static const char* const type_map[ntypes] =
"TQBitArray",
"TQKeySequence",
"TQPen",
- "Q_LLONG",
- "Q_ULLONG"
+ "TQ_LLONG",
+ "TQ_ULLONG"
};
int qvariant_nameToType( const char* name )
@@ -493,9 +493,9 @@ struct Property
} else if ( type == "TQValueList" ) {
type = "TQValueList";
} else if ( type == "LongLong" ) {
- type = "Q_LLONG";
+ type = "TQ_LLONG";
} else if ( type == "ULongLong" ) {
- type = "Q_ULLONG";
+ type = "TQ_ULLONG";
}
}
@@ -6243,9 +6243,9 @@ void generateClass() // generate C++ source code for a class
fprintf( out, "v->asMap()" );
else if ( type == "TQValueList" )
fprintf( out, "v->asList()" );
- else if ( type == "Q_LLONG" )
+ else if ( type == "TQ_LLONG" )
fprintf( out, "v->asLongLong()" );
- else if ( type == "Q_ULLONG" )
+ else if ( type == "TQ_ULLONG" )
fprintf( out, "v->asULongLong()" );
else if ( isVariantType( type ) ) {
if (( type[0] == 'T' ) && ( type[1] == 'Q' ))
diff --git a/src/network/ntqdns.h b/src/network/ntqdns.h
index fdf255a7..c594e394 100644
--- a/src/network/ntqdns.h
+++ b/src/network/ntqdns.h
@@ -93,22 +93,22 @@ public:
class TQM_EXPORT_DNS MailServer {
public:
- MailServer( const TQString & n=TQString::null, Q_UINT16 p=0 )
+ MailServer( const TQString & n=TQString::null, TQ_UINT16 p=0 )
:name(n), priority(p) {}
TQString name;
- Q_UINT16 priority;
+ TQ_UINT16 priority;
Q_DUMMY_COMPARISON_OPERATOR(MailServer)
};
TQValueList mailServers() const;
class TQM_EXPORT_DNS Server {
public:
- Server(const TQString & n=TQString::null, Q_UINT16 p=0, Q_UINT16 w=0, Q_UINT16 po=0 )
+ Server(const TQString & n=TQString::null, TQ_UINT16 p=0, TQ_UINT16 w=0, TQ_UINT16 po=0 )
: name(n), priority(p), weight(w), port(po) {}
TQString name;
- Q_UINT16 priority;
- Q_UINT16 weight;
- Q_UINT16 port;
+ TQ_UINT16 priority;
+ TQ_UINT16 weight;
+ TQ_UINT16 port;
Q_DUMMY_COMPARISON_OPERATOR(Server)
};
TQValueList servers() const;
diff --git a/src/network/ntqftp.h b/src/network/ntqftp.h
index af4036fb..e68867ad 100644
--- a/src/network/ntqftp.h
+++ b/src/network/ntqftp.h
@@ -102,7 +102,7 @@ public:
RawCommand
};
- int connectToHost( const TQString &host, Q_UINT16 port=21 );
+ int connectToHost( const TQString &host, TQ_UINT16 port=21 );
int login( const TQString &user=TQString::null, const TQString &password=TQString::null );
int close();
int list( const TQString &dir=TQString::null );
@@ -117,8 +117,8 @@ public:
int rawCommand( const TQString &command );
- Q_ULONG bytesAvailable() const;
- Q_LONG readBlock( char *data, Q_ULONG maxlen );
+ TQ_ULONG bytesAvailable() const;
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
TQByteArray readAll();
int currentId() const;
diff --git a/src/network/ntqhostaddress.h b/src/network/ntqhostaddress.h
index 2ae4a8ea..e28e3c20 100644
--- a/src/network/ntqhostaddress.h
+++ b/src/network/ntqhostaddress.h
@@ -55,15 +55,15 @@
class TQHostAddressPrivate;
typedef struct {
- Q_UINT8 c[16];
+ TQ_UINT8 c[16];
} Q_IPV6ADDR;
class TQM_EXPORT_NETWORK TQHostAddress
{
public:
TQHostAddress();
- TQHostAddress( Q_UINT32 ip4Addr );
- TQHostAddress( Q_UINT8 *ip6Addr );
+ TQHostAddress( TQ_UINT32 ip4Addr );
+ TQHostAddress( TQ_UINT8 *ip6Addr );
TQHostAddress(const Q_IPV6ADDR &ip6Addr);
#ifndef QT_NO_STRINGLIST
TQHostAddress(const TQString &address);
@@ -73,16 +73,16 @@ public:
TQHostAddress & operator=( const TQHostAddress & );
- void setAddress( Q_UINT32 ip4Addr );
- void setAddress( Q_UINT8 *ip6Addr );
+ void setAddress( TQ_UINT32 ip4Addr );
+ void setAddress( TQ_UINT8 *ip6Addr );
#ifndef QT_NO_STRINGLIST
bool setAddress( const TQString& address );
#endif
bool isIp4Addr() const; // obsolete
- Q_UINT32 ip4Addr() const; // obsolete
+ TQ_UINT32 ip4Addr() const; // obsolete
bool isIPv4Address() const;
- Q_UINT32 toIPv4Address() const;
+ TQ_UINT32 toIPv4Address() const;
bool isIPv6Address() const;
Q_IPV6ADDR toIPv6Address() const;
diff --git a/src/network/ntqhttp.h b/src/network/ntqhttp.h
index 27849350..98d77bc8 100644
--- a/src/network/ntqhttp.h
+++ b/src/network/ntqhttp.h
@@ -173,7 +173,7 @@ class TQM_EXPORT_HTTP TQHttp : public TQNetworkProtocol
public:
TQHttp();
TQHttp( TQObject* parent, const char* name = 0 ); // ### TQt 4.0: make parent=0 and get rid of the TQHttp() constructor
- TQHttp( const TQString &hostname, Q_UINT16 port=80, TQObject* parent=0, const char* name = 0 );
+ TQHttp( const TQString &hostname, TQ_UINT16 port=80, TQObject* parent=0, const char* name = 0 );
virtual ~TQHttp();
int supportedOperations() const;
@@ -190,7 +190,7 @@ public:
Aborted
};
- int setHost(const TQString &hostname, Q_UINT16 port=80 );
+ int setHost(const TQString &hostname, TQ_UINT16 port=80 );
int get( const TQString& path, TQIODevice* to=0 );
int post( const TQString& path, TQIODevice* data, TQIODevice* to=0 );
@@ -201,8 +201,8 @@ public:
int closeConnection();
- Q_ULONG bytesAvailable() const;
- Q_LONG readBlock( char *data, Q_ULONG maxlen );
+ TQ_ULONG bytesAvailable() const;
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
TQByteArray readAll();
int currentId() const;
diff --git a/src/network/ntqserversocket.h b/src/network/ntqserversocket.h
index 7d151030..4da629e6 100644
--- a/src/network/ntqserversocket.h
+++ b/src/network/ntqserversocket.h
@@ -61,16 +61,16 @@ class TQM_EXPORT_NETWORK TQServerSocket : public TQObject
{
TQ_OBJECT
public:
- TQServerSocket( Q_UINT16 port, int backlog = 1,
+ TQServerSocket( TQ_UINT16 port, int backlog = 1,
TQObject *parent=0, const char *name=0 );
- TQServerSocket( const TQHostAddress & address, Q_UINT16 port, int backlog = 1,
+ TQServerSocket( const TQHostAddress & address, TQ_UINT16 port, int backlog = 1,
TQObject *parent=0, const char *name=0 );
TQServerSocket( TQObject *parent=0, const char *name=0 );
virtual ~TQServerSocket();
bool ok() const;
- Q_UINT16 port() const ;
+ TQ_UINT16 port() const ;
int socket() const ;
virtual void setSocket( int socket );
@@ -87,7 +87,7 @@ private slots:
private:
TQServerSocketPrivate *d;
- void init( const TQHostAddress & address, Q_UINT16 port, int backlog );
+ void init( const TQHostAddress & address, TQ_UINT16 port, int backlog );
};
#endif // QT_NO_NETWORK
diff --git a/src/network/ntqsocket.h b/src/network/ntqsocket.h
index 545647ee..e5131926 100644
--- a/src/network/ntqsocket.h
+++ b/src/network/ntqsocket.h
@@ -83,7 +83,7 @@ public:
virtual void setSocketDevice( TQSocketDevice * );
#ifndef QT_NO_DNS
- virtual void connectToHost( const TQString &host, Q_UINT16 port );
+ virtual void connectToHost( const TQString &host, TQ_UINT16 port );
#endif
TQString peerName() const;
@@ -96,15 +96,15 @@ public:
bool at( Offset );
bool atEnd() const;
- Q_ULONG bytesAvailable() const; // ### TQIODevice::Offset instead?
- Q_ULONG waitForMore( int msecs, bool *timeout ) const;
- Q_ULONG waitForMore( int msecs ) const; // ### TQt 4.0: merge the two overloads
- Q_ULONG bytesToWrite() const;
+ TQ_ULONG bytesAvailable() const; // ### TQIODevice::Offset instead?
+ TQ_ULONG waitForMore( int msecs, bool *timeout ) const;
+ TQ_ULONG waitForMore( int msecs ) const; // ### TQt 4.0: merge the two overloads
+ TQ_ULONG bytesToWrite() const;
void clearPendingData();
- Q_LONG readBlock( char *data, Q_ULONG maxlen );
- Q_LONG writeBlock( const char *data, Q_ULONG len );
- Q_LONG readLine( char *data, Q_ULONG maxlen );
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
+ TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+ TQ_LONG readLine( char *data, TQ_ULONG maxlen );
int getch();
int putch( int );
@@ -113,13 +113,13 @@ public:
bool canReadLine() const;
virtual TQString readLine();
- Q_UINT16 port() const;
- Q_UINT16 peerPort() const;
+ TQ_UINT16 port() const;
+ TQ_UINT16 peerPort() const;
TQHostAddress address() const;
TQHostAddress peerAddress() const;
- void setReadBufferSize( Q_ULONG );
- Q_ULONG readBufferSize() const;
+ void setReadBufferSize( TQ_ULONG );
+ TQ_ULONG readBufferSize() const;
signals:
void hostFound();
@@ -141,7 +141,7 @@ private slots:
private:
TQSocketPrivate *d;
- bool consumeWriteBuf( Q_ULONG nbytes );
+ bool consumeWriteBuf( TQ_ULONG nbytes );
void tryConnection();
void setSocketIntern( int socket );
diff --git a/src/network/ntqsocketdevice.h b/src/network/ntqsocketdevice.h
index a8a5b83c..bff85934 100644
--- a/src/network/ntqsocketdevice.h
+++ b/src/network/ntqsocketdevice.h
@@ -95,25 +95,25 @@ public:
int sendBufferSize() const;
virtual void setSendBufferSize( uint );
- virtual bool connect( const TQHostAddress &, Q_UINT16 );
+ virtual bool connect( const TQHostAddress &, TQ_UINT16 );
- virtual bool bind( const TQHostAddress &, Q_UINT16 );
+ virtual bool bind( const TQHostAddress &, TQ_UINT16 );
virtual bool listen( int backlog );
virtual int accept();
- Q_LONG bytesAvailable() const;
- Q_LONG waitForMore( int msecs, bool *timeout=0 ) const;
- Q_LONG readBlock( char *data, Q_ULONG maxlen );
- Q_LONG writeBlock( const char *data, Q_ULONG len );
- virtual Q_LONG writeBlock( const char *data, Q_ULONG len,
- const TQHostAddress & host, Q_UINT16 port );
+ TQ_LONG bytesAvailable() const;
+ TQ_LONG waitForMore( int msecs, bool *timeout=0 ) const;
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
+ TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+ virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len,
+ const TQHostAddress & host, TQ_UINT16 port );
int getch();
int putch( int );
int ungetch(int);
- Q_UINT16 port() const;
- Q_UINT16 peerPort() const;
+ TQ_UINT16 port() const;
+ TQ_UINT16 peerPort() const;
TQHostAddress address() const;
TQHostAddress peerAddress() const;
@@ -138,9 +138,9 @@ protected:
private:
int fd;
Type t;
- Q_UINT16 p;
+ TQ_UINT16 p;
TQHostAddress a;
- Q_UINT16 pp;
+ TQ_UINT16 pp;
TQHostAddress pa;
TQSocketDevice::Error e;
TQSocketDevicePrivate * d;
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index ac5ced85..7a4c534f 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -84,14 +84,14 @@
//#define TQDNS_DEBUG
-static Q_UINT16 id; // ### seeded started by now()
+static TQ_UINT16 id; // ### seeded started by now()
static TQDateTime * originOfTime = 0;
static TQCleanupHandler qdns_cleanup_time;
-static Q_UINT32 now()
+static TQ_UINT32 now()
{
if ( originOfTime )
return originOfTime->secsTo( TQDateTime::currentDateTime() );
@@ -175,18 +175,18 @@ public:
TQDns::RecordType t;
bool nxdomain;
bool current;
- Q_UINT32 expireTime;
- Q_UINT32 deleteTime;
+ TQ_UINT32 expireTime;
+ TQ_UINT32 deleteTime;
// somewhat space-wasting per-type data
// a / aaaa
TQHostAddress address;
// cname / mx / srv / ptr
TQString target;
// mx / srv
- Q_UINT16 priority;
+ TQ_UINT16 priority;
// srv
- Q_UINT16 weight;
- Q_UINT16 port;
+ TQ_UINT16 weight;
+ TQ_UINT16 port;
// txt
TQString text; // could be overloaded into target...
private:
@@ -204,7 +204,7 @@ public:
void take( TQDnsRR * );
- void sweep( Q_UINT32 thisSweep );
+ void sweep( TQ_UINT32 thisSweep );
bool isEmpty() const { return rrs == 0 || rrs->isEmpty(); }
@@ -222,12 +222,12 @@ public:
id( 0 ), t( TQDns::None ), step(0), started(0),
dns( new TQPtrDict(17) ) {}
~TQDnsQuery() { delete dns; }
- Q_UINT16 id;
+ TQ_UINT16 id;
TQDns::RecordType t;
TQString l;
uint step;
- Q_UINT32 started;
+ TQ_UINT32 started;
TQPtrDict * dns;
};
@@ -248,7 +248,7 @@ public:
private:
TQDnsQuery * query;
- Q_UINT8 * answer;
+ TQ_UINT8 * answer;
int size;
int pp;
@@ -320,7 +320,7 @@ TQDnsAnswer::TQDnsAnswer( const TQByteArray& answer_,
{
ok = TRUE;
- answer = (Q_UINT8 *)(answer_.data());
+ answer = (TQ_UINT8 *)(answer_.data());
size = (int)answer_.size();
query = query_;
pp = 0;
@@ -351,7 +351,7 @@ TQString TQDnsAnswer::readString(bool multipleLabels)
{
int p = pp;
TQString r = TQString::null;
- Q_UINT8 b;
+ TQ_UINT8 b;
for( ;; ) {
b = 128;
// Read one character
@@ -1026,14 +1026,14 @@ TQDnsManager::~TQDnsManager()
#endif
}
-static Q_UINT32 lastSweep = 0;
+static TQ_UINT32 lastSweep = 0;
void TQDnsManager::cleanCache()
{
bool again = FALSE;
TQDictIterator it( cache );
TQDnsDomain * d;
- Q_UINT32 thisSweep = now();
+ TQ_UINT32 thisSweep = now();
#if defined(TQDNS_DEBUG)
tqDebug( "TQDnsManager::cleanCache(: Called, time is %u, last was %u",
thisSweep, lastSweep );
@@ -1094,7 +1094,7 @@ void TQDnsManager::answer()
// of our name servers...
a.resize( r );
- Q_UINT16 aid = (((Q_UINT8)a[0]) << 8) + ((Q_UINT8)a[1]);
+ TQ_UINT16 aid = (((TQ_UINT8)a[0]) << 8) + ((TQ_UINT8)a[1]);
uint i = 0;
while( i < queries.size() &&
!( queries[i] && queries[i]->id == aid ) )
@@ -1108,7 +1108,7 @@ void TQDnsManager::answer()
// at this point queries[i] is whatever we asked for.
- if ( ( (Q_UINT8)(a[2]) & 0x80 ) == 0 ) {
+ if ( ( (TQ_UINT8)(a[2]) & 0x80 ) == 0 ) {
#if defined(TQDNS_DEBUG)
tqDebug( "DNS Manager: received a query" );
#endif
@@ -1527,7 +1527,7 @@ TQPtrList * TQDnsDomain::cached( const TQDns * r )
}
-void TQDnsDomain::sweep( Q_UINT32 thisSweep )
+void TQDnsDomain::sweep( TQ_UINT32 thisSweep )
{
if ( !rrs )
return;
@@ -1920,7 +1920,7 @@ TQString TQDns::toInAddrArpaDomain( const TQHostAddress &address )
// if the address isn't valid, neither of the other two make
// cases make sense. better to just return.
} else if ( address.isIp4Addr() ) {
- Q_UINT32 i = address.ip4Addr();
+ TQ_UINT32 i = address.ip4Addr();
s.sprintf( "%d.%d.%d.%d.IN-ADDR.ARPA",
i & 0xff, (i >> 8) & 0xff, (i>>16) & 0xff, (i>>24) & 0xff );
} else {
@@ -1976,7 +1976,7 @@ bool TQDns::isWorking() const
#endif
TQPtrList * ll = TQDnsDomain::cached( this );
- Q_LONG queries = n.count();
+ TQ_LONG queries = n.count();
while( ll->current() != 0 ) {
if ( ll->current()->nxdomain ) {
queries--;
@@ -2056,7 +2056,7 @@ TQValueList TQDns::addresses() const
class \c TQDns::MailServer contains the following public variables:
\list
\i TQString TQDns::MailServer::name
- \i Q_UINT16 TQDns::MailServer::priority
+ \i TQ_UINT16 TQDns::MailServer::priority
\endlist
Note that if you want to iterate over the list, you should iterate
@@ -2112,9 +2112,9 @@ TQValueList TQDns::mailServers() const
\c TQDns::Server contains the following public variables:
\list
\i TQString TQDns::Server::name
- \i Q_UINT16 TQDns::Server::priority
- \i Q_UINT16 TQDns::Server::weight
- \i Q_UINT16 TQDns::Server::port
+ \i TQ_UINT16 TQDns::Server::priority
+ \i TQ_UINT16 TQDns::Server::weight
+ \i TQ_UINT16 TQDns::Server::port
\endlist
Note that if you want to iterate over the list, you should iterate
@@ -2461,7 +2461,7 @@ void TQDns::doResInit()
last = nameServer.length();
TQDns tmp( nameServer.mid( first, last-first ), TQDns::A );
TQValueList address = tmp.addresses();
- Q_LONG i = address.count();
+ TQ_LONG i = address.count();
while( i )
ns->append( new TQHostAddress(address[--i]) );
first = last+1;
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index cb7af95a..222c2a59 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -92,18 +92,18 @@ public:
TQString errorMessage() const;
void clearError();
- void connectToHost( const TQString & host, Q_UINT16 port )
+ void connectToHost( const TQString & host, TQ_UINT16 port )
{ socket.connectToHost( host, port ); }
TQSocket::State socketState() const
{ return socket.state(); }
- Q_ULONG bytesAvailable() const
+ TQ_ULONG bytesAvailable() const
{ return socket.bytesAvailable(); }
- Q_LONG readBlock( char *data, Q_ULONG maxlen )
+ TQ_LONG readBlock( char *data, TQ_ULONG maxlen )
{
- Q_LONG read = socket.readBlock( data, maxlen );
+ TQ_LONG read = socket.readBlock( data, maxlen );
bytesDone += read;
return read;
}
@@ -163,7 +163,7 @@ class TQFtpPI : public TQObject
public:
TQFtpPI( TQObject *parent = 0 );
- void connectToHost( const TQString &host, Q_UINT16 port );
+ void connectToHost( const TQString &host, TQ_UINT16 port );
bool sendCommands( const TQStringList &cmds );
bool sendCommand( const TQString &cmd )
@@ -338,7 +338,7 @@ void TQFtpDTP::writeData()
const int blockSize = 16*1024;
char buf[blockSize];
while ( !data.dev->atEnd() && socket.bytesToWrite()==0 ) {
- Q_LONG read = data.dev->readBlock( buf, blockSize );
+ TQ_LONG read = data.dev->readBlock( buf, blockSize );
#if defined(TQFTPDTP_DEBUG)
tqDebug( "TQFtpDTP::writeData: writeBlock() of size %d bytes", (int)read );
#endif
@@ -562,7 +562,7 @@ void TQFtpDTP::socketReadyRead()
} else {
if ( !is_ba && data.dev ) {
TQByteArray ba( socket.bytesAvailable() );
- Q_LONG bytesRead = socket.readBlock( ba.data(), ba.size() );
+ TQ_LONG bytesRead = socket.readBlock( ba.data(), ba.size() );
if ( bytesRead < 0 ) {
// ### error handling
return;
@@ -654,7 +654,7 @@ TQFtpPI::TQFtpPI( TQObject *parent ) :
SLOT(dtpConnectState(int)) );
}
-void TQFtpPI::connectToHost( const TQString &host, Q_UINT16 port )
+void TQFtpPI::connectToHost( const TQString &host, TQ_UINT16 port )
{
emit connectState( TQFtp::HostLookup );
commandSocket.connectToHost( host, port );
@@ -884,7 +884,7 @@ bool TQFtpPI::processReply()
} else {
TQStringList lst = addrPortPattern.capturedTexts();
TQString host = lst[1] + "." + lst[2] + "." + lst[3] + "." + lst[4];
- Q_UINT16 port = ( lst[5].toUInt() << 8 ) + lst[6].toUInt();
+ TQ_UINT16 port = ( lst[5].toUInt() << 8 ) + lst[6].toUInt();
waitForDtpToConnect = TRUE;
dtp.connectToHost( host, port );
}
@@ -1448,7 +1448,7 @@ void TQFtp::init()
\sa stateChanged() commandStarted() commandFinished()
*/
-int TQFtp::connectToHost( const TQString &host, Q_UINT16 port )
+int TQFtp::connectToHost( const TQString &host, TQ_UINT16 port )
{
TQStringList cmds;
cmds << host;
@@ -1761,7 +1761,7 @@ int TQFtp::rawCommand( const TQString &command )
\sa get() readyRead() readBlock() readAll()
*/
-Q_ULONG TQFtp::bytesAvailable() const
+TQ_ULONG TQFtp::bytesAvailable() const
{
TQFtpPrivate *d = ::d( this );
return d->pi.dtp.bytesAvailable();
@@ -1773,7 +1773,7 @@ Q_ULONG TQFtp::bytesAvailable() const
\sa get() readyRead() bytesAvailable() readAll()
*/
-Q_LONG TQFtp::readBlock( char *data, Q_ULONG maxlen )
+TQ_LONG TQFtp::readBlock( char *data, TQ_ULONG maxlen )
{
TQFtpPrivate *d = ::d( this );
return d->pi.dtp.readBlock( data, maxlen );
diff --git a/src/network/qhostaddress.cpp b/src/network/qhostaddress.cpp
index 43d614cc..fdbc0e39 100644
--- a/src/network/qhostaddress.cpp
+++ b/src/network/qhostaddress.cpp
@@ -45,10 +45,10 @@
class TQHostAddressPrivate
{
public:
- TQHostAddressPrivate( Q_UINT32 a_=0 ) : a(a_), isIp4(TRUE)
+ TQHostAddressPrivate( TQ_UINT32 a_=0 ) : a(a_), isIp4(TRUE)
{
}
- TQHostAddressPrivate( Q_UINT8 *a_ );
+ TQHostAddressPrivate( TQ_UINT8 *a_ );
TQHostAddressPrivate(const Q_IPV6ADDR &a_);
~TQHostAddressPrivate()
{
@@ -63,14 +63,14 @@ public:
}
private:
- Q_UINT32 a; // ip 4 address
+ TQ_UINT32 a; // ip 4 address
Q_IPV6ADDR a6; // ip 6 address
bool isIp4;
friend class TQHostAddress;
};
-TQHostAddressPrivate::TQHostAddressPrivate(Q_UINT8 *a_) : a(0), isIp4(FALSE)
+TQHostAddressPrivate::TQHostAddressPrivate(TQ_UINT8 *a_) : a(0), isIp4(FALSE)
{
for ( int i=0; i<16; i++ ) {
a6.c[i] = a_[i];
@@ -119,7 +119,7 @@ TQHostAddress::TQHostAddress()
/*!
Creates a host address object for the IPv4 address \a ip4Addr.
*/
-TQHostAddress::TQHostAddress( Q_UINT32 ip4Addr )
+TQHostAddress::TQHostAddress( TQ_UINT32 ip4Addr )
: d( new TQHostAddressPrivate( ip4Addr ) )
{
}
@@ -131,7 +131,7 @@ TQHostAddress::TQHostAddress( Q_UINT32 ip4Addr )
\a ip6Addr must be a 16 byte array in network byte order
(high-order byte first).
*/
-TQHostAddress::TQHostAddress( Q_UINT8 *ip6Addr )
+TQHostAddress::TQHostAddress( TQ_UINT8 *ip6Addr )
: d( new TQHostAddressPrivate( ip6Addr ) )
{
}
@@ -188,7 +188,7 @@ TQHostAddress & TQHostAddress::operator=( const TQHostAddress & address )
/*!
Set the IPv4 address specified by \a ip4Addr.
*/
-void TQHostAddress::setAddress( Q_UINT32 ip4Addr )
+void TQHostAddress::setAddress( TQ_UINT32 ip4Addr )
{
delete d;
d = new TQHostAddressPrivate( ip4Addr );
@@ -203,14 +203,14 @@ void TQHostAddress::setAddress( Q_UINT32 ip4Addr )
\a ip6Addr must be a 16 byte array in network byte order
(high-order byte first).
*/
-void TQHostAddress::setAddress( Q_UINT8 *ip6Addr )
+void TQHostAddress::setAddress( TQ_UINT8 *ip6Addr )
{
delete d;
d = new TQHostAddressPrivate( ip6Addr );
}
#ifndef QT_NO_STRINGLIST
-static bool parseIp4(const TQString& address, Q_UINT32 *addr)
+static bool parseIp4(const TQString& address, TQ_UINT32 *addr)
{
TQStringList ipv4 = TQStringList::split(".", address, FALSE);
if (ipv4.count() == 4) {
@@ -243,7 +243,7 @@ bool TQHostAddress::setAddress(const TQString& address)
TQString a = address.simplifyWhiteSpace();
// try ipv4
- Q_UINT32 maybeIp4 = 0;
+ TQ_UINT32 maybeIp4 = 0;
if (parseIp4(address, &maybeIp4)) {
setAddress(maybeIp4);
return TRUE;
@@ -256,7 +256,7 @@ bool TQHostAddress::setAddress(const TQString& address)
return FALSE; // there must be at least two ":"
if (count > 8)
return FALSE; // maximum of seven ":" exceeded
- Q_UINT8 maybeIp6[16];
+ TQ_UINT8 maybeIp6[16];
int mc = 16;
int fillCount = 9 - count;
for (int i=count-1; i>=0; --i) {
@@ -339,7 +339,7 @@ bool TQHostAddress::isIPv4Address() const
Use toIPv4Address() instead.
*/
-Q_UINT32 TQHostAddress::ip4Addr() const
+TQ_UINT32 TQHostAddress::ip4Addr() const
{
return toIPv4Address();
}
@@ -354,7 +354,7 @@ Q_UINT32 TQHostAddress::ip4Addr() const
\sa toString()
*/
-Q_UINT32 TQHostAddress::toIPv4Address() const
+TQ_UINT32 TQHostAddress::toIPv4Address() const
{
return d->a;
}
@@ -402,16 +402,16 @@ Q_IPV6ADDR TQHostAddress::toIPv6Address() const
TQString TQHostAddress::toString() const
{
if ( d->isIp4 ) {
- Q_UINT32 i = ip4Addr();
+ TQ_UINT32 i = ip4Addr();
TQString s;
s.sprintf( "%d.%d.%d.%d", (i>>24) & 0xff, (i>>16) & 0xff,
(i >> 8) & 0xff, i & 0xff );
return s;
} else {
- Q_UINT16 ugle[8];
+ TQ_UINT16 ugle[8];
for ( int i=0; i<8; i++ ) {
- ugle[i] = ( (Q_UINT16)( d->a6.c[2*i] ) << 8 ) |
- ( (Q_UINT16)( d->a6.c[2*i+1] ) );
+ ugle[i] = ( (TQ_UINT16)( d->a6.c[2*i] ) << 8 ) |
+ ( (TQ_UINT16)( d->a6.c[2*i+1] ) );
}
TQString s;
s.sprintf( "%X:%X:%X:%X:%X:%X:%X:%X",
diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp
index 1962557b..af50e8ce 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -80,7 +80,7 @@ public:
TQString errorString;
TQString hostname;
- Q_UINT16 port;
+ TQ_UINT16 port;
TQByteArray buffer;
TQIODevice* toDevice;
@@ -88,7 +88,7 @@ public:
uint bytesDone;
uint bytesTotal;
- Q_LONG chunkedSize;
+ TQ_LONG chunkedSize;
TQHttpRequestHeader header;
@@ -278,7 +278,7 @@ void TQHttpPGHRequest::start( TQHttp *http )
class TQHttpSetHostRequest : public TQHttpRequest
{
public:
- TQHttpSetHostRequest( const TQString &h, Q_UINT16 p ) :
+ TQHttpSetHostRequest( const TQString &h, TQ_UINT16 p ) :
hostname(h), port(p)
{ }
@@ -291,7 +291,7 @@ public:
private:
TQString hostname;
- Q_UINT16 port;
+ TQ_UINT16 port;
};
void TQHttpSetHostRequest::start( TQHttp *http )
@@ -1208,7 +1208,7 @@ TQHttp::TQHttp( TQObject* parent, const char* name )
\sa setHost()
*/
-TQHttp::TQHttp( const TQString &hostname, Q_UINT16 port, TQObject* parent, const char* name )
+TQHttp::TQHttp( const TQString &hostname, TQ_UINT16 port, TQObject* parent, const char* name )
{
if ( parent )
parent->insertChild( this );
@@ -1432,7 +1432,7 @@ void TQHttp::abort()
\sa get() post() request() readyRead() readBlock() readAll()
*/
-Q_ULONG TQHttp::bytesAvailable() const
+TQ_ULONG TQHttp::bytesAvailable() const
{
#if defined(TQHTTP_DEBUG)
tqDebug( "TQHttp::bytesAvailable(): %d bytes", (int)d->rba.size() );
@@ -1446,7 +1446,7 @@ Q_ULONG TQHttp::bytesAvailable() const
\sa get() post() request() readyRead() bytesAvailable() readAll()
*/
-Q_LONG TQHttp::readBlock( char *data, Q_ULONG maxlen )
+TQ_LONG TQHttp::readBlock( char *data, TQ_ULONG maxlen )
{
if ( data == 0 && maxlen != 0 ) {
#if defined(QT_CHECK_NULL)
@@ -1472,9 +1472,9 @@ Q_LONG TQHttp::readBlock( char *data, Q_ULONG maxlen )
*/
TQByteArray TQHttp::readAll()
{
- Q_ULONG avail = bytesAvailable();
+ TQ_ULONG avail = bytesAvailable();
TQByteArray tmp( avail );
- Q_LONG read = readBlock( tmp.data(), avail );
+ TQ_LONG read = readBlock( tmp.data(), avail );
tmp.resize( read );
return tmp;
}
@@ -1591,7 +1591,7 @@ void TQHttp::clearPendingRequests()
\sa get() post() head() request() requestStarted() requestFinished() done()
*/
-int TQHttp::setHost(const TQString &hostname, Q_UINT16 port )
+int TQHttp::setHost(const TQString &hostname, TQ_UINT16 port )
{
return addRequest( new TQHttpSetHostRequest( hostname, port ) );
}
@@ -1998,7 +1998,7 @@ void TQHttp::slotReadyRead()
if ( currentRequest().method() == "HEAD" ) {
everythingRead = TRUE;
} else {
- Q_ULONG n = d->socket.bytesAvailable();
+ TQ_ULONG n = d->socket.bytesAvailable();
TQByteArray *arr = 0;
if ( d->chunkedSize != -1 ) {
// transfer-encoding is chunked
@@ -2039,19 +2039,19 @@ void TQHttp::slotReadyRead()
n = d->socket.bytesAvailable();
if ( n == 0 )
break;
- if ( (Q_LONG)n == d->chunkedSize || (Q_LONG)n == d->chunkedSize+1 ) {
+ if ( (TQ_LONG)n == d->chunkedSize || (TQ_LONG)n == d->chunkedSize+1 ) {
n = d->chunkedSize - 1;
if ( n == 0 )
break;
}
// read data
- uint toRead = TQMIN( (Q_LONG)n, (d->chunkedSize < 0 ? (Q_LONG)n : d->chunkedSize) );
+ uint toRead = TQMIN( (TQ_LONG)n, (d->chunkedSize < 0 ? (TQ_LONG)n : d->chunkedSize) );
if ( !arr )
arr = new TQByteArray( 0 );
uint oldArrSize = arr->size();
arr->resize( oldArrSize + toRead );
- Q_LONG read = d->socket.readBlock( arr->data()+oldArrSize, toRead );
+ TQ_LONG read = d->socket.readBlock( arr->data()+oldArrSize, toRead );
arr->resize( oldArrSize + read );
d->chunkedSize -= read;
@@ -2071,7 +2071,7 @@ void TQHttp::slotReadyRead()
n = TQMIN( d->response.contentLength() - d->bytesDone, n );
if ( n > 0 ) {
arr = new TQByteArray( n );
- Q_LONG read = d->socket.readBlock( arr->data(), n );
+ TQ_LONG read = d->socket.readBlock( arr->data(), n );
arr->resize( read );
}
if ( d->bytesDone + bytesAvailable() + n == d->response.contentLength() )
diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp
index 840ee231..97dd9559 100644
--- a/src/network/qserversocket.cpp
+++ b/src/network/qserversocket.cpp
@@ -94,7 +94,7 @@ public:
value larger than 0.
*/
-TQServerSocket::TQServerSocket( Q_UINT16 port, int backlog,
+TQServerSocket::TQServerSocket( TQ_UINT16 port, int backlog,
TQObject *parent, const char *name )
: TQObject( parent, name )
{
@@ -116,7 +116,7 @@ TQServerSocket::TQServerSocket( Q_UINT16 port, int backlog,
value larger than 0.
*/
-TQServerSocket::TQServerSocket( const TQHostAddress & address, Q_UINT16 port,
+TQServerSocket::TQServerSocket( const TQHostAddress & address, TQ_UINT16 port,
int backlog,
TQObject *parent, const char *name )
: TQObject( parent, name )
@@ -157,7 +157,7 @@ bool TQServerSocket::ok() const
/*
The common bit of the constructors.
*/
-void TQServerSocket::init( const TQHostAddress & address, Q_UINT16 port, int backlog )
+void TQServerSocket::init( const TQHostAddress & address, TQ_UINT16 port, int backlog )
{
d->s = new TQSocketDevice( TQSocketDevice::Stream, address.isIPv4Address()
? TQSocketDevice::IPv4 : TQSocketDevice::IPv6, 0 );
@@ -224,7 +224,7 @@ void TQServerSocket::incomingConnection( int )
\sa address() TQSocketDevice::port()
*/
-Q_UINT16 TQServerSocket::port() const
+TQ_UINT16 TQServerSocket::port() const
{
if ( !d || !d->s )
return 0;
diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp
index 10cd2173..fe6e0b6c 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/qsocket.cpp
@@ -88,7 +88,7 @@
buffer.open( IO_ReadOnly );
TQDataStream os( &buffer );
- Q_UINT32 x;
+ TQ_UINT32 x;
os >> x;
buffer.close();
@@ -101,7 +101,7 @@
TQBuffer buf;
buf.open( IO_ReadOnly );
TQDataStream ds( &buf );
- Q_INT32 x;
+ TQ_INT32 x;
ds >> x;
buf.close();
@@ -123,11 +123,11 @@ public:
TQSocket::State state; // connection state
TQString host; // host name
- Q_UINT16 port; // host port
+ TQ_UINT16 port; // host port
TQSocketDevice *socket; // connection socket
TQSocketNotifier *rsn, *wsn; // socket notifiers
TQMembuf rba; // read buffer
- Q_ULONG readBufferSize; // limit for the read buffer size
+ TQ_ULONG readBufferSize; // limit for the read buffer size
TQPtrList wba; // list of write bufs
TQHostAddress addr; // connection address
TQValueList addresses; // alternatives looked up
@@ -408,7 +408,7 @@ TQSocket::State TQSocket::state() const
\sa state()
*/
-void TQSocket::connectToHost( const TQString &host, Q_UINT16 port )
+void TQSocket::connectToHost( const TQString &host, TQ_UINT16 port )
{
#if defined(TQSOCKET_DEBUG)
tqDebug( "TQSocket (%s)::connectToHost: host %s, port %d",
@@ -716,7 +716,7 @@ void TQSocket::close()
buffer.
*/
-bool TQSocket::consumeWriteBuf( Q_ULONG nbytes )
+bool TQSocket::consumeWriteBuf( TQ_ULONG nbytes )
{
if ( nbytes <= 0 || nbytes > d->wsize )
return FALSE;
@@ -860,7 +860,7 @@ bool TQSocket::at( Offset index )
{
if ( index > d->rba.size() )
return FALSE;
- d->rba.consumeBytes( (Q_ULONG)index, 0 ); // throw away data 0..index-1
+ d->rba.consumeBytes( (TQ_ULONG)index, 0 ); // throw away data 0..index-1
// After we read data from our internal buffer, if we use the
// setReadBufferSize() to limit our buffer, we might now be able to
// read more data in our buffer. So enable the read socket notifier,
@@ -899,7 +899,7 @@ bool TQSocket::atEnd() const
\sa bytesToWrite()
*/
-Q_ULONG TQSocket::bytesAvailable() const
+TQ_ULONG TQSocket::bytesAvailable() const
{
if ( d->socket == 0 )
return 0;
@@ -929,7 +929,7 @@ Q_ULONG TQSocket::bytesAvailable() const
\sa bytesAvailable()
*/
-Q_ULONG TQSocket::waitForMore( int msecs, bool *timeout ) const
+TQ_ULONG TQSocket::waitForMore( int msecs, bool *timeout ) const
{
if ( d->socket == 0 )
return 0;
@@ -942,7 +942,7 @@ Q_ULONG TQSocket::waitForMore( int msecs, bool *timeout ) const
/*! \overload
*/
-Q_ULONG TQSocket::waitForMore( int msecs ) const
+TQ_ULONG TQSocket::waitForMore( int msecs ) const
{
return waitForMore( msecs, 0 );
}
@@ -954,7 +954,7 @@ Q_ULONG TQSocket::waitForMore( int msecs ) const
\sa bytesAvailable() clearPendingData()
*/
-Q_ULONG TQSocket::bytesToWrite() const
+TQ_ULONG TQSocket::bytesToWrite() const
{
return d->wsize;
}
@@ -977,7 +977,7 @@ void TQSocket::clearPendingData()
number of bytes read. Returns -1 if an error occurred.
*/
-Q_LONG TQSocket::readBlock( char *data, Q_ULONG maxlen )
+TQ_LONG TQSocket::readBlock( char *data, TQ_ULONG maxlen )
{
if ( data == 0 && maxlen != 0 ) {
#if defined(QT_CHECK_NULL)
@@ -1015,7 +1015,7 @@ Q_LONG TQSocket::readBlock( char *data, Q_ULONG maxlen )
number of bytes written. Returns -1 if an error occurred.
*/
-Q_LONG TQSocket::writeBlock( const char *data, Q_ULONG len )
+TQ_LONG TQSocket::writeBlock( const char *data, TQ_ULONG len )
{
#if defined(QT_CHECK_NULL)
if ( data == 0 && len != 0 ) {
@@ -1158,7 +1158,7 @@ bool TQSocket::canReadLine() const
\internal
So that it's not hidden by our other readLine().
*/
-Q_LONG TQSocket::readLine( char *data, Q_ULONG maxlen )
+TQ_LONG TQSocket::readLine( char *data, TQ_ULONG maxlen )
{
return TQIODevice::readLine(data,maxlen);
}
@@ -1196,7 +1196,7 @@ TQString TQSocket::readLine()
void TQSocket::sn_read( bool force )
{
- Q_LONG maxToRead = 0;
+ TQ_LONG maxToRead = 0;
if ( d->readBufferSize > 0 ) {
maxToRead = d->readBufferSize - d->rba.size();
if ( maxToRead <= 0 ) {
@@ -1214,8 +1214,8 @@ void TQSocket::sn_read( bool force )
TQSocketPrivate::sn_read_alreadyCalled.append( this );
char buf[4096];
- Q_LONG nbytes = d->socket->bytesAvailable();
- Q_LONG nread;
+ TQ_LONG nbytes = d->socket->bytesAvailable();
+ TQ_LONG nread;
TQByteArray *a = 0;
if ( state() == Connecting ) {
@@ -1239,7 +1239,7 @@ void TQSocket::sn_read( bool force )
// event is processed. A new read operation would then block.
// This code is also useful when TQSocket is used without an
// event loop.
- nread = d->socket->readBlock( buf, maxToRead ? TQMIN((Q_LONG)sizeof(buf),maxToRead) : sizeof(buf) );
+ nread = d->socket->readBlock( buf, maxToRead ? TQMIN((TQ_LONG)sizeof(buf),maxToRead) : sizeof(buf) );
if ( nread == 0 ) { // really closed
if ( !d->socket->isOpen() ) {
#if defined(TQSOCKET_DEBUG)
@@ -1280,7 +1280,7 @@ void TQSocket::sn_read( bool force )
nread = d->socket->readBlock( a->data(), maxToRead ? TQMIN(nbytes,maxToRead) : nbytes );
} else {
a = 0;
- nread = d->socket->readBlock( buf, maxToRead ? TQMIN((Q_LONG)sizeof(buf),maxToRead) : sizeof(buf) );
+ nread = d->socket->readBlock( buf, maxToRead ? TQMIN((TQ_LONG)sizeof(buf),maxToRead) : sizeof(buf) );
if ( nread > 0 ) {
// ##### could setRawData
a = new TQByteArray( nread );
@@ -1408,7 +1408,7 @@ void TQSocket::setSocketIntern( int socket )
clearPendingData();
close();
}
- Q_ULONG oldBufferSize = d ? d->readBufferSize : 0;
+ TQ_ULONG oldBufferSize = d ? d->readBufferSize : 0;
delete d;
d = new TQSocketPrivate;
@@ -1443,7 +1443,7 @@ void TQSocket::setSocketIntern( int socket )
Returns the host port number of this socket, in native byte order.
*/
-Q_UINT16 TQSocket::port() const
+TQ_UINT16 TQSocket::port() const
{
if ( d->socket == 0 )
return 0;
@@ -1460,7 +1460,7 @@ Q_UINT16 TQSocket::port() const
there is no need to call htons().
*/
-Q_UINT16 TQSocket::peerPort() const
+TQ_UINT16 TQSocket::peerPort() const
{
if ( d->socket == 0 )
return 0;
@@ -1527,7 +1527,7 @@ TQString TQSocket::peerName() const
\sa readBufferSize()
*/
-void TQSocket::setReadBufferSize( Q_ULONG bufSize )
+void TQSocket::setReadBufferSize( TQ_ULONG bufSize )
{
d->readBufferSize = bufSize;
}
@@ -1538,7 +1538,7 @@ void TQSocket::setReadBufferSize( Q_ULONG bufSize )
\sa setReadBufferSize()
*/
-Q_ULONG TQSocket::readBufferSize() const
+TQ_ULONG TQSocket::readBufferSize() const
{
return d->readBufferSize;
}
diff --git a/src/network/qsocketdevice.cpp b/src/network/qsocketdevice.cpp
index 7be3accb..a2055899 100644
--- a/src/network/qsocketdevice.cpp
+++ b/src/network/qsocketdevice.cpp
@@ -539,7 +539,7 @@ void TQSocketDevice::setSendBufferSize( uint size )
Note that TQt always uses native byte order, i.e. 67 is 67 in TQt;
there is no need to call htons().
*/
-Q_UINT16 TQSocketDevice::port() const
+TQ_UINT16 TQSocketDevice::port() const
{
return p;
}
diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp
index 2d359f21..827cc349 100644
--- a/src/network/qsocketdevice_unix.cpp
+++ b/src/network/qsocketdevice_unix.cpp
@@ -91,7 +91,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol)
static inline void qt_socket_getportaddr( struct sockaddr *sa,
- Q_UINT16 *port, TQHostAddress *addr )
+ TQ_UINT16 *port, TQHostAddress *addr )
{
#if !defined(QT_NO_IPV6)
if ( sa->sa_family == AF_INET6 ) {
@@ -402,7 +402,7 @@ void TQSocketDevice::setOption( Option opt, int v )
sockets; this just means that you can call connect() again in a
little while and it'll probably succeed.
*/
-bool TQSocketDevice::connect( const TQHostAddress &addr, Q_UINT16 port )
+bool TQSocketDevice::connect( const TQHostAddress &addr, TQ_UINT16 port )
{
if ( !isValid() )
return FALSE;
@@ -493,7 +493,7 @@ bool TQSocketDevice::connect( const TQHostAddress &addr, Q_UINT16 port )
bind() is used by servers for setting up incoming connections.
Call bind() before listen().
*/
-bool TQSocketDevice::bind( const TQHostAddress &address, Q_UINT16 port )
+bool TQSocketDevice::bind( const TQHostAddress &address, TQ_UINT16 port )
{
if ( !isValid() )
return FALSE;
@@ -671,7 +671,7 @@ int TQSocketDevice::accept()
data on the socket is to read it using readBlock(). TQSocket has
workarounds to deal with this problem.
*/
-Q_LONG TQSocketDevice::bytesAvailable() const
+TQ_LONG TQSocketDevice::bytesAvailable() const
{
if ( !isValid() )
return -1;
@@ -695,7 +695,7 @@ Q_LONG TQSocketDevice::bytesAvailable() const
// gives shorter than true amounts on Unix domain sockets.
if ( ::ioctl(fd, FIONREAD, (char*)&nbytes) < 0 )
return -1;
- return (Q_LONG) *((int *) &nbytes);
+ return (TQ_LONG) *((int *) &nbytes);
}
@@ -717,7 +717,7 @@ Q_LONG TQSocketDevice::bytesAvailable() const
\sa bytesAvailable()
*/
-Q_LONG TQSocketDevice::waitForMore( int msecs, bool *timeout ) const
+TQ_LONG TQSocketDevice::waitForMore( int msecs, bool *timeout ) const
{
if ( !isValid() )
return -1;
@@ -756,7 +756,7 @@ Q_LONG TQSocketDevice::waitForMore( int msecs, bool *timeout ) const
host closes the connection. For Datagram sockets, 0 is a valid
datagram size.
*/
-Q_LONG TQSocketDevice::readBlock( char *data, Q_ULONG maxlen )
+TQ_LONG TQSocketDevice::readBlock( char *data, TQ_ULONG maxlen )
{
#if defined(QT_CHECK_NULL)
if ( data == 0 && maxlen != 0 ) {
@@ -847,7 +847,7 @@ Q_LONG TQSocketDevice::readBlock( char *data, Q_ULONG maxlen )
This is used for \c TQSocketDevice::Stream sockets.
*/
-Q_LONG TQSocketDevice::writeBlock( const char *data, Q_ULONG len )
+TQ_LONG TQSocketDevice::writeBlock( const char *data, TQ_ULONG len )
{
if ( data == 0 && len != 0 ) {
#if defined(QT_CHECK_NULL) || defined(TQSOCKETDEVICE_DEBUG)
@@ -934,8 +934,8 @@ Q_LONG TQSocketDevice::writeBlock( const char *data, Q_ULONG len )
This is used for \c TQSocketDevice::Datagram sockets. You must
specify the \a host and \a port of the destination of the data.
*/
-Q_LONG TQSocketDevice::writeBlock( const char * data, Q_ULONG len,
- const TQHostAddress & host, Q_UINT16 port )
+TQ_LONG TQSocketDevice::writeBlock( const char * data, TQ_ULONG len,
+ const TQHostAddress & host, TQ_UINT16 port )
{
if ( t != Datagram ) {
#if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG)
@@ -1077,7 +1077,7 @@ void TQSocketDevice::fetchConnectionParameters()
Note that for Datagram sockets, this is the source port of the
last packet received, and that it is in native byte order.
*/
-Q_UINT16 TQSocketDevice::peerPort() const
+TQ_UINT16 TQSocketDevice::peerPort() const
{
return pp;
}
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h
index 0ebe5a6b..a8f933cf 100644
--- a/src/opengl/ntqgl.h
+++ b/src/opengl/ntqgl.h
@@ -235,7 +235,7 @@ protected:
void* vi;
void* cx;
#if defined(Q_WS_X11)
- Q_UINT32 gpm;
+ TQ_UINT32 gpm;
#endif
#endif
TQGLFormat glFormat;
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index a738aa48..a0e07187 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -497,7 +497,7 @@ bool TQGLContext::chooseContext( const TQGLContext* shareContext )
d->paintDevice->handle(),
choose_cmap( disp, (XVisualInfo *)vi ) );
#else
- gpm = (Q_UINT32)glXCreateGLXPixmap( disp, (XVisualInfo *)vi,
+ gpm = (TQ_UINT32)glXCreateGLXPixmap( disp, (XVisualInfo *)vi,
d->paintDevice->handle() );
#endif
if ( !gpm )
@@ -1236,7 +1236,7 @@ bool TQGLWidget::renderCxPm( TQPixmap* pm )
choose_cmap( pm->x11Display(),
(XVisualInfo*)glcx->vi ) );
#else
- glPm = (Q_UINT32)glXCreateGLXPixmap( x11Display(),
+ glPm = (TQ_UINT32)glXCreateGLXPixmap( x11Display(),
(XVisualInfo*)glcx->vi,
(Pixmap)pm->handle() );
#endif
diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp
index 59d9f89a..6a1d0abf 100644
--- a/src/sql/drivers/ibase/qsql_ibase.cpp
+++ b/src/sql/drivers/ibase/qsql_ibase.cpp
@@ -495,10 +495,10 @@ bool TQIBaseResult::exec()
switch(d->inda->sqlvar[para].sqltype & ~1) {
case SQL_INT64:
if (d->inda->sqlvar[para].sqlscale < 0)
- *((Q_LLONG*)d->inda->sqlvar[para].sqldata) = Q_LLONG(val.toDouble() *
+ *((TQ_LLONG*)d->inda->sqlvar[para].sqldata) = TQ_LLONG(val.toDouble() *
pow(10.0, d->inda->sqlvar[para].sqlscale * -1));
else
- *((Q_LLONG*)d->inda->sqlvar[para].sqldata) = val.toLongLong();
+ *((TQ_LLONG*)d->inda->sqlvar[para].sqldata) = val.toLongLong();
break;
case SQL_LONG:
*((long*)d->inda->sqlvar[para].sqldata) = (long)val.toLongLong();
@@ -650,15 +650,15 @@ bool TQIBaseResult::gotoNext(TQtSqlCachedResult::RowCache* row)
break;
case SQL_INT64:
if (d->sqlda->sqlvar[i].sqlscale < 0)
- (*row)[i] = *(Q_LLONG*)buf * pow(10.0, d->sqlda->sqlvar[i].sqlscale);
+ (*row)[i] = *(TQ_LLONG*)buf * pow(10.0, d->sqlda->sqlvar[i].sqlscale);
else
- (*row)[i] = TQVariant(*(Q_LLONG*)buf);
+ (*row)[i] = TQVariant(*(TQ_LLONG*)buf);
break;
case SQL_LONG:
if (sizeof(int) == sizeof(long)) //dear compiler: please optimize me out.
(*row)[i] = TQVariant((int)(*(long*)buf));
else
- (*row)[i] = TQVariant((Q_LLONG)(*(long*)buf));
+ (*row)[i] = TQVariant((TQ_LLONG)(*(long*)buf));
break;
case SQL_SHORT:
(*row)[i] = TQVariant((int)(*(short*)buf));
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index cfe4d337..7abf5c59 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -872,7 +872,7 @@ TQVariant TQODBCResult::data( int field )
const TQSqlFieldInfo info = d->rInf[ current ];
switch ( info.type() ) {
case TQVariant::LongLong:
- fieldCache[ current ] = TQVariant( (Q_LLONG) qGetBigIntData( d->hStmt, current, isNull ) );
+ fieldCache[ current ] = TQVariant( (TQ_LLONG) qGetBigIntData( d->hStmt, current, isNull ) );
nullCache[ current ] = isNull;
break;
case TQVariant::Int:
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 3510574c..0a30f27e 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -1985,7 +1985,7 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
// calculate slider length
if (scrollbar->maxValue() != scrollbar->minValue()) {
uint range = scrollbar->maxValue() - scrollbar->minValue();
- sliderlen = (Q_LLONG(scrollbar->pageStep()) * maxlen) / (range + scrollbar->pageStep());
+ sliderlen = (TQ_LLONG(scrollbar->pageStep()) * maxlen) / (range + scrollbar->pageStep());
int slidermin = pixelMetric( PM_ScrollBarSliderMin, widget );
if ( sliderlen < slidermin || range > INT_MAX / 2 )
diff --git a/src/tools/ntqbuffer.h b/src/tools/ntqbuffer.h
index 7ab32039..e50f1917 100644
--- a/src/tools/ntqbuffer.h
+++ b/src/tools/ntqbuffer.h
@@ -65,11 +65,11 @@ public:
Offset at() const;
bool at( Offset );
- Q_LONG readBlock( char *p, Q_ULONG );
- Q_LONG writeBlock( const char *p, Q_ULONG );
- Q_LONG writeBlock( const TQByteArray& data )
+ TQ_LONG readBlock( char *p, TQ_ULONG );
+ TQ_LONG writeBlock( const char *p, TQ_ULONG );
+ TQ_LONG writeBlock( const TQByteArray& data )
{ return TQIODevice::writeBlock(data); }
- Q_LONG readLine( char *p, Q_ULONG );
+ TQ_LONG readLine( char *p, TQ_ULONG );
int getch();
int putch( int );
diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h
index 7c60c1f4..0bcdffa5 100644
--- a/src/tools/ntqcstring.h
+++ b/src/tools/ntqcstring.h
@@ -98,7 +98,7 @@ Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len )
// tqChecksum: Internet checksum
-Q_EXPORT Q_UINT16 tqChecksum( const char *s, uint len );
+Q_EXPORT TQ_UINT16 tqChecksum( const char *s, uint len );
/*****************************************************************************
TQByteArray class
diff --git a/src/tools/ntqdatastream.h b/src/tools/ntqdatastream.h
index 1031f3bf..3c2df147 100644
--- a/src/tools/ntqdatastream.h
+++ b/src/tools/ntqdatastream.h
@@ -72,34 +72,34 @@ public:
int version() const;
void setVersion( int );
- TQDataStream &operator>>( Q_INT8 &i );
- TQDataStream &operator>>( Q_UINT8 &i );
- TQDataStream &operator>>( Q_INT16 &i );
- TQDataStream &operator>>( Q_UINT16 &i );
- TQDataStream &operator>>( Q_INT32 &i );
- TQDataStream &operator>>( Q_UINT32 &i );
- TQDataStream &operator>>( Q_INT64 &i );
- TQDataStream &operator>>( Q_UINT64 &i );
+ TQDataStream &operator>>( TQ_INT8 &i );
+ TQDataStream &operator>>( TQ_UINT8 &i );
+ TQDataStream &operator>>( TQ_INT16 &i );
+ TQDataStream &operator>>( TQ_UINT16 &i );
+ TQDataStream &operator>>( TQ_INT32 &i );
+ TQDataStream &operator>>( TQ_UINT32 &i );
+ TQDataStream &operator>>( TQ_INT64 &i );
+ TQDataStream &operator>>( TQ_UINT64 &i );
#if !defined(Q_OS_WIN64)
- TQDataStream &operator>>( Q_LONG &i );
- TQDataStream &operator>>( Q_ULONG &i );
+ TQDataStream &operator>>( TQ_LONG &i );
+ TQDataStream &operator>>( TQ_ULONG &i );
#endif
TQDataStream &operator>>( float &f );
TQDataStream &operator>>( double &f );
TQDataStream &operator>>( char *&str );
- TQDataStream &operator<<( Q_INT8 i );
- TQDataStream &operator<<( Q_UINT8 i );
- TQDataStream &operator<<( Q_INT16 i );
- TQDataStream &operator<<( Q_UINT16 i );
- TQDataStream &operator<<( Q_INT32 i );
- TQDataStream &operator<<( Q_UINT32 i );
- TQDataStream &operator<<( Q_INT64 i );
- TQDataStream &operator<<( Q_UINT64 i );
+ TQDataStream &operator<<( TQ_INT8 i );
+ TQDataStream &operator<<( TQ_UINT8 i );
+ TQDataStream &operator<<( TQ_INT16 i );
+ TQDataStream &operator<<( TQ_UINT16 i );
+ TQDataStream &operator<<( TQ_INT32 i );
+ TQDataStream &operator<<( TQ_UINT32 i );
+ TQDataStream &operator<<( TQ_INT64 i );
+ TQDataStream &operator<<( TQ_UINT64 i );
#if !defined(Q_OS_WIN64)
- TQDataStream &operator<<( Q_LONG i );
- TQDataStream &operator<<( Q_ULONG i );
+ TQDataStream &operator<<( TQ_LONG i );
+ TQDataStream &operator<<( TQ_ULONG i );
#endif
TQDataStream &operator<<( float f );
TQDataStream &operator<<( double f );
@@ -155,38 +155,38 @@ inline int TQDataStream::version() const
inline void TQDataStream::setVersion( int v )
{ ver = v; }
-inline TQDataStream &TQDataStream::operator>>( Q_UINT8 &i )
-{ return *this >> (Q_INT8&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_UINT8 &i )
+{ return *this >> (TQ_INT8&)i; }
-inline TQDataStream &TQDataStream::operator>>( Q_UINT16 &i )
-{ return *this >> (Q_INT16&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_UINT16 &i )
+{ return *this >> (TQ_INT16&)i; }
-inline TQDataStream &TQDataStream::operator>>( Q_UINT32 &i )
-{ return *this >> (Q_INT32&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_UINT32 &i )
+{ return *this >> (TQ_INT32&)i; }
-inline TQDataStream &TQDataStream::operator>>( Q_UINT64 &i )
-{ return *this >> (Q_INT64&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_UINT64 &i )
+{ return *this >> (TQ_INT64&)i; }
#if !defined(Q_OS_WIN64)
-inline TQDataStream &TQDataStream::operator>>( Q_ULONG &i )
-{ return *this >> (Q_LONG&)i; }
+inline TQDataStream &TQDataStream::operator>>( TQ_ULONG &i )
+{ return *this >> (TQ_LONG&)i; }
#endif
-inline TQDataStream &TQDataStream::operator<<( Q_UINT8 i )
-{ return *this << (Q_INT8)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_UINT8 i )
+{ return *this << (TQ_INT8)i; }
-inline TQDataStream &TQDataStream::operator<<( Q_UINT16 i )
-{ return *this << (Q_INT16)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_UINT16 i )
+{ return *this << (TQ_INT16)i; }
-inline TQDataStream &TQDataStream::operator<<( Q_UINT32 i )
-{ return *this << (Q_INT32)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_UINT32 i )
+{ return *this << (TQ_INT32)i; }
-inline TQDataStream &TQDataStream::operator<<( Q_UINT64 i )
-{ return *this << (Q_INT64)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_UINT64 i )
+{ return *this << (TQ_INT64)i; }
#if !defined(Q_OS_WIN64)
-inline TQDataStream &TQDataStream::operator<<( Q_ULONG i )
-{ return *this << (Q_LONG)i; }
+inline TQDataStream &TQDataStream::operator<<( TQ_ULONG i )
+{ return *this << (TQ_LONG)i; }
#endif
#endif // QT_NO_DATASTREAM
diff --git a/src/tools/ntqfile.h b/src/tools/ntqfile.h
index 829ae91d..c007d5cb 100644
--- a/src/tools/ntqfile.h
+++ b/src/tools/ntqfile.h
@@ -84,12 +84,12 @@ public:
bool at( Offset );
bool atEnd() const;
- Q_LONG readBlock( char *data, Q_ULONG len );
- Q_LONG writeBlock( const char *data, Q_ULONG len );
- Q_LONG writeBlock( const TQByteArray& data )
+ TQ_LONG readBlock( char *data, TQ_ULONG len );
+ TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+ TQ_LONG writeBlock( const TQByteArray& data )
{ return TQIODevice::writeBlock(data); }
- Q_LONG readLine( char *data, Q_ULONG maxlen );
- Q_LONG readLine( TQString &, Q_ULONG maxlen );
+ TQ_LONG readLine( char *data, TQ_ULONG maxlen );
+ TQ_LONG readLine( TQString &, TQ_ULONG maxlen );
int getch();
int putch( int );
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index b2a6413a..de5ed88e 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -712,40 +712,40 @@ typedef int INT32; // 32 bit signed
typedef unsigned int UINT32; // 32 bit unsigned
#endif
-typedef signed char Q_INT8; // 8 bit signed
-typedef unsigned char Q_UINT8; // 8 bit unsigned
-typedef short Q_INT16; // 16 bit signed
-typedef unsigned short Q_UINT16; // 16 bit unsigned
-typedef int Q_INT32; // 32 bit signed
-typedef unsigned int Q_UINT32; // 32 bit unsigned
+typedef signed char TQ_INT8; // 8 bit signed
+typedef unsigned char TQ_UINT8; // 8 bit unsigned
+typedef short TQ_INT16; // 16 bit signed
+typedef unsigned short TQ_UINT16; // 16 bit unsigned
+typedef int TQ_INT32; // 32 bit signed
+typedef unsigned int TQ_UINT32; // 32 bit unsigned
#if defined(Q_OS_WIN64)
-typedef __int64 Q_LONG; // word up to 64 bit signed
-typedef unsigned __int64 Q_ULONG; // word up to 64 bit unsigned
+typedef __int64 TQ_LONG; // word up to 64 bit signed
+typedef unsigned __int64 TQ_ULONG; // word up to 64 bit unsigned
#else
-typedef long Q_LONG; // word up to 64 bit signed
-typedef unsigned long Q_ULONG; // word up to 64 bit unsigned
+typedef long TQ_LONG; // word up to 64 bit signed
+typedef unsigned long TQ_ULONG; // word up to 64 bit unsigned
#endif
#if defined(Q_OS_WIN) && !defined(Q_CC_GNU)
# define TQ_INT64_C(c) c ## i64 // signed 64 bit constant
# define TQ_UINT64_C(c) c ## ui64 // unsigned 64 bit constant
-typedef __int64 Q_INT64; // 64 bit signed
-typedef unsigned __int64 Q_UINT64; // 64 bit unsigned
+typedef __int64 TQ_INT64; // 64 bit signed
+typedef unsigned __int64 TQ_UINT64; // 64 bit unsigned
#else
# define TQ_INT64_C(c) c ## LL // signed 64 bit constant
# define TQ_UINT64_C(c) c ## ULL // unsigned 64 bit constant
-typedef long long Q_INT64; // 64 bit signed
-typedef unsigned long long Q_UINT64; // 64 bit unsigned
+typedef long long TQ_INT64; // 64 bit signed
+typedef unsigned long long TQ_UINT64; // 64 bit unsigned
#endif
-typedef Q_INT64 Q_LLONG; // signed long long
-typedef Q_UINT64 Q_ULLONG; // unsigned long long
+typedef TQ_INT64 TQ_LLONG; // signed long long
+typedef TQ_UINT64 TQ_ULLONG; // unsigned long long
#if defined(Q_OS_MACX) && !defined(QT_LARGEFILE_SUPPORT)
# define QT_LARGEFILE_SUPPORT 64
#endif
#if defined(QT_LARGEFILE_SUPPORT)
- typedef Q_ULLONG TQtOffset;
+ typedef TQ_ULLONG TQtOffset;
#else
- typedef Q_ULONG TQtOffset;
+ typedef TQ_ULONG TQtOffset;
#endif
diff --git a/src/tools/ntqiodevice.h b/src/tools/ntqiodevice.h
index 33516d07..d014265c 100644
--- a/src/tools/ntqiodevice.h
+++ b/src/tools/ntqiodevice.h
@@ -92,9 +92,9 @@ class Q_EXPORT TQIODevice
{
public:
#if defined(QT_ABI_QT4)
- typedef Q_LLONG Offset;
+ typedef TQ_LLONG Offset;
#else
- typedef Q_ULONG Offset;
+ typedef TQ_ULONG Offset;
#endif
TQIODevice();
@@ -131,10 +131,10 @@ public:
virtual bool atEnd() const;
bool reset() { return at(0); }
- virtual Q_LONG readBlock( char *data, Q_ULONG maxlen ) = 0;
- virtual Q_LONG writeBlock( const char *data, Q_ULONG len ) = 0;
- virtual Q_LONG readLine( char *data, Q_ULONG maxlen );
- Q_LONG writeBlock( const TQByteArray& data );
+ virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen ) = 0;
+ virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len ) = 0;
+ virtual TQ_LONG readLine( char *data, TQ_ULONG maxlen );
+ TQ_LONG writeBlock( const TQByteArray& data );
virtual TQByteArray readAll();
virtual int getch() = 0;
diff --git a/src/tools/ntqlocale.h b/src/tools/ntqlocale.h
index 231203f4..5cfaa32c 100644
--- a/src/tools/ntqlocale.h
+++ b/src/tools/ntqlocale.h
@@ -452,29 +452,29 @@ public:
ushort toUShort(const TQString &s, bool *ok = 0) const;
int toInt(const TQString &s, bool *ok = 0) const;
uint toUInt(const TQString &s, bool *ok = 0) const;
- Q_LONG toLong(const TQString &s, bool *ok = 0) const;
- Q_ULONG toULong(const TQString &s, bool *ok = 0) const;
- Q_LLONG toLongLong(const TQString &s, bool *ok = 0) const;
- Q_ULLONG toULongLong(const TQString &s, bool *ok = 0) const;
+ TQ_LONG toLong(const TQString &s, bool *ok = 0) const;
+ TQ_ULONG toULong(const TQString &s, bool *ok = 0) const;
+ TQ_LLONG toLongLong(const TQString &s, bool *ok = 0) const;
+ TQ_ULLONG toULongLong(const TQString &s, bool *ok = 0) const;
float toFloat(const TQString &s, bool *ok = 0) const;
double toDouble(const TQString &s, bool *ok = 0) const;
TQString toString(short i) const
- { return toString((Q_LLONG)i); }
+ { return toString((TQ_LLONG)i); }
TQString toString(ushort i) const
- { return toString((Q_ULLONG)i); }
+ { return toString((TQ_ULLONG)i); }
TQString toString(int i) const
- { return toString((Q_LLONG)i); }
+ { return toString((TQ_LLONG)i); }
TQString toString(uint i) const
- { return toString((Q_ULLONG)i); }
+ { return toString((TQ_ULLONG)i); }
#if !defined(Q_OS_WIN64)
- TQString toString(Q_LONG i) const
- { return toString((Q_LLONG)i); }
- TQString toString(Q_ULONG i) const
- { return toString((Q_ULLONG)i); }
+ TQString toString(TQ_LONG i) const
+ { return toString((TQ_LLONG)i); }
+ TQString toString(TQ_ULONG i) const
+ { return toString((TQ_ULLONG)i); }
#endif
- TQString toString(Q_LLONG i) const;
- TQString toString(Q_ULLONG i) const;
+ TQString toString(TQ_LLONG i) const;
+ TQString toString(TQ_ULLONG i) const;
TQString toString(float i, char f = 'g', int prec = 6) const
{ return toString((double) i, f, prec); }
TQString toString(double i, char f = 'g', int prec = 6) const;
diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h
index 02dd289c..c8d97fd5 100644
--- a/src/tools/ntqmap.h
+++ b/src/tools/ntqmap.h
@@ -849,9 +849,9 @@ Q_INLINE_TEMPLATES void TQMap::detachInternal()
template
Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap& m ) {
m.clear();
- Q_UINT32 c;
+ TQ_UINT32 c;
s >> c;
- for( Q_UINT32 i = 0; i < c; ++i ) {
+ for( TQ_UINT32 i = 0; i < c; ++i ) {
Key k; T t;
s >> k >> t;
m.insert( k, t );
@@ -864,7 +864,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap& m )
template
Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap& m ) {
- s << (Q_UINT32)m.size();
+ s << (TQ_UINT32)m.size();
TQMapConstIterator it = m.begin();
for( ; it != m.end(); ++it )
s << it.key() << it.data();
diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h
index 54fb170a..29704e71 100644
--- a/src/tools/ntqstring.h
+++ b/src/tools/ntqstring.h
@@ -435,8 +435,8 @@ public:
TQString arg( long a, int fieldWidth = 0, int base = 10 ) const;
TQString arg( ulong a, int fieldWidth = 0, int base = 10 ) const;
- TQString arg( Q_LLONG a, int fieldwidth=0, int base=10 ) const;
- TQString arg( Q_ULLONG a, int fieldwidth=0, int base=10 ) const;
+ TQString arg( TQ_LLONG a, int fieldwidth=0, int base=10 ) const;
+ TQString arg( TQ_ULLONG a, int fieldwidth=0, int base=10 ) const;
TQString arg( int a, int fieldWidth = 0, int base = 10 ) const;
TQString arg( uint a, int fieldWidth = 0, int base = 10 ) const;
TQString arg( short a, int fieldWidth = 0, int base = 10 ) const;
@@ -600,8 +600,8 @@ public:
uint toUInt( bool *ok=0, int base=10 ) const;
long toLong( bool *ok=0, int base=10 ) const;
ulong toULong( bool *ok=0, int base=10 ) const;
- Q_LLONG toLongLong( bool *ok=0, int base=10 ) const;
- Q_ULLONG toULongLong( bool *ok=0, int base=10 ) const;
+ TQ_LLONG toLongLong( bool *ok=0, int base=10 ) const;
+ TQ_ULLONG toULongLong( bool *ok=0, int base=10 ) const;
float toFloat( bool *ok=0 ) const;
double toDouble( bool *ok=0 ) const;
@@ -611,15 +611,15 @@ public:
TQString &setNum( uint, int base=10 );
TQString &setNum( long, int base=10 );
TQString &setNum( ulong, int base=10 );
- TQString &setNum( Q_LLONG, int base=10 );
- TQString &setNum( Q_ULLONG, int base=10 );
+ TQString &setNum( TQ_LLONG, int base=10 );
+ TQString &setNum( TQ_ULLONG, int base=10 );
TQString &setNum( float, char f='g', int prec=6 );
TQString &setNum( double, char f='g', int prec=6 );
static TQString number( long, int base=10 );
static TQString number( ulong, int base=10);
- static TQString number( Q_LLONG, int base=10 );
- static TQString number( Q_ULLONG, int base=10);
+ static TQString number( TQ_LLONG, int base=10 );
+ static TQString number( TQ_ULLONG, int base=10);
static TQString number( int, int base=10 );
static TQString number( uint, int base=10);
static TQString number( double, char f='g', int prec=6 );
@@ -955,31 +955,31 @@ inline TQString &TQString::prepend( const std::string& s )
#endif
inline TQString &TQString::setNum( short n, int base )
-{ return setNum((Q_LLONG)n, base); }
+{ return setNum((TQ_LLONG)n, base); }
inline TQString &TQString::setNum( ushort n, int base )
-{ return setNum((Q_ULLONG)n, base); }
+{ return setNum((TQ_ULLONG)n, base); }
inline TQString &TQString::setNum( int n, int base )
-{ return setNum((Q_LLONG)n, base); }
+{ return setNum((TQ_LLONG)n, base); }
inline TQString &TQString::setNum( uint n, int base )
-{ return setNum((Q_ULLONG)n, base); }
+{ return setNum((TQ_ULLONG)n, base); }
inline TQString &TQString::setNum( float n, char f, int prec )
{ return setNum((double)n,f,prec); }
inline TQString TQString::arg( int a, int fieldWidth, int base ) const
-{ return arg( (Q_LLONG)a, fieldWidth, base ); }
+{ return arg( (TQ_LLONG)a, fieldWidth, base ); }
inline TQString TQString::arg( uint a, int fieldWidth, int base ) const
-{ return arg( (Q_ULLONG)a, fieldWidth, base ); }
+{ return arg( (TQ_ULLONG)a, fieldWidth, base ); }
inline TQString TQString::arg( short a, int fieldWidth, int base ) const
-{ return arg( (Q_LLONG)a, fieldWidth, base ); }
+{ return arg( (TQ_LLONG)a, fieldWidth, base ); }
inline TQString TQString::arg( ushort a, int fieldWidth, int base ) const
-{ return arg( (Q_ULLONG)a, fieldWidth, base ); }
+{ return arg( (TQ_ULLONG)a, fieldWidth, base ); }
inline TQString TQString::arg( const TQString& a1, const TQString& a2 ) const {
return multiArg( 2, a1, a2 );
diff --git a/src/tools/ntqvaluelist.h b/src/tools/ntqvaluelist.h
index 91a437a9..91d50c94 100644
--- a/src/tools/ntqvaluelist.h
+++ b/src/tools/ntqvaluelist.h
@@ -640,9 +640,9 @@ template
Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList& l )
{
l.clear();
- Q_UINT32 c;
+ TQ_UINT32 c;
s >> c;
- for( Q_UINT32 i = 0; i < c; ++i )
+ for( TQ_UINT32 i = 0; i < c; ++i )
{
T t;
s >> t;
@@ -656,7 +656,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList& l
template
Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList& l )
{
- s << (Q_UINT32)l.size();
+ s << (TQ_UINT32)l.size();
TQValueListConstIterator it = l.begin();
for( ; it != l.end(); ++it )
s << *it;
diff --git a/src/tools/ntqvaluevector.h b/src/tools/ntqvaluevector.h
index 02a15111..6a50230e 100644
--- a/src/tools/ntqvaluevector.h
+++ b/src/tools/ntqvaluevector.h
@@ -547,10 +547,10 @@ template
Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector& v )
{
v.clear();
- Q_UINT32 c;
+ TQ_UINT32 c;
s >> c;
v.resize( c );
- for( Q_UINT32 i = 0; i < c; ++i )
+ for( TQ_UINT32 i = 0; i < c; ++i )
{
T t;
s >> t;
@@ -562,7 +562,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector&
template
Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector& v )
{
- s << (Q_UINT32)v.size();
+ s << (TQ_UINT32)v.size();
// ### use typename TQValueVector::const_iterator once all supported
// ### compilers know about the 'typename' keyword.
const T* it = v.begin();
diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp
index 49074ad9..ec850327 100644
--- a/src/tools/qbitarray.cpp
+++ b/src/tools/qbitarray.cpp
@@ -632,7 +632,7 @@ TQBitArray operator^( const TQBitArray &a1, const TQBitArray &a2 )
#ifndef QT_NO_DATASTREAM
TQDataStream &operator<<( TQDataStream &s, const TQBitArray &a )
{
- Q_UINT32 len = a.size();
+ TQ_UINT32 len = a.size();
s << len; // write size of array
if ( len > 0 ) // write data
s.writeRawBytes( a.data(), a.TQByteArray::size() );
@@ -649,7 +649,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQBitArray &a )
TQDataStream &operator>>( TQDataStream &s, TQBitArray &a )
{
- Q_UINT32 len;
+ TQ_UINT32 len;
s >> len; // read size of array
if ( !a.resize( (uint)len ) ) { // resize array
#if defined(QT_CHECK_NULL)
diff --git a/src/tools/qbuffer.cpp b/src/tools/qbuffer.cpp
index 34230980..0afa52ae 100644
--- a/src/tools/qbuffer.cpp
+++ b/src/tools/qbuffer.cpp
@@ -285,7 +285,7 @@ bool TQBuffer::at( Offset pos )
\reimp
*/
-Q_LONG TQBuffer::readBlock( char *p, Q_ULONG len )
+TQ_LONG TQBuffer::readBlock( char *p, TQ_ULONG len )
{
#if defined(QT_CHECK_STATE)
if ( !p ) {
@@ -314,7 +314,7 @@ Q_LONG TQBuffer::readBlock( char *p, Q_ULONG len )
}
/*!
- \overload Q_LONG TQBuffer::writeBlock( const TQByteArray& data )
+ \overload TQ_LONG TQBuffer::writeBlock( const TQByteArray& data )
This convenience function is the same as calling
\c{writeBlock( data.data(), data.size() )} with \a data.
@@ -330,7 +330,7 @@ Q_LONG TQBuffer::readBlock( char *p, Q_ULONG len )
\sa readBlock()
*/
-Q_LONG TQBuffer::writeBlock( const char *p, Q_ULONG len )
+TQ_LONG TQBuffer::writeBlock( const char *p, TQ_ULONG len )
{
if ( len == 0 )
return 0;
@@ -352,7 +352,7 @@ Q_LONG TQBuffer::writeBlock( const char *p, Q_ULONG len )
}
#endif
if ( ioIndex + len > a_len ) { // overflow
- Q_ULONG new_len = a_len + a_inc*((ioIndex+len-a_len)/a_inc+1);
+ TQ_ULONG new_len = a_len + a_inc*((ioIndex+len-a_len)/a_inc+1);
if ( !a.resize( new_len ) ) { // could not resize
#if defined(QT_CHECK_NULL)
tqWarning( "TQBuffer::writeBlock: Memory allocation error" );
@@ -376,7 +376,7 @@ Q_LONG TQBuffer::writeBlock( const char *p, Q_ULONG len )
\reimp
*/
-Q_LONG TQBuffer::readLine( char *p, Q_ULONG maxlen )
+TQ_LONG TQBuffer::readLine( char *p, TQ_ULONG maxlen )
{
#if defined(QT_CHECK_NULL)
if ( p == 0 ) {
@@ -396,7 +396,7 @@ Q_LONG TQBuffer::readLine( char *p, Q_ULONG maxlen )
#endif
if ( maxlen == 0 )
return 0;
- Q_ULONG start = ioIndex;
+ TQ_ULONG start = ioIndex;
char *d = a.data() + ioIndex;
maxlen--; // make room for 0-terminator
if ( a.size() - ioIndex < maxlen )
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index f6f4f1ff..a3bea8ff 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -268,7 +268,7 @@ int tqstrnicmp( const char *str1, const char *str2, uint len )
}
-static Q_UINT16 crc_tbl[16];
+static TQ_UINT16 crc_tbl[16];
static bool crc_tbl_init = FALSE;
static void createCRC16Table() // build CRC16 lookup table
@@ -308,7 +308,7 @@ static void createCRC16Table() // build CRC16 lookup table
The checksum is independent of the byte order (endianness).
*/
-Q_UINT16 tqChecksum( const char *data, uint len )
+TQ_UINT16 tqChecksum( const char *data, uint len )
{
if ( !crc_tbl_init ) { // create lookup table
@@ -322,7 +322,7 @@ Q_UINT16 tqChecksum( const char *data, uint len )
crc_tbl_init = TRUE;
}
}
- register Q_UINT16 crc = 0xffff;
+ register TQ_UINT16 crc = 0xffff;
uchar c;
uchar *p = (uchar *)data;
while ( len-- ) {
@@ -544,7 +544,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQByteArray &a )
TQDataStream &operator>>( TQDataStream &s, TQByteArray &a )
{
- Q_UINT32 len;
+ TQ_UINT32 len;
s >> len; // read size of array
if ( len == 0 || s.eof() ) { // end of file reached
a.resize( 0 );
@@ -2315,7 +2315,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCString &str )
TQDataStream &operator>>( TQDataStream &s, TQCString &str )
{
str.detach();
- Q_UINT32 len;
+ TQ_UINT32 len;
s >> len; // read size of string
if ( len == 0 || s.eof() ) { // end of file reached
str.resize( 0 );
diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp
index 1af0d649..33cec9b3 100644
--- a/src/tools/qdatastream.cpp
+++ b/src/tools/qdatastream.cpp
@@ -83,7 +83,7 @@
file.open( IO_WriteOnly );
TQDataStream stream( &file ); // we will serialize the data into the file
stream << "the answer is"; // serialize a string
- stream << (Q_INT32)42; // serialize an integer
+ stream << (TQ_INT32)42; // serialize an integer
\endcode
Example (read binary data from a stream):
@@ -92,7 +92,7 @@
file.open( IO_ReadOnly );
TQDataStream stream( &file ); // read the data serialized from the file
TQString str;
- Q_INT32 a;
+ TQ_INT32 a;
stream >> str >> a; // extract "the answer is" and 42
\endcode
@@ -139,8 +139,8 @@
TQDataStream stream( &file );
// Write a header with a "magic number" and a version
- stream << (Q_UINT32)0xA0B0C0D0;
- stream << (Q_INT32)123;
+ stream << (TQ_UINT32)0xA0B0C0D0;
+ stream << (TQ_INT32)123;
// Write the data
stream << [lots of interesting data]
@@ -154,13 +154,13 @@
TQDataStream stream( &file );
// Read and check the header
- Q_UINT32 magic;
+ TQ_UINT32 magic;
stream >> magic;
if ( magic != 0xA0B0C0D0 )
return XXX_BAD_FILE_FORMAT;
// Read the version
- Q_INT32 version;
+ TQ_INT32 version;
stream >> version;
if ( version < 100 )
return XXX_BAD_FILE_TOO_OLD;
@@ -193,11 +193,11 @@
A similar pair of functions is readBytes() and writeBytes(). These
differ from their \e raw counterparts as follows: readBytes()
- reads a Q_UINT32 which is taken to be the length of the data to be
+ reads a TQ_UINT32 which is taken to be the length of the data to be
read, then that number of bytes is read into the preallocated
- char*; writeBytes() writes a Q_UINT32 containing the length of the
+ char*; writeBytes() writes a TQ_UINT32 containing the length of the
data, followed by the data. Notice that any encoding/decoding of
- the data (apart from the length Q_UINT32) must be done by you.
+ the data (apart from the length TQ_UINT32) must be done by you.
\sa TQTextStream TQVariant
*/
@@ -491,7 +491,7 @@ void TQDataStream::setByteOrder( int bo )
extern "C" long long __strtoll( const char *, char**, int );
#endif
-static Q_INT64 read_int_ascii( TQDataStream *s )
+static TQ_INT64 read_int_ascii( TQDataStream *s )
{
register int n = 0;
char buf[40];
@@ -522,7 +522,7 @@ static Q_INT64 read_int_ascii( TQDataStream *s )
}
/*!
- \overload TQDataStream &TQDataStream::operator>>( Q_UINT8 &i )
+ \overload TQDataStream &TQDataStream::operator>>( TQ_UINT8 &i )
Reads an unsigned byte from the stream into \a i, and returns a
reference to the stream.
@@ -533,25 +533,25 @@ static Q_INT64 read_int_ascii( TQDataStream *s )
reference to the stream.
*/
-TQDataStream &TQDataStream::operator>>( Q_INT8 &i )
+TQDataStream &TQDataStream::operator>>( TQ_INT8 &i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
- i = (Q_INT8)dev->getch();
+ i = (TQ_INT8)dev->getch();
if ( i == '\\' ) { // read octal code
char buf[4];
dev->readBlock( buf, 3 );
i = (buf[2] & 0x07)+((buf[1] & 0x07) << 3)+((buf[0] & 0x07) << 6);
}
} else { // data or text
- i = (Q_INT8)dev->getch();
+ i = (TQ_INT8)dev->getch();
}
return *this;
}
/*!
- \overload TQDataStream &TQDataStream::operator>>( Q_UINT16 &i )
+ \overload TQDataStream &TQDataStream::operator>>( TQ_UINT16 &i )
Reads an unsigned 16-bit integer from the stream into \a i, and
returns a reference to the stream.
@@ -564,13 +564,13 @@ TQDataStream &TQDataStream::operator>>( Q_INT8 &i )
returns a reference to the stream.
*/
-TQDataStream &TQDataStream::operator>>( Q_INT16 &i )
+TQDataStream &TQDataStream::operator>>( TQ_INT16 &i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
- i = (Q_INT16)read_int_ascii( this );
+ i = (TQ_INT16)read_int_ascii( this );
} else if ( noswap ) { // no conversion needed
- dev->readBlock( (char *)&i, sizeof(Q_INT16) );
+ dev->readBlock( (char *)&i, sizeof(TQ_INT16) );
} else { // swap bytes
register uchar *p = (uchar *)(&i);
char b[2];
@@ -583,7 +583,7 @@ TQDataStream &TQDataStream::operator>>( Q_INT16 &i )
/*!
- \overload TQDataStream &TQDataStream::operator>>( Q_UINT32 &i )
+ \overload TQDataStream &TQDataStream::operator>>( TQ_UINT32 &i )
Reads an unsigned 32-bit integer from the stream into \a i, and
returns a reference to the stream.
@@ -596,13 +596,13 @@ TQDataStream &TQDataStream::operator>>( Q_INT16 &i )
returns a reference to the stream.
*/
-TQDataStream &TQDataStream::operator>>( Q_INT32 &i )
+TQDataStream &TQDataStream::operator>>( TQ_INT32 &i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
- i = (Q_INT32)read_int_ascii( this );
+ i = (TQ_INT32)read_int_ascii( this );
} else if ( noswap ) { // no conversion needed
- dev->readBlock( (char *)&i, sizeof(Q_INT32) );
+ dev->readBlock( (char *)&i, sizeof(TQ_INT32) );
} else { // swap bytes
uchar *p = (uchar *)(&i);
char b[4];
@@ -616,7 +616,7 @@ TQDataStream &TQDataStream::operator>>( Q_INT32 &i )
}
/*!
- \overload TQDataStream &TQDataStream::operator>>( Q_UINT64 &i )
+ \overload TQDataStream &TQDataStream::operator>>( TQ_UINT64 &i )
Reads an unsigned 64-bit integer from the stream, into \a i, and
returns a reference to the stream.
@@ -629,17 +629,17 @@ TQDataStream &TQDataStream::operator>>( Q_INT32 &i )
returns a reference to the stream.
*/
-TQDataStream &TQDataStream::operator>>( Q_INT64 &i )
+TQDataStream &TQDataStream::operator>>( TQ_INT64 &i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
i = read_int_ascii( this );
} else if ( version() < 6 ) {
- Q_UINT32 i1, i2;
+ TQ_UINT32 i1, i2;
*this >> i2 >> i1;
- i = ((Q_UINT64)i1 << 32) + i2;
+ i = ((TQ_UINT64)i1 << 32) + i2;
} else if ( noswap ) { // no conversion needed
- dev->readBlock( (char *)&i, sizeof(Q_INT64) );
+ dev->readBlock( (char *)&i, sizeof(TQ_INT64) );
} else { // swap bytes
uchar *p = (uchar *)(&i);
char b[8];
@@ -658,7 +658,7 @@ TQDataStream &TQDataStream::operator>>( Q_INT64 &i )
/*!
- \overload TQDataStream &TQDataStream::operator>>( Q_ULONG &i )
+ \overload TQDataStream &TQDataStream::operator>>( TQ_ULONG &i )
Reads an unsigned integer of the system's word length from the
stream, into \a i, and returns a reference to the stream.
@@ -673,18 +673,18 @@ TQDataStream &TQDataStream::operator>>( Q_INT64 &i )
*/
-TQDataStream &TQDataStream::operator>>( Q_LONG &i )
+TQDataStream &TQDataStream::operator>>( TQ_LONG &i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
- i = (Q_LONG)read_int_ascii( this );
+ i = (TQ_LONG)read_int_ascii( this );
} else if ( noswap ) { // no conversion needed
- dev->readBlock( (char *)&i, sizeof(Q_LONG) );
+ dev->readBlock( (char *)&i, sizeof(TQ_LONG) );
} else { // swap bytes
register uchar *p = (uchar *)(&i);
- char b[sizeof(Q_LONG)];
- dev->readBlock( b, sizeof(Q_LONG) );
- for ( int j = sizeof(Q_LONG); j; )
+ char b[sizeof(TQ_LONG)];
+ dev->readBlock( b, sizeof(TQ_LONG) );
+ for ( int j = sizeof(TQ_LONG); j; )
*p++ = b[--j];
}
return *this;
@@ -793,7 +793,7 @@ TQDataStream &TQDataStream::operator>>( char *&s )
The \a l parameter will be set to the length of the buffer.
- The serialization format is a Q_UINT32 length specifier first,
+ The serialization format is a TQ_UINT32 length specifier first,
then \a l bytes of data. Note that the data is \e not encoded.
\sa readRawBytes(), writeBytes()
@@ -802,7 +802,7 @@ TQDataStream &TQDataStream::operator>>( char *&s )
TQDataStream &TQDataStream::readBytes( char *&s, uint &l )
{
CHECK_STREAM_PRECOND
- Q_UINT32 len;
+ TQ_UINT32 len;
*this >> len; // first read length spec
l = (uint)len;
if ( len == 0 || eof() ) {
@@ -831,10 +831,10 @@ TQDataStream &TQDataStream::readRawBytes( char *s, uint len )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
- register Q_INT8 *p = (Q_INT8*)s;
+ register TQ_INT8 *p = (TQ_INT8*)s;
if ( version() < 4 ) {
while ( len-- ) {
- Q_INT32 tmp;
+ TQ_INT32 tmp;
*this >> tmp;
*p++ = tmp;
}
@@ -855,7 +855,7 @@ TQDataStream &TQDataStream::readRawBytes( char *s, uint len )
/*!
- \overload TQDataStream &TQDataStream::operator<<( Q_UINT8 i )
+ \overload TQDataStream &TQDataStream::operator<<( TQ_UINT8 i )
Writes an unsigned byte, \a i, to the stream and returns a
reference to the stream.
@@ -866,7 +866,7 @@ TQDataStream &TQDataStream::readRawBytes( char *s, uint len )
to the stream.
*/
-TQDataStream &TQDataStream::operator<<( Q_INT8 i )
+TQDataStream &TQDataStream::operator<<( TQ_INT8 i )
{
CHECK_STREAM_PRECOND
if ( printable && (i == '\\' || !isprint((uchar) i)) ) {
@@ -885,7 +885,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT8 i )
/*!
- \overload TQDataStream &TQDataStream::operator<<( Q_UINT16 i )
+ \overload TQDataStream &TQDataStream::operator<<( TQ_UINT16 i )
Writes an unsigned 16-bit integer, \a i, to the stream and returns
a reference to the stream.
@@ -898,7 +898,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT8 i )
reference to the stream.
*/
-TQDataStream &TQDataStream::operator<<( Q_INT16 i )
+TQDataStream &TQDataStream::operator<<( TQ_INT16 i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
@@ -906,7 +906,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT16 i )
sprintf( buf, "%d\n", i );
dev->writeBlock( buf, strlen(buf) );
} else if ( noswap ) { // no conversion needed
- dev->writeBlock( (char *)&i, sizeof(Q_INT16) );
+ dev->writeBlock( (char *)&i, sizeof(TQ_INT16) );
} else { // swap bytes
register uchar *p = (uchar *)(&i);
char b[2];
@@ -924,7 +924,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT16 i )
reference to the stream.
*/
-TQDataStream &TQDataStream::operator<<( Q_INT32 i )
+TQDataStream &TQDataStream::operator<<( TQ_INT32 i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
@@ -932,7 +932,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT32 i )
sprintf( buf, "%d\n", i );
dev->writeBlock( buf, strlen(buf) );
} else if ( noswap ) { // no conversion needed
- dev->writeBlock( (char *)&i, sizeof(Q_INT32) );
+ dev->writeBlock( (char *)&i, sizeof(TQ_INT32) );
} else { // swap bytes
register uchar *p = (uchar *)(&i);
char b[4];
@@ -946,7 +946,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT32 i )
}
/*!
- \overload TQDataStream &TQDataStream::operator<<( Q_UINT64 i )
+ \overload TQDataStream &TQDataStream::operator<<( TQ_UINT64 i )
Writes an unsigned 64-bit integer, \a i, to the stream and returns a
reference to the stream.
@@ -959,7 +959,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT32 i )
reference to the stream.
*/
-TQDataStream &TQDataStream::operator<<( Q_INT64 i )
+TQDataStream &TQDataStream::operator<<( TQ_INT64 i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
@@ -971,11 +971,11 @@ TQDataStream &TQDataStream::operator<<( Q_INT64 i )
#endif
dev->writeBlock( buf, strlen(buf) );
} else if ( version() < 6 ) {
- Q_UINT32 i1 = i & 0xffffffff;
- Q_UINT32 i2 = i >> 32;
+ TQ_UINT32 i1 = i & 0xffffffff;
+ TQ_UINT32 i2 = i >> 32;
*this << i2 << i1;
} else if ( noswap ) { // no conversion needed
- dev->writeBlock( (char *)&i, sizeof(Q_INT64) );
+ dev->writeBlock( (char *)&i, sizeof(TQ_INT64) );
} else { // swap bytes
register uchar *p = (uchar *)(&i);
char b[8];
@@ -993,7 +993,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT64 i )
}
/*!
- \overload TQDataStream &TQDataStream::operator<<( Q_ULONG i )
+ \overload TQDataStream &TQDataStream::operator<<( TQ_ULONG i )
Writes an unsigned integer \a i, of the system's word length, to
the stream and returns a reference to the stream.
@@ -1007,7 +1007,7 @@ TQDataStream &TQDataStream::operator<<( Q_INT64 i )
stream and returns a reference to the stream.
*/
-TQDataStream &TQDataStream::operator<<( Q_LONG i )
+TQDataStream &TQDataStream::operator<<( TQ_LONG i )
{
CHECK_STREAM_PRECOND
if ( printable ) { // printable data
@@ -1015,13 +1015,13 @@ TQDataStream &TQDataStream::operator<<( Q_LONG i )
sprintf( buf, "%ld\n", i );
dev->writeBlock( buf, strlen(buf) );
} else if ( noswap ) { // no conversion needed
- dev->writeBlock( (char *)&i, sizeof(Q_LONG) );
+ dev->writeBlock( (char *)&i, sizeof(TQ_LONG) );
} else { // swap bytes
register uchar *p = (uchar *)(&i);
- char b[sizeof(Q_LONG)];
- for ( int j = sizeof(Q_LONG); j; )
+ char b[sizeof(TQ_LONG)];
+ for ( int j = sizeof(TQ_LONG); j; )
b[--j] = *p++;
- dev->writeBlock( b, sizeof(Q_LONG) );
+ dev->writeBlock( b, sizeof(TQ_LONG) );
}
return *this;
}
@@ -1029,10 +1029,10 @@ TQDataStream &TQDataStream::operator<<( Q_LONG i )
/*!
- \overload TQDataStream &TQDataStream::operator<<( Q_UINT32 i )
+ \overload TQDataStream &TQDataStream::operator<<( TQ_UINT32 i )
Writes an unsigned integer, \a i, to the stream as a 32-bit
- unsigned integer (Q_UINT32). Returns a reference to the stream.
+ unsigned integer (TQ_UINT32). Returns a reference to the stream.
*/
/*!
@@ -1112,11 +1112,11 @@ TQDataStream &TQDataStream::operator<<( double f )
TQDataStream &TQDataStream::operator<<( const char *s )
{
if ( !s ) {
- *this << (Q_UINT32)0;
+ *this << (TQ_UINT32)0;
return *this;
}
uint len = tqstrlen( s ) + 1; // also write null terminator
- *this << (Q_UINT32)len; // write length specifier
+ *this << (TQ_UINT32)len; // write length specifier
return writeRawBytes( s, len );
}
@@ -1125,7 +1125,7 @@ TQDataStream &TQDataStream::operator<<( const char *s )
Writes the length specifier \a len and the buffer \a s to the
stream and returns a reference to the stream.
- The \a len is serialized as a Q_UINT32, followed by \a len bytes
+ The \a len is serialized as a TQ_UINT32, followed by \a len bytes
from \a s. Note that the data is \e not encoded.
\sa writeRawBytes(), readBytes()
@@ -1134,7 +1134,7 @@ TQDataStream &TQDataStream::operator<<( const char *s )
TQDataStream &TQDataStream::writeBytes(const char *s, uint len)
{
CHECK_STREAM_PRECOND
- *this << (Q_UINT32)len; // write length specifier
+ *this << (TQ_UINT32)len; // write length specifier
if ( len )
writeRawBytes( s, len );
return *this;
@@ -1157,7 +1157,7 @@ TQDataStream &TQDataStream::writeRawBytes( const char *s, uint len )
while ( len-- )
*this << *p++;
} else {
- register Q_INT8 *p = (Q_INT8*)s;
+ register TQ_INT8 *p = (TQ_INT8*)s;
while ( len-- )
*this << *p++;
}
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp
index 00eba97d..6a8d45e2 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -2523,7 +2523,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f )
TQDataStream &operator<<( TQDataStream &s, const TQDate &d )
{
- return s << (Q_UINT32)(d.jd);
+ return s << (TQ_UINT32)(d.jd);
}
/*!
@@ -2536,7 +2536,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQDate &d )
TQDataStream &operator>>( TQDataStream &s, TQDate &d )
{
- Q_UINT32 jd;
+ TQ_UINT32 jd;
s >> jd;
d.jd = jd;
return s;
@@ -2552,7 +2552,7 @@ TQDataStream &operator>>( TQDataStream &s, TQDate &d )
TQDataStream &operator<<( TQDataStream &s, const TQTime &t )
{
- return s << (Q_UINT32)(t.ds);
+ return s << (TQ_UINT32)(t.ds);
}
/*!
@@ -2565,7 +2565,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQTime &t )
TQDataStream &operator>>( TQDataStream &s, TQTime &t )
{
- Q_UINT32 ds;
+ TQ_UINT32 ds;
s >> ds;
t.ds = ds;
return s;
diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp
index eee25683..47f77b5e 100644
--- a/src/tools/qfile.cpp
+++ b/src/tools/qfile.cpp
@@ -150,7 +150,7 @@ extern bool qt_file_access( const TQString& fn, int t );
*/
/*!
- \fn Q_LONG TQFile::writeBlock( const TQByteArray& data )
+ \fn TQ_LONG TQFile::writeBlock( const TQByteArray& data )
\overload
*/
@@ -366,7 +366,7 @@ bool TQFile::atEnd() const
\sa readBlock(), TQTextStream::readLine()
*/
-Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen )
+TQ_LONG TQFile::readLine( char *p, TQ_ULONG maxlen )
{
if ( maxlen == 0 ) // application bug?
return 0;
@@ -381,7 +381,7 @@ Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen )
return -1;
}
#endif
- Q_LONG nread; // number of bytes read
+ TQ_LONG nread; // number of bytes read
if ( isRaw() ) { // raw file
nread = TQIODevice::readLine( p, maxlen );
} else { // buffered file
@@ -419,10 +419,10 @@ Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen )
\sa readBlock(), TQTextStream::readLine()
*/
-Q_LONG TQFile::readLine( TQString& s, Q_ULONG maxlen )
+TQ_LONG TQFile::readLine( TQString& s, TQ_ULONG maxlen )
{
TQByteArray ba(maxlen);
- Q_LONG l = readLine(ba.data(),maxlen);
+ TQ_LONG l = readLine(ba.data(),maxlen);
if ( l >= 0 ) {
ba.truncate(l);
s = TQString(ba);
diff --git a/src/tools/qfile_unix.cpp b/src/tools/qfile_unix.cpp
index 90decadb..9aa4b1f6 100644
--- a/src/tools/qfile_unix.cpp
+++ b/src/tools/qfile_unix.cpp
@@ -553,7 +553,7 @@ bool TQFile::at( Offset pos )
readBlock() solved this problem.
*/
-Q_LONG TQFile::readBlock( char *p, Q_ULONG len )
+TQ_LONG TQFile::readBlock( char *p, TQ_ULONG len )
{
if ( !len ) // nothing to do
return 0;
@@ -572,7 +572,7 @@ Q_LONG TQFile::readBlock( char *p, Q_ULONG len )
return -1;
}
#endif
- Q_ULONG nread = 0; // number of bytes read
+ TQ_ULONG nread = 0; // number of bytes read
if ( !ungetchBuffer.isEmpty() ) {
// need to add these to the returned string.
uint l = ungetchBuffer.length();
@@ -622,7 +622,7 @@ Q_LONG TQFile::readBlock( char *p, Q_ULONG len )
\sa readBlock()
*/
-Q_LONG TQFile::writeBlock( const char *p, Q_ULONG len )
+TQ_LONG TQFile::writeBlock( const char *p, TQ_ULONG len )
{
if ( !len ) // nothing to do
return 0;
@@ -641,7 +641,7 @@ Q_LONG TQFile::writeBlock( const char *p, Q_ULONG len )
return -1;
}
#endif
- Q_ULONG nwritten; // number of bytes written
+ TQ_ULONG nwritten; // number of bytes written
if ( isRaw() ) // raw file
nwritten = ::write( fd, (void *)p, len );
else // buffered file
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index 31e88179..f2b41e50 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -324,13 +324,13 @@ bool TQGArray::fill( const char *d, int len, uint sz )
if ( sz == 1 ) // 8 bit elements
memset( data(), *d, len );
else if ( sz == 4 ) { // 32 bit elements
- register Q_INT32 *x = (Q_INT32*)data();
- Q_INT32 v = *((Q_INT32*)d);
+ register TQ_INT32 *x = (TQ_INT32*)data();
+ TQ_INT32 v = *((TQ_INT32*)d);
while ( len-- )
*x++ = v;
} else if ( sz == 2 ) { // 16 bit elements
- register Q_INT16 *x = (Q_INT16*)data();
- Q_INT16 v = *((Q_INT16*)d);
+ register TQ_INT16 *x = (TQ_INT16*)data();
+ TQ_INT16 v = *((TQ_INT16*)d);
while ( len-- )
*x++ = v;
} else { // any other size elements
@@ -619,8 +619,8 @@ int TQGArray::find( const char *d, uint index, uint sz ) const
}
break;
case 2: { // 16 bit elements
- register Q_INT16 *x = (Q_INT16*)(data() + index);
- Q_INT16 v = *((Q_INT16*)d);
+ register TQ_INT16 *x = (TQ_INT16*)(data() + index);
+ TQ_INT16 v = *((TQ_INT16*)d);
for ( i=index; ilen; i+=2 ) {
if ( *x++ == v )
break;
@@ -629,8 +629,8 @@ int TQGArray::find( const char *d, uint index, uint sz ) const
}
break;
case 4: { // 32 bit elements
- register Q_INT32 *x = (Q_INT32*)(data() + index);
- Q_INT32 v = *((Q_INT32*)d);
+ register TQ_INT32 *x = (TQ_INT32*)(data() + index);
+ TQ_INT32 v = *((TQ_INT32*)d);
for ( i=index; ilen; i+=4 ) {
if ( *x++ == v )
break;
@@ -672,8 +672,8 @@ int TQGArray::contains( const char *d, uint sz ) const
}
break;
case 2: { // 16 bit elements
- register Q_INT16 *x = (Q_INT16*)data();
- Q_INT16 v = *((Q_INT16*)d);
+ register TQ_INT16 *x = (TQ_INT16*)data();
+ TQ_INT16 v = *((TQ_INT16*)d);
i /= 2;
while ( i-- ) {
if ( *x++ == v )
@@ -682,8 +682,8 @@ int TQGArray::contains( const char *d, uint sz ) const
}
break;
case 4: { // 32 bit elements
- register Q_INT32 *x = (Q_INT32*)data();
- Q_INT32 v = *((Q_INT32*)d);
+ register TQ_INT32 *x = (TQ_INT32*)data();
+ TQ_INT32 v = *((TQ_INT32*)d);
i /= 4;
while ( i-- ) {
if ( *x++ == v )
diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp
index 22574524..e794a43f 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/qgdict.cpp
@@ -934,7 +934,7 @@ TQDataStream &TQGDict::read( TQDataStream &s )
break;
case IntKey:
{
- Q_UINT32 k;
+ TQ_UINT32 k;
s >> k;
read( s, d );
look_int( k, d, op_insert );
@@ -942,7 +942,7 @@ TQDataStream &TQGDict::read( TQDataStream &s )
break;
case PtrKey:
{
- Q_UINT32 k;
+ TQ_UINT32 k;
s >> k;
read( s, d );
// ### cannot insert 0 - this renders the thing
@@ -977,10 +977,10 @@ TQDataStream& TQGDict::write( TQDataStream &s ) const
s << ((TQAsciiBucket*)n)->getKey();
break;
case IntKey:
- s << (Q_UINT32)((TQIntBucket*)n)->getKey();
+ s << (TQ_UINT32)((TQIntBucket*)n)->getKey();
break;
case PtrKey:
- s << (Q_UINT32)0; // ### cannot serialize a pointer
+ s << (TQ_UINT32)0; // ### cannot serialize a pointer
break;
}
write( s, n->getData() ); // write data
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 296e600f..07074c9f 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -113,7 +113,7 @@ bool tqSysInfo( int *wordSize, bool *bigEndian )
}
si_wordSize = 0;
- Q_ULONG n = (Q_ULONG)(~0);
+ TQ_ULONG n = (TQ_ULONG)(~0);
while ( n ) { // detect word size
si_wordSize++;
n /= 2;
@@ -128,8 +128,8 @@ bool tqSysInfo( int *wordSize, bool *bigEndian )
#endif
return FALSE;
}
- if ( sizeof(Q_INT8) != 1 || sizeof(Q_INT16) != 2 || sizeof(Q_INT32) != 4 ||
- sizeof(Q_ULONG)*8 != si_wordSize || sizeof(float) != 4 || sizeof(double) != 8 ) {
+ if ( sizeof(TQ_INT8) != 1 || sizeof(TQ_INT16) != 2 || sizeof(TQ_INT32) != 4 ||
+ sizeof(TQ_ULONG)*8 != si_wordSize || sizeof(float) != 4 || sizeof(double) != 8 ) {
#if defined(QT_CHECK_RANGE)
tqFatal( "qSysInfo: Unsupported system data type size" );
#endif
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp
index ac8a2eeb..8e2ea9a0 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/qgpluginmanager.cpp
@@ -136,8 +136,8 @@ public:
efficiency.
*/
union {
- Q_UINT8 b[52];
- Q_UINT32 w[13];
+ TQ_UINT8 b[52];
+ TQ_UINT32 w[13];
};
TQCoMatrix() { memset( b, 0, 52 ); }
diff --git a/src/tools/qiodevice.cpp b/src/tools/qiodevice.cpp
index 6e584ec4..4f89ddea 100644
--- a/src/tools/qiodevice.cpp
+++ b/src/tools/qiodevice.cpp
@@ -611,7 +611,7 @@ bool TQIODevice::atEnd() const
/*!
- \fn int TQIODevice::readBlock( char *data, Q_ULONG maxlen )
+ \fn int TQIODevice::readBlock( char *data, TQ_ULONG maxlen )
Reads at most \a maxlen bytes from the I/O device into \a data and
returns the number of bytes actually read.
@@ -671,7 +671,7 @@ TQByteArray TQIODevice::readAll()
}
/*!
- \fn int TQIODevice::writeBlock( const char *data, Q_ULONG len )
+ \fn int TQIODevice::writeBlock( const char *data, TQ_ULONG len )
Writes \a len bytes from \a data to the I/O device and returns the
number of bytes actually written.
@@ -689,7 +689,7 @@ TQByteArray TQIODevice::readAll()
This convenience function is the same as calling writeBlock(
data.data(), data.size() ).
*/
-Q_LONG TQIODevice::writeBlock( const TQByteArray& data )
+TQ_LONG TQIODevice::writeBlock( const TQByteArray& data )
{
return writeBlock( data.data(), data.size() );
}
@@ -708,7 +708,7 @@ Q_LONG TQIODevice::writeBlock( const TQByteArray& data )
\sa readBlock(), TQTextStream::readLine()
*/
-Q_LONG TQIODevice::readLine( char *data, Q_ULONG maxlen )
+TQ_LONG TQIODevice::readLine( char *data, TQ_ULONG maxlen )
{
if ( maxlen == 0 ) // application bug?
return 0;
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 3dabc3ee..2b9a10bc 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -163,8 +163,8 @@ static char *_qdtoa(double d, int mode, int ndigits, int *decpt,
int *sign, char **rve, char **digits_str);
static double qstrtod(const char *s00, char const **se, bool *ok);
#endif
-static Q_LLONG qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok);
-static Q_ULLONG qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok);
+static TQ_LLONG qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok);
+static TQ_ULLONG qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok);
static inline bool compareBits(double d1, double d2)
{
@@ -2677,7 +2677,7 @@ TQString TQLocale::countryToString(Country country)
short TQLocale::toShort(const TQString &s, bool *ok) const
{
- Q_LLONG i = toLongLong(s, ok);
+ TQ_LLONG i = toLongLong(s, ok);
if (i < SHRT_MIN || i > SHRT_MAX) {
if (ok != 0)
*ok = FALSE;
@@ -2700,7 +2700,7 @@ short TQLocale::toShort(const TQString &s, bool *ok) const
ushort TQLocale::toUShort(const TQString &s, bool *ok) const
{
- Q_ULLONG i = toULongLong(s, ok);
+ TQ_ULLONG i = toULongLong(s, ok);
if (i > USHRT_MAX) {
if (ok != 0)
*ok = FALSE;
@@ -2723,7 +2723,7 @@ ushort TQLocale::toUShort(const TQString &s, bool *ok) const
int TQLocale::toInt(const TQString &s, bool *ok) const
{
- Q_LLONG i = toLongLong(s, ok);
+ TQ_LLONG i = toLongLong(s, ok);
if (i < INT_MIN || i > INT_MAX) {
if (ok != 0)
*ok = FALSE;
@@ -2746,7 +2746,7 @@ int TQLocale::toInt(const TQString &s, bool *ok) const
uint TQLocale::toUInt(const TQString &s, bool *ok) const
{
- Q_ULLONG i = toULongLong(s, ok);
+ TQ_ULLONG i = toULongLong(s, ok);
if (i > UINT_MAX) {
if (ok != 0)
*ok = FALSE;
@@ -2767,15 +2767,15 @@ uint TQLocale::toUInt(const TQString &s, bool *ok) const
\sa toString()
*/
-Q_LONG TQLocale::toLong(const TQString &s, bool *ok) const
+TQ_LONG TQLocale::toLong(const TQString &s, bool *ok) const
{
- Q_LLONG i = toLongLong(s, ok);
+ TQ_LLONG i = toLongLong(s, ok);
if (i < LONG_MIN || i > LONG_MAX) {
if (ok != 0)
*ok = FALSE;
return 0;
}
- return (Q_LONG) i;
+ return (TQ_LONG) i;
}
/*!
@@ -2790,15 +2790,15 @@ Q_LONG TQLocale::toLong(const TQString &s, bool *ok) const
\sa toString()
*/
-Q_ULONG TQLocale::toULong(const TQString &s, bool *ok) const
+TQ_ULONG TQLocale::toULong(const TQString &s, bool *ok) const
{
- Q_ULLONG i = toULongLong(s, ok);
+ TQ_ULLONG i = toULongLong(s, ok);
if (i > ULONG_MAX) {
if (ok != 0)
*ok = FALSE;
return 0;
}
- return (Q_ULONG) i;
+ return (TQ_ULONG) i;
}
/*!
@@ -2814,7 +2814,7 @@ Q_ULONG TQLocale::toULong(const TQString &s, bool *ok) const
*/
-Q_LLONG TQLocale::toLongLong(const TQString &s, bool *ok) const
+TQ_LLONG TQLocale::toLongLong(const TQString &s, bool *ok) const
{
return d->stringToLongLong(s, 0, ok, TQLocalePrivate::ParseGroupSeparators);
}
@@ -2832,7 +2832,7 @@ Q_LLONG TQLocale::toLongLong(const TQString &s, bool *ok) const
*/
-Q_ULLONG TQLocale::toULongLong(const TQString &s, bool *ok) const
+TQ_ULLONG TQLocale::toULongLong(const TQString &s, bool *ok) const
{
return d->stringToUnsLongLong(s, 0, ok, TQLocalePrivate::ParseGroupSeparators);
}
@@ -2912,7 +2912,7 @@ double TQLocale::toDouble(const TQString &s, bool *ok) const
\sa toLongLong()
*/
-TQString TQLocale::toString(Q_LLONG i) const
+TQString TQLocale::toString(TQ_LLONG i) const
{
return d->longLongToString(i, -1, 10, -1, TQLocalePrivate::ThousandsGroup);
}
@@ -2923,7 +2923,7 @@ TQString TQLocale::toString(Q_LLONG i) const
\sa toULongLong()
*/
-TQString TQLocale::toString(Q_ULLONG i) const
+TQString TQLocale::toString(TQ_ULLONG i) const
{
return d->unsLongLongToString(i, -1, 10, -1, TQLocalePrivate::ThousandsGroup);
}
@@ -3033,7 +3033,7 @@ TQLocale TQLocale::system()
*/
/*!
-\fn TQString TQLocale::toString(Q_LONG i) const
+\fn TQString TQLocale::toString(TQ_LONG i) const
\overload
@@ -3041,7 +3041,7 @@ TQLocale TQLocale::system()
*/
/*!
-\fn TQString TQLocale::toString(Q_ULONG i) const
+\fn TQString TQLocale::toString(TQ_ULONG i) const
\overload
@@ -3075,7 +3075,7 @@ static char digitToCLocale(TQChar zero, TQChar d)
return TQChar(0);
}
-static TQString qulltoa(Q_ULLONG l, int base, const TQLocalePrivate &locale)
+static TQString qulltoa(TQ_ULLONG l, int base, const TQLocalePrivate &locale)
{
TQChar buff[65]; // length of MAX_ULLONG in base 2
TQChar *p = buff + 65;
@@ -3107,7 +3107,7 @@ static TQString qulltoa(Q_ULLONG l, int base, const TQLocalePrivate &locale)
return TQString(p, 65 - (p - buff));
}
-static TQString qlltoa(Q_LLONG l, int base, const TQLocalePrivate &locale)
+static TQString qlltoa(TQ_LLONG l, int base, const TQLocalePrivate &locale)
{
return qulltoa(l < 0 ? -l : l, base, locale);
}
@@ -3368,7 +3368,7 @@ TQString TQLocalePrivate::doubleToString(double d,
return num_str;
}
-TQString TQLocalePrivate::longLongToString(Q_LLONG l, int precision,
+TQString TQLocalePrivate::longLongToString(TQ_LLONG l, int precision,
int base, int width,
unsigned flags) const
{
@@ -3453,7 +3453,7 @@ TQString TQLocalePrivate::longLongToString(Q_LLONG l, int precision,
return num_str;
}
-TQString TQLocalePrivate::unsLongLongToString(Q_ULLONG l, int precision,
+TQString TQLocalePrivate::unsLongLongToString(TQ_ULLONG l, int precision,
int base, int width,
unsigned flags) const
{
@@ -3703,7 +3703,7 @@ double TQLocalePrivate::stringToDouble(TQString num,
return d;
}
-Q_LLONG TQLocalePrivate::stringToLongLong(TQString num, int base,
+TQ_LLONG TQLocalePrivate::stringToLongLong(TQString num, int base,
bool *ok,
GroupSeparatorMode group_sep_mode) const
{
@@ -3716,7 +3716,7 @@ Q_LLONG TQLocalePrivate::stringToLongLong(TQString num, int base,
bool _ok;
const char *endptr;
const char *num_buff = num.latin1();
- Q_LLONG l = qstrtoll(num_buff, &endptr, base, &_ok);
+ TQ_LLONG l = qstrtoll(num_buff, &endptr, base, &_ok);
if (!_ok || *endptr != '\0') {
if (ok != 0)
@@ -3729,7 +3729,7 @@ Q_LLONG TQLocalePrivate::stringToLongLong(TQString num, int base,
return l;
}
-Q_ULLONG TQLocalePrivate::stringToUnsLongLong(TQString num, int base,
+TQ_ULLONG TQLocalePrivate::stringToUnsLongLong(TQString num, int base,
bool *ok,
GroupSeparatorMode group_sep_mode) const
{
@@ -3742,7 +3742,7 @@ Q_ULLONG TQLocalePrivate::stringToUnsLongLong(TQString num, int base,
bool _ok;
const char *endptr;
const char *num_buff = num.latin1();
- Q_ULLONG l = qstrtoull(num_buff, &endptr, base, &_ok);
+ TQ_ULLONG l = qstrtoull(num_buff, &endptr, base, &_ok);
if (!_ok || *endptr != '\0') {
if (ok != 0)
@@ -3792,17 +3792,17 @@ Q_ULLONG TQLocalePrivate::stringToUnsLongLong(TQString num, int base,
// "$FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.5.2.1 2001/03/02 09:45:20 obrien Exp $";
/*
- * Convert a string to an Q_ULLONG integer.
+ * Convert a string to an TQ_ULLONG integer.
*
* Ignores `locale' stuff. Assumes that the upper and lower case
* alphabets and digits are each contiguous.
*/
-static Q_ULLONG qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok)
+static TQ_ULLONG qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok)
{
register const char *s = nptr;
- register Q_ULLONG acc;
+ register TQ_ULLONG acc;
register unsigned char c;
- register Q_ULLONG qbase, cutoff;
+ register TQ_ULLONG qbase, cutoff;
register int neg, any, cutlim;
if (ok != 0)
@@ -3835,8 +3835,8 @@ static Q_ULLONG qstrtoull(const char *nptr, const char **endptr, register int ba
if (base == 0)
base = c == '0' ? 8 : 10;
qbase = (unsigned)base;
- cutoff = (Q_ULLONG)ULLONG_MAX / qbase;
- cutlim = (Q_ULLONG)ULLONG_MAX % qbase;
+ cutoff = (TQ_ULLONG)ULLONG_MAX / qbase;
+ cutlim = (TQ_ULLONG)ULLONG_MAX % qbase;
for (acc = 0, any = 0;; c = *s++) {
if (!isascii(c))
break;
@@ -3873,17 +3873,17 @@ static Q_ULLONG qstrtoull(const char *nptr, const char **endptr, register int ba
/*
- * Convert a string to a Q_LLONG integer.
+ * Convert a string to a TQ_LLONG integer.
*
* Ignores `locale' stuff. Assumes that the upper and lower case
* alphabets and digits are each contiguous.
*/
-static Q_LLONG qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok)
+static TQ_LLONG qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok)
{
register const char *s;
- register Q_ULLONG acc;
+ register TQ_ULLONG acc;
register unsigned char c;
- register Q_ULLONG qbase, cutoff;
+ register TQ_ULLONG qbase, cutoff;
register int neg, any, cutlim;
if (ok != 0)
@@ -3934,7 +3934,7 @@ static Q_LLONG qstrtoll(const char *nptr, const char **endptr, register int base
* overflow.
*/
qbase = (unsigned)base;
- cutoff = neg ? (Q_ULLONG)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX
+ cutoff = neg ? (TQ_ULLONG)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX
: LLONG_MAX;
cutlim = cutoff % qbase;
cutoff /= qbase;
@@ -4075,8 +4075,8 @@ __RCSID("$NetBSD: strtod.c,v 1.26 1998/02/03 18:44:21 perry Exp $");
#define VAX
#endif
-#define Long Q_INT32
-#define ULong Q_UINT32
+#define Long TQ_INT32
+#define ULong TQ_UINT32
#define MALLOC malloc
#define CONST const
diff --git a/src/tools/qlocale_p.h b/src/tools/qlocale_p.h
index 1b80a4c8..dbe14ca0 100644
--- a/src/tools/qlocale_p.h
+++ b/src/tools/qlocale_p.h
@@ -67,8 +67,8 @@ public:
TQString infinity() const;
TQString nan() const;
- Q_UINT32 languageId() const { return m_language_id; }
- Q_UINT32 countryId() const { return m_country_id; }
+ TQ_UINT32 languageId() const { return m_language_id; }
+ TQ_UINT32 countryId() const { return m_country_id; }
bool isDigit(TQChar d) const;
@@ -102,23 +102,23 @@ public:
DoubleForm form = DFSignificantDigits,
int width = -1,
unsigned flags = NoFlags) const;
- TQString longLongToString(Q_LLONG l, int precision = -1,
+ TQString longLongToString(TQ_LLONG l, int precision = -1,
int base = 10,
int width = -1,
unsigned flags = NoFlags) const;
- TQString unsLongLongToString(Q_ULLONG l, int precision = -1,
+ TQString unsLongLongToString(TQ_ULLONG l, int precision = -1,
int base = 10,
int width = -1,
unsigned flags = NoFlags) const;
double stringToDouble(TQString num, bool *ok, GroupSeparatorMode group_sep_mode) const;
- Q_LLONG stringToLongLong(TQString num, int base, bool *ok, GroupSeparatorMode group_sep_mode) const;
- Q_ULLONG stringToUnsLongLong(TQString num, int base, bool *ok, GroupSeparatorMode group_sep_mode) const;
+ TQ_LLONG stringToLongLong(TQString num, int base, bool *ok, GroupSeparatorMode group_sep_mode) const;
+ TQ_ULLONG stringToUnsLongLong(TQString num, int base, bool *ok, GroupSeparatorMode group_sep_mode) const;
bool removeGroupSeparators(TQString &num_str) const;
bool numberToCLocale(TQString &locale_num, GroupSeparatorMode group_sep_mode) const;
- Q_UINT32 m_language_id, m_country_id;
+ TQ_UINT32 m_language_id, m_country_id;
- Q_UINT16 m_decimal, m_group, m_list, m_percent,
+ TQ_UINT16 m_decimal, m_group, m_list, m_percent,
m_zero, m_minus, m_exponential;
static const TQString m_infinity;
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index bb521868..86ba4246 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -642,7 +642,7 @@ const TQString &TQChar::decomposition() const
pos+=2;
TQString s;
- Q_UINT16 c;
+ TQ_UINT16 c;
while ( (c = TQUnicodeTables::decomposition_map[pos++]) != 0 )
s += TQChar( c );
// ### In 4.0, return s, and not shared_decomp. shared_decomp
@@ -926,17 +926,17 @@ class TQLigature
public:
TQLigature( TQChar c );
- Q_UINT16 first() { cur = ligatures; return cur ? *cur : 0; }
- Q_UINT16 next() { return cur && *cur ? *(cur++) : 0; }
- Q_UINT16 current() { return cur ? *cur : 0; }
+ TQ_UINT16 first() { cur = ligatures; return cur ? *cur : 0; }
+ TQ_UINT16 next() { return cur && *cur ? *(cur++) : 0; }
+ TQ_UINT16 current() { return cur ? *cur : 0; }
int match(TQString & str, unsigned int index);
TQChar head();
TQChar::Decomposition tag();
private:
- Q_UINT16 *ligatures;
- Q_UINT16 *cur;
+ TQ_UINT16 *ligatures;
+ TQ_UINT16 *cur;
};
TQLigature::TQLigature( TQChar c )
@@ -947,7 +947,7 @@ TQLigature::TQLigature( TQChar c )
else
{
pos = TQUnicodeTables::ligature_info[(pos<<8)+c.cell()];
- ligatures = (Q_UINT16 *)&(TQUnicodeTables::ligature_map[pos]);
+ ligatures = (TQ_UINT16 *)&(TQUnicodeTables::ligature_map[pos]);
}
cur = ligatures;
}
@@ -974,8 +974,8 @@ int TQLigature::match(TQString & str, unsigned int index)
if(!current()) return 0;
- Q_UINT16 lig = current() + 2;
- Q_UINT16 ch;
+ TQ_UINT16 lig = current() + 2;
+ TQ_UINT16 ch;
while ((i < str.length()) && (ch = TQUnicodeTables::decomposition_map[lig])) {
if (str[(int)i] != TQChar(ch))
@@ -2076,7 +2076,7 @@ TQString TQString::arg( const TQString& a, int fieldWidth ) const
*/
TQString TQString::arg( long a, int fieldWidth, int base ) const
{
- return arg((Q_LLONG)a, fieldWidth, base);
+ return arg((TQ_LLONG)a, fieldWidth, base);
}
/*!
@@ -2088,7 +2088,7 @@ TQString TQString::arg( long a, int fieldWidth, int base ) const
*/
TQString TQString::arg( ulong a, int fieldWidth, int base ) const
{
- return arg((Q_ULLONG)a, fieldWidth, base);
+ return arg((TQ_ULLONG)a, fieldWidth, base);
}
/*!
@@ -2098,7 +2098,7 @@ TQString TQString::arg( ulong a, int fieldWidth, int base ) const
be between 2 and 36. If \a base is 10, the '%L' syntax can be used
to produce localized strings.
*/
-TQString TQString::arg( Q_LLONG a, int fieldWidth, int base ) const
+TQString TQString::arg( TQ_LLONG a, int fieldWidth, int base ) const
{
ArgEscapeData d = findArgEscapes(*this);
@@ -2128,7 +2128,7 @@ TQString TQString::arg( Q_LLONG a, int fieldWidth, int base ) const
be between 2 and 36. If \a base is 10, the '%L' syntax can be used
to produce localized strings.
*/
-TQString TQString::arg( Q_ULLONG a, int fieldWidth, int base ) const
+TQString TQString::arg( TQ_ULLONG a, int fieldWidth, int base ) const
{
ArgEscapeData d = findArgEscapes(*this);
@@ -2557,13 +2557,13 @@ TQString &TQString::sprintf( const char* cformat, ... )
switch (*c) {
case 'd':
case 'i': {
- Q_LLONG i;
+ TQ_LLONG i;
switch (length_mod) {
case lm_none: i = va_arg(ap, int); break;
case lm_hh: i = va_arg(ap, int); break;
case lm_h: i = va_arg(ap, int); break;
case lm_l: i = va_arg(ap, long int); break;
- case lm_ll: i = va_arg(ap, Q_LLONG); break;
+ case lm_ll: i = va_arg(ap, TQ_LLONG); break;
case lm_j: i = va_arg(ap, long int); break;
case lm_z: i = va_arg(ap, size_t); break;
case lm_t: i = va_arg(ap, int); break;
@@ -2577,13 +2577,13 @@ TQString &TQString::sprintf( const char* cformat, ... )
case 'u':
case 'x':
case 'X': {
- Q_ULLONG u;
+ TQ_ULLONG u;
switch (length_mod) {
case lm_none: u = va_arg(ap, unsigned int); break;
case lm_hh: u = va_arg(ap, unsigned int); break;
case lm_h: u = va_arg(ap, unsigned int); break;
case lm_l: u = va_arg(ap, unsigned long int); break;
- case lm_ll: u = va_arg(ap, Q_ULLONG); break;
+ case lm_ll: u = va_arg(ap, TQ_ULLONG); break;
default: u = 0; break;
}
@@ -2656,11 +2656,11 @@ TQString &TQString::sprintf( const char* cformat, ... )
break;
}
case 'p': {
- Q_ULLONG i;
+ TQ_ULLONG i;
#ifdef Q_OS_WIN64
- i = (Q_ULLONG) va_arg(ap, void*);
+ i = (TQ_ULLONG) va_arg(ap, void*);
#else
- i = (Q_ULONG) va_arg(ap, void*);
+ i = (TQ_ULONG) va_arg(ap, void*);
#endif
#ifdef Q_OS_WIN32
@@ -2691,7 +2691,7 @@ TQString &TQString::sprintf( const char* cformat, ... )
break;
}
case lm_ll: {
- Q_LLONG *n = va_arg(ap, Q_LLONG*);
+ TQ_LLONG *n = va_arg(ap, TQ_LLONG*);
volatile uint tmp = result.length(); // egcs-2.91.66 gets internal
*n = tmp; // compiler error without volatile
break;
@@ -4697,7 +4697,7 @@ int TQString::contains( const TQRegExp &rx ) const
long TQString::toLong( bool *ok, int base ) const
{
- Q_LLONG v = toLongLong( ok, base );
+ TQ_LLONG v = toLongLong( ok, base );
if ( v < LONG_MIN || v > LONG_MAX ) {
if ( ok )
*ok = FALSE;
@@ -4731,7 +4731,7 @@ long TQString::toLong( bool *ok, int base ) const
\sa number()
*/
-Q_LLONG TQString::toLongLong( bool *ok, int base ) const
+TQ_LLONG TQString::toLongLong( bool *ok, int base ) const
{
#if defined(QT_CHECK_RANGE)
if ( base != 0 && (base < 2 || base > 36) ) {
@@ -4742,7 +4742,7 @@ Q_LLONG TQString::toLongLong( bool *ok, int base ) const
bool my_ok;
TQLocale def_locale;
- Q_LLONG result = def_locale.d->stringToLongLong(*this, base, &my_ok, TQLocalePrivate::FailOnGroupSeparators);
+ TQ_LLONG result = def_locale.d->stringToLongLong(*this, base, &my_ok, TQLocalePrivate::FailOnGroupSeparators);
if (my_ok) {
if (ok != 0)
*ok = TRUE;
@@ -4787,7 +4787,7 @@ Q_LLONG TQString::toLongLong( bool *ok, int base ) const
ulong TQString::toULong( bool *ok, int base ) const
{
- Q_ULLONG v = toULongLong( ok, base );
+ TQ_ULLONG v = toULongLong( ok, base );
if ( v > ULONG_MAX ) {
if ( ok )
*ok = FALSE;
@@ -4821,7 +4821,7 @@ ulong TQString::toULong( bool *ok, int base ) const
\sa number()
*/
-Q_ULLONG TQString::toULongLong( bool *ok, int base ) const
+TQ_ULLONG TQString::toULongLong( bool *ok, int base ) const
{
#if defined(QT_CHECK_RANGE)
if ( base != 0 && (base < 2 || base > 36) ) {
@@ -4832,7 +4832,7 @@ Q_ULLONG TQString::toULongLong( bool *ok, int base ) const
bool my_ok;
TQLocale def_locale;
- Q_ULLONG result = def_locale.d->stringToUnsLongLong(*this, base, &my_ok, TQLocalePrivate::FailOnGroupSeparators);
+ TQ_ULLONG result = def_locale.d->stringToUnsLongLong(*this, base, &my_ok, TQLocalePrivate::FailOnGroupSeparators);
if (my_ok) {
if (ok != 0)
*ok = TRUE;
@@ -4879,7 +4879,7 @@ Q_ULLONG TQString::toULongLong( bool *ok, int base ) const
short TQString::toShort( bool *ok, int base ) const
{
- Q_LLONG v = toLongLong( ok, base );
+ TQ_LLONG v = toLongLong( ok, base );
if ( v < SHRT_MIN || v > SHRT_MAX ) {
if ( ok )
*ok = FALSE;
@@ -4916,7 +4916,7 @@ short TQString::toShort( bool *ok, int base ) const
ushort TQString::toUShort( bool *ok, int base ) const
{
- Q_ULLONG v = toULongLong( ok, base );
+ TQ_ULLONG v = toULongLong( ok, base );
if ( v > USHRT_MAX ) {
if ( ok )
*ok = FALSE;
@@ -4961,7 +4961,7 @@ ushort TQString::toUShort( bool *ok, int base ) const
int TQString::toInt( bool *ok, int base ) const
{
- Q_LLONG v = toLongLong( ok, base );
+ TQ_LLONG v = toLongLong( ok, base );
if ( v < INT_MIN || v > INT_MAX ) {
if ( ok )
*ok = FALSE;
@@ -4997,7 +4997,7 @@ int TQString::toInt( bool *ok, int base ) const
uint TQString::toUInt( bool *ok, int base ) const
{
- Q_ULLONG v = toULongLong( ok, base );
+ TQ_ULLONG v = toULongLong( ok, base );
if ( v > UINT_MAX ) {
if ( ok )
*ok = FALSE;
@@ -5149,7 +5149,7 @@ float TQString::toFloat( bool *ok ) const
\endcode
*/
-TQString &TQString::setNum( Q_LLONG n, int base )
+TQString &TQString::setNum( TQ_LLONG n, int base )
{
#if defined(QT_CHECK_RANGE)
if ( base < 2 || base > 36 ) {
@@ -5171,7 +5171,7 @@ TQString &TQString::setNum( Q_LLONG n, int base )
The base is 10 by default and must be between 2 and 36.
*/
-TQString &TQString::setNum( Q_ULLONG n, int base )
+TQString &TQString::setNum( TQ_ULLONG n, int base )
{
#if defined(QT_CHECK_RANGE)
if ( base < 2 || base > 36 ) {
@@ -5192,7 +5192,7 @@ TQString &TQString::setNum( Q_ULLONG n, int base )
// ### 4.0: inline
TQString &TQString::setNum( long n, int base )
{
- return setNum( (Q_LLONG)n, base );
+ return setNum( (TQ_LLONG)n, base );
}
/*!
@@ -5203,7 +5203,7 @@ TQString &TQString::setNum( long n, int base )
// ### 4.0: inline
TQString &TQString::setNum( ulong n, int base )
{
- return setNum( (Q_ULLONG)n, base );
+ return setNum( (TQ_ULLONG)n, base );
}
/*!
@@ -5343,7 +5343,7 @@ TQString TQString::number( ulong n, int base )
\sa setNum()
*/
-TQString TQString::number( Q_LLONG n, int base )
+TQString TQString::number( TQ_LLONG n, int base )
{
TQString s;
s.setNum( n, base );
@@ -5355,7 +5355,7 @@ TQString TQString::number( Q_LLONG n, int base )
\sa setNum()
*/
-TQString TQString::number( Q_ULLONG n, int base )
+TQString TQString::number( TQ_ULLONG n, int base )
{
TQString s;
s.setNum( n, base );
@@ -6846,7 +6846,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQString &str )
delete [] b;
} else {
// write null marker
- s << (Q_UINT32)0xffffffff;
+ s << (TQ_UINT32)0xffffffff;
}
}
return s;
@@ -6873,7 +6873,7 @@ TQDataStream &operator>>( TQDataStream &s, TQString &str )
str = TQString( l );
}
else {
- Q_UINT32 bytes = 0;
+ TQ_UINT32 bytes = 0;
s >> bytes; // read size of string
if ( bytes == 0xffffffff ) { // null string
str = TQString::null;
diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp
index e5ccf8ba..6a0e1d6b 100644
--- a/src/tools/qtextstream.cpp
+++ b/src/tools/qtextstream.cpp
@@ -299,8 +299,8 @@ public:
Offset size() const;
Offset at() const;
bool at( Offset pos );
- Q_LONG readBlock( char *p, Q_ULONG len );
- Q_LONG writeBlock( const char *p, Q_ULONG len );
+ TQ_LONG readBlock( char *p, TQ_ULONG len );
+ TQ_LONG writeBlock( const char *p, TQ_ULONG len );
int getch();
int putch( int ch );
int ungetch( int ch );
@@ -396,7 +396,7 @@ bool TQStringBuffer::at( Offset pos )
}
-Q_LONG TQStringBuffer::readBlock( char *p, Q_ULONG len )
+TQ_LONG TQStringBuffer::readBlock( char *p, TQ_ULONG len )
{
#if defined(QT_CHECK_STATE)
TQ_CHECK_PTR( p );
@@ -423,7 +423,7 @@ Q_LONG TQStringBuffer::readBlock( char *p, Q_ULONG len )
return len;
}
-Q_LONG TQStringBuffer::writeBlock( const char *p, Q_ULONG len )
+TQ_LONG TQStringBuffer::writeBlock( const char *p, TQ_ULONG len )
{
#if defined(QT_CHECK_NULL)
if ( p == 0 && len != 0 )
diff --git a/src/tools/qunicodetables.cpp b/src/tools/qunicodetables.cpp
index abcfadf7..8e9b5c1d 100644
--- a/src/tools/qunicodetables.cpp
+++ b/src/tools/qunicodetables.cpp
@@ -239,7 +239,7 @@ print "#ifndef QT_NO_UNICODETABLES\n\n";
# Print pages...
#
-print "const Q_UINT8 TQUnicodeTables::unicode_info[] = {";
+print "const TQ_UINT8 TQUnicodeTables::unicode_info[] = {";
print $rowtable_txt;
$size += 256;
print "\n\n";
@@ -252,7 +252,7 @@ print "// $size bytes\n\n";
$rowtable_txt = "";
$row_txt = "";
$table_txt =
- "const Q_UINT16 TQUnicodeTables::decomposition_map[] = {\n 0,\n";
+ "const TQ_UINT16 TQUnicodeTables::decomposition_map[] = {\n 0,\n";
$pos = 1;
for $row ( 0..255 ) {
$nonzero=0;
@@ -286,7 +286,7 @@ for $row ( 0..255 ) {
#
print "$table_txt\n};\n\n";
-print "const Q_UINT16 TQUnicodeTables::decomposition_info[] = {";
+print "const TQ_UINT16 TQUnicodeTables::decomposition_info[] = {";
print "$rowtable_txt\n";
$size += 512;
print $row_txt;
@@ -302,7 +302,7 @@ $pos = 1;
$rowtable_txt = "";
$row_txt = "";
$table_txt =
- "const Q_UINT16 TQUnicodeTables::ligature_map[] = {\n 0,\n";
+ "const TQ_UINT16 TQUnicodeTables::ligature_map[] = {\n 0,\n";
for $lig_row ( 0..255 ) {
$nonzero=0;
$txt = "";
@@ -350,7 +350,7 @@ for $lig_row ( 0..255 ) {
# Print ligature tables
#
print "$table_txt\n};\n\n";
-print "const Q_UINT16 TQUnicodeTables::ligature_info[] = {";
+print "const TQ_UINT16 TQUnicodeTables::ligature_info[] = {";
print "$rowtable_txt\n\n";
$size+=512;
print $row_txt;
@@ -392,7 +392,7 @@ for $dir_row ( 0..255 ) {
# Print pages...
#
-print "const Q_UINT8 TQUnicodeTables::direction_info[] = {";
+print "const TQ_UINT8 TQUnicodeTables::direction_info[] = {";
print "$rowtable_txt\n\n";
$size+=256;
print $row_txt;
@@ -427,7 +427,7 @@ for $combining_row ( 0..255 ) {
# Print pages...
#
-print "const Q_UINT8 TQUnicodeTables::combining_info[] = {";
+print "const TQ_UINT8 TQUnicodeTables::combining_info[] = {";
print "$rowtable_txt\n\n";
$size+=256;
print $row_txt;
@@ -478,7 +478,7 @@ for $row ( 0..255 ) {
# Print pages...
#
-print "const Q_UINT16 TQUnicodeTables::case_info[] = {";
+print "const TQ_UINT16 TQUnicodeTables::case_info[] = {";
print "$rowtable_txt\n\n";
$size+=512;
print $row_txt;
@@ -522,7 +522,7 @@ for $row ( 0..255 ) {
# Print pages...
#
-print "const Q_INT8 TQUnicodeTables::decimal_info[] = {";
+print "const TQ_INT8 TQUnicodeTables::decimal_info[] = {";
print "$rowtable_txt\n\n";
$size+=512;
print $row_txt;
@@ -560,7 +560,7 @@ for $row ( 0..255 ) {
# Print pages...
#
-print "const Q_UINT8 TQUnicodeTables::line_break_info[] = {";
+print "const TQ_UINT8 TQUnicodeTables::line_break_info[] = {";
print "$rowtable_txt\n\n";
$size+=512;
print $row_txt;
@@ -581,7 +581,7 @@ __END__
#ifndef QT_NO_UNICODETABLES
-const Q_UINT8 TQUnicodeTables::unicode_info[] = {
+const TQ_UINT8 TQUnicodeTables::unicode_info[] = {
1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24,
@@ -2401,7 +2401,7 @@ const Q_UINT8 TQUnicodeTables::unicode_info[] = {
// 14080 bytes
-const Q_UINT16 TQUnicodeTables::decomposition_map[] = {
+const TQ_UINT16 TQUnicodeTables::decomposition_map[] = {
0,
3, 0x00A0, 0x0020, 0,
16, 0x00A8, 0x0020, 0x0308, 0,
@@ -6003,7 +6003,7 @@ const Q_UINT16 TQUnicodeTables::decomposition_map[] = {
};
-const Q_UINT16 TQUnicodeTables::decomposition_info[] = {
+const TQ_UINT16 TQUnicodeTables::decomposition_info[] = {
1, 2, 3, 4, 5, 6, 7, 8,
8, 9, 10, 11, 12, 13, 14, 15,
16, 8, 8, 8, 8, 8, 8, 8,
@@ -7261,7 +7261,7 @@ const Q_UINT16 TQUnicodeTables::decomposition_info[] = {
// 67552 bytes
-const Q_UINT16 TQUnicodeTables::ligature_map[] = {
+const TQ_UINT16 TQUnicodeTables::ligature_map[] = {
0,
5567, 0,
5552, 0,
@@ -7682,7 +7682,7 @@ const Q_UINT16 TQUnicodeTables::ligature_map[] = {
};
-const Q_UINT16 TQUnicodeTables::ligature_info[] = {
+const TQ_UINT16 TQUnicodeTables::ligature_info[] = {
1, 2, 3, 4, 5, 6, 7, 8,
8, 9, 10, 11, 12, 13, 8, 14,
15, 8, 8, 8, 8, 8, 8, 8,
@@ -8446,7 +8446,7 @@ const Q_UINT16 TQUnicodeTables::ligature_info[] = {
// 14586 bytes
-const Q_UINT8 TQUnicodeTables::direction_info[] = {
+const TQ_UINT8 TQUnicodeTables::direction_info[] = {
1, 2, 3, 4, 5, 6, 7, 8,
2, 9, 10, 11, 12, 13, 14, 15,
16, 2, 2, 2, 2, 2, 17, 18,
@@ -9804,7 +9804,7 @@ const Q_UINT8 TQUnicodeTables::direction_info[] = {
// 25082 bytes
-const Q_UINT8 TQUnicodeTables::combining_info[] = {
+const TQ_UINT8 TQUnicodeTables::combining_info[] = {
1, 1, 1, 2, 3, 4, 5, 6,
1, 7, 8, 9, 10, 11, 12, 13,
14, 1, 1, 1, 1, 1, 1, 15,
@@ -10502,7 +10502,7 @@ const Q_UINT8 TQUnicodeTables::combining_info[] = {
// 30458 bytes
-const Q_UINT16 TQUnicodeTables::case_info[] = {
+const TQ_UINT16 TQUnicodeTables::case_info[] = {
1, 2, 3, 4, 5, 6, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -10902,7 +10902,7 @@ const Q_UINT16 TQUnicodeTables::case_info[] = {
};
// 36602 bytes
-const Q_INT8 TQUnicodeTables::decimal_info[] = {
+const TQ_INT8 TQUnicodeTables::decimal_info[] = {
1, 0, 0, 0, 0, 0, 2, 0,
0, 3, 3, 4, 3, 5, 6, 7,
8, 0, 0, 9, 0, 0, 0, 10,
@@ -11405,7 +11405,7 @@ const Q_INT8 TQUnicodeTables::decimal_info[] = {
#ifdef QT_NO_UNICODETABLES
-const Q_UINT8 TQUnicodeTables::latin1_line_break_info[] = {
+const TQ_UINT8 TQUnicodeTables::latin1_line_break_info[] = {
19, 19, 19, 19, 19, 19, 19, 19,
19, 15, 23, 19, 21, 22, 19, 19,
19, 19, 19, 19, 19, 19, 19, 19,
@@ -11442,7 +11442,7 @@ const Q_UINT8 TQUnicodeTables::latin1_line_break_info[] = {
#else
-const Q_UINT8 TQUnicodeTables::line_break_info[] = {
+const TQ_UINT8 TQUnicodeTables::line_break_info[] = {
1, 2, 3, 4, 5, 6, 7, 8,
2, 9, 10, 11, 12, 13, 14, 15,
16, 17, 2, 18, 2, 2, 19, 20,
@@ -12937,7 +12937,7 @@ const Q_UINT8 TQUnicodeTables::line_break_info[] = {
#ifndef QT_NO_UNICODETABLES
-const Q_UINT16 TQUnicodeTables::symmetricPairs[] = {
+const TQ_UINT16 TQUnicodeTables::symmetricPairs[] = {
0x0028, 0x0029, 0x003C, 0x003E, 0x005B, 0x005D, 0x007B, 0x007D,
0x00AB, 0x00BB, 0x2039, 0x203A, 0x2045, 0x2046, 0x207D, 0x207E,
0x208D, 0x208E, 0x2208, 0x220B, 0x2209, 0x220C, 0x220A, 0x220D,
@@ -12990,7 +12990,7 @@ const int TQUnicodeTables::symmetricPairsSize =
only include info for the first unicode range (latin1) when building
without unicode tables.
*/
-const Q_UINT8 TQUnicodeTables::unicode_info[] = {
+const TQ_UINT8 TQUnicodeTables::unicode_info[] = {
10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 10, 10, 10, 10, 10, 10,
10, 10, 10, 10, 10, 10, 10, 10,
diff --git a/src/tools/qunicodetables_p.h b/src/tools/qunicodetables_p.h
index 07d4a599..7cc4cc6e 100644
--- a/src/tools/qunicodetables_p.h
+++ b/src/tools/qunicodetables_p.h
@@ -61,21 +61,21 @@
class TQUnicodeTables {
public:
- static const Q_UINT8 unicode_info[];
+ static const TQ_UINT8 unicode_info[];
#ifndef QT_NO_UNICODETABLES
- static const Q_UINT16 decomposition_map[];
- static const Q_UINT16 decomposition_info[];
- static const Q_UINT16 ligature_map[];
- static const Q_UINT16 ligature_info[];
- static const Q_UINT8 direction_info[];
- static const Q_UINT8 combining_info[];
- static const Q_UINT16 case_info[];
- static const Q_INT8 decimal_info[];
- static const Q_UINT16 symmetricPairs[];
+ static const TQ_UINT16 decomposition_map[];
+ static const TQ_UINT16 decomposition_info[];
+ static const TQ_UINT16 ligature_map[];
+ static const TQ_UINT16 ligature_info[];
+ static const TQ_UINT8 direction_info[];
+ static const TQ_UINT8 combining_info[];
+ static const TQ_UINT16 case_info[];
+ static const TQ_INT8 decimal_info[];
+ static const TQ_UINT16 symmetricPairs[];
static const int symmetricPairsSize;
- static const Q_UINT8 line_break_info[];
+ static const TQ_UINT8 line_break_info[];
#else
- static const Q_UINT8 latin1_line_break_info[];
+ static const TQ_UINT8 latin1_line_break_info[];
#endif
static const unsigned char otherScripts[];
static const unsigned char indicScripts[];
@@ -117,7 +117,7 @@ inline TQChar lower( const TQChar &c )
uc += c.cell();
if (TQUnicodeTables::unicode_info[uc] != TQChar::Letter_Uppercase || !ci)
return c;
- Q_UINT16 lower = TQUnicodeTables::case_info[(ci<<8)+cell];
+ TQ_UINT16 lower = TQUnicodeTables::case_info[(ci<<8)+cell];
return lower ? TQChar(lower) : c;
#else
if ( c.row() )
@@ -136,7 +136,7 @@ inline TQChar upper( const TQChar &c )
uc += c.cell();
if (TQUnicodeTables::unicode_info[uc] != TQChar::Letter_Lowercase || !ci)
return c;
- Q_UINT16 upper = TQUnicodeTables::case_info[(ci<<8)+cell];
+ TQ_UINT16 upper = TQUnicodeTables::case_info[(ci<<8)+cell];
return upper ? TQChar(upper) : c;
#else
if ( c.row() )
diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp
index 64ec7a3b..36472176 100644
--- a/src/tools/quuid.cpp
+++ b/src/tools/quuid.cpp
@@ -209,11 +209,11 @@ TQString TQUuid::toString() const
*/
TQDataStream &operator<<( TQDataStream &s, const TQUuid &id )
{
- s << (Q_UINT32)id.data1;
- s << (Q_UINT16)id.data2;
- s << (Q_UINT16)id.data3;
+ s << (TQ_UINT32)id.data1;
+ s << (TQ_UINT16)id.data2;
+ s << (TQ_UINT16)id.data3;
for (int i = 0; i < 8; i++ )
- s << (Q_UINT8)id.data4[i];
+ s << (TQ_UINT8)id.data4[i];
return s;
}
@@ -223,9 +223,9 @@ TQDataStream &operator<<( TQDataStream &s, const TQUuid &id )
*/
TQDataStream &operator>>( TQDataStream &s, TQUuid &id )
{
- Q_UINT32 u32;
- Q_UINT16 u16;
- Q_UINT8 u8;
+ TQ_UINT32 u32;
+ TQ_UINT16 u16;
+ TQ_UINT8 u8;
s >> u32;
id.data1 = u32;
s >> u16;
diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp
index a14eec3a..0762e6c7 100644
--- a/src/widgets/qdialogbuttons.cpp
+++ b/src/widgets/qdialogbuttons.cpp
@@ -56,14 +56,14 @@ struct TQDialogButtonsPrivate
TQMap text;
TQMap buttons;
TQGuardedPtr custom;
- Q_UINT32 enabled, visible;
+ TQ_UINT32 enabled, visible;
TQDialogButtons::Button def;
TQt::Orientation orient;
bool questionMode;
};
#ifndef QT_NO_DIALOG
-TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, Q_UINT32 buttons,
+TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 buttons,
Orientation orient, const char *name ) : TQWidget(parent, name)
{
init(buttons, orient);
@@ -74,14 +74,14 @@ TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, Q_UINT32 bu
}
#endif // QT_NO_DIALOG
-TQDialogButtons::TQDialogButtons(TQWidget *parent, Q_UINT32 buttons,
+TQDialogButtons::TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons,
Orientation orient, const char *name ) : TQWidget(parent, name)
{
init(buttons, orient);
}
void
-TQDialogButtons::init(Q_UINT32 buttons, Orientation orient)
+TQDialogButtons::init(TQ_UINT32 buttons, Orientation orient)
{
if(buttons == All) {
tqWarning("TQDialogButtons: cannot specify All by itself!");
diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h
index 0e7c20d6..d41c6bea 100644
--- a/src/widgets/qdialogbuttons_p.h
+++ b/src/widgets/qdialogbuttons_p.h
@@ -55,10 +55,10 @@ TQDialogButtons : public TQWidget
public:
enum Button { None=0, Accept=0x01, Reject=0x02, Help=0x04, Apply=0x08, All=0x10, Abort=0x20, Retry=0x40, Ignore=0x80 };
#ifndef QT_NO_DIALOG
- TQDialogButtons(TQDialog *parent, bool autoConnect = TRUE, Q_UINT32 buttons = Accept | Reject,
+ TQDialogButtons(TQDialog *parent, bool autoConnect = TRUE, TQ_UINT32 buttons = Accept | Reject,
Orientation orient = Horizontal, const char *name = NULL);
#endif // QT_NO_DIALOG
- TQDialogButtons(TQWidget *parent, Q_UINT32 buttons = Accept | Reject,
+ TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons = Accept | Reject,
Orientation orient = Horizontal, const char *name = NULL);
~TQDialogButtons();
@@ -112,7 +112,7 @@ signals:
private:
TQDialogButtonsPrivate *d;
- void init(Q_UINT32, Orientation);
+ void init(TQ_UINT32, Orientation);
};
#endif //QT_NO_DIALOGBUTTONS
#endif //TQDIALOGBUTTONS_P_H
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index d2f20791..d431f21b 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -307,18 +307,18 @@ void TQAlphaWidget::alphaBlend()
switch( front.depth() ) {
case 32:
{
- Q_UINT32** md = (Q_UINT32**)mixed.jumpTable();
- Q_UINT32** bd = (Q_UINT32**)back.jumpTable();
- Q_UINT32** fd = (Q_UINT32**)front.jumpTable();
+ TQ_UINT32** md = (TQ_UINT32**)mixed.jumpTable();
+ TQ_UINT32** bd = (TQ_UINT32**)back.jumpTable();
+ TQ_UINT32** fd = (TQ_UINT32**)front.jumpTable();
for (int sy = 0; sy < sh; sy++ ) {
- Q_UINT32* bl = ((Q_UINT32*)bd[sy]);
- Q_UINT32* fl = ((Q_UINT32*)fd[sy]);
+ TQ_UINT32* bl = ((TQ_UINT32*)bd[sy]);
+ TQ_UINT32* fl = ((TQ_UINT32*)fd[sy]);
for (int sx = 0; sx < sw; sx++ ) {
- Q_UINT32 bp = bl[sx];
- Q_UINT32 fp = fl[sx];
+ TQ_UINT32 bp = bl[sx];
+ TQ_UINT32 fp = fl[sx];
- ((Q_UINT32*)(md[sy]))[sx] = tqRgb(int (tqRed(bp)*ia + tqRed(fp)*alpha),
+ ((TQ_UINT32*)(md[sy]))[sx] = tqRgb(int (tqRed(bp)*ia + tqRed(fp)*alpha),
int (tqGreen(bp)*ia + tqGreen(fp)*alpha),
int (tqBlue(bp)*ia + tqBlue(fp)*alpha) );
}
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index abce3ae8..00ab8cdc 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -333,7 +333,7 @@ void HelpDialog::loadIndexFile()
editIndex->setEnabled(FALSE);
TQDataStream ds( &indexFile );
- Q_UINT32 fileAges;
+ TQ_UINT32 fileAges;
ds >> fileAges;
if ( fileAges != getFileAges() ) {
indexFile.close();
@@ -376,12 +376,12 @@ void HelpDialog::loadIndexFile()
editIndex->setEnabled(TRUE);
}
-Q_UINT32 HelpDialog::getFileAges()
+TQ_UINT32 HelpDialog::getFileAges()
{
TQStringList addDocuFiles = Config::configuration()->docFiles();
TQStringList::const_iterator i = addDocuFiles.begin();
- Q_UINT32 fileAges = 0;
+ TQ_UINT32 fileAges = 0;
for( ; i != addDocuFiles.end(); ++i ) {
TQFileInfo fi( *i );
if ( fi.exists() )
@@ -406,7 +406,7 @@ void HelpDialog::buildKeywordDB()
processEvents();
TQValueList lst;
- Q_UINT32 fileAges = 0;
+ TQ_UINT32 fileAges = 0;
for( i = addDocuFiles.begin(); i != addDocuFiles.end(); i++ ){
TQFile file( *i );
if ( !file.exists() ) {
@@ -497,7 +497,7 @@ void HelpDialog::getAllContents()
}
TQDataStream ds( &contentFile );
- Q_UINT32 fileAges;
+ TQ_UINT32 fileAges;
ds >> fileAges;
if ( fileAges != getFileAges() ) {
contentFile.close();
@@ -520,7 +520,7 @@ void HelpDialog::buildContentDict()
{
TQStringList docuFiles = Config::configuration()->docFiles();
- Q_UINT32 fileAges = 0;
+ TQ_UINT32 fileAges = 0;
for( TQStringList::iterator it = docuFiles.begin(); it != docuFiles.end(); it++ ) {
TQFile file( *it );
if ( !file.exists() ) {
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index ecb3bf3e..08db2fc2 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -144,7 +144,7 @@ private:
typedef TQValueList ContentList;
void removeOldCacheFiles();
void buildKeywordDB();
- Q_UINT32 getFileAges();
+ TQ_UINT32 getFileAges();
void showIndexTopic();
void showBookmarkTopic();
void setupTitleMap();
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index 785f27bc..7a342892 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -59,8 +59,8 @@ TQDataStream &operator>>( TQDataStream &s, Document &l )
TQDataStream &operator<<( TQDataStream &s, const Document &l )
{
- s << (Q_INT16)l.docNumber;
- s << (Q_INT16)l.frequency;
+ s << (TQ_INT16)l.docNumber;
+ s << (TQ_INT16)l.frequency;
return s;
}
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 2bd32f20..b8a42173 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -54,8 +54,8 @@ struct Document {
bool operator>( const Document &doc ) const {
return frequency < doc.frequency;
}
- Q_INT16 docNumber;
- Q_INT16 frequency;
+ TQ_INT16 docNumber;
+ TQ_INT16 frequency;
};
TQDataStream &operator>>( TQDataStream &s, Document &l );
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index a30c72b0..9adf7830 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -72,7 +72,7 @@ private slots:
private:
TQSocket *socket;
TQProcess *proc;
- Q_UINT16 port;
+ TQ_UINT16 port;
TQString host, assistantCommand, pageBuffer;
bool opened;
};
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index b0fc0df3..4db090fb 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -230,7 +230,7 @@ void TQAssistantClient::openAssistant()
void TQAssistantClient::readPort()
{
TQString p = proc->readLineStdout();
- Q_UINT16 port = p.toUShort();
+ TQ_UINT16 port = p.toUShort();
if ( port == 0 ) {
emit error( tr( "Cannot connect to TQt Assistant." ) );
return;
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index 8954709c..ce8ffd2d 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -78,14 +78,14 @@ class AssistantServer : public TQServerSocket
public:
AssistantServer( TQObject* parent = 0 );
void newConnection( int socket );
- Q_UINT16 getPort() const;
+ TQ_UINT16 getPort() const;
signals:
void showLinkRequest( const TQString& );
void newConnect();
private:
- Q_UINT16 p;
+ TQ_UINT16 p;
};
@@ -127,7 +127,7 @@ AssistantServer::AssistantServer( TQObject *parent )
p = port();
}
-Q_UINT16 AssistantServer::getPort() const
+TQ_UINT16 AssistantServer::getPort() const
{
return p;
}
diff --git a/tools/designer/designer/listboxdnd.cpp b/tools/designer/designer/listboxdnd.cpp
index 11f38868..f4bf7305 100644
--- a/tools/designer/designer/listboxdnd.cpp
+++ b/tools/designer/designer/listboxdnd.cpp
@@ -195,11 +195,11 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
: TQStoredDrag( "qt/listboxitem", parent, name )
{
// ### FIX!
- TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
+ TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
TQDataStream stream( data, IO_WriteOnly );
stream << items.count();
- stream << (Q_UINT8) sendPtr; // just transfer item pointer; omit data
+ stream << (TQ_UINT8) sendPtr; // just transfer item pointer; omit data
TQListBoxItem * i = items.first();
@@ -207,7 +207,7 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
while ( i ) {
- stream << (Q_ULONG) i; //###FIX: demands sizeof(ulong) >= sizeof(void*)
+ stream << (TQ_ULONG) i; //###FIX: demands sizeof(ulong) >= sizeof(void*)
i = items.next();
}
@@ -216,21 +216,21 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
while ( i ) {
- Q_UINT8 b = 0;
+ TQ_UINT8 b = 0;
- b = (Q_UINT8) ( i->text() != TQString::null ); // does item have text ?
+ b = (TQ_UINT8) ( i->text() != TQString::null ); // does item have text ?
stream << b;
if ( b ) {
stream << i->text();
}
- b = (Q_UINT8) ( !!i->pixmap() ); // does item have a pixmap ?
+ b = (TQ_UINT8) ( !!i->pixmap() ); // does item have a pixmap ?
stream << b;
if ( b ) {
stream << ( *i->pixmap() );
}
- stream << (Q_UINT8) i->isSelectable();
+ stream << (TQ_UINT8) i->isSelectable();
i = items.next();
}
@@ -256,7 +256,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
int count = 0;
stream >> count;
- Q_UINT8 recievePtr = 0; // data contains just item pointers; no data
+ TQ_UINT8 recievePtr = 0; // data contains just item pointers; no data
stream >> recievePtr;
TQListBoxItem * item = 0;
@@ -265,7 +265,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
for( int i = 0; i < count; i++ ) {
- Q_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*)
+ TQ_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*)
stream >> p;
item = (TQListBoxItem *) p;
@@ -277,21 +277,21 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
for ( int i = 0; i < count; i++ ) {
- Q_UINT8 hasText = 0;
+ TQ_UINT8 hasText = 0;
TQString text;
stream >> hasText;
if ( hasText ) {
stream >> text;
}
- Q_UINT8 hasPixmap = 0;
+ TQ_UINT8 hasPixmap = 0;
TQPixmap pixmap;
stream >> hasPixmap;
if ( hasPixmap ) {
stream >> pixmap;
}
- Q_UINT8 isSelectable = 0;
+ TQ_UINT8 isSelectable = 0;
stream >> isSelectable;
if ( hasPixmap ) {
diff --git a/tools/designer/designer/listviewdnd.cpp b/tools/designer/designer/listviewdnd.cpp
index 49c7980f..a7b831d1 100644
--- a/tools/designer/designer/listviewdnd.cpp
+++ b/tools/designer/designer/listviewdnd.cpp
@@ -270,7 +270,7 @@ ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent,
: TQStoredDrag( "qt/listviewitem", parent, name )
{
// ### FIX!
- TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListViewItem ) * items.count() );
+ TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListViewItem ) * items.count() );
TQDataStream stream( data, IO_WriteOnly );
stream << items.count();
@@ -327,11 +327,11 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
int columns = item.listView()->columns();
stream << columns;
- Q_UINT8 b = 0;
+ TQ_UINT8 b = 0;
int i;
for ( i = 0; i < columns; i++ ) {
- b = (Q_UINT8) ( item.text( i ) != TQString::null ); // does column i have a string ?
+ b = (TQ_UINT8) ( item.text( i ) != TQString::null ); // does column i have a string ?
stream << b;
if ( b ) {
stream << item.text( i );
@@ -339,25 +339,25 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
}
for ( i = 0; i < columns; i++ ) {
- b = (Q_UINT8) ( !!item.pixmap( i ) ); // does column i have a pixmap ?
+ b = (TQ_UINT8) ( !!item.pixmap( i ) ); // does column i have a pixmap ?
stream << b;
if ( b ) {
stream << ( *item.pixmap( i ) );
}
}
- stream << (Q_UINT8) item.isOpen();
- stream << (Q_UINT8) item.isSelectable();
- stream << (Q_UINT8) item.isExpandable();
- stream << (Q_UINT8) item.dragEnabled();
- stream << (Q_UINT8) item.dropEnabled();
- stream << (Q_UINT8) item.isVisible();
+ stream << (TQ_UINT8) item.isOpen();
+ stream << (TQ_UINT8) item.isSelectable();
+ stream << (TQ_UINT8) item.isExpandable();
+ stream << (TQ_UINT8) item.dragEnabled();
+ stream << (TQ_UINT8) item.dropEnabled();
+ stream << (TQ_UINT8) item.isVisible();
for ( i = 0; i < columns; i++ ) {
- stream << (Q_UINT8) item.renameEnabled( i );
+ stream << (TQ_UINT8) item.renameEnabled( i );
}
- stream << (Q_UINT8) item.multiLinesEnabled();
+ stream << (TQ_UINT8) item.multiLinesEnabled();
stream << item.childCount();
if ( item.childCount() > 0 ) {
@@ -373,10 +373,10 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item )
{
- Q_INT32 columns;
+ TQ_INT32 columns;
stream >> columns;
- Q_UINT8 b = 0;
+ TQ_UINT8 b = 0;
TQString text;
int i;
diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp
index 84e75034..fa763b54 100644
--- a/tools/designer/designer/menubareditor.cpp
+++ b/tools/designer/designer/menubareditor.cpp
@@ -66,9 +66,9 @@ MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
const char * name )
: TQStoredDrag( "qt/menubareditoritemptr", parent, name )
{
- TQByteArray data( sizeof( Q_LONG ) );
+ TQByteArray data( sizeof( TQ_LONG ) );
TQDataStream stream( data, IO_WriteOnly );
- stream << ( Q_LONG ) item;
+ stream << ( TQ_LONG ) item;
setEncodedData( data );
}
@@ -85,7 +85,7 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
if ( !data.size() )
return FALSE;
- Q_LONG p = 0;
+ TQ_LONG p = 0;
stream >> p;
*i = ( MenuBarEditorItem *) p;
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index 719e147d..9d95f54d 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -72,9 +72,9 @@ PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * it
TQWidget * parent, const char * name )
: TQStoredDrag( "qt/popupmenueditoritemptr", parent, name )
{
- TQByteArray data( sizeof( Q_LONG ) );
+ TQByteArray data( sizeof( TQ_LONG ) );
TQDataStream stream( data, IO_WriteOnly );
- stream << ( Q_LONG ) item;
+ stream << ( TQ_LONG ) item;
setEncodedData( data );
}
@@ -91,7 +91,7 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem **
if ( !data.size() )
return FALSE;
- Q_LONG p = 0;
+ TQ_LONG p = 0;
stream >> p;
*i = ( PopupMenuEditorItem *) p;
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index 23969798..fa3085e5 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -198,22 +198,22 @@ int UibIndexMap::find( const TQString& name, int deflt ) const
}
}
-static void packUInt16( TQDataStream& out, Q_UINT16 n )
+static void packUInt16( TQDataStream& out, TQ_UINT16 n )
{
if ( n < 255 ) {
- out << (Q_UINT8) n;
+ out << (TQ_UINT8) n;
} else {
- out << (Q_UINT8) 255;
+ out << (TQ_UINT8) 255;
out << n;
}
}
-static void packUInt32( TQDataStream& out, Q_UINT32 n )
+static void packUInt32( TQDataStream& out, TQ_UINT32 n )
{
if ( n < 65535 ) {
- out << (Q_UINT16) n;
+ out << (TQ_UINT16) n;
} else {
- out << (Q_UINT16) 65535;
+ out << (TQ_UINT16) 65535;
out << n;
}
}
@@ -251,7 +251,7 @@ static void packVariant( UibStrTable& strings, TQDataStream& out,
{
TQStringList::ConstIterator s;
- Q_UINT8 type = value.type();
+ TQ_UINT8 type = value.type();
if ( tag == "pixmap" ) {
type = TQVariant::Pixmap;
} else if ( tag == "image" ) {
@@ -300,7 +300,7 @@ static void packVariant( UibStrTable& strings, TQDataStream& out,
packUInt32( out, value.asInt() );
break;
case TQVariant::Bool:
- out << (Q_UINT8) value.asBool();
+ out << (TQ_UINT8) value.asBool();
break;
case TQVariant::Double:
out << value.asDouble();
@@ -340,8 +340,8 @@ static void outputProperty( TQMap& buddies, int objectNo,
if ( tag == "font" ) {
TQString family;
- Q_UINT16 pointSize = 65535;
- Q_UINT8 fontFlags = 0;
+ TQ_UINT16 pointSize = 65535;
+ TQ_UINT8 fontFlags = 0;
TQDomElement g = f.firstChild().toElement();
while ( !g.isNull() ) {
@@ -351,7 +351,7 @@ static void outputProperty( TQMap& buddies, int objectNo,
family = text;
} else if ( g.tagName() == "pointsize" ) {
fontFlags |= Font_PointSize;
- pointSize = (Q_UINT16) text.toUInt();
+ pointSize = (TQ_UINT16) text.toUInt();
} else {
if ( g.firstChild().toText().data().toInt() != 0 ) {
if ( g.tagName() == "bold" ) {
@@ -368,7 +368,7 @@ static void outputProperty( TQMap& buddies, int objectNo,
g = g.nextSibling().toElement();
}
- out << (Q_UINT8) Object_FontProperty;
+ out << (TQ_UINT8) Object_FontProperty;
packCString( strings, out, name );
out << fontFlags;
if ( fontFlags & Font_Family )
@@ -376,7 +376,7 @@ static void outputProperty( TQMap& buddies, int objectNo,
if ( fontFlags & Font_PointSize )
packUInt16( out, pointSize );
} else if ( tag == "palette" ) {
- out << (Q_UINT8) Object_PaletteProperty;
+ out << (TQ_UINT8) Object_PaletteProperty;
packCString( strings, out, name );
TQDomElement g = f.firstChild().toElement();
@@ -385,25 +385,25 @@ static void outputProperty( TQMap& buddies, int objectNo,
while ( !h.isNull() ) {
value = DomTool::elementToVariant( h, TQt::gray );
if ( h.tagName() == "color" ) {
- out << (Q_UINT8) Palette_Color;
+ out << (TQ_UINT8) Palette_Color;
out << value.asColor();
} else if ( h.tagName() == "pixmap" ) {
- out << (Q_UINT8) Palette_Pixmap;
+ out << (TQ_UINT8) Palette_Pixmap;
packVariant( strings, out, value, "pixmap" );
}
h = h.nextSibling().toElement();
}
if ( g.tagName() == "active" ) {
- out << (Q_UINT8) Palette_Active;
+ out << (TQ_UINT8) Palette_Active;
} else if ( g.tagName() == "inactive" ) {
- out << (Q_UINT8) Palette_Inactive;
+ out << (TQ_UINT8) Palette_Inactive;
} else {
- out << (Q_UINT8) Palette_Disabled;
+ out << (TQ_UINT8) Palette_Disabled;
}
g = g.nextSibling().toElement();
}
- out << (Q_UINT8) Palette_End;
+ out << (TQ_UINT8) Palette_End;
} else {
value = DomTool::elementToVariant( f, value, comment );
if ( value.isValid() ) {
@@ -411,12 +411,12 @@ static void outputProperty( TQMap& buddies, int objectNo,
buddies[objectNo] += value.asString();
} else {
if ( tag == "string" ) {
- out << (Q_UINT8) Object_TextProperty;
+ out << (TQ_UINT8) Object_TextProperty;
packCString( strings, out, name );
packCString( strings, out, value.asString().utf8() );
packCString( strings, out, comment.utf8() );
} else {
- out << (Q_UINT8) Object_VariantProperty;
+ out << (TQ_UINT8) Object_VariantProperty;
packCString( strings, out, name );
packVariant( strings, out, value, tag );
}
@@ -437,7 +437,7 @@ static void outputGridCell( TQDataStream& out, TQDomElement elem )
rowspan = 1;
if ( column != 0 || row != 0 || colspan != 1 || rowspan != 1 ) {
- out << (Q_UINT8) Object_GridCell;
+ out << (TQ_UINT8) Object_GridCell;
packUInt16( out, column );
packUInt16( out, row );
packUInt16( out, colspan );
@@ -463,7 +463,7 @@ static void outputLayoutWidgetsSubLayout( TQMap& buddies,
while ( !f.isNull() ) {
TQString tag = f.tagName();
if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) {
- out << (Q_UINT8) Object_SubLayout;
+ out << (TQ_UINT8) Object_SubLayout;
subLayoutNo = outputObject( buddies, objects, strings, out, f,
layoutForTag(tag) );
} else if ( tag == "property" ) {
@@ -484,7 +484,7 @@ static void outputLayoutWidgetsSubLayout( TQMap& buddies,
out.device()->at( out.device()->at() - 1 );
outputGridCell( out, elem );
outputProperty( buddies, subLayoutNo, strings, out, nameElem );
- out << (Q_UINT8) Object_End;
+ out << (TQ_UINT8) Object_End;
objects.setName( subLayoutNo, name );
}
@@ -498,7 +498,7 @@ static int outputObject( TQMap& buddies,
bool isTQObject = !className.isEmpty();
if ( className == "TQToolBar" )
- out << (Q_UINT8) elem.attribute( "dock", "0" ).toInt();
+ out << (TQ_UINT8) elem.attribute( "dock", "0" ).toInt();
if ( className == "TQWidget" )
className = elem.attribute( "class", className ).latin1();
@@ -525,50 +525,50 @@ static int outputObject( TQMap& buddies,
TQString actionName = f.attribute( "name" );
int no = objects.find( actionName );
if ( no != -1 ) {
- out << (Q_UINT8) Object_ActionRef;
+ out << (TQ_UINT8) Object_ActionRef;
packUInt16( out, no );
}
} else {
- out << (Q_UINT8) Object_SubAction;
+ out << (TQ_UINT8) Object_SubAction;
outputObject( buddies, objects, strings, out, f, "TQAction" );
}
} else if ( tag == "actiongroup" ) {
- out << (Q_UINT8) Object_SubAction;
+ out << (TQ_UINT8) Object_SubAction;
outputObject( buddies, objects, strings, out, f, "TQActionGroup" );
} else if ( tag == "attribute" ) {
- out << (Q_UINT8) Object_Attribute;
+ out << (TQ_UINT8) Object_Attribute;
outputProperty( buddies, objectNo, strings, out, f );
} else if ( tag == "column" ) {
- out << (Q_UINT8) Object_Column;
+ out << (TQ_UINT8) Object_Column;
outputObject( buddies, objects, strings, out, f );
} else if ( tag == "event" ) {
- out << (Q_UINT8) Object_Event;
+ out << (TQ_UINT8) Object_Event;
packCString( strings, out, f.attribute("name").latin1() );
packVariant( strings, out,
TQStringList::split(',', f.attribute("functions")) );
} else if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) {
- out << (Q_UINT8) Object_SubLayout;
+ out << (TQ_UINT8) Object_SubLayout;
outputObject( buddies, objects, strings, out, f,
layoutForTag(tag) );
} else if ( tag == "item" ) {
if ( elem.tagName() == "menubar" ) {
- out << (Q_UINT8) Object_MenuItem;
+ out << (TQ_UINT8) Object_MenuItem;
packCString( strings, out, f.attribute("name").latin1() );
packCString( strings, out, f.attribute("text").utf8() );
outputObject( buddies, objects, strings, out, f );
} else {
- out << (Q_UINT8) Object_Item;
+ out << (TQ_UINT8) Object_Item;
outputObject( buddies, objects, strings, out, f );
}
} else if ( tag == "property" ) {
outputProperty( buddies, objectNo, strings, out, f );
} else if ( tag == "row" ) {
- out << (Q_UINT8) Object_Row;
+ out << (TQ_UINT8) Object_Row;
outputObject( buddies, objects, strings, out, f );
} else if ( tag == "separator" ) {
- out << (Q_UINT8) Object_Separator;
+ out << (TQ_UINT8) Object_Separator;
} else if ( tag == "spacer" ) {
- out << (Q_UINT8) Object_Spacer;
+ out << (TQ_UINT8) Object_Spacer;
outputObject( buddies, objects, strings, out, f );
} else if ( tag == "widget" ) {
if ( f.attribute("class") == "TQLayoutWidget" &&
@@ -576,13 +576,13 @@ static int outputObject( TQMap& buddies,
outputLayoutWidgetsSubLayout( buddies, objects, strings, out,
f );
} else {
- out << (Q_UINT8) Object_SubWidget;
+ out << (TQ_UINT8) Object_SubWidget;
outputObject( buddies, objects, strings, out, f, "TQWidget" );
}
}
f = f.nextSibling().toElement();
}
- out << (Q_UINT8) Object_End;
+ out << (TQ_UINT8) Object_End;
if ( isTQObject )
objects.setName( objectNo,
DomTool::readProperty(elem, "name", "").asString() );
@@ -593,7 +593,7 @@ static void outputBlock( TQDataStream& out, BlockTag tag,
const TQByteArray& data )
{
if ( !data.isEmpty() ) {
- out << (Q_UINT8) tag;
+ out << (TQ_UINT8) tag;
packByteArray( out, data );
}
}
@@ -626,9 +626,9 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
UibIndexMap objects;
int widgetNo = -1;
TQCString className;
- Q_INT16 defaultMargin = -32768;
- Q_INT16 defaultSpacing = -32768;
- Q_UINT8 introFlags = 0;
+ TQ_INT16 defaultMargin = -32768;
+ TQ_INT16 defaultSpacing = -32768;
+ TQ_UINT8 introFlags = 0;
TQDomElement elem = doc.firstChild().toElement().firstChild().toElement();
while ( !elem.isNull() ) {
@@ -834,7 +834,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
TQString signal = UibHack::normalize( argMap["signal"] );
TQString slot = UibHack::normalize( argMap["slot"] );
- Q_UINT8 connectionFlags = 0;
+ TQ_UINT8 connectionFlags = 0;
if ( language != prevLanguage )
connectionFlags |= Connection_Language;
if ( senderNo != prevSenderNo )
@@ -880,9 +880,9 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
}
out << UibMagic;
- out << (Q_UINT8) '\n';
- out << (Q_UINT8) '\r';
- out << (Q_UINT8) out.version();
+ out << (TQ_UINT8) '\n';
+ out << (TQ_UINT8) '\r';
+ out << (TQ_UINT8) out.version();
outputBlock( out, Block_Strings, strings.block() );
outputBlock( out, Block_Intro, introBlock );
outputBlock( out, Block_Images, imagesBlock );
@@ -896,5 +896,5 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
outputBlock( out, Block_Functions, functionsBlock );
outputBlock( out, Block_Buddies, buddiesBlock );
outputBlock( out, Block_Connections, connectionsBlock );
- out << (Q_UINT8) Block_End;
+ out << (TQ_UINT8) Block_End;
}
diff --git a/tools/designer/shared/uib.h b/tools/designer/shared/uib.h
index d4b09add..47c6f08f 100644
--- a/tools/designer/shared/uib.h
+++ b/tools/designer/shared/uib.h
@@ -36,7 +36,7 @@
#include
-const Q_UINT32 UibMagic = 0xb77c61d8;
+const TQ_UINT32 UibMagic = 0xb77c61d8;
enum BlockTag { Block_End = '$', Block_Actions = 'A', Block_Buddies = 'B',
Block_Connections = 'C', Block_Functions = 'F',
@@ -108,7 +108,7 @@ inline int UibStrTable::insertCString( const char *cstr )
return i;
}
for ( i = 0; i < len + 1; i++ )
- out << (Q_UINT8) cstr[i];
+ out << (TQ_UINT8) cstr[i];
return nextPos;
}
}
@@ -117,7 +117,7 @@ inline int UibStrTable::insertString( const TQString& str )
{
if ( str.contains('\0') || str[0] == TQChar(0x7f) ) {
int nextPos = table.size();
- out << (Q_UINT8) 0x7f;
+ out << (TQ_UINT8) 0x7f;
out << str;
return nextPos;
} else {
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index 02cdcaa7..5c564c9d 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -1383,7 +1383,7 @@ void Uic::createFormImpl( const TQDomElement &e )
2. If the type is 'bool', we return 'FALSE'.
3. If the type is 'unsigned long' or
- 'Q_UINT16' or 'double' or similar, we
+ 'TQ_UINT16' or 'double' or similar, we
return '0'.
4. If the type is 'Foo *', we return '0'.
diff --git a/tools/designer/uilib/ntqwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h
index 4213199c..99095d07 100644
--- a/tools/designer/uilib/ntqwidgetfactory.h
+++ b/tools/designer/uilib/ntqwidgetfactory.h
@@ -107,8 +107,8 @@ private:
TQString translate( const char *sourceText, const char *comment = "" );
TQString translate( const TQString& sourceText, const TQString& comment = TQString::null );
- void unpackUInt16( TQDataStream& in, Q_UINT16& n );
- void unpackUInt32( TQDataStream& in, Q_UINT32& n );
+ void unpackUInt16( TQDataStream& in, TQ_UINT16& n );
+ void unpackUInt32( TQDataStream& in, TQ_UINT32& n );
void unpackByteArray( TQDataStream& in, TQByteArray& array );
void unpackCString( const UibStrTable& strings, TQDataStream& in,
TQCString& cstr );
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index e126e937..9cb6eeaa 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -333,7 +333,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
// If we have no GUI, we only want to load the code
if ( tqApp->type() != TQApplication::Tty ) {
TQIODevice::Offset start = dev->at();
- Q_UINT32 magic;
+ TQ_UINT32 magic;
TQDataStream in( dev );
in >> magic;
if ( magic == UibMagic ) {
@@ -505,9 +505,9 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
return w;
}
-void TQWidgetFactory::unpackUInt16( TQDataStream& in, Q_UINT16& n )
+void TQWidgetFactory::unpackUInt16( TQDataStream& in, TQ_UINT16& n )
{
- Q_UINT8 half;
+ TQ_UINT8 half;
in >> half;
if ( half == 255 ) {
in >> n;
@@ -516,9 +516,9 @@ void TQWidgetFactory::unpackUInt16( TQDataStream& in, Q_UINT16& n )
}
}
-void TQWidgetFactory::unpackUInt32( TQDataStream& in, Q_UINT32& n )
+void TQWidgetFactory::unpackUInt32( TQDataStream& in, TQ_UINT32& n )
{
- Q_UINT16 half;
+ TQ_UINT16 half;
in >> half;
if ( half == 65535 ) {
in >> n;
@@ -529,7 +529,7 @@ void TQWidgetFactory::unpackUInt32( TQDataStream& in, Q_UINT32& n )
void TQWidgetFactory::unpackByteArray( TQDataStream& in, TQByteArray& array )
{
- Q_UINT32 size;
+ TQ_UINT32 size;
unpackUInt32( in, size );
array.resize( size );
in.readRawBytes( array.data(), size );
@@ -538,7 +538,7 @@ void TQWidgetFactory::unpackByteArray( TQDataStream& in, TQByteArray& array )
void TQWidgetFactory::unpackCString( const UibStrTable& strings, TQDataStream& in,
TQCString& cstr )
{
- Q_UINT32 n;
+ TQ_UINT32 n;
unpackUInt32( in, n );
cstr = strings.asCString( n );
}
@@ -546,7 +546,7 @@ void TQWidgetFactory::unpackCString( const UibStrTable& strings, TQDataStream& i
void TQWidgetFactory::unpackString( const UibStrTable& strings, TQDataStream& in,
TQString& str )
{
- Q_UINT32 n;
+ TQ_UINT32 n;
unpackUInt32( in, n );
str = strings.asString( n );
}
@@ -564,14 +564,14 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i
TQVariant& value )
{
TQString imageName;
- Q_UINT32 number;
- Q_UINT16 count;
- Q_UINT16 x;
- Q_UINT16 y;
- Q_UINT16 width;
- Q_UINT16 height;
- Q_UINT8 bit;
- Q_UINT8 type;
+ TQ_UINT32 number;
+ TQ_UINT16 count;
+ TQ_UINT16 x;
+ TQ_UINT16 y;
+ TQ_UINT16 width;
+ TQ_UINT16 height;
+ TQ_UINT8 bit;
+ TQ_UINT8 type;
in >> type;
@@ -672,11 +672,11 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
bool vertical = FALSE;
int w = 0;
int h = 0;
- Q_UINT16 column = 0;
- Q_UINT16 row = 0;
- Q_UINT16 colspan = 1;
- Q_UINT16 rowspan = 1;
- Q_UINT8 objectTag;
+ TQ_UINT16 column = 0;
+ TQ_UINT16 row = 0;
+ TQ_UINT16 colspan = 1;
+ TQ_UINT16 rowspan = 1;
+ TQ_UINT8 objectTag;
in >> objectTag;
while ( !in.atEnd() && objectTag != Object_End ) {
@@ -738,7 +738,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
TQVariant value;
TQCString comment;
TQString str;
- Q_UINT8 objectTag;
+ TQ_UINT8 objectTag;
in >> objectTag;
while ( !in.atEnd() && objectTag != Object_End ) {
@@ -794,7 +794,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
TQCString name;
TQVariant value;
TQCString comment;
- Q_UINT8 objectTag;
+ TQ_UINT8 objectTag;
TQListView *listView = 0;
if ( parent != 0 && parent->inherits("TQListView") )
@@ -885,8 +885,8 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects,
{
TQCString name;
TQCString text;
- Q_UINT16 actionNo;
- Q_UINT8 objectTag;
+ TQ_UINT16 actionNo;
+ TQ_UINT8 objectTag;
unpackCString( strings, in, name );
unpackCString( strings, in, text );
@@ -963,7 +963,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
widget = ((TQMainWindow *) parent)->menuBar();
obj = widget;
} else if ( className == "TQToolBar" ) {
- Q_UINT8 dock;
+ TQ_UINT8 dock;
in >> dock;
unpackCString( strings, in, className );
widget = new TQToolBar( TQString::null, (TQMainWindow *) parent,
@@ -985,14 +985,14 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
TQVariant value;
TQCString comment;
TQString str;
- Q_UINT16 actionNo;
+ TQ_UINT16 actionNo;
int metAttribute = 0;
- Q_UINT16 column = 0;
- Q_UINT16 row = 0;
- Q_UINT16 colspan = 1;
- Q_UINT16 rowspan = 1;
- Q_UINT8 paletteTag;
- Q_UINT8 objectTag;
+ TQ_UINT16 column = 0;
+ TQ_UINT16 row = 0;
+ TQ_UINT16 colspan = 1;
+ TQ_UINT16 rowspan = 1;
+ TQ_UINT8 paletteTag;
+ TQ_UINT8 objectTag;
in >> objectTag;
while ( !in.atEnd() && objectTag != Object_End ) {
@@ -1016,8 +1016,8 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
{
TQFont font;
TQString family;
- Q_UINT16 pointSize;
- Q_UINT8 fontFlags;
+ TQ_UINT16 pointSize;
+ TQ_UINT8 fontFlags;
unpackCString( strings, in, name );
in >> fontFlags;
@@ -1188,8 +1188,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
#define END_OF_BLOCK() \
( in.atEnd() || in.device()->at() >= nextBlock )
- Q_UINT8 lf;
- Q_UINT8 cr;
+ TQ_UINT8 lf;
+ TQ_UINT8 cr;
in >> lf;
in >> cr;
if ( lf != '\n' || cr != '\r' ) {
@@ -1197,7 +1197,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
return 0;
}
- Q_UINT8 qdatastreamVersion;
+ TQ_UINT8 qdatastreamVersion;
in >> qdatastreamVersion;
if ( (int) qdatastreamVersion > in.version() ) {
tqWarning( "Incompatible version of TQt" );
@@ -1209,8 +1209,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
TQObject **objects = 0;
int numObjects = 0;
- Q_UINT8 blockType;
- Q_UINT32 blockSize;
+ TQ_UINT8 blockType;
+ TQ_UINT32 blockSize;
in >> blockType;
while ( !in.atEnd() && blockType != Block_End ) {
@@ -1223,8 +1223,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
break;
case Block_Buddies:
{
- Q_UINT16 labelNo;
- Q_UINT16 buddyNo;
+ TQ_UINT16 labelNo;
+ TQ_UINT16 buddyNo;
do {
unpackUInt16( in, labelNo );
@@ -1239,11 +1239,11 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
case Block_Connections:
{
TQString language = "C++";
- Q_UINT16 senderNo = 0;
+ TQ_UINT16 senderNo = 0;
TQString signal = "clicked()";
- Q_UINT16 receiverNo = 0;
+ TQ_UINT16 receiverNo = 0;
TQString slot = "accept()";
- Q_UINT8 connectionFlags;
+ TQ_UINT8 connectionFlags;
do {
in >> connectionFlags;
@@ -1274,7 +1274,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
case Block_Images:
{
TQString format;
- Q_UINT32 length;
+ TQ_UINT32 length;
TQByteArray data;
Image image;
@@ -1290,10 +1290,10 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
break;
case Block_Intro:
{
- Q_INT16 defaultMargin;
- Q_INT16 defaultSpacing;
- Q_UINT16 maxObjects;
- Q_UINT8 introFlags;
+ TQ_INT16 defaultMargin;
+ TQ_INT16 defaultSpacing;
+ TQ_UINT16 maxObjects;
+ TQ_UINT8 introFlags;
in >> introFlags;
in >> defaultMargin;
@@ -1330,8 +1330,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
break;
case Block_Tabstops:
{
- Q_UINT16 beforeNo;
- Q_UINT16 afterNo;
+ TQ_UINT16 beforeNo;
+ TQ_UINT16 afterNo;
unpackUInt16( in, beforeNo );
while ( !END_OF_BLOCK() ) {
diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp
index 8d618221..0611058d 100644
--- a/tools/linguist/linguist/simtexth.cpp
+++ b/tools/linguist/linguist/simtexth.cpp
@@ -134,8 +134,8 @@ struct CoMatrix
words. Some operations are performed on words for more efficiency.
*/
union {
- Q_UINT8 b[52];
- Q_UINT32 w[13];
+ TQ_UINT8 b[52];
+ TQ_UINT32 w[13];
};
CoMatrix() { memset( b, 0, 52 ); }
|