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

diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index ec1efde..2170362 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
@@ -39,7 +39,7 @@
 KviKvsDnsManager * KviKvsDnsManager::m_pInstance = 0;
 
 
-KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const QString &szQuery,bool bRebindOnWindowClose,KviKvsScript * pCallback,KviKvsVariantList * pParameterList)
+KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const TQString &szQuery,bool bRebindOnWindowClose,KviKvsScript * pCallback,KviKvsVariantList * pParameterList)
 {
 	m_pDns = pDns;
 	m_pWindow = pWnd;
@@ -51,7 +51,7 @@ KviKvsDnsObject::KviKvsDnsObject(KviDns * pDns,KviWindow * pWnd,const QString &s
 
 KviKvsDnsObject::~KviKvsDnsObject()
 {
-	QObject::disconnect(m_pDns,0,0,0);
+	TQObject::disconnect(m_pDns,0,0,0);
 	if(m_pDns->isRunning())
 	{
 		g_pApp->collectGarbage(m_pDns);
@@ -64,7 +64,7 @@ KviKvsDnsObject::~KviKvsDnsObject()
 
 
 KviKvsDnsManager::KviKvsDnsManager()
-: QObject()
+: TQObject()
 {
 	m_pDnsObjects = 0;
 }
@@ -102,13 +102,13 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject)
 		m_pDnsObjects = new KviPointerHashTable<void *,KviKvsDnsObject>;
 		m_pDnsObjects->setAutoDelete(true);
 	}
-	m_pDnsObjects->replace(pObject->dns(),pObject);
-	connect(pObject->dns(),SIGNAL(lookupDone(KviDns *)),this,SLOT(dnsLookupTerminated(KviDns *)));
+	m_pDnsObjects->tqreplace(pObject->dns(),pObject);
+	connect(pObject->dns(),TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupTerminated(KviDns *)));
 }
 
 void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns)
 {
-	KviKvsDnsObject * o = m_pDnsObjects->find(pDns);
+	KviKvsDnsObject * o = m_pDnsObjects->tqfind(pDns);
 	if(!o)
 	{
 		debug("KviKvsDnsManager::dnsLookupTerminated(): can't find the KviKvsDnsObject structure");
@@ -140,12 +140,12 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns)
 			o->parameterList()->prepend(new KviKvsVariant(KviError::getDescription(o->dns()->error()))); // $2
 			o->parameterList()->prepend(new KviKvsVariant((kvs_int_t)0)); // $1
 		} else {
-			QString * fh = o->dns()->hostnameList()->first();
-			QString * fi = o->dns()->ipAddressList()->first();
+			TQString * fh = o->dns()->hostnameList()->first();
+			TQString * fi = o->dns()->ipAddressList()->first();
 
 			// $4... is the magic data
-			o->parameterList()->prepend(new KviKvsVariant(fh ? *fh : QString("?.?"))); // $3
-			o->parameterList()->prepend(new KviKvsVariant(fi ? *fi : QString("?.?.?.?"))); // $2
+			o->parameterList()->prepend(new KviKvsVariant(fh ? *fh : TQString("?.?"))); // $3
+			o->parameterList()->prepend(new KviKvsVariant(fi ? *fi : TQString("?.?.?.?"))); // $2
 			o->parameterList()->prepend(new KviKvsVariant((kvs_int_t)1)); // $1
 		}
 		o->parameterList()->prepend(new KviKvsVariant(o->query())); // $0
@@ -153,22 +153,22 @@ void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns)
 		copy.run(o->window(),o->parameterList(),0,KviKvsScript::PreserveParams);
 
 	} else {
-		QString szQuery = o->dns()->query();
+		TQString szQuery = o->dns()->query();
 		o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("DNS Lookup result for query \"%Q\""),&szQuery);
 	
 		if(o->dns()->state() == KviDns::Failure)
 		{
-			QString szErr = KviError::getDescription(o->dns()->error());
+			TQString szErr = KviError::getDescription(o->dns()->error());
 			o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Error: %Q"),&szErr);
 		} else {
 			int idx = 1;
-			for(QString * h = o->dns()->hostnameList()->first();h;h = o->dns()->hostnameList()->next())
+			for(TQString * h = o->dns()->hostnameList()->first();h;h = o->dns()->hostnameList()->next())
 			{
 				o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("Hostname %d: %Q"),idx,h);
 				idx++;
 			}
 			idx = 1;
-			for(QString * a = o->dns()->ipAddressList()->first();a;a = o->dns()->ipAddressList()->next())
+			for(TQString * a = o->dns()->ipAddressList()->first();a;a = o->dns()->ipAddressList()->next())
 			{
 				o->window()->output(KVI_OUT_HOSTLOOKUP,__tr2qs("IP address %d: %Q"),idx,a);
 				idx++;