TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


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

1 files changed, 15 insertions, 9 deletions

diff --git a/src/modules/options/optw_taskbar.h b/src/modules/options/optw_taskbar.h
index 66990c26..84a0633d 100644
--- a/src/modules/options/optw_taskbar.h
+++ b/src/modules/options/optw_taskbar.h
@@ -27,7 +27,7 @@
 
 
 #include "kvi_optionswidget.h"
-#include <qcombobox.h>
+#include <tqcombobox.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTaskBarOptionsWidget KVI_SMALLICON_CLASSICTASKBAR
 #define KVI_OPTIONS_WIDGET_NAME_KviTaskBarOptionsWidget __tr2qs_no_lookup("Taskbar")
@@ -38,8 +38,9 @@
 class KviTaskBarOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTaskBarOptionsWidget(QWidget * parent);
+	KviTaskBarOptionsWidget(TQWidget * tqparent);
 	~KviTaskBarOptionsWidget();
 };
 
@@ -53,8 +54,9 @@ public:
 class KviTreeTaskBarOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTreeTaskBarOptionsWidget(QWidget * pParent);
+	KviTreeTaskBarOptionsWidget(TQWidget * pParent);
 	~KviTreeTaskBarOptionsWidget();
 };
 
@@ -68,8 +70,9 @@ public:
 class KviTreeTaskBarForegroundOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTreeTaskBarForegroundOptionsWidget(QWidget * parent);
+	KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent);
 	~KviTreeTaskBarForegroundOptionsWidget();
 };
 
@@ -83,11 +86,12 @@ public:
 class KviTreeTaskBarBackgroundOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 private:
-	QComboBox* m_pHorizontalAlign;
-	QComboBox* m_pVerticalAlign;
+	TQComboBox* m_pHorizontalAlign;
+	TQComboBox* m_pVerticalAlign;
 public:
-	KviTreeTaskBarBackgroundOptionsWidget(QWidget * parent);
+	KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent);
 	~KviTreeTaskBarBackgroundOptionsWidget();
 	
 	virtual void commit();
@@ -102,8 +106,9 @@ public:
 class KviTreeTaskBarFeaturesOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviTreeTaskBarFeaturesOptionsWidget(QWidget * parent);
+	KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent);
 	~KviTreeTaskBarFeaturesOptionsWidget();
 };
 
@@ -117,8 +122,9 @@ public:
 class KviClassicTaskBarOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviClassicTaskBarOptionsWidget(QWidget * parent);
+	KviClassicTaskBarOptionsWidget(TQWidget * tqparent);
 	~KviClassicTaskBarOptionsWidget();
 };