TQt4 port kvkbd

This enables compilation under both Qt3 and Qt4


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

1 files changed, 19 insertions, 17 deletions

diff --git a/src/MainWidget.h b/src/MainWidget.h
index 0eb87ac..3df3089 100644
--- a/src/MainWidget.h
+++ b/src/MainWidget.h
@@ -21,14 +21,14 @@
 #define KVKBDMAINWIDGET_H
 
 
-#include <qevent.h>
-#include <qpoint.h>
-#include <qtimer.h>
+#include <tqevent.h>
+#include <tqpoint.h>
+#include <tqtimer.h>
 #include <kaboutdata.h>
 #include <ksystemtray.h>
 #include <kpopupmenu.h>
-#include <qpainter.h>
-#include <qthread.h>
+#include <tqpainter.h>
+#include <tqthread.h>
 
 #include "resizabledragwidget.h"
 #include "VButton.h"
@@ -41,8 +41,9 @@ class KbdTray;
 class MainWidget : public ResizableDragWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	MainWidget(KAboutData *about=0, bool tren=false, QWidget *parent=0,const char *name="", WFlags f=WStyle_Customize | Qt::WX11BypassWM |WStyle_NormalBorder);
+	MainWidget(KAboutData *about=0, bool tren=false, TQWidget *tqparent=0,const char *name="", WFlags f=WStyle_Customize | TQt::WX11BypassWM |WStyle_NormalBorder);
 	void mappingNotify(XMappingEvent *e);
 	void finishInit();
 	bool close ( bool alsoDelete );
@@ -68,8 +69,8 @@ public slots:
  	void saveState();
 
 protected:
-	void resizeEvent(QResizeEvent *e);
-	void hideEvent ( QHideEvent *e );
+	void resizeEvent(TQResizeEvent *e);
+	void hideEvent ( TQHideEvent *e );
 
 
 private:
@@ -105,10 +106,10 @@ private:
 	NumpadVButton *ins;
 	NumpadVButton *del;
 	
-	QValueList<VButton *> btns;
-	QValueList<VButton *> mod_keys;
-	QValueList<VButton *> other_keys;
-	QValueList<NumpadVButton *> numl_keys;
+	TQValueList<VButton *> btns;
+	TQValueList<VButton *> mod_keys;
+	TQValueList<VButton *> other_keys;
+	TQValueList<NumpadVButton *> numl_keys;
 
 	void send_key(unsigned int keycode, bool press, bool release);
 	 
@@ -134,21 +135,22 @@ private:
 class KbdDock : public DragWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KbdDock(MainWidget *m);
     ~KbdDock();
 
-	void paintEvent(QPaintEvent *);
+	void paintEvent(TQPaintEvent *);
 
 
 private:
-	QPixmap icn;
+	TQPixmap icn;
 	MainWidget *mainWidget;
 	
 
 protected:
-	void mouseReleaseEvent(QMouseEvent *e);
+	void mouseReleaseEvent(TQMouseEvent *e);
 
 };
 
@@ -156,10 +158,10 @@ class KbdTray : public KSystemTray
 {
 
 public:
- 	KbdTray( QWidget* parent = 0, const char* name  = 0 );
+ 	KbdTray( TQWidget* tqparent = 0, const char* name  = 0 );
 
 protected:	
-    void mousePressEvent(QMouseEvent *);
+    void mousePressEvent(TQMouseEvent *);
 
 };