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

diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 717f568d..50717e77 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -48,7 +48,7 @@
 #include "send.h"
 #include "window.h"
 
-#include <qfileinfo.h>
+#include <tqfileinfo.h>
 
 #ifdef COMPILE_ON_WINDOWS
 	// Ugly Windoze compiler...
@@ -73,9 +73,9 @@ static void dcc_module_set_dcc_type(KviDccDescriptor * d,const char * szBaseType
 
 static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCommandCall *c)
 {
-	d->bIsTdcc = c->switches()->find('t',"tdcc");
+	d->bIsTdcc = c->switches()->tqfind('t',"tdcc");
 
-	KviKvsVariant * pSw = c->switches()->find('m',"minimize");
+	KviKvsVariant * pSw = c->switches()->tqfind('m',"minimize");
 
 	if(pSw != 0)
 		d->bOverrideMinimize = pSw->asBoolean();
@@ -85,7 +85,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 	if(!d->console())
 	{
 		// We don't need a console with -c and -n , otherwise we need it
-		if(!(c->switches()->find('c',"connect") || c->switches()->find('n',"no-ctcp")))
+		if(!(c->switches()->tqfind('c',"connect") || c->switches()->tqfind('n',"no-ctcp")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("This window has no associated IRC context (an IRC context is required unless -c or -n are passed)","dcc"));
@@ -98,7 +98,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 	if(!d->console()->isConnected())
 	{
 		// We don't need a connection with -c and -n , otherwise we need it
-		if(!(c->switches()->find('c',"connect") || c->switches()->find('n',"no-ctcp")))
+		if(!(c->switches()->tqfind('c',"connect") || c->switches()->tqfind('n',"no-ctcp")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("You're not connected to a server (an active connection is required unless -c or -n are passed)","dcc"));
@@ -118,10 +118,10 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 		d->szLocalHost  = d->console()->connection()->userInfo()->hostName();
 	}
 
-	if(pSw = c->switches()->find('i',"ip"))
+	if(pSw = c->switches()->tqfind('i',"ip"))
 	{
 		pSw->asString(d->szListenIp);
-		if(!(d->szListenIp.contains('.') || d->szListenIp.contains(':')))
+		if(!(d->szListenIp.tqcontains('.') || d->szListenIp.tqcontains(':')))
 		{
 			// This will magically work with the same buffer as source and dst!
 			if(!KviNetUtils::getInterfaceAddress(d->szListenIp,d->szListenIp))
@@ -132,7 +132,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 			}
 		}
 	} else {
-		QString tmp;
+		TQString tmp;
 		if(!dcc_kvs_get_listen_ip_address(c,d->console(),tmp))
 		{
 			delete d;
@@ -142,13 +142,13 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 		d->szListenIp=tmp;
 	}
 
-	if(pSw = c->switches()->find('p',"port"))
+	if(pSw = c->switches()->tqfind('p',"port"))
 	{
 		pSw->asString(d->szListenPort); // fixme!
 	}
 	else d->szListenPort = "0"; // any port is ok
 
-	if(pSw = c->switches()->find('a',"fake-address"))
+	if(pSw = c->switches()->tqfind('a',"fake-address"))
 	{
 		pSw->asString(d->szFakeIp);
 	}
@@ -160,16 +160,16 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 		}
 	}
 
-	if(pSw = c->switches()->find('f',"fake-port"))
+	if(pSw = c->switches()->tqfind('f',"fake-port"))
 	{
 		pSw->asString(d->szFakePort);
 	}
 
-	d->bDoTimeout = (!c->switches()->find('u',"unlimited"));
+	d->bDoTimeout = (!c->switches()->tqfind('u',"unlimited"));
 #ifdef COMPILE_SSL_SUPPORT
-	d->bIsSSL = c->switches()->find('s',"ssl");
+	d->bIsSSL = c->switches()->tqfind('s',"ssl");
 #else
-	if(c->switches()->find('s',"ssl"))c->warning(__tr2qs_ctx("This executable was built without SSL support, -s switch ignored","dcc"));
+	if(c->switches()->tqfind('s',"ssl"))c->warning(__tr2qs_ctx("This executable was built without SSL support, -s switch ignored","dcc"));
 #endif
 
 	return true;
@@ -397,7 +397,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 
 static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 {
-	QString szTarget;
+	TQString szTarget;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
 	KVSM_PARAMETERS_END(c)
@@ -411,7 +411,7 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 	if(!dcc_kvs_parse_default_parameters(d,c))return false;
 	dcc_module_set_dcc_type(d,"CHAT");
 
-	if(c->switches()->find('z',"zero-port"))
+	if(c->switches()->tqfind('z',"zero-port"))
 	{
 		// we want to have it reversed... add a tag and send out the request
 		KviDccZeroPortTag * t = g_pDccBroker->addZeroPortTag();
@@ -426,9 +426,9 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	if(c->switches()->find('c',"connect"))
+	if(c->switches()->tqfind('c',"connect"))
 	{
-		if(!(c->switches()->find('i',"ip") && c->switches()->find('p',"port")))
+		if(!(c->switches()->tqfind('i',"ip") && c->switches()->tqfind('p',"port")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("-c requires -i and -p","dcc"));
@@ -443,7 +443,7 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 		d->szIp         = __tr2qs_ctx("unknown","dcc");
 		d->szPort       = d->szIp;
 		d->bActive      = false;
-		d->bSendRequest = !c->switches()->find('n',"no-ctcp");
+		d->bSendRequest = !c->switches()->tqfind('n',"no-ctcp");
 	}
 	
 	//c->window()->output(0,"%Q %Q %Q",&(d->szIp),&(d->szPort),&(d->szListenIp));
@@ -605,7 +605,7 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 
 static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 {
-	QString szTarget,szFileName;
+	TQString szTarget,szFileName;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
 		KVSM_PARAMETER("file name",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szFileName)
@@ -615,12 +615,12 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 
 	d->szNick            = szTarget;    // we always specify the nickname
 
-	QString szTmp;
+	TQString szTmp;
 	KviKvsVariant * pSw = 0;
 
-	if(pSw = c->switches()->find('g',"get"))
+	if(pSw = c->switches()->tqfind('g',"get"))
 	{
-		d->szFileName = QFileInfo(szFileName).fileName();
+		d->szFileName = TQFileInfo(szFileName).fileName();
 
 		if(!pSw->isBoolean())
 		{
@@ -642,16 +642,16 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 	d->szUser            = __tr2qs_ctx("unknown","dcc"); // username is always unknown
 	d->szHost            = d->szUser;                 // host is always unknown
 	d->bRecvFile         = pSw != 0;
-	d->bNoAcks           = c->switches()->find('b',"blind") || c->switches()->find('t',"tdcc");
+	d->bNoAcks           = c->switches()->tqfind('b',"blind") || c->switches()->tqfind('t',"tdcc");
 	d->bResume           = false;
 	d->bAutoAccept       = pSw != 0;
 	d->bIsIncomingAvatar = false;
 
 	if(!dcc_kvs_parse_default_parameters(d,c))return false;
 
-	if(c->switches()->find('c',"connect"))
+	if(c->switches()->tqfind('c',"connect"))
 	{
-		if(!(c->switches()->find('i',"ip") && c->switches()->find('p',"port")))
+		if(!(c->switches()->tqfind('i',"ip") && c->switches()->tqfind('p',"port")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("-c requires -i and -p","dcc"));
@@ -666,10 +666,10 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 		d->szIp         = __tr2qs_ctx("unknown","dcc");
 		d->szPort       = d->szIp;
 		d->bActive      = false;
-		d->bSendRequest = !c->switches()->find('n',"no-ctcp");
+		d->bSendRequest = !c->switches()->tqfind('n',"no-ctcp");
 	}
 
-	if(c->switches()->find('g',"get"))
+	if(c->switches()->tqfind('g',"get"))
 	{
 		dcc_module_set_dcc_type(d,"RECV");
 		d->triggerCreationEvent();
@@ -790,7 +790,7 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 
 static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 {
-	QString szTarget,szFileName;
+	TQString szTarget,szFileName;
 	kvs_uint_t uSize;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
@@ -815,8 +815,8 @@ static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 	d->bActive           = false; // we have to listen!
 	d->bResume           = false; 
 	d->bRecvFile         = true;  // we have to receive the file!
-	d->bSendRequest      = !c->switches()->find('n',"no-ctcp");
-	d->bNoAcks           = d->bIsTdcc || c->switches()->find('b',"blind");
+	d->bSendRequest      = !c->switches()->tqfind('n',"no-ctcp");
+	d->bNoAcks           = d->bIsTdcc || c->switches()->tqfind('b',"blind");
 	d->bAutoAccept       = KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend);
 	d->bIsIncomingAvatar = g_pApp->findPendingAvatarChange(d->console(),d->szNick,d->szFileName);
 
@@ -862,7 +862,7 @@ static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 		The remote end may acknowledge the request by sending a DCC RECV request.
 		This command effects are similar to [cmd]dcc.send[/cmd], but will work also on machines
 		that can't accept incoming connections (firewalling or masquerading problems).[br]
-		A 120 seconds file offer is added for the specified file and mask "<nickname>!*@*".
+		A 120 seconds file offer is added for the specified file and tqmask "<nickname>!*@*".
 	@examples:
 
 */
@@ -872,25 +872,25 @@ static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 
 static bool dcc_kvs_cmd_rsend(KviKvsModuleCommandCall * c)
 {
-	QString szTarget,szFileName;
+	TQString szTarget,szFileName;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
 		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szFileName)
 	KVSM_PARAMETERS_END(c)
 
-	KVSM_REQUIRE_CONNECTION(c)
+	KVSM_RETQUIRE_CONNECTION(c)
 
 	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
 	d->szNick            = szTarget;
 	d->szLocalFileName   = szFileName;
-	d->bIsTdcc           = c->switches()->find('t',"tdcc");
+	d->bIsTdcc           = c->switches()->tqfind('t',"tdcc");
 #ifdef COMPILE_SSL_SUPPORT
-	d->bIsSSL            = c->switches()->find('s',"ssl");
+	d->bIsSSL            = c->switches()->tqfind('s',"ssl");
 #else
-	if(c->switches()->find('s',"ssl"))c->warning(__tr2qs_ctx("This executable has been built without SSL support, -s switch ignored","dcc"));
+	if(c->switches()->tqfind('s',"ssl"))c->warning(__tr2qs_ctx("This executable has been built without SSL support, -s switch ignored","dcc"));
 #endif //!COMPILE_SSL_SUPPORT
 
-	if(c->switches()->find('z',"zero-port"))
+	if(c->switches()->tqfind('z',"zero-port"))
 	{
 		dcc_module_set_dcc_type(d,"SEND");
 		d->setZeroPortRequestTag("nonempty"); // just to tag it
@@ -935,7 +935,7 @@ static bool dcc_kvs_cmd_rsend(KviKvsModuleCommandCall * c)
 
 static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
 {
-	QString szTarget,szFileName;
+	TQString szTarget,szFileName;
 	kvs_uint_t uSize;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
@@ -943,11 +943,11 @@ static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("size",KVS_PT_UINT,KVS_PF_OPTIONAL,uSize)
 	KVSM_PARAMETERS_END(c)
 
-	KVSM_REQUIRE_CONNECTION(c)
+	KVSM_RETQUIRE_CONNECTION(c)
 
-	KviQString::cutToLast(szFileName,'/');
+	KviTQString::cutToLast(szFileName,'/');
 
-	if(szFileName.contains(' '))
+	if(szFileName.tqcontains(' '))
 	{
 		szFileName.prepend('"');
 		szFileName.append('"');
@@ -955,11 +955,11 @@ static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
 
 	KviStr szDCC("GET");
 #ifdef COMPILE_SSL_SUPPORT
-	if(c->switches()->find('s',"ssl"))szDCC.prepend('S');
+	if(c->switches()->tqfind('s',"ssl"))szDCC.prepend('S');
 #else
-	if(c->switches()->find('s',"ssl"))c->warning(__tr2qs_ctx("This executable has no SSL support, -s switch ignored","dcc"));
+	if(c->switches()->tqfind('s',"ssl"))c->warning(__tr2qs_ctx("This executable has no SSL support, -s switch ignored","dcc"));
 #endif
-	if(c->switches()->find('t',"tdcc"))szDCC.prepend('T');
+	if(c->switches()->tqfind('t',"tdcc"))szDCC.prepend('T');
 
 	if(uSize == 0)
 	{
@@ -1105,7 +1105,7 @@ static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
 
 static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 {
-	QString szTarget;
+	TQString szTarget;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
 	KVSM_PARAMETERS_END(c)
@@ -1124,7 +1124,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 
 	if(!dcc_kvs_parse_default_parameters(d,c))return false;
 
-	if(KviKvsVariant * pSR = c->switches()->find('h',"sample-rate"))
+	if(KviKvsVariant * pSR = c->switches()->tqfind('h',"sample-rate"))
 	{
 		kvs_int_t iSR;
 		if(!pSR->asInteger(iSR))
@@ -1138,9 +1138,9 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 
 	d->szCodec = "adpcm";
 
-	if(KviKvsVariant * pCodec = c->switches()->find('g',"codec"))
+	if(KviKvsVariant * pCodec = c->switches()->tqfind('g',"codec"))
 	{
-		QString szCodec;
+		TQString szCodec;
 		pCodec->asString(szCodec);
 
 		if(!kvi_dcc_voice_is_valid_codec(szCodec))
@@ -1151,9 +1151,9 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 	}
 
 	dcc_module_set_dcc_type(d,"VOICE");
-	if(c->switches()->find('c',"connect"))
+	if(c->switches()->tqfind('c',"connect"))
 	{
-		if(!(c->switches()->find('i',"ip") && c->switches()->find('p',"port")))
+		if(!(c->switches()->tqfind('i',"ip") && c->switches()->tqfind('p',"port")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("-c requires -i and -p","dcc"));
@@ -1171,7 +1171,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 		d->szIp         = __tr2qs_ctx("unknown","dcc");
 		d->szPort       = d->szIp;
 		d->bActive      = false;
-		d->bSendRequest = !(c->switches()->find('n',"no-ctcp"));
+		d->bSendRequest = !(c->switches()->tqfind('n',"no-ctcp"));
 
 		d->triggerCreationEvent();
 		g_pDccBroker->passiveVoiceExecute(d);
@@ -1244,7 +1244,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 	if(c->hasSwitch('i'))
 	{
 		c->getSwitchValue('i',d->szListenIp);
-		if(!(d->szListenIp.contains('.') || d->szListenIp.contains(':')))
+		if(!(d->szListenIp.tqcontains('.') || d->szListenIp.tqcontains(':')))
 		{
 			// This will magically work with the same buffer as source and dst!
 			if(!kvi_getInterfaceAddress(d->szListenIp.ptr(),d->szListenIp))
@@ -1543,8 +1543,8 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 		[br]
 		[big]DCC File Transfer[/big][br]
 		DCC Send: Send a file, sender is passive, receiver is active (not good for firewalled senders)[br]
-		DCC Recv: Receive a file, sender is active, receiver is passive (not good for firewalled receivers)[br]
-		DCC RSend: Send a file, sender is active, receiver is passive (not good for firewalled receivers)[br]
+		DCC Recv: Receive a file, sender is active, receiver is passive (not good for firewalled tqreceivers)[br]
+		DCC RSend: Send a file, sender is active, receiver is passive (not good for firewalled tqreceivers)[br]
 		DCC Get: Receive a file, sender is passive if not firewalled, receiver active if sender not firewalled (will fail only if both are firewalled)[br]
 		The "turbo" extension disables the stream of acknowledges and is activated by prepending the 'T' character to the DCC subprotocol name[br]
 		The "SSL" extension causes a Secure Socket Layer to be used and is activated by prepending the 'S' character to the DCC subprotocol name[br]
@@ -1577,7 +1577,7 @@ static KviDccDescriptor * dcc_kvs_find_dcc_descriptor(const kvs_uint_t &uId,KviK
 			c->warning(__tr2qs_ctx("The current window has no associated DCC session","dcc"));
 		return dcc;
 	}
-	dcc = KviDccDescriptor::find(uId);
+	dcc = KviDccDescriptor::tqfind(uId);
 	if((!dcc) && bWarn)
 		c->warning(__tr2qs_ctx("The specified parameter is not a valid DCC identifier","dcc"));
 	return dcc;
@@ -1615,7 +1615,7 @@ static bool dcc_kvs_cmd_abort(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->find('q',"quiet"));
+	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->tqfind('q',"quiet"));
 
 	if(dcc)
 	{
@@ -1655,11 +1655,11 @@ static bool dcc_kvs_cmd_setBandwidthLimit(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->find('q',"quiet"));
+	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->tqfind('q',"quiet"));
 	if(dcc)
 	{
 		if (dcc->transfer())dcc->transfer()->setBandwidthLimit(uVal);
-		else if (!c->switches()->find('q',"quiet"))c->warning(__tr2qs_ctx("This DCC session is not a DCC transfer session","dcc"));
+		else if (!c->switches()->tqfind('q',"quiet"))c->warning(__tr2qs_ctx("This DCC session is not a DCC transfer session","dcc"));
 	}
 	return true;
 }
@@ -2082,7 +2082,7 @@ static bool dcc_kvs_fnc_localFileSize(KviKvsModuleFunctionCall * c)
 
 	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
-	if(dcc)c->returnValue()->setString(dcc->localFileSize().isEmpty() ? QString("0") : dcc->localFileSize());
+	if(dcc)c->returnValue()->setString(dcc->localFileSize().isEmpty() ? TQString("0") : dcc->localFileSize());
 	return true;
 }
 
@@ -2324,7 +2324,7 @@ static bool dcc_kvs_fnc_remoteFileSize(KviKvsModuleFunctionCall * c)
 
 	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
-	if(dcc)c->returnValue()->setString(dcc->remoteFileSize().isEmpty() ? QString("0") : dcc->remoteFileSize());
+	if(dcc)c->returnValue()->setString(dcc->remoteFileSize().isEmpty() ? TQString("0") : dcc->remoteFileSize());
 	return true;
 }
 
@@ -2369,16 +2369,16 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
 
 
 /*
-	@doc: dcc.transferStatus
+	@doc: dcc.transfertqStatus
 	@type:
 		function
 	@title:
-		$dcc.transferStatus
+		$dcc.transfertqStatus
 	@short:
 		Returns the current status of a dcc file transfer
 	@syntax:
-		<string> $dcc.transferStatus
-		<string> $dcc.transferStatus(<dcc_id:uint>)
+		<string> $dcc.transfertqStatus
+		<string> $dcc.transfertqStatus(<dcc_id:uint>)
 	@description:
 		Returns the status in the specified DCC session.[br]
 		The status is one of the strings "connecting", "transferring", "success" and "failure".
@@ -2393,7 +2393,7 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
 		See the [module:dcc]dcc module[/module] documentation for more informations.[br]
 */
 
-static bool dcc_kvs_fnc_transferStatus(KviKvsModuleFunctionCall * c)
+static bool dcc_kvs_fnc_transfertqStatus(KviKvsModuleFunctionCall * c)
 {
 	kvs_uint_t uDccId;
 	KVSM_PARAMETERS_BEGIN(c)
@@ -2406,7 +2406,7 @@ static bool dcc_kvs_fnc_transferStatus(KviKvsModuleFunctionCall * c)
 	{
 		if(dcc->transfer())
 		{
-			QString tmp;
+			TQString tmp;
 			dcc->transfer()->fillStatusString(tmp);
 			c->returnValue()->setString(tmp);
 		}
@@ -2527,7 +2527,7 @@ static bool dcc_kvs_fnc_averageSpeed(KviKvsModuleFunctionCall * c)
 
 static bool dcc_kvs_fnc_session(KviKvsModuleFunctionCall * c)
 {
-	QString szWinId;
+	TQString szWinId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window_id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
 	KVSM_PARAMETERS_END(c)
@@ -2590,7 +2590,7 @@ static bool dcc_kvs_fnc_session(KviKvsModuleFunctionCall * c)
 
 static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 {
-	QString szFlags;
+	TQString szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("filter",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
 	KVSM_PARAMETERS_END(c)
@@ -2614,9 +2614,9 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 			++it;
 		}
 	} else {
-		bool bWantFileUploads = szFlags.find('u',false) != -1;
-		bool bWantFileDownloads = szFlags.contains('d',false) != -1;
-		bool bWantChats = szFlags.contains('c',false) != -1;
+		bool bWantFileUploads = szFlags.tqfind('u',false) != -1;
+		bool bWantFileDownloads = szFlags.tqcontains('d',false) != -1;
+		bool bWantChats = szFlags.tqcontains('c',false) != -1;
 
 		while(KviDccDescriptor * dcc = it.current())
 		{
@@ -2669,7 +2669,7 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 		[fnc]$dcc.sessionList[/fnc][br]
 		[fnc]$dcc.protocol[/fnc][br]
 		[fnc]$dcc.connectionType[/fnc][br]
-		[fnc]$dcc.transferStatus[/fnc][br]
+		[fnc]$dcc.transfertqStatus[/fnc][br]
 		[fnc]$dcc.isFileTransfer[/fnc][br]
 		[fnc]$dcc.isFileUpload[/fnc][br]
 		[fnc]$dcc.isFileDownload[/fnc][br]
@@ -2708,7 +2708,7 @@ static bool dcc_module_init(KviModule * m)
 
 	// FIXME: file upload / download state ?
 
-	KVSM_REGISTER_FUNCTION(m,"transferStatus",dcc_kvs_fnc_transferStatus);
+	KVSM_REGISTER_FUNCTION(m,"transfertqStatus",dcc_kvs_fnc_transfertqStatus);
 	KVSM_REGISTER_FUNCTION(m,"protocol",dcc_kvs_fnc_protocol);
 	KVSM_REGISTER_FUNCTION(m,"connectionType",dcc_kvs_fnc_connectionType);
 	KVSM_REGISTER_FUNCTION(m,"isFileTransfer",dcc_kvs_fnc_isFileTransfer);