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

diff --git a/karbon/render/vqpainter.h b/karbon/render/vqpainter.h
index 7f4f501b..d1a556db 100644
--- a/karbon/render/vqpainter.h
+++ b/karbon/render/vqpainter.h
@@ -18,33 +18,33 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef __VQPAINTER_H__
-#define __VQPAINTER_H__
+#ifndef __VTQPAINTER_H__
+#define __VTQPAINTER_H__
 
 // qpainter wrapper
 
 #include "vpainter.h"
-#include "qpointarray.h"
+#include "tqpointarray.h"
 
-class QPainter;
+class TQPainter;
 
-class VQPainter : public VPainter
+class VTQPainter : public VPainter
 {
 public:
-	VQPainter( QPaintDevice *target, unsigned int w = 0, unsigned int h = 0 );
-	virtual ~VQPainter();
+	VTQPainter( TQPaintDevice *target, unsigned int w = 0, unsigned int h = 0 );
+	virtual ~VTQPainter();
 
     //
 	virtual void resize( unsigned int w, unsigned int h );
 	virtual void begin();
 	virtual void end();
 	virtual void blit( const KoRect & );
-	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();
+	virtual void setWorldMatrix( const TQWMatrix & );
+	virtual const TQWMatrix tqworldMatrix();
 	virtual void setZoomFactor( double );
 	virtual double zoomFactor() { return m_zoomFactor; }
 
@@ -61,13 +61,13 @@ 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();
@@ -78,16 +78,16 @@ public:
 	virtual void drawRect( const KoRect & );
 
 	//
-	virtual void setRasterOp( Qt::RasterOp );
+	virtual void setRasterOp( TQt::RasterOp );
 
-	virtual QPaintDevice *device() { return m_target; }
+	virtual TQPaintDevice *device() { return m_target; }
 
 private:
 	double m_zoomFactor;
 	unsigned int m_index;
-	QPointArray m_pa;
-	QPainter *m_painter;
-	QPaintDevice *m_target;
+	TQPointArray m_pa;
+	TQPainter *m_painter;
+	TQPaintDevice *m_target;
 	unsigned int m_width;
 	unsigned int m_height;
 };