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

diff --git a/lib/kwmf/kowmfread.h b/lib/kwmf/kowmfread.h
index becfc74f..ff8fa9be 100644
--- a/lib/kwmf/kowmfread.h
+++ b/lib/kwmf/kowmfread.h
@@ -18,24 +18,24 @@
 #ifndef _KOWMFREAD_H_
 #define _KOWMFREAD_H_
 
-#include <qpen.h>
-#include <qbrush.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qrect.h>
-#include <qregion.h>
-#include <qimage.h>
-#include <qwmatrix.h>
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qpointarray.h>
+#include <tqpen.h>
+#include <tqbrush.h>
+#include <tqfont.h>
+#include <tqcolor.h>
+#include <tqrect.h>
+#include <tqregion.h>
+#include <tqimage.h>
+#include <tqwmatrix.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include <tqpointarray.h>
 
 #include <../kofficecore/koffice_export.h>
 class KoWmfReadPrivate;
 
 /**
  * KoWmfRead allows the redirection of the actions stored in a WMF file.
- * Most of the virtuals functions are compatible with QPainter format.
+ * Most of the virtuals functions are compatible with TQPainter format.
  *
  * How to use :
  *   inherit this class and define abstract functions
@@ -52,8 +52,8 @@ public:
     /**
      * Load WMF file. Returns true on success.
      */
-    virtual bool load( const QString& fileName );
-    virtual bool load( const QByteArray& array );
+    virtual bool load( const TQString& fileName );
+    virtual bool load( const TQByteArray& array );
 
     /**
      * play the WMF file => call virtuals functions
@@ -74,7 +74,7 @@ public:
      * Placeable Meta File : return the bounding box from header
      * always in logical coordinate
      */
-    virtual QRect boundingRect( void ) const;
+    virtual TQRect boundingRect( void ) const;
 
     /**
      * Returns the default DotPerInch for placeable meta file,
@@ -90,24 +90,24 @@ public:
     void setDebug( int nbFunc );
 
     // -------------------------------------------------------------------------
-    // A virtual QPainter : inherit those virtuals functions
-    // for a good documentation : check QPainter documentation
+    // A virtual TQPainter : inherit those virtuals functions
+    // for a good documentation : check TQPainter documentation
     virtual bool  begin() = 0;
     virtual bool  end() = 0;
     virtual void  save() = 0;
     virtual void  restore() = 0;
 
     // Drawing tools
-    virtual void  setFont( const QFont & ) = 0;
+    virtual void  setFont( const TQFont & ) = 0;
     // the pen : the width of the pen is in logical coordinate
-    virtual void  setPen( const QPen &p ) = 0;
-    virtual const QPen &pen() const = 0;
-    virtual void  setBrush( const QBrush & ) = 0;
+    virtual void  setPen( const TQPen &p ) = 0;
+    virtual const TQPen &pen() const = 0;
+    virtual void  setBrush( const TQBrush & ) = 0;
 
     // Drawing attributes/modes
-    virtual void  setBackgroundColor( const QColor & ) = 0;
+    virtual void  setBackgroundColor( const TQColor & ) = 0;
     virtual void  setBackgroundMode( Qt::BGMode ) = 0;
-    virtual void  setRasterOp( Qt::RasterOp ) = 0;
+    virtual void  setRasterOp( TQt::RasterOp ) = 0;
 
     // Change logical Coordinate
     // some wmf files call those functions several times in the middle of a drawing
@@ -118,8 +118,8 @@ public:
     // Clipping
     // the 'CoordinateMode' parameter is ommitted : always CoordPainter in wmf
     // setClipRegion() is often used with save() and restore() => implement all or none
-    virtual void  setClipRegion( const QRegion & ) = 0;
-    virtual QRegion clipRegion() = 0;
+    virtual void  setClipRegion( const TQRegion & ) = 0;
+    virtual TQRegion clipRegion() = 0;
 
     // Graphics drawing functions
     virtual void  moveTo( int x, int y ) = 0;
@@ -130,20 +130,20 @@ public:
     virtual void  drawArc( int x, int y, int w, int h, int a, int alen ) = 0;
     virtual void  drawPie( int x, int y, int w, int h, int a, int alen ) = 0;
     virtual void  drawChord( int x, int y, int w, int h, int a, int alen ) = 0;
-    virtual void  drawPolyline( const QPointArray &pa ) = 0;
-    virtual void  drawPolygon( const QPointArray &pa, bool winding=FALSE ) = 0;
+    virtual void  drawPolyline( const TQPointArray &pa ) = 0;
+    virtual void  drawPolygon( const TQPointArray &pa, bool winding=FALSE ) = 0;
     // drawPolyPolygon draw the XOR of a list of polygons
     // listPa : list of polygons
-    virtual void  drawPolyPolygon( QPtrList<QPointArray>& listPa, bool winding=FALSE ) = 0;
-    virtual void  drawImage( int x, int y, const QImage &, int sx = 0, int sy = 0, int sw = -1, int sh = -1 ) = 0;
+    virtual void  drawPolyPolygon( TQPtrList<TQPointArray>& listPa, bool winding=FALSE ) = 0;
+    virtual void  drawImage( int x, int y, const TQImage &, int sx = 0, int sy = 0, int sw = -1, int sh = -1 ) = 0;
 
     // Text drawing functions
     // rotation = the degrees of rotation in counterclockwise
     // not yet implemented in KWinMetaFile
-    virtual void  drawText( int x, int y, int w, int h, int flags, const QString &s, double rotation ) = 0;
+    virtual void  drawText( int x, int y, int w, int h, int flags, const TQString &s, double rotation ) = 0;
 
     // matrix transformation : only used for bitmap manipulation
-    virtual void  setWorldMatrix( const QWMatrix &, bool combine=FALSE ) = 0;
+    virtual void  setWorldMatrix( const TQWMatrix &, bool combine=FALSE ) = 0;
 
 private:
     KoWmfReadPrivate  *mKwmf;