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, 29 insertions, 29 deletions

diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 9fec0a0c..569d4aee 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -31,8 +31,8 @@
 #include "kvi_pointerlist.h"
 #include "kvi_string.h"
 
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
 #include "kvi_tal_hbox.h"
 
 #ifdef COMPILE_INFO_TIPS
@@ -43,7 +43,7 @@
 
 
 
-KviSoundOptionsWidget::KviSoundOptionsWidget(QWidget * pParent)
+KviSoundOptionsWidget::KviSoundOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
@@ -53,8 +53,8 @@ KviSoundOptionsWidget::~KviSoundOptionsWidget()
 }
 
 
-KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"sound_system_options_widget")
+KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"sound_system_options_widget")
 {
 #ifdef COMPILE_ON_WINDOWS
 	createLayout(4,1);
@@ -67,13 +67,13 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	KviTalHBox * h = new KviTalHBox(g);
 
-	m_pSoundSystemBox = new QComboBox(false,h);
+	m_pSoundSystemBox = new TQComboBox(false,h);
 
-	m_pSoundAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect","options"),h);
-	connect(m_pSoundAutoDetectButton,SIGNAL(clicked()),this,SLOT(soundAutoDetect()));
+	m_pSoundAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h);
+	connect(m_pSoundAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundAutoDetect()));
 
-	m_pSoundTestButton = new QPushButton(__tr2qs_ctx("Test","options"),h);
-	connect(m_pSoundTestButton,SIGNAL(clicked()),this,SLOT(soundTest()));
+	m_pSoundTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h);
+	connect(m_pSoundTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundTest()));
 
 
 	g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Media Player","options"),true);
@@ -83,13 +83,13 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pMediaPlayerBox = new QComboBox(false,h);
+	m_pMediaPlayerBox = new TQComboBox(false,h);
 
-	m_pMediaAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect","options"),h);
-	connect(m_pMediaAutoDetectButton,SIGNAL(clicked()),this,SLOT(mediaAutoDetect()));
+	m_pMediaAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h);
+	connect(m_pMediaAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaAutoDetect()));
 
-	m_pMediaTestButton = new QPushButton(__tr2qs_ctx("Test","options"),h);
-	connect(m_pMediaTestButton,SIGNAL(clicked()),this,SLOT(mediaTest()));
+	m_pMediaTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h);
+	connect(m_pMediaTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaTest()));
 
 	addRowSpacer(0,2,0,2);
 
@@ -105,7 +105,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pTagsEncodingCombo = new QComboBox(false,h);
+	m_pTagsEncodingCombo = new TQComboBox(false,h);
 	m_pTagsEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
 
 	int i = 0;
@@ -114,7 +114,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i);
 	while(d->szName)
 	{
-		if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding)))iMatch = i + 1;
+		if(KviTQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding)))iMatch = i + 1;
 		m_pTagsEncodingCombo->insertItem(d->szName);
 		i++;
 		d = KviLocale::encodingDescription(i);
@@ -128,7 +128,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pWinampEncodingCombo = new QComboBox(false,h);
+	m_pWinampEncodingCombo = new TQComboBox(false,h);
 	
 	m_pWinampEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
 	i = 0;
@@ -137,7 +137,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	d = KviLocale::encodingDescription(i);
 	while(d->szName)
 	{
-		if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringWinampTextEncoding)))iMatch = i + 1;
+		if(KviTQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringWinampTextEncoding)))iMatch = i + 1;
 		m_pWinampEncodingCombo->insertItem(d->szName);
 		i++;
 		d = KviLocale::encodingDescription(i);
@@ -180,8 +180,8 @@ void KviSoundGeneralOptionsWidget::mediaAutoDetect()
 void KviSoundGeneralOptionsWidget::soundFillBox()
 {
 
-	QStringList l;
-	QStringList::Iterator it;
+	TQStringList l;
+	TQStringList::Iterator it;
 	int cnt;
 	int i;
 	KviModule * m = g_pModuleManager->getModule("snd");
@@ -203,8 +203,8 @@ void KviSoundGeneralOptionsWidget::soundFillBox()
 
 	for(i=0;i<cnt;i++)
 	{
-		QString t = m_pSoundSystemBox->text(i);
-		if(KviQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringSoundSystem)))
+		TQString t = m_pSoundSystemBox->text(i);
+		if(KviTQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringSoundSystem)))
 		{
 			m_pSoundSystemBox->setCurrentItem(i);
 			break;
@@ -221,8 +221,8 @@ disable:
 
 void KviSoundGeneralOptionsWidget::mediaFillBox()
 {
-	QStringList l;
-	QStringList::Iterator it;
+	TQStringList l;
+	TQStringList::Iterator it;
 	int cnt;
 	int i;
 	KviModule * m = g_pModuleManager->getModule("mediaplayer");
@@ -238,8 +238,8 @@ void KviSoundGeneralOptionsWidget::mediaFillBox()
 
 	for(i=0;i<cnt;i++)
 	{
-		QString t = m_pMediaPlayerBox->text(i);
-		if(KviQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer)))
+		TQString t = m_pMediaPlayerBox->text(i);
+		if(KviTQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer)))
 		{
 			m_pMediaPlayerBox->setCurrentItem(i);
 			break;
@@ -283,8 +283,8 @@ void KviSoundGeneralOptionsWidget::commit()
 #endif
 }
 
-KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"sound_options_widget")
+KviSoundsOptionsWidget::KviSoundsOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"sound_options_widget")
 {
 	createLayout(5,2);
 	addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options"));