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

diff --git a/lib/kwmf/kowmfpaint.h b/lib/kwmf/kowmfpaint.h
index b229f2ff..7fb9356d 100644
--- a/lib/kwmf/kowmfpaint.h
+++ b/lib/kwmf/kowmfpaint.h
@@ -18,18 +18,18 @@
 #ifndef _KOWMFPAINT_H_
 #define _KOWMFPAINT_H_
 
-#include <qpainter.h>
+#include <tqpainter.h>
 
 #include "kowmfread.h"
 #include <../kofficecore/koffice_export.h>
 /**
  * KoWmfPaint inherits the abstract class KoWmfRead
- * and redirects WMF actions onto a QPaintDevice.
+ * and redirects WMF actions onto a TQPaintDevice.
  * Uses relative or absolute coordinate.
  *
  * how to use:
  * <pre>
- *   QPixmap pix( 100, 100 );
+ *   TQPixmap pix( 100, 100 );
  *   KoWmfPaint wmf;
  *   if ( wmf.load( "/home/test.wmf" ) ) {
  *      wmf.play( pix );
@@ -46,33 +46,33 @@ public:
     ~KoWmfPaint() { }
 
     /**
-     * play WMF file on a QPaintDevice. Return true on success.
+     * play WMF file on a TQPaintDevice. Return true on success.
      * Use absolute or relative coordinate :
      *   absolute coord. reset the world transfomation Matrix (by default)
      *   relative coord. use the existing world transfomation Matrix
      */
-    bool play( QPaintDevice& target, bool relativeCoord=false );
+    bool play( TQPaintDevice& target, bool relativeCoord=false );
 
 
 private:
     // -------------------------------------------------------------------------
-    // A virtual QPainter
+    // A virtual TQPainter
     bool  begin();
     bool  end();
     void  save();
     void  restore();
 
     // Drawing tools
-    void  setFont( const QFont& font );
+    void  setFont( const TQFont& font );
     // the pen : the width of the pen is in logical coordinate
-    void  setPen( const QPen& pen );
-    const QPen& pen() const;
-    void  setBrush( const QBrush& brush );
+    void  setPen( const TQPen& pen );
+    const TQPen& pen() const;
+    void  setBrush( const TQBrush& brush );
 
     // Drawing attributes/modes
-    void  setBackgroundColor( const QColor& c );
+    void  setBackgroundColor( const TQColor& c );
     void  setBackgroundMode( Qt::BGMode mode );
-    void  setRasterOp( Qt::RasterOp op );
+    void  setRasterOp( TQt::RasterOp op );
 
     /**
      * Change logical Coordinate
@@ -86,8 +86,8 @@ private:
     // Clipping
     // the 'CoordinateMode' is ommitted : always CoordPainter in wmf
     // setClipRegion() is often used with save() and restore() => implement all or none
-    void  setClipRegion( const QRegion &rec );
-    QRegion clipRegion();
+    void  setClipRegion( const TQRegion &rec );
+    TQRegion clipRegion();
 
     // Graphics drawing functions
     void  moveTo( int x, int y );
@@ -98,29 +98,29 @@ private:
     void  drawArc( int x, int y, int w, int h, int a, int alen );
     void  drawPie( int x, int y, int w, int h, int a, int alen );
     void  drawChord( int x, int y, int w, int h, int a, int alen );
-    void  drawPolyline( const QPointArray& pa );
-    void  drawPolygon( const QPointArray& pa, bool winding=FALSE );
+    void  drawPolyline( const TQPointArray& pa );
+    void  drawPolygon( const TQPointArray& pa, bool winding=FALSE );
     /**
      * drawPolyPolygon draw the XOR of a list of polygons
      * listPa : list of polygons
      */
-    void  drawPolyPolygon( QPtrList<QPointArray>& listPa, bool winding=FALSE );
-    void  drawImage( int x, int y, const QImage &, int sx = 0, int sy = 0, int sw = -1, int sh = -1 );
+    void  drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding=FALSE );
+    void  drawImage( int x, int y, const TQImage &, int sx = 0, int sy = 0, int sw = -1, int sh = -1 );
 
     // Text drawing functions
     // rotation = the degrees of rotation in counterclockwise
     // not yet implemented in KWinMetaFile
-    void  drawText( int x, int y, int w, int h, int flags, const QString &s, double rotation );
+    void  drawText( int x, int y, int w, int h, int flags, const TQString &s, double rotation );
 
     // matrix transformation : only used in some bitmap manipulation
-    void  setWorldMatrix( const QWMatrix &, bool combine=FALSE );
+    void  setWorldMatrix( const TQWMatrix &, bool combine=FALSE );
 
 private:
-    QPainter mPainter;
-    QPaintDevice *mTarget;
+    TQPainter mPainter;
+    TQPaintDevice *mTarget;
     bool  mRelativeCoord;
     // memorisation of WMF matrix transformation (in relative coordinate)
-    QWMatrix  mInternalWorldMatrix;
+    TQWMatrix  mInternalWorldMatrix;
 
 };