16 files changed, 190 insertions, 190 deletions

diff --git a/doc/man/man3/qaxbase.3qt b/doc/man/man3/qaxbase.3qt
index 154031b51..22326f9a4 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. <center>.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<QVariant> const QValueList<QVariant>& QValueList<QVariant>& 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<QVariant> const QValueList<QVariant>& QValueList<QVariant>& 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
 </center>
diff --git a/doc/man/man3/qbuffer.3qt b/doc/man/man3/qbuffer.3qt
index c696de242..82d78bb09 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 (<a href="ntqfile.html#open">IO_WriteOnly</a> 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 c2627a8b5..b4c5222eb 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 '&#92;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 55d7e9a4f..fab7a5fab 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 b06be825b..aab1c83a5 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 a1b5c450b..94e822485 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 3835e421b..2666b7d34 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 0710e05e2..39573eb70 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 05a550fb1..6d087c344 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 '&#92;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 '&#92;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 fb6208e46..b1ff1ad39 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 5a26651d0..ef3c0871d 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 3d019e425..7fbb9757d 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 c552ba46e..2a643b61c 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 2a922fa1f..aaf0c39c1 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 1395b5fa5..00f736305 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 cc1c0b38c..99bd38a83 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<QString, QVariant> & 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.