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

1 files changed, 20 insertions, 20 deletions

diff --git a/kspread/valuecalc.h b/kspread/valuecalc.h
index e62bd2ed..2d78211b 100644
--- a/kspread/valuecalc.h
+++ b/kspread/valuecalc.h
@@ -22,8 +22,8 @@
 
 #include <map>
 
-#include <qvaluelist.h>
-#include <qvaluevector.h>
+#include <tqvaluelist.h>
+#include <tqvaluevector.h>
 
 #include "kspread_value.h"
 
@@ -42,11 +42,11 @@ struct Condition
   Comp     comp;
   int      index;
   double   value;
-  QString  stringValue;
+  TQString  stringValue;
   Type     type;
 };
 
-typedef QValueList<Condition> ConditionList;
+typedef TQValueList<Condition> ConditionList;
 
 typedef void (*arrayWalkFunc) (ValueCalc *, Value &result,
     Value val, Value param);
@@ -199,14 +199,14 @@ class ValueCalc {
       arrayWalkFunc func, Value param);
   /** Walk the array in function-like style.
   This method is here to avoid duplication in function handlers. */
-  void arrayWalk (QValueVector<Value> &range, Value &res,
+  void arrayWalk (TQValueVector<Value> &range, Value &res,
       arrayWalkFunc func, Value param);
   void twoArrayWalk (const Value &a1, const Value &a2,
       Value &res, arrayWalkFunc func);
-  void twoArrayWalk (QValueVector<Value> &a1,
-      QValueVector<Value> &a2, Value &res, arrayWalkFunc func);
-  arrayWalkFunc awFunc (const QString &name);
-  void registerAwFunc (const QString &name, arrayWalkFunc func);
+  void twoArrayWalk (TQValueVector<Value> &a1,
+      TQValueVector<Value> &a2, Value &res, arrayWalkFunc func);
+  arrayWalkFunc awFunc (const TQString &name);
+  void registerAwFunc (const TQString &name, arrayWalkFunc func);
 
   /** basic range functions */
   // if full is true, A-version is used (means string/bool values included)
@@ -229,18 +229,18 @@ class ValueCalc {
       bool full = true);
   
   /** range functions using value lists */
-  Value sum (QValueVector<Value> range, bool full = true);
-  int count (QValueVector<Value> range, bool full = true);
-  Value avg (QValueVector<Value> range, bool full = true);
-  Value max (QValueVector<Value> range, bool full = true);
-  Value min (QValueVector<Value> range, bool full = true);
-  Value product (QValueVector<Value> range, Value init,
+  Value sum (TQValueVector<Value> range, bool full = true);
+  int count (TQValueVector<Value> range, bool full = true);
+  Value avg (TQValueVector<Value> range, bool full = true);
+  Value max (TQValueVector<Value> range, bool full = true);
+  Value min (TQValueVector<Value> range, bool full = true);
+  Value product (TQValueVector<Value> range, Value init,
       bool full = true);
-  Value stddev (QValueVector<Value> range, bool full = true);
-  Value stddev (QValueVector<Value> range, Value avg,
+  Value stddev (TQValueVector<Value> range, bool full = true);
+  Value stddev (TQValueVector<Value> range, Value avg,
       bool full = true);
-  Value stddevP (QValueVector<Value> range, bool full = true);
-  Value stddevP (QValueVector<Value> range, Value avg,
+  Value stddevP (TQValueVector<Value> range, bool full = true);
+  Value stddevP (TQValueVector<Value> range, Value avg,
       bool full = true);
 
   /**
@@ -263,7 +263,7 @@ class ValueCalc {
   Doc *_doc;
   
   /** registered array-walk functions */
-  std::map<QString, arrayWalkFunc> awFuncs;
+  std::map<TQString, arrayWalkFunc> awFuncs;
 };
 
 }  //namespace KSpread