Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

1 files changed, 16 insertions, 16 deletions

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;