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

1 files changed, 16 insertions, 16 deletions

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.