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, 12 insertions, 12 deletions

diff --git a/lib/kformula/kformulacompatibility.h b/lib/kformula/kformulacompatibility.h
index 98c268cc..9be5c7ba 100644
--- a/lib/kformula/kformulacompatibility.h
+++ b/lib/kformula/kformulacompatibility.h
@@ -20,8 +20,8 @@
 #ifndef KFORMULACOMPATIBILITY_H
 #define KFORMULACOMPATIBILITY_H
 
-#include <qdom.h>
-#include <qstring.h>
+#include <tqdom.h>
+#include <tqstring.h>
 
 KFORMULA_NAMESPACE_BEGIN
 
@@ -37,22 +37,22 @@ public:
     /**
      * Builds a kformula DOM from a old formula string.
      */
-    QDomDocument buildDOM(QString text);
+    TQDomDocument buildDOM(TQString text);
 
 private:
 
-    QDomElement readSequence(const QDomDocument& doc);
-    QDomElement readMatrix(const QDomDocument& doc);
+    TQDomElement readSequence(const TQDomDocument& doc);
+    TQDomElement readMatrix(const TQDomDocument& doc);
 
-    void appendToSequence(QDomElement sequence, QDomElement element, int leftIndexSeen);
+    void appendToSequence(TQDomElement sequence, TQDomElement element, int leftIndexSeen);
 
-    void appendNextSequence(const QDomDocument& doc, QDomElement element);
-    QDomElement getLastSequence(const QDomDocument& doc, QDomElement sequence);
+    void appendNextSequence(const TQDomDocument& doc, TQDomElement element);
+    TQDomElement getLastSequence(const TQDomDocument& doc, TQDomElement sequence);
 
-    QDomElement findIndexNode(const QDomDocument& doc, QDomElement sequence);
+    TQDomElement findIndexNode(const TQDomDocument& doc, TQDomElement sequence);
 
-    ushort nextToken() { return formulaString[pos++].unicode(); }
-    ushort lookAhead(uint i) const { return formulaString[pos+i].unicode(); }
+    ushort nextToken() { return formulaString[pos++].tqunicode(); }
+    ushort lookAhead(uint i) const { return formulaString[pos+i].tqunicode(); }
     void pushback() { pos--; }
 
     bool hasNext() const { return pos < formulaString.length(); }
@@ -61,7 +61,7 @@ private:
     /**
      * the string we read
      */
-    QString formulaString;
+    TQString formulaString;
 
     /**
      * current pos