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, 34 insertions, 33 deletions

diff --git a/src/kbfxplasmacanvasview.h b/src/kbfxplasmacanvasview.h
index 80c8a99..4d7df00 100644
--- a/src/kbfxplasmacanvasview.h
+++ b/src/kbfxplasmacanvasview.h
@@ -22,10 +22,10 @@
 #ifndef KBFX_PLASMA_CANVAS_VIEW_H
 #define KBFX_PLASMA_CANVAS_VIEW_H
 
-#include <qcanvas.h>
-#include <qcursor.h>
-#include <qdragobject.h>
-#include <qpainter.h>
+#include <tqcanvas.h>
+#include <tqcursor.h>
+#include <tqdragobject.h>
+#include <tqpainter.h>
 
 #include <kimageeffect.h>
 
@@ -46,45 +46,46 @@
 #include "kbfxspinxscrollbar.h"
 
 
-class QCanvasView;
+class TQCanvasView;
 
 
-class KbfxPlasmaCanvasView : public QCanvasView
+class KbfxPlasmaCanvasView : public TQCanvasView
 {
 		Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		typedef QMap<QString,KbfxPlasmaCanvasStack*> stackMap;
-		typedef QMap<QString,KbfxDataStack*> dataStack;
-		typedef QMap<int,KbfxPlasmaCanvasItem*> searchMap;
+		typedef TQMap<TQString,KbfxPlasmaCanvasStack*> stackMap;
+		typedef TQMap<TQString,KbfxDataStack*> dataStack;
+		typedef TQMap<int,KbfxPlasmaCanvasItem*> searchMap;
 
-		KbfxPlasmaCanvasView ( QWidget * parent = 0, const char * name = 0, WFlags f = 0 );
+		KbfxPlasmaCanvasView ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 );
 		virtual	~KbfxPlasmaCanvasView();
-		void addStack ( KbfxPlasmaCanvasStack*stk,QString name );
-		void addStack ( KbfxDataStack*stk,QString name );
+		void addStack ( KbfxPlasmaCanvasStack*stk,TQString name );
+		void addStack ( KbfxDataStack*stk,TQString name );
 		
-		void setKbfxCanvas ( QCanvas*cnv );
+		void setKbfxCanvas ( TQCanvas*cnv );
 		void loadGroup ( KbfxDataGroupList * src,KbfxPlasmaCanvasGroupView * dest );
-		void contentsDragLeaveEvent ( QDragEnterEvent *event );
-		void contentsDragEnterEvent ( QDragEnterEvent *event );
+		void contentsDragLeaveEvent ( TQDragEnterEvent *event );
+		void contentsDragEnterEvent ( TQDragEnterEvent *event );
 		
 
 	public slots:
 
 		void clearAll();
-		virtual void contentsMousePressEvent ( QMouseEvent * me );
-		virtual void contentsMouseMoveEvent ( QMouseEvent * e );
-		virtual void contentsMouseReleaseEvent ( QMouseEvent * e );
-		virtual void mouseMoveEvent ( QMouseEvent * me );
-		virtual void enterEvent ( QEvent * e );
-		virtual void keyPressEvent ( QKeyEvent * ke );
-		virtual void emulatedKeyPress ( QKeyEvent * k ) {keyPressEvent ( k );}
-		virtual void resizeEvent ( QResizeEvent * ) ;
-		virtual void leaveEvent ( QEvent * e );
-//		virtual void leaveEvent(QEvent e );
+		virtual void contentsMousePressEvent ( TQMouseEvent * me );
+		virtual void contentsMouseMoveEvent ( TQMouseEvent * e );
+		virtual void contentsMouseReleaseEvent ( TQMouseEvent * e );
+		virtual void mouseMoveEvent ( TQMouseEvent * me );
+		virtual void enterEvent ( TQEvent * e );
+		virtual void keyPressEvent ( TQKeyEvent * ke );
+		virtual void emulatedKeyPress ( TQKeyEvent * k ) {keyPressEvent ( k );}
+		virtual void resizeEvent ( TQResizeEvent * ) ;
+		virtual void leaveEvent ( TQEvent * e );
+//		virtual void leaveEvent(TQEvent e );
 		void handleLoadRequest ( KbfxSignal );
-		void search ( const QString & );
-		void search_R ( const QString key );
+		void search ( const TQString & );
+		void search_R ( const TQString key );
 		void execFirst();
 		void execAt ( int  i );
 		void expandAll();
@@ -99,24 +100,24 @@ class KbfxPlasmaCanvasView : public QCanvasView
 		void startDrag();
 		void placeScrollBars();
 
-		QPoint m_clickPos;
+		TQPoint m_clickPos;
 		KbfxPlasmaCanvasItem  * m_currentItem;
 		KbfxPlasmaCanvasStack * m_currentStack;
 		KbfxPlasmaCanvasStack * m_stack;
-		QString m_lastSignalData;
+		TQString m_lastSignalData;
 		stackMap m_appletMap;
 		dataStack m_dataStack;
 		searchMap m_searchMap;
 		KbfxPlasmaCanvasStack * gstack ;
 		KbfxPlasmaCanvasItem * m_exeCandidate;
-		QCanvas * m_default;
-		QCanvas * m_search;
+		TQCanvas * m_default;
+		TQCanvas * m_search;
 		bool m_findDone;
 		KbfxSpinxScrollBar * m_scrollbar_top;
 		KbfxSpinxScrollBar * m_scrollbar_bot;
-		QPoint m_dragPos;
+		TQPoint m_dragPos;
 		KbfxPlasmaCanvasGroupView * m_currentView;
-		QString m_currentViewName;
+		TQString m_currentViewName;
 		KbfxPlasmaCanvasItem * m_selectedItem;
 };