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

diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index c798a4eb..0b0d7c5e 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -22,8 +22,8 @@
 
 #include "optw_mediatypes.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <tqlayout.h>
+#include <tqlabel.h>
 #include "kvi_tal_tooltip.h"
 
 #include "kvi_options.h"
@@ -62,8 +62,8 @@ void KviMediaTypeListViewItem::copyData(KviMediaType * t)
 	setText(2,m_data.szDescription.ptr());	
 }
 
-KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"mediatypes_options_widget")
+KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * tqparent)
+: KviOptionsWidget(tqparent,"mediatypes_options_widget")
 {
 	createLayout(11,3);
 
@@ -75,74 +75,74 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 
 
 
-	connect(m_pListView,SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(currentItemChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
 
-	layout()->addMultiCellWidget(m_pListView,0,0,0,2);
+	tqlayout()->addMultiCellWidget(m_pListView,0,0,0,2);
 
-	QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this);
-	layout()->addWidget(l,1,0);
-	m_pDescription = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pDescription,1,1,1,2);
+	TQLabel * l = new TQLabel(__tr2qs_ctx("Description:","options"),this);
+	tqlayout()->addWidget(l,1,0);
+	m_pDescription = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pDescription,1,1,1,2);
 
-	l = new QLabel(__tr2qs_ctx("MIME type:","options"),this);
-	layout()->addWidget(l,2,0);
-	m_pIanaType = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
+	l = new TQLabel(__tr2qs_ctx("MIME type:","options"),this);
+	tqlayout()->addWidget(l,2,0);
+	m_pIanaType = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
 
-	l = new QLabel(__tr2qs_ctx("File pattern:","options"),this);
-	layout()->addWidget(l,3,0);
-	m_pFileMask = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
+	l = new TQLabel(__tr2qs_ctx("File pattern:","options"),this);
+	tqlayout()->addWidget(l,3,0);
+	m_pFileMask = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
 
-	l = new QLabel(__tr2qs_ctx("Magic bytes:","options"),this);
-	layout()->addWidget(l,4,0);
-	m_pMagicBytes = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
+	l = new TQLabel(__tr2qs_ctx("Magic bytes:","options"),this);
+	tqlayout()->addWidget(l,4,0);
+	m_pMagicBytes = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
 
-	l = new QLabel(__tr2qs_ctx("Save path:","options"),this);
-	layout()->addWidget(l,5,0);
-	m_pSavePath = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
+	l = new TQLabel(__tr2qs_ctx("Save path:","options"),this);
+	tqlayout()->addWidget(l,5,0);
+	m_pSavePath = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
 
-	l = new QLabel(__tr2qs_ctx("Local open command:","options"),this);
-	layout()->addWidget(l,6,0);
-	m_pCommandline = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
+	l = new TQLabel(__tr2qs_ctx("Local open command:","options"),this);
+	tqlayout()->addWidget(l,6,0);
+	m_pCommandline = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pCommandline,__tr2qs_ctx("<center>This field contains the command to execute to open a local file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Remote open command:","options"),this);
-	layout()->addWidget(l,7,0);
-	m_pRemoteExecCommandline = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
+	l = new TQLabel(__tr2qs_ctx("Remote open command:","options"),this);
+	tqlayout()->addWidget(l,7,0);
+	m_pRemoteExecCommandline = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 #endif
 
-	l = new QLabel(__tr2qs_ctx("Icon","options"),this);
-	layout()->addWidget(l,8,0);
-	m_pIcon = new QLineEdit(this);
-	layout()->addMultiCellWidget(m_pIcon,8,8,1,2);
+	l = new TQLabel(__tr2qs_ctx("Icon","options"),this);
+	tqlayout()->addWidget(l,8,0);
+	m_pIcon = new TQLineEdit(this);
+	tqlayout()->addMultiCellWidget(m_pIcon,8,8,1,2);
 
-	QFrame * f = new QFrame(this);
-	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
-	layout()->addMultiCellWidget(f,9,9,0,2);
+	TQFrame * f = new TQFrame(this);
+	f->setFrameStyle(TQFrame::Sunken | TQFrame::HLine);
+	tqlayout()->addMultiCellWidget(f,9,9,0,2);
 
-	QPushButton * b = new QPushButton(__tr2qs_ctx("&New","options"),this);
-	connect(b,SIGNAL(clicked()),this,SLOT(newMediaType()));
-	layout()->addWidget(b,10,1);
+	TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this);
+	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType()));
+	tqlayout()->addWidget(b,10,1);
 
-	m_pDelete = new QPushButton(__tr2qs_ctx("Re&move","options"),this);
-	connect(m_pDelete,SIGNAL(clicked()),this,SLOT(delMediaType()));
-	layout()->addWidget(m_pDelete,10,2);
+	m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this);
+	connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType()));
+	tqlayout()->addWidget(m_pDelete,10,2);
 	
 
-	layout()->setColStretch(1,1);
-	layout()->setColStretch(2,1);
-	layout()->setRowStretch(0,1);
+	tqlayout()->setColStretch(1,1);
+	tqlayout()->setColStretch(2,1);
+	tqlayout()->setRowStretch(0,1);
 
 	m_pLastItem = 0;