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

diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 523d3c79..98acb0a5 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -30,19 +30,19 @@
 #include "kvi_options.h"
 #include "kvi_styled_controls.h"
 
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
 #include <kvi_tal_groupbox.h>
 #include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
+#include <tqcursor.h>
 #include "kvi_tal_tooltip.h"
-#include <qtoolbutton.h>
+#include <tqtoolbutton.h>
 
 
-KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,KviProxy * prx)
-: KviTalListViewItem(parent,prx->m_szHostname.ptr())
+KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx)
+: KviTalListViewItem(tqparent,prx->m_szHostname.ptr())
 {
 	setPixmap(0,pm);
 	m_pProxyData = new KviProxy(*prx);
@@ -53,8 +53,8 @@ KviProxyOptionsListViewItem::~KviProxyOptionsListViewItem()
 	delete m_pProxyData;
 }
 
-KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"proxy_options_widget")
+KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"proxy_options_widget")
 {
 	createLayout(3,2);
 
@@ -67,13 +67,13 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	m_pListView->setAllColumnsShowFocus(true);
 	m_pListView->setSelectionMode(KviTalListView::Single);
 
-	connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),
-		this,SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,SIGNAL(rightButtonPressed(KviTalListViewItem *,const QPoint &,int)),
-		this,SLOT(listViewRightButtonPressed(KviTalListViewItem *,const QPoint &,int)));
+	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),
+		this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQT_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int)));
 
 #ifdef COMPILE_INFO_TIPS
-  QString tiptxt = __tr2qs_ctx("<center>This is the list of available proxy servers.<br>" \
+  TQString tiptxt = __tr2qs_ctx("<center>This is the list of available proxy servers.<br>" \
                            "Right-click on the list to add or remove proxies.</center>","options");
   mergeTip(m_pListView,tiptxt);
   mergeTip(m_pListView->viewport(),tiptxt);
@@ -82,10 +82,10 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
   KviTalVBox * vbox = new KviTalVBox(this);
   addWidgetToLayout(vbox,1,1,1,1);
 
-  QToolButton * tb = new KviStyledToolButton(vbox);
+  TQToolButton * tb = new KviStyledToolButton(vbox);
   tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)));
   tb->setAutoRaise(true);
-  connect(tb,SIGNAL(clicked()),this,SLOT(newProxy()));
+  connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(newProxy()));
 #ifdef COMPILE_INFO_TIPS
   mergeTip(tb,__tr2qs_ctx("New Proxy","options"));
 #endif
@@ -94,51 +94,51 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
   tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)));
   //tb->setEnabled(false);
   tb->setAutoRaise(true);
-  connect(tb,SIGNAL(clicked()),this,SLOT(removeCurrent()));
+  connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent()));
 #ifdef COMPILE_INFO_TIPS
   mergeTip(tb,__tr2qs_ctx("Remove Proxy","options"));
 #endif
 
-  QFrame * lll = new QFrame(vbox);
+  TQFrame * lll = new TQFrame(vbox);
   vbox->setStretchFactor(lll,100);
 
 
 	KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),this);
-	//QGridLayout * gl = new QGridLayout(gbox->layout());
+	//TQGridLayout * gl = new TQGridLayout(gbox->tqlayout());
 	//gl->setMargin(2);
 	//gl->setSpacing(4);
 
-	m_pProxyLabel = new QLabel(__tr2qs_ctx("Proxy:","options"),gbox);
+	m_pProxyLabel = new TQLabel(__tr2qs_ctx("Proxy:","options"),gbox);
 
-	m_pProxyEdit = new QLineEdit(gbox);
+	m_pProxyEdit = new TQLineEdit(gbox);
 
-	m_pPortLabel = new QLabel(__tr2qs_ctx("Port:","options"),gbox);
+	m_pPortLabel = new TQLabel(__tr2qs_ctx("Port:","options"),gbox);
 
-	m_pPortEdit = new QLineEdit(gbox);
+	m_pPortEdit = new TQLineEdit(gbox);
 
-	m_pIpLabel = new QLabel(__tr2qs_ctx("IP address:","options"),gbox);
+	m_pIpLabel = new TQLabel(__tr2qs_ctx("IP address:","options"),gbox);
 
 	m_pIpEditor = new KviIpEditor(gbox,KviIpEditor::IpV4);
 
-	m_pUserLabel = new QLabel(__tr2qs_ctx("Username:","options"),gbox);
+	m_pUserLabel = new TQLabel(__tr2qs_ctx("Username:","options"),gbox);
 
-	m_pUserEdit = new QLineEdit(gbox);
+	m_pUserEdit = new TQLineEdit(gbox);
 
-	m_pPassLabel = new QLabel(__tr2qs_ctx("Password:","options"),gbox);
+	m_pPassLabel = new TQLabel(__tr2qs_ctx("Password:","options"),gbox);
 
-	m_pPassEdit = new QLineEdit(gbox);
+	m_pPassEdit = new TQLineEdit(gbox);
 
-	m_pProtocolLabel = new QLabel(__tr2qs_ctx("Protocol:","options"),gbox);
+	m_pProtocolLabel = new TQLabel(__tr2qs_ctx("Protocol:","options"),gbox);
 
-	m_pProtocolBox = new QComboBox(false,gbox);
+	m_pProtocolBox = new TQComboBox(false,gbox);
 
-	QStringList l;
+	TQStringList l;
 	KviProxy::getSupportedProtocolNames(l);
 
 	m_pProtocolBox->insertStringList(l);
 
 	m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
-	connect(m_pIpV6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool)));
+	connect(m_pIpV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(ipV6CheckToggled(bool)));
 #ifndef COMPILE_IPV6_SUPPORT
 	m_pIpV6Check->setEnabled(false);
 #endif
@@ -147,8 +147,8 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 
 	fillProxyList();
 
-	layout()->setRowStretch(0,1);
-	layout()->setColStretch(0,1);
+	tqlayout()->setRowStretch(0,1);
+	tqlayout()->setColStretch(0,1);
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 
@@ -330,12 +330,12 @@ void KviProxyOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-void KviProxyOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col)
+void KviProxyOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const TQPoint &pnt,int col)
 {
 	m_pContextPopup->clear();
-	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy()));
-	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())),it);
-	m_pContextPopup->popup(QCursor::pos());
+	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,TQT_SLOT(newProxy()));
+	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,TQT_SLOT(removeCurrent())),it);
+	m_pContextPopup->popup(TQCursor::pos());
 }
 
 void KviProxyOptionsWidget::newProxy()