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/kformula/fsparser.h b/kformula/fsparser.h
index ab594a4d..b79b2b22 100644
--- a/kformula/fsparser.h
+++ b/kformula/fsparser.h
@@ -20,9 +20,9 @@
 #ifndef FSPARSER_H
 #define FSPARSER_H
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdom.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdom.h>
 
 namespace KFormula { class SymbolTable; }
 class ParserNode;
@@ -32,12 +32,12 @@ class ParserNode;
  */
 class FormulaStringParser {
 public:
-    FormulaStringParser( const KFormula::SymbolTable& symbolTable, QString formula );
+    FormulaStringParser( const KFormula::SymbolTable& symbolTable, TQString formula );
     ~FormulaStringParser();
 
-    QDomDocument parse();
+    TQDomDocument parse();
 
-    QStringList errorList() const { return m_errorList; }
+    TQStringList errorList() const { return m_errorList; }
 
 private:
 
@@ -49,26 +49,26 @@ private:
     ParserNode* parseTerm();
     ParserNode* parsePower();
     ParserNode* parsePrimary();
-    void expect( TokenType type, QString msg );
+    void expect( TokenType type, TQString msg );
 
-    QString nextToken();
+    TQString nextToken();
     bool eol() { return m_formula.length() == pos; }
 
     void readNumber();
     void readDigits();
 
-    void error( QString err );
-    QStringList m_errorList;
+    void error( TQString err );
+    TQStringList m_errorList;
 
     const KFormula::SymbolTable& m_symbolTable;
-    QString m_formula;
+    TQString m_formula;
     uint pos;
     uint line;
     uint column;
     bool m_newlineIsSpace;
 
     TokenType currentType;
-    QString current;
+    TQString current;
 
     ParserNode* head;
 };