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

diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 07b39d0d..90695e2a 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -21,7 +21,7 @@
 //
 #include "optw_userlist.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
@@ -29,8 +29,8 @@
 
 //#warning "Info tips"
 
-KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"userlistlook_options_widget")
+KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"userlistlook_options_widget")
 {
 }
 
@@ -43,8 +43,8 @@ KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"userlistlook_foreground_options_widget")
+KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"userlistlook_foreground_options_widget")
 {
 	createLayout(2,2);
 
@@ -65,7 +65,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q
 	hb->setSpacing(4);
 	KviBoolSelector * b = addBoolSelector(hb,__tr2qs_ctx("Use different color for own nick:","options"),KviOption_boolUseDifferentColorForOwnNick);
 	KviColorSelector * s = addColorSelector(hb,"",KviOption_colorUserListViewOwnForeground,KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick));
-	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,3,0,3);
 }
@@ -74,30 +74,30 @@ KviUserListLookForegroundOptionsWidget::~KviUserListLookForegroundOptionsWidget(
 {
 }
 
-KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
+KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent)
 {
 	createLayout(5,1);
 	KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid);
 
 	KviColorSelector* s = addColorSelector(0,1,0,1,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool)));
 
 	KviTalHBox* hb = new KviTalHBox(this);
 	addWidgetToLayout(hb,0,2,0,2);
 	hb->setSpacing(4);
 
-	QLabel * l = new QLabel(__tr2qs_ctx("Grid type:","options"),hb);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("Grid type:","options"),hb);
 	l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,SIGNAL(toggled(bool)),l,SLOT(setEnabled(bool)));
-	m_pGridTypeCombo = new QComboBox(false,hb);
+	connect(b,TQT_SIGNAL(toggled(bool)),l,TQT_SLOT(setEnabled(bool)));
+	m_pGridTypeCombo = new TQComboBox(false,hb);
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("3D Grid","options"));
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("3D Buttons","options"));
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("Plain Grid","options"));
 	m_pGridTypeCombo->insertItem(__tr2qs_ctx("Dotted Grid","options"));
 	m_pGridTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintUserListViewGridType));
 	m_pGridTypeCombo->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
-	connect(b,SIGNAL(toggled(bool)),m_pGridTypeCombo,SLOT(setEnabled(bool)));
+	connect(b,TQT_SIGNAL(toggled(bool)),m_pGridTypeCombo,TQT_SLOT(setEnabled(bool)));
 	addRowSpacer(0,3,0,3);
 }
 
@@ -116,8 +116,8 @@ void KviUserListGridOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"userlistlook_background_options_widget")
+KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"userlistlook_background_options_widget")
 {
 	createLayout(3,2);
 
@@ -129,11 +129,11 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 	addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapUserListViewBackground);
 
 	addLabel(0,2,0,2,__tr2qs_ctx("Horizontal Alignment:","options"));
-	m_pHorizontalAlign=new QComboBox(this);
+	m_pHorizontalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pHorizontalAlign,1,2,1,2);
 	
 	addLabel(0,3,0,3,__tr2qs_ctx("Vertical Alignment:","options"));
-	m_pVerticalAlign=new QComboBox(this);
+	m_pVerticalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,3,1,3);
 	
 	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Tile","options"));
@@ -146,30 +146,30 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
 	
-	switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & Qt::AlignHorizontal_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & TQt::AlignHorizontal_Mask)
 	{
-		case Qt::AlignLeft:
+		case TQt::AlignLeft:
 			m_pHorizontalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignRight:
+		case TQt::AlignRight:
 			m_pHorizontalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignHCenter:
+		case TQt::AlignHCenter:
 			m_pHorizontalAlign->setCurrentItem(3);
 			break;
 		default:
 			m_pHorizontalAlign->setCurrentItem(0);
 	}
 	
-	switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & Qt::AlignVertical_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & TQt::AlignVertical_Mask)
 	{
-		case Qt::AlignTop:
+		case TQt::AlignTop:
 			m_pVerticalAlign->setCurrentItem(1);
 			break;
-		case Qt::AlignBottom:
+		case TQt::AlignBottom:
 			m_pVerticalAlign->setCurrentItem(2);
 			break;
-		case Qt::AlignVCenter:
+		case TQt::AlignVCenter:
 			m_pVerticalAlign->setCurrentItem(3);
 			break;
 		default:
@@ -178,8 +178,8 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 
 
 
-	//layout()->setColStretch(0,1);
-	layout()->setRowStretch(1,1);
+	//tqlayout()->setColStretch(0,1);
+	tqlayout()->setRowStretch(1,1);
 }
 
 KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget()
@@ -195,25 +195,25 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 	switch(m_pHorizontalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignLeft;
+			iFlags|=TQt::AlignLeft;
 			break;
 		case 2:
-			iFlags|=Qt::AlignRight;
+			iFlags|=TQt::AlignRight;
 			break;
 		case 3:
-			iFlags|=Qt::AlignHCenter;
+			iFlags|=TQt::AlignHCenter;
 			break;
 	}
 	switch(m_pVerticalAlign->currentItem())
 	{
 		case 1:
-			iFlags|=Qt::AlignTop;
+			iFlags|=TQt::AlignTop;
 			break;
 		case 2:
-			iFlags|=Qt::AlignBottom;
+			iFlags|=TQt::AlignBottom;
 			break;
 		case 3:
-			iFlags|=Qt::AlignVCenter;
+			iFlags|=TQt::AlignVCenter;
 			break;
 	}
 	
@@ -223,8 +223,8 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"userlistfeatures_options_widget")
+KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"userlistfeatures_options_widget")
 {
 	createLayout(7,1);