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

diff --git a/karbon/render/vkopainter.h b/karbon/render/vkopainter.h
index 48336092..75ac0bd1 100644
--- a/karbon/render/vkopainter.h
+++ b/karbon/render/vkopainter.h
@@ -23,10 +23,10 @@
 // kopainter/libart wrapper
 
 #include "vpainter.h"
-#include <qwmatrix.h>
-#include <qptrlist.h>
+#include <tqwmatrix.h>
+#include <tqptrlist.h>
 #include <koffice_export.h>
-class QPainter;
+class TQPainter;
 struct _ArtVpath;
 struct _ArtBpath;
 struct _ArtSVP;
@@ -38,7 +38,7 @@ class KoRect;
 class KARBONBASE_EXPORT VKoPainter : public VPainter
 {
 public:
-	VKoPainter( QPaintDevice *target, unsigned int w = 0, unsigned int h = 0, bool = true );
+	VKoPainter( TQPaintDevice *target, unsigned int w = 0, unsigned int h = 0, bool = true );
 	VKoPainter( unsigned char *buffer, unsigned int w = 0, unsigned int h = 0, bool = true );
 	virtual ~VKoPainter();
 
@@ -47,12 +47,12 @@ public:
 	virtual void end();
 	virtual void blit( const KoRect & );
 	void clear();
-	virtual void clear( const QColor & );
-	virtual void clear( const KoRect &, const QColor & );
+	virtual void clear( const TQColor & );
+	virtual void clear( const KoRect &, const TQColor & );
 
 	// matrix manipulation
-	virtual void setWorldMatrix( const QWMatrix & );
-	virtual const QWMatrix worldMatrix() { return m_matrix; }
+	virtual void setWorldMatrix( const TQWMatrix & );
+	virtual const TQWMatrix tqworldMatrix() { return m_matrix; }
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }
 
@@ -74,22 +74,22 @@ public:
 
 	// pen + brush
 	virtual void setPen( const VStroke & );
-	virtual void setPen( const QColor & );
+	virtual void setPen( const TQColor & );
 	virtual void setPen( Qt::PenStyle style );
 	virtual void setBrush( const VFill & );
-	virtual void setBrush( const QColor & );
-	virtual void setBrush( Qt::BrushStyle style );
+	virtual void setBrush( const TQColor & );
+	virtual void setBrush( TQt::BrushStyle style );
 
-	virtual void drawImage( const QImage &, const QWMatrix & );
+	virtual void drawImage( const TQImage &, const TQWMatrix & );
 
 	// stack management
 	virtual void save();
 	virtual void restore();
 
 	//
-	virtual void setRasterOp( Qt::RasterOp );
+	virtual void setRasterOp( TQt::RasterOp );
 
-	virtual QPaintDevice *device() { return m_target; } 
+	virtual TQPaintDevice *device() { return m_target; } 
 	unsigned char *buffer() { return m_buffer; }
 
 private:
@@ -106,15 +106,15 @@ private:
 	unsigned int m_index;
 	unsigned int m_alloccount;
 	unsigned char *m_buffer;
-	QPaintDevice *m_target;
+	TQPaintDevice *m_target;
 	unsigned int m_width;
 	unsigned int m_height;
-	QWMatrix m_matrix;
+	TQWMatrix m_matrix;
 	VStroke *m_stroke;
 	VFill *m_fill;
 	VFillRule m_fillRule;
 	double m_zoomFactor;
-	QPtrList<_ArtSVP> m_clipPaths;
+	TQPtrList<_ArtSVP> m_clipPaths;
 
 	bool m_bDrawNodes;