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, 24 insertions, 22 deletions

diff --git a/kword/KWFormulaFrameSet.h b/kword/KWFormulaFrameSet.h
index e7d64987..b9b06a4d 100644
--- a/kword/KWFormulaFrameSet.h
+++ b/kword/KWFormulaFrameSet.h
@@ -44,11 +44,12 @@ class KWFormulaFrameSetEdit;
 class KWFormulaFrameSet : public KWFrameSet
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KWFormulaFrameSet( KWDocument *doc, const QString & name );
+    KWFormulaFrameSet( KWDocument *doc, const TQString & name );
     /// Used for OASIS loading
-    KWFormulaFrameSet( KWDocument* doc, const QDomElement& frame,
-                       const QDomElement& objectTag, KoOasisContext& context );
+    KWFormulaFrameSet( KWDocument* doc, const TQDomElement& frame,
+                       const TQDomElement& objectTag, KoOasisContext& context );
     virtual ~KWFormulaFrameSet();
 
     virtual KWordFrameSetIface* dcopObject();
@@ -75,14 +76,14 @@ public:
     /**
      * Paint this frameset
      */
-    virtual void drawFrameContents(KWFrame *, QPainter*, const QRect&,
-                                   const QColorGroup&, bool onlyChanged, bool resetChanged,
+    virtual void drawFrameContents(KWFrame *, TQPainter*, const TQRect&,
+                                   const TQColorGroup&, bool onlyChanged, bool resetChanged,
                                    KWFrameSetEdit *edit, KWViewMode *viewMode);
 
-    virtual QDomElement save( QDomElement &parentElem, bool saveFrames = true );
-    virtual void load( QDomElement &attributes, bool loadFrames = true );
+    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual void load( TQDomElement &attributes, bool loadFrames = true );
     virtual void saveOasis(KoXmlWriter&, KoSavingContext&, bool saveFrames ) const;
-    void paste( QDomNode& formulaElem );
+    void paste( TQDomNode& formulaElem );
 
     KFormula::Container* getFormula() const { return formula; }
 
@@ -101,13 +102,13 @@ public:
 protected slots:
 
     void slotFormulaChanged( double width, double height );
-    void slotErrorMessage( const QString& msg );
+    void slotErrorMessage( const TQString& msg );
 
 private:
     void init();
 
-    static QPixmap* doubleBufferPixmap( const QSize& s );
-    static QPixmap* m_bufPixmap;
+    static TQPixmap* doubleBufferPixmap( const TQSize& s );
+    static TQPixmap* m_bufPixmap;
 
     friend class KWFormulaFrameSetEdit;
 
@@ -118,9 +119,10 @@ private:
 };
 
 
-class KWFormulaFrameSetEdit : public QObject, public KWFrameSetEdit
+class KWFormulaFrameSetEdit : public TQObject, public KWFrameSetEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KWFormulaFrameSetEdit(KWFormulaFrameSet* fs, KWCanvas* canvas);
     virtual ~KWFormulaFrameSetEdit();
@@ -136,21 +138,21 @@ public:
     virtual DCOPObject* dcopObject();
 
     // Events forwarded by the canvas (when being in "edit" mode)
-    virtual void keyPressEvent(QKeyEvent*);
-    virtual void mousePressEvent(QMouseEvent*, const QPoint & n, const KoPoint & d );
-    virtual void mouseMoveEvent(QMouseEvent*, const QPoint & n, const KoPoint & d); // only called if button is pressed
-    virtual void mouseReleaseEvent(QMouseEvent*, const QPoint & n, const KoPoint & d);
-    //virtual void mouseDoubleClickEvent( QMouseEvent *, const QPoint & n, const KoPoint & d ) {}
-    //virtual void dragEnterEvent( QDragEnterEvent * ) {}
-    //virtual void dragMoveEvent( QDragMoveEvent *, const QPoint &, const KoPoint & ) {}
-    //virtual void dragLeaveEvent( QDragLeaveEvent * ) {}
-    //virtual void dropEvent( QDropEvent *, const QPoint &, const KoPoint &, KWView* ) {}
+    virtual void keyPressEvent(TQKeyEvent*);
+    virtual void mousePressEvent(TQMouseEvent*, const TQPoint & n, const KoPoint & d );
+    virtual void mouseMoveEvent(TQMouseEvent*, const TQPoint & n, const KoPoint & d); // only called if button is pressed
+    virtual void mouseReleaseEvent(TQMouseEvent*, const TQPoint & n, const KoPoint & d);
+    //virtual void mouseDoubleClickEvent( TQMouseEvent *, const TQPoint & n, const KoPoint & d ) {}
+    //virtual void dragEnterEvent( TQDragEnterEvent * ) {}
+    //virtual void dragMoveEvent( TQDragMoveEvent *, const TQPoint &, const KoPoint & ) {}
+    //virtual void dragLeaveEvent( TQDragLeaveEvent * ) {}
+    //virtual void dropEvent( TQDropEvent *, const TQPoint &, const KoPoint &, KWView* ) {}
     virtual void focusInEvent();
     virtual void focusOutEvent();
     virtual void copy();
     virtual void cut();
     virtual void paste();
-    virtual void pasteData( QMimeSource* data, int provides, bool drop );
+    virtual void pasteData( TQMimeSource* data, int provides, bool drop );
     virtual void selectAll();
 
     /** Moves the cursor to the first position */