diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
commit | f008adb5a77e094eaf6abf3fc0f36958e66896a5 (patch) | |
tree | 8e9244c4d4957c36be81e15b566b4aa5ea26c982 /kspread/valuecalc.cc | |
parent | 1210f27b660efb7b37ff43ec68763e85a403471f (diff) | |
download | koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.tar.gz koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.zip |
TQt4 port koffice
This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kspread/valuecalc.cc')
-rw-r--r-- | kspread/valuecalc.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/kspread/valuecalc.cc b/kspread/valuecalc.cc index ab7e6420..3a1182e5 100644 --- a/kspread/valuecalc.cc +++ b/kspread/valuecalc.cc @@ -723,7 +723,7 @@ Value ValueCalc::base (const Value &val, int base, int prec) return Value::errorVALUE(); double value = converter->asFloat (val).asFloat(); - QString result = QString::number ((int)value, base); + TQString result = TQString::number ((int)value, base); if (prec > 0) { @@ -743,7 +743,7 @@ Value ValueCalc::base (const Value &val, int base, int prec) Value ValueCalc::fromBase (const Value &val, int base) { - QString str = converter->asString (val).asString(); + TQString str = converter->asString (val).asString(); bool ok; double num = str.toLong (&ok, base); if (ok) @@ -1557,7 +1557,7 @@ void ValueCalc::arrayWalk (const Value &range, } } -void ValueCalc::arrayWalk (QValueVector<Value> &range, +void ValueCalc::arrayWalk (TQValueVector<Value> &range, Value &res, arrayWalkFunc func, Value param) { if (res.isError()) return; @@ -1598,8 +1598,8 @@ void ValueCalc::twoArrayWalk (const Value &a1, const Value &a2, } } -void ValueCalc::twoArrayWalk (QValueVector<Value> &a1, - QValueVector<Value> &a2, Value &res, arrayWalkFunc func) +void ValueCalc::twoArrayWalk (TQValueVector<Value> &a1, + TQValueVector<Value> &a2, Value &res, arrayWalkFunc func) { if (res.isError()) return; if (a1.count() != a2.count()) { @@ -1610,14 +1610,14 @@ void ValueCalc::twoArrayWalk (QValueVector<Value> &a1, twoArrayWalk (a1[i], a2[i], res, func); } -arrayWalkFunc ValueCalc::awFunc (const QString &name) +arrayWalkFunc ValueCalc::awFunc (const TQString &name) { if (awFuncs.count(name)) return awFuncs[name]; return 0; } -void ValueCalc::registerAwFunc (const QString &name, arrayWalkFunc func) +void ValueCalc::registerAwFunc (const TQString &name, arrayWalkFunc func) { awFuncs[name] = func; } @@ -1631,7 +1631,7 @@ Value ValueCalc::sum (const Value &range, bool full) return res; } -Value ValueCalc::sum (QValueVector<Value> range, bool full) +Value ValueCalc::sum (TQValueVector<Value> range, bool full) { Value res; arrayWalk (range, res, awFunc (full ? "suma" : "sum"), 0); @@ -1686,7 +1686,7 @@ int ValueCalc::count (const Value &range, bool full) return converter->asInteger (res).asInteger (); } -int ValueCalc::count (QValueVector<Value> range, bool full) +int ValueCalc::count (TQValueVector<Value> range, bool full) { Value res = 0; arrayWalk (range, res, awFunc (full ? "counta" : "count"), 0); @@ -1729,7 +1729,7 @@ Value ValueCalc::avg (const Value &range, bool full) return Value (0.0); } -Value ValueCalc::avg (QValueVector<Value> range, bool full) +Value ValueCalc::avg (TQValueVector<Value> range, bool full) { int cnt = count (range, full); if (cnt) @@ -1744,7 +1744,7 @@ Value ValueCalc::max (const Value &range, bool full) return res; } -Value ValueCalc::max (QValueVector<Value> range, bool full) +Value ValueCalc::max (TQValueVector<Value> range, bool full) { Value res; arrayWalk (range, res, awFunc (full ? "maxa" : "max"), 0); @@ -1758,7 +1758,7 @@ Value ValueCalc::min (const Value &range, bool full) return res; } -Value ValueCalc::min (QValueVector<Value> range, bool full) +Value ValueCalc::min (TQValueVector<Value> range, bool full) { Value res; arrayWalk (range, res, awFunc (full ? "mina" : "min"), 0); @@ -1779,7 +1779,7 @@ Value ValueCalc::product (const Value &range, Value init, return res; } -Value ValueCalc::product (QValueVector<Value> range, +Value ValueCalc::product (TQValueVector<Value> range, Value init, bool full) { Value res = init; @@ -1807,12 +1807,12 @@ Value ValueCalc::stddev (const Value &range, Value avg, return sqrt (div (res, cnt-1)); } -Value ValueCalc::stddev (QValueVector<Value> range, bool full) +Value ValueCalc::stddev (TQValueVector<Value> range, bool full) { return stddev (range, avg (range, full), full); } -Value ValueCalc::stddev (QValueVector<Value> range, +Value ValueCalc::stddev (TQValueVector<Value> range, Value avg, bool full) { Value res; @@ -1835,12 +1835,12 @@ Value ValueCalc::stddevP (const Value &range, Value avg, return sqrt (div (res, cnt)); } -Value ValueCalc::stddevP (QValueVector<Value> range, bool full) +Value ValueCalc::stddevP (TQValueVector<Value> range, bool full) { return stddevP (range, avg (range, full), full); } -Value ValueCalc::stddevP (QValueVector<Value> range, +Value ValueCalc::stddevP (TQValueVector<Value> range, Value avg, bool full) { Value res; @@ -1870,7 +1870,7 @@ void ValueCalc::getCond (Condition &cond, Value val) cond.value = converter->asFloat (val).asFloat(); return; } - QString text = converter->asString (val).asString(); + TQString text = converter->asString (val).asString(); cond.comp = isEqual; text = text.stripWhiteSpace(); @@ -1959,7 +1959,7 @@ bool ValueCalc::matches (const Condition &cond, Value val) break; } } else { - QString d = converter->asString (val).asString(); + TQString d = converter->asString (val).asString(); switch ( cond.comp ) { case isEqual: |