TQt4 port kbfx

This enables compilation under both Qt3 and Qt4


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

1 files changed, 38 insertions, 37 deletions

diff --git a/src/kbfxplasmacanvasitem.h b/src/kbfxplasmacanvasitem.h
index 92f1047..f240ef5 100644
--- a/src/kbfxplasmacanvasitem.h
+++ b/src/kbfxplasmacanvasitem.h
@@ -22,10 +22,10 @@
 #ifndef KBFX_PLASMA_CANVAS_ITEM_H
 #define KBFX_PLASMA_CANVAS_ITEM_H
 
-#include <qcanvas.h>
-#include <qfont.h>
-#include <qfontinfo.h>
-#include <qimage.h>
+#include <tqcanvas.h>
+#include <tqfont.h>
+#include <tqfontinfo.h>
+#include <tqimage.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -41,6 +41,7 @@ class KbfxPlasmaCanvasItem:public KbfxPlasmaCanvasAbstractItem
 {
 
 		Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
@@ -48,7 +49,7 @@ class KbfxPlasmaCanvasItem:public KbfxPlasmaCanvasAbstractItem
 		typedef enum {RASTER=0,VECTOR,NATIVE} SkinMode;
 
 
-		KbfxPlasmaCanvasItem ( QCanvasPixmapArray * a, QCanvas * canvas );
+		KbfxPlasmaCanvasItem ( TQCanvasPixmapArray * a, TQCanvas * canvas );
 		KbfxPlasmaCanvasItem ( const KbfxPlasmaCanvasItem &t );
 		KbfxPlasmaCanvasItem &operator = ( const KbfxPlasmaCanvasItem &t );
 		virtual ~KbfxPlasmaCanvasItem ();
@@ -57,39 +58,39 @@ class KbfxPlasmaCanvasItem:public KbfxPlasmaCanvasAbstractItem
 		void setItemMode ( bool mode=true );
 		void setType ( Type );
 		void setCurrent ( bool );
-		void setExec ( QString desktopfile );
-		QString name() {return m_labelText;};
-		QString desktopFile() { return m_desktopFilePath;}
+		void setExec ( TQString desktopfile );
+		TQString name() {return m_labelText;};
+		TQString desktopFile() { return m_desktopFilePath;}
 
 
 		KbfxDataSource * source() { return m_source;}
 		void setSource ( KbfxDataSource src );
-		void setCommand ( QString cmd );
-		void setComment ( QString comment );
-		void setIcon ( QPixmap pixmap );
-		void setIconPath ( QString path );
+		void setCommand ( TQString cmd );
+		void setComment ( TQString comment );
+		void setIcon ( TQPixmap pixmap );
+		void setIconPath ( TQString path );
 		bool isCurrent();
 		int height() { return m_height;}
 		int width() { return m_width;}
 		Type type() { return m_type;}
-		bool lookup ( QString str );
+		bool lookup ( TQString str );
 		virtual void advance ( int phase );
 		virtual int  rtti() const { return CANVASITEM;}
-		virtual void draw ( QPainter & pe );
-		virtual void drawContent ( QPainter * pe );
-		virtual QPixmap dragPixmap();
+		virtual void draw ( TQPainter & pe );
+		virtual void drawContent ( TQPainter * pe );
+		virtual TQPixmap dragPixmap();
 
-//		virtual void drawText(QPainter  *pe,QString str);
-		virtual void drawBackDrop ( QPainter * pe,QRect & rect );
+//		virtual void drawText(TQPainter  *pe,TQString str);
+		virtual void drawBackDrop ( TQPainter * pe,TQRect & rect );
 
 		/* Event Handling */
-		virtual void mousePressEvent ( QMouseEvent * e );
-		virtual void mouseMoveEvent ( QMouseEvent * e );
-		virtual void enterEvent ( QEvent * e );
-		virtual void mouseReleaseEvent ( QMouseEvent * e );
+		virtual void mousePressEvent ( TQMouseEvent * e );
+		virtual void mouseMoveEvent ( TQMouseEvent * e );
+		virtual void enterEvent ( TQEvent * e );
+		virtual void mouseReleaseEvent ( TQMouseEvent * e );
 
 
-		void setLabelText ( QString s );
+		void setLabelText ( TQString s );
 
 	public slots:
 		void updateAngle() {}
@@ -102,32 +103,32 @@ class KbfxPlasmaCanvasItem:public KbfxPlasmaCanvasAbstractItem
 	private:
 
 
-		void drawStar ( QPainter * pe );
+		void drawStar ( TQPainter * pe );
 
 		int m_frameCount;
 		int m_textWidth;
-		QString m_exec;
-		QString m_desktopFilePath;
-		QString m_labelText;
-		QString m_commentText;
-		QPixmap m_icon;
-		QString m_iconPath;
+		TQString m_exec;
+		TQString m_desktopFilePath;
+		TQString m_labelText;
+		TQString m_commentText;
+		TQPixmap m_icon;
+		TQString m_iconPath;
 		KDesktopFile  * m_desktopFile;
 		KbfxDataSource * m_source;
 
 		/* Theming stuff */
-		QColor m_fontAppNameColor;
-		QFont m_fontAppNameFont;
-		QColor m_commentColor;
-		QFont m_commentFont;
-		QColor m_lineColor;
-		QFont m_sepNameFont;
+		TQColor m_fontAppNameColor;
+		TQFont m_fontAppNameFont;
+		TQColor m_commentColor;
+		TQFont m_commentFont;
+		TQColor m_lineColor;
+		TQFont m_sepNameFont;
 		bool m_boldFonts;
 		bool m_skined;
 		bool m_restricted ; //KDE kiosk
 		Type  m_type;
 		bool m_hidden;
-		QString m_error;
+		TQString m_error;
 		bool m_isCurrent;
 		bool m_noComments;
 		int m_margin;