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

diff --git a/karbon/core/vcursor.cc b/karbon/core/vcursor.cc
index ed9d1f8d..a44004f2 100644
--- a/karbon/core/vcursor.cc
+++ b/karbon/core/vcursor.cc
@@ -18,7 +18,7 @@
 */
 
 #include "vcursor.h"
-#include <qbitmap.h>
+#include <tqbitmap.h>
 
 static const char* const cminus[] = {
 "16 16 6 1",
@@ -72,7 +72,7 @@ static const char* const cplus[] = {
 "OOOOOOOOOOOOO  O"
 };
 
-QCursor VCursor::createCursor( CursorType type )
+TQCursor VCursor::createCursor( CursorType type )
 {
 	switch( type )
 	{
@@ -80,69 +80,69 @@ QCursor VCursor::createCursor( CursorType type )
 			return crossHair();
 		break;
 		case ZoomPlus:
-			return QCursor( QPixmap( ( const char**) cplus ), -1, -1 );
+			return TQCursor( TQPixmap( ( const char**) cplus ), -1, -1 );
 		break;
 		case ZoomMinus:
-			return QCursor( QPixmap( ( const char**) cminus ), -1, -1 );
+			return TQCursor( TQPixmap( ( const char**) cminus ), -1, -1 );
 		break;
 		case NeedleArrow:
 			return needleArrow();
 		break;
-		default: return QCursor( Qt::arrowCursor );
+		default: return TQCursor( TQt::arrowCursor );
 	}
 }
 
-QCursor VCursor::createCursor( const char * bitmap[], const char * mask[], int hotX, int hotY )
+TQCursor VCursor::createCursor( const char * bitmap[], const char * tqmask[], int hotX, int hotY )
 {
-	// the cursor bitmap and mask
-	QBitmap b, m;
+	// the cursor bitmap and tqmask
+	TQBitmap b, m;
 
-	b = QPixmap( (const char**) bitmap );
-	m = QPixmap( (const char**) mask );
+	b = TQPixmap( (const char**) bitmap );
+	m = TQPixmap( (const char**) tqmask );
 	
-	return QCursor( b, m, hotX, hotY );
+	return TQCursor( b, m, hotX, hotY );
 }
 
-QCursor VCursor::crossHair()
+TQCursor VCursor::crossHair()
 {
 	static unsigned char cross_bits[] = {
 		0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00,
 		0x80, 0x00, 0xff, 0x7f, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00,
 		0x80, 0x00, 0x80, 0x00, 0x80, 0x00};
 
-	QBitmap b = QBitmap( 15, 15, cross_bits, true );
-	QBitmap m = b.createHeuristicMask( false );
+	TQBitmap b = TQBitmap( 15, 15, cross_bits, true );
+	TQBitmap m = b.createHeuristicMask( false );
 
-    return QCursor( b, m, 7, 7 );
+    return TQCursor( b, m, 7, 7 );
 }
 
-QCursor VCursor::needleArrow()
+TQCursor VCursor::needleArrow()
 {
 	static unsigned char needle_bits[] = {
 		0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x60, 0x00, 0xc0, 0x00, 0xc0, 0x01,
 		0x80, 0x03, 0x80, 0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3e, 0x00, 0x7e,
 		0x00, 0x7c, 0x00, 0x1c, 0x00, 0x18, 0x00, 0x00};
 
-	QBitmap b = QBitmap( 16, 16, needle_bits, true );
-	QBitmap m = b.createHeuristicMask( false );
+	TQBitmap b = TQBitmap( 16, 16, needle_bits, true );
+	TQBitmap m = b.createHeuristicMask( false );
 
-    return QCursor( b, m, 2, 0 );
+    return TQCursor( b, m, 2, 0 );
 }
 
-QCursor VCursor::needleMoveArrow()
+TQCursor VCursor::needleMoveArrow()
 {
 	static unsigned char needle_move_bits[] = {
 		0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x60, 0x00, 0xc0, 0x00, 0xc0, 0x01,
 		0x80, 0x03, 0x80, 0x07, 0x10, 0x0f, 0x38, 0x1f, 0x54, 0x3e, 0xfe, 0x7e,
 		0x54, 0x7c, 0x38, 0x1c, 0x10, 0x18, 0x00, 0x00};
 
-	QBitmap b = QBitmap( 16, 16, needle_move_bits, true );
-	QBitmap m = b.createHeuristicMask( false );
+	TQBitmap b = TQBitmap( 16, 16, needle_move_bits, true );
+	TQBitmap m = b.createHeuristicMask( false );
 
-    return QCursor( b, m, 2, 0 );
+    return TQCursor( b, m, 2, 0 );
 }
 
-QCursor VCursor::horzMove()
+TQCursor VCursor::horzMove()
 {
 /*
 	#define horzMove_width 15
@@ -159,8 +159,8 @@ QCursor VCursor::horzMove()
 		0x0c, 0x18, 0xfe, 0x3f, 0x0c, 0x18, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-	QBitmap b = QBitmap( 15, 15, horzMove_bits, true );
-	QBitmap m = b.createHeuristicMask( false );
+	TQBitmap b = TQBitmap( 15, 15, horzMove_bits, true );
+	TQBitmap m = b.createHeuristicMask( false );
 
-    return QCursor( b, m, 7, 7 );
+    return TQCursor( b, m, 7, 7 );
 }