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, 10 insertions, 9 deletions

diff --git a/lib/kformula/kformulamathmlread.h b/lib/kformula/kformulamathmlread.h
index 2a3cb2a5..2aad4d68 100644
--- a/lib/kformula/kformulamathmlread.h
+++ b/lib/kformula/kformulamathmlread.h
@@ -21,8 +21,8 @@
 #ifndef KFORMULAMATHMLREAD_H
 #define KFORMULAMATHMLREAD_H
 
-#include <qobject.h>
-#include <qdom.h>
+#include <tqobject.h>
+#include <tqdom.h>
 #include "kformulainputfilter.h"
 #include "contextstyle.h"
 
@@ -37,6 +37,7 @@ class MathML2KFormulaPrivate;
 class MathML2KFormula : public KFInputFilter
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class MathML2KFormulaPrivate;
 
@@ -48,18 +49,18 @@ public:
      * a conversionFinished() signal, then call
      * getKFormulaDom() to get the converted DOM
      */
-    MathML2KFormula( const QDomDocument& mmldoc, const ContextStyle &contextStyle, bool oasisFormat = false );
+    MathML2KFormula( const TQDomDocument& mmldoc, const ContextStyle &contextStyle, bool oasisFormat = false );
 
 	/**
 	 * Build a MathML 2 KFormula converter.
 	 * A DOM Element is required instead of a full Document, useful for embedded MathML
 	 */ 
-    MathML2KFormula( const QDomElement& mmelm, const ContextStyle &contextStyle, bool oasisFormat = false );
+    MathML2KFormula( const TQDomElement& mmelm, const ContextStyle &contextStyle, bool oasisFormat = false );
 
     /*
      * Get the just created DOM.
      */
-    virtual QDomDocument getKFormulaDom();
+    virtual TQDomDocument getKFormulaDom();
 
 
 public slots:
@@ -71,11 +72,11 @@ public:
 
 private:
 
-    bool processElement( QDomNode node, QDomDocument& doc,
-                         QDomNode docnode );
+    bool processElement( TQDomNode node, TQDomDocument& doc,
+                         TQDomNode docnode );
 
-    QDomElement orig_element;
-    QDomDocument formuladoc;
+    TQDomElement orig_element;
+    TQDomDocument formuladoc;
     bool oasisFormat;
     const ContextStyle& context;