Automated update from Qt3

5 files changed, 15 insertions, 15 deletions

diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index bc8cb99d8..7b54c340a 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -147,7 +147,7 @@
 #  define Q_OS_QNX6
 #elif defined(__QNX__)
 #  define Q_OS_QNX
-#elif defined(_SETQUENT_)
+#elif defined(_SEQUENT_)
 #  define Q_OS_DYNIX
 #elif defined(_SCO_DS)                   /* SCO OpenServer 5 + GCC */
 #  define Q_OS_SCO
diff --git a/src/tools/ntqptrqueue.h b/src/tools/ntqptrqueue.h
index 0c1bd5e6b..0f3cbbd34 100644
--- a/src/tools/ntqptrqueue.h
+++ b/src/tools/ntqptrqueue.h
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#ifndef TQPTRTQUEUE_H
-#define TQPTRTQUEUE_H
+#ifndef TQPTRQUEUE_H
+#define TQPTRQUEUE_H
 
 #ifndef QT_H
 #include "ntqglist.h"
@@ -91,4 +91,4 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtrCollection::
 #define TQQueue TQPtrQueue
 #endif
 
-#endif // TQPTRTQUEUE_H
+#endif // TQPTRQUEUE_H
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index 2b9a10bc4..22c20caee 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -3285,7 +3285,7 @@ TQString TQLocalePrivate::doubleToString(double d,
         else
             mode = 2;
 
-        /* This next bit is a bit tquirky. In DFExponent form, the precision
+        /* This next bit is a bit quirky. In DFExponent form, the precision
            is the number of digits after decpt. So that would suggest using
            mode=3 for qdtoa. But qdtoa behaves strangely when mode=3 and
            precision=0. So we get around this by using mode=2 and reasoning
@@ -3779,7 +3779,7 @@ TQ_ULLONG TQLocalePrivate::stringToUnsLongLong(TQString num, int base,
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
@@ -4027,7 +4027,7 @@ static TQ_LLONG qstrtoll(const char *nptr, const char **endptr, register int bas
  * #define No_leftright to omit left-right logic in fast floating-point
  *        computation of dtoa.
  * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3.
- * #define RND_PRODTQUOT to use rnd_prod and rnd_quot (assembly routines
+ * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines
  *        that use extended-precision instructions to compute rounded
  *        products and quotients) with IBM.
  * #define ROUND_BIASED for IEEE-format with biased rounding.
@@ -4245,7 +4245,7 @@ static inline void Storeinc(ULong *&a, const ULong &b, const ULong &c)
 #define ROUND_BIASED
 #endif
 
-#ifdef RND_PRODTQUOT
+#ifdef RND_PRODQUOT
 #define rounded_product(a,b) a = rnd_prod(a, b)
 #define rounded_quotient(a,b) a = rnd_quot(a, b)
 extern double rnd_prod(double, double), rnd_quot(double, double);
@@ -5139,7 +5139,7 @@ static double qstrtod(CONST char *s00, CONST char **se, bool *ok)
         rv = tens[k - 9] * rv + z;
     bd0 = 0;
     if (nd <= DBL_DIG
-#ifndef RND_PRODTQUOT
+#ifndef RND_PRODQUOT
         && FLT_ROUNDS == 1
 #endif
         ) {
@@ -5758,7 +5758,7 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt,
 
     int bbits, b2, b5, be, dig, i, ieps, ilim0,
         j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
-        try_tquick;
+        try_quick;
     int ilim = 0, ilim1 = 0, spec_case = 0;        /* pacify gcc */
     Long L;
 #ifndef Sudden_Underflow
@@ -5901,10 +5901,10 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt,
     }
     if (mode < 0 || mode > 9)
         mode = 0;
-    try_tquick = 1;
+    try_quick = 1;
     if (mode > 5) {
         mode -= 4;
-        try_tquick = 0;
+        try_quick = 0;
     }
     leftright = 1;
     switch(mode) {
@@ -5935,7 +5935,7 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt,
     *resultp = (char *) malloc(i + 1);
     s = s0 = *resultp;
 
-    if (ilim >= 0 && ilim <= Quick_max && try_tquick) {
+    if (ilim >= 0 && ilim <= Quick_max && try_quick) {
 
         /* Try to get by with floating-point arithmetic. */
 
diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp
index ed3c328be..d4f240f70 100644
--- a/src/tools/qsemaphore.cpp
+++ b/src/tools/qsemaphore.cpp
@@ -83,7 +83,7 @@
     accesses allowed is retrieved with available(), and the total
     number with total(). Note that the incrementing functions will
     block if there aren't enough available accesses. Use tryAccess()
-    if you want to actquire accesses without blocking.
+    if you want to acquire accesses without blocking.
 */
 
 
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 878f3e60f..a5408cac5 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -6493,7 +6493,7 @@ int TQString::compare( const TQString& s ) const
 
 #if !defined(CSTR_LESS_THAN)
 #define CSTR_LESS_THAN    1
-#define CSTR_ETQUAL        2
+#define CSTR_EQUAL        2
 #define CSTR_GREATER_THAN 3
 #endif