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, 15 insertions, 14 deletions

diff --git a/kformula/kformula_doc.h b/kformula/kformula_doc.h
index b139f922..ab775bc2 100644
--- a/kformula/kformula_doc.h
+++ b/kformula/kformula_doc.h
@@ -21,8 +21,8 @@
 #ifndef KFORMULA_DOC_H
 #define KFORMULA_DOC_H
 
-#include <qptrlist.h>
-#include <qpainter.h>
+#include <tqptrlist.h>
+#include <tqpainter.h>
 
 #include <kcommand.h>
 #include <KoDocument.h>
@@ -49,24 +49,25 @@ KFORMULA_NAMESPACE_END
 class KFormulaDoc : public KoDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    KFormulaDoc(QWidget *parentWidget = 0,
+    KFormulaDoc(TQWidget *tqparentWidget = 0,
                 const char *widgetName = 0,
-                QObject* parent = 0,
+                TQObject* tqparent = 0,
                 const char* name = 0,
                 bool singleViewMode = false);
     ~KFormulaDoc();
 
-    virtual void paintContent( QPainter &painter, const QRect &rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
+    virtual void paintContent( TQPainter &painter, const TQRect &rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
 
-    virtual bool initDoc(InitDocFlags flags, QWidget* parentWidget=0);
-    virtual void showStartUpWidget(KoMainWindow* parent, bool alwaysShow = false);
-    virtual bool showEmbedInitDialog(QWidget* parent);
-    virtual bool loadOasis( const QDomDocument& doc, KoOasisStyles& oasisStyles, const QDomDocument& settings, KoStore* );
-    virtual bool loadXML(QIODevice *, const QDomDocument& doc);
-    virtual QDomDocument saveXML();
+    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual void showStartUpWidget(KoMainWindow* tqparent, bool alwaysShow = false);
+    virtual bool showEmbedInitDialog(TQWidget* tqparent);
+    virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* );
+    virtual bool loadXML(TQIODevice *, const TQDomDocument& doc);
+    virtual TQDomDocument saveXML();
     virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter );
 	
 	/**
@@ -74,7 +75,7 @@ public:
 	 * It is reimplemented to handle the special case of MathML, since it is
 	 * a native format but not compressed.
 	 */
-    virtual bool saveNativeFormat( const QString & file );
+    virtual bool saveNativeFormat( const TQString & file );
 
     KFormula::Container* getFormula() const { return formula; }
     KFormula::Document* getDocument() const { return document; }
@@ -86,8 +87,8 @@ protected slots:
 
 protected:
 
-    virtual QString configFile() const;
-    virtual KoView* createViewInstance(QWidget* parent, const char* name);
+    virtual TQString configFile() const;
+    virtual KoView* createViewInstance(TQWidget* tqparent, const char* name);
 
 private: