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, 16 insertions, 13 deletions

diff --git a/src/modules/options/optw_sound.h b/src/modules/options/optw_sound.h
index 37b3c0ed..3c2128f3 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/optw_sound.h
@@ -25,8 +25,8 @@
 //=============================================================================
 
 #include "kvi_optionswidget.h"
-#include <qcombobox.h>
-#include <qpushbutton.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSoundOptionsWidget KVI_SMALLICON_SOUND
 #define KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget __tr2qs_no_lookup("Sound")
@@ -37,8 +37,9 @@
 class KviSoundOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSoundOptionsWidget(QWidget * parent);
+	KviSoundOptionsWidget(TQWidget * tqparent);
 	~KviSoundOptionsWidget();
 };
 
@@ -51,21 +52,22 @@ public:
 class KviSoundGeneralOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSoundGeneralOptionsWidget(QWidget * parent);
+	KviSoundGeneralOptionsWidget(TQWidget * tqparent);
 	~KviSoundGeneralOptionsWidget();
 protected:
-	QComboBox * m_pSoundSystemBox;
-	QPushButton * m_pSoundTestButton;
-	QPushButton * m_pSoundAutoDetectButton;
-	QComboBox * m_pMediaPlayerBox;
-	QPushButton * m_pMediaTestButton;
-	QPushButton * m_pMediaAutoDetectButton;
+	TQComboBox * m_pSoundSystemBox;
+	TQPushButton * m_pSoundTestButton;
+	TQPushButton * m_pSoundAutoDetectButton;
+	TQComboBox * m_pMediaPlayerBox;
+	TQPushButton * m_pMediaTestButton;
+	TQPushButton * m_pMediaAutoDetectButton;
 
 #ifdef COMPILE_ON_WINDOWS
-	QComboBox * m_pWinampEncodingCombo;
+	TQComboBox * m_pWinampEncodingCombo;
 #endif
-	QComboBox * m_pTagsEncodingCombo;
+	TQComboBox * m_pTagsEncodingCombo;
 protected:
 	void soundFillBox();
 	void mediaFillBox();
@@ -86,8 +88,9 @@ protected slots:
 class KviSoundsOptionsWidget : public KviOptionsWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KviSoundsOptionsWidget(QWidget * parent);
+	KviSoundsOptionsWidget(TQWidget * tqparent);
 	~KviSoundsOptionsWidget();
 };