summaryrefslogtreecommitdiffstats
path: root/src/tools/qlocale.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-07 21:58:34 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-07 21:58:34 -0500
commitc740211ffba3330d951f4c3ddefea8edf23a01cd (patch)
tree0a8b7641d3c5b576d18a2f7912c75fc600f494e2 /src/tools/qlocale.cpp
parent8a4eacb6185de3653f6ae401c352aef833a9e72a (diff)
downloadtqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.tar.gz
tqt3-c740211ffba3330d951f4c3ddefea8edf23a01cd.zip
Automated update from Qt3
Diffstat (limited to 'src/tools/qlocale.cpp')
-rw-r--r--src/tools/qlocale.cpp18
1 files changed, 9 insertions, 9 deletions
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. */