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

diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 860f80c5..1c9e4a28 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -21,13 +21,13 @@
 //
 #include "optw_ircview.h"
 
-#include <qlayout.h>
+#include <tqlayout.h>
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
 //#warning "Info tips"
 
-KviIrcViewThemeOptionsWidget::KviIrcViewThemeOptionsWidget(QWidget * pParent)
+KviIrcViewThemeOptionsWidget::KviIrcViewThemeOptionsWidget(TQWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
@@ -38,8 +38,8 @@ KviIrcViewThemeOptionsWidget::~KviIrcViewThemeOptionsWidget()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewlook_options_widget")
+KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ircviewlook_options_widget")
 {
 	createLayout(6,2);
 
@@ -49,11 +49,11 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
 	addPixmapSelector(0,2,1,2,__tr2qs_ctx("Background image:","options"),KviOption_pixmapIrcViewBackground);
 
 	addLabel(0,3,0,3,__tr2qs_ctx("Horizontal align:","options"));
-	m_pHorizontalAlign=new QComboBox(this);
+	m_pHorizontalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pHorizontalAlign,1,3,1,3);
 	
 	addLabel(0,4,0,4,__tr2qs_ctx("Vertical align:","options"));
-	m_pVerticalAlign=new QComboBox(this);
+	m_pVerticalAlign=new TQComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,4,1,4);
 		
 	addColorSelector(0,5,1,5,__tr2qs_ctx("Mark Line:","options"),KviOption_colorIrcViewMarkLine);
@@ -68,37 +68,37 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
 	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
 	
-	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignHorizontal_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & 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_uintIrcViewPixmapAlign) & Qt::AlignVertical_Mask)
+	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & 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:
 			m_pVerticalAlign->setCurrentItem(0);
 	}
 	
-	layout()->setRowStretch(2,1);
+	tqlayout()->setRowStretch(2,1);
 }
 
 KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget()
@@ -111,25 +111,25 @@ void KviIrcViewLookOptionsWidget::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;
 	}
 	
@@ -139,8 +139,8 @@ void KviIrcViewLookOptionsWidget::commit()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
+KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget")
 {
 	createLayout(14,1);