From 98d15d90b6a83e2df32d678013847e18b8a8c7e8 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 28 May 2011 18:03:09 +0000
Subject: 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
---
 katapult/plugins/display/o2display/o2display.cpp   | 10 ++++----
 katapult/plugins/display/o2display/o2display.h     |  3 ++-
 katapult/plugins/display/o2display/qembed_images.h | 28 +++++++++++-----------
 3 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'katapult/plugins/display/o2display')

diff --git a/katapult/plugins/display/o2display/o2display.cpp b/katapult/plugins/display/o2display/o2display.cpp
index 823dfb9..c2104d3 100644
--- a/katapult/plugins/display/o2display/o2display.cpp
+++ b/katapult/plugins/display/o2display/o2display.cpp
@@ -20,7 +20,7 @@
 
 #include <kiconloader.h>
 #include <kgenericfactory.h>
-#include <qpixmap.h>
+#include <tqpixmap.h>
 
 #include "o2display.h"
 #include "qembed_images.h"
@@ -41,11 +41,11 @@ K_EXPORT_COMPONENT_FACTORY( katapult_o2display,
 #define RIGHTMARGIN 25
 #define BOTTOMMARGIN 40 
 
-o2Display::o2Display(QObject *parent, const char *name, const QStringList& list)
-	: ImageDisplay(parent, name, list)
+o2Display::o2Display(TQWidget *tqparent, const char *name, const TQStringList& list)
+	: ImageDisplay(TQT_TQOBJECT(tqparent), name, list)
 {
-	setSingleBG(new QPixmap(qembed_findImage("singlebg")));
-	setDoubleBG(new QPixmap(qembed_findImage("doublebg")));
+	setSingleBG(new TQPixmap(qembed_findImage("singlebg")));
+	setDoubleBG(new TQPixmap(qembed_findImage("doublebg")));
 	
 	setSingleSize(WIDTH_SINGLE, HEIGHT_SINGLE);
 	setDoubleSize(WIDTH_DOUBLE, HEIGHT_DOUBLE);
diff --git a/katapult/plugins/display/o2display/o2display.h b/katapult/plugins/display/o2display/o2display.h
index bd3c293..db26a1c 100644
--- a/katapult/plugins/display/o2display/o2display.h
+++ b/katapult/plugins/display/o2display/o2display.h
@@ -28,8 +28,9 @@
 class o2Display : public ImageDisplay
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
-		o2Display(QObject *, const char *, const QStringList&);
+		o2Display(TQWidget *, const char *, const TQStringList&);
 		virtual ~o2Display();
 };
 
diff --git a/katapult/plugins/display/o2display/qembed_images.h b/katapult/plugins/display/o2display/qembed_images.h
index d953c11..db3b3cf 100644
--- a/katapult/plugins/display/o2display/qembed_images.h
+++ b/katapult/plugins/display/o2display/qembed_images.h
@@ -1,8 +1,8 @@
-#ifndef _QEMBED_1804289383
-#define _QEMBED_1804289383
-#include <qimage.h>
-#include <qdict.h>
-static const QRgb singlebg_data[] = {
+#ifndef _TQEMBED_1804289383
+#define _TQEMBED_1804289383
+#include <tqimage.h>
+#include <tqdict.h>
+static const TQRgb singlebg_data[] = {
     0xffffff,0xffffff,0xffffff,0x9000000,0x45000000,0x8d010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,
     0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,
     0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,0xac010002,
@@ -3589,7 +3589,7 @@ static const QRgb singlebg_data[] = {
 };
 
 /* Generated by qembed */
-static const QRgb doublebg_data[] = {
+static const TQRgb doublebg_data[] = {
     0xffffff,0xffffff,0xffffff,0xffffff,0xffffff,0x3000000,0x3a000000,0x62000000,0x8a000000,0xb6010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,
     0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,
     0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,0xcc010001,
@@ -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;
 	}
     }
-- 
cgit v1.2.1