TQt4 port Katapult

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/katapult@1233929 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 14 insertions, 14 deletions

diff --git a/katapult/plugins/display/puredisplay/qembed_images.h b/katapult/plugins/display/puredisplay/qembed_images.h
index 5f809df..79c8b67 100644
--- a/katapult/plugins/display/puredisplay/qembed_images.h
+++ b/katapult/plugins/display/puredisplay/qembed_images.h
@@ -1,8 +1,8 @@
-#ifndef _QEMBED_1804289383
-#define _QEMBED_1804289383
-#include <qimage.h>
-#include <qdict.h>
-static const QRgb doublebg_data[] = {
+#ifndef _TQEMBED_1804289383
+#define _TQEMBED_1804289383
+#include <tqimage.h>
+#include <tqdict.h>
+static const TQRgb doublebg_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x1000000,0x1000000,0x1000000,0x2000000,0x2000000,0x2000000,0x2000000,0x2000000,0x3000000,0x3000000,0x3000000,
     0x3000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,
@@ -6166,7 +6166,7 @@ static const QRgb doublebg_data[] = {
 };
 
 /* Generated by qembed */
-static const QRgb singlebg_data[] = {
+static const TQRgb singlebg_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x1000000,0x1000000,0x1000000,0x2000000,0x2000000,0x2000000,0x2000000,0x2000000,0x3000000,0x3000000,0x3000000,
     0x3000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,0x4000000,
@@ -9756,7 +9756,7 @@ static struct EmbedImage {
     int width, height, depth;
     const unsigned char *data;
     int numColors;
-    const QRgb *colorTable;
+    const TQRgb *colorTable;
     bool alpha;
     const char *name;
 } embed_image_vec[] = {
@@ -9765,20 +9765,20 @@ static struct EmbedImage {
     { 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static const QImage& qembed_findImage( const QString& name )
+static const TQImage& qembed_findImage( const TQString& name )
 {
-    static QDict<QImage> dict;
-    QImage* img = dict.find( name );
+    static TQDict<TQImage> dict;
+    TQImage* img = dict.tqfind( name );
     if ( !img ) {
 	for ( int i = 0; embed_image_vec[i].data; i++ ) {
 	    if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) {
-		img = new QImage((uchar*)embed_image_vec[i].data,
+		img = new TQImage((uchar*)embed_image_vec[i].data,
 			    embed_image_vec[i].width,
 			    embed_image_vec[i].height,
 			    embed_image_vec[i].depth,
-			    (QRgb*)embed_image_vec[i].colorTable,
+			    (TQRgb*)embed_image_vec[i].colorTable,
 			    embed_image_vec[i].numColors,
-			    QImage::BigEndian );
+			    TQImage::BigEndian );
 		if ( embed_image_vec[i].alpha )
 		    img->setAlphaBuffer( TRUE );
 		dict.insert( name, img );
@@ -9786,7 +9786,7 @@ static const QImage& qembed_findImage( const QString& name )
 	    }
 	}
 	if ( !img ) {
-	    static QImage dummy;
+	    static TQImage dummy;
 	    return dummy;
 	}
     }