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

diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 99f8e38e..a2ff3bb3 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -35,7 +35,7 @@
 #include "kvi_ircconnectiontarget.h"
 #include "kvi_ircconnection.h"
 
-static KviChannel * chan_kvs_find_channel(KviKvsModuleFunctionCall * c,QString &szChan,bool noWarnings=false)
+static KviChannel * chan_kvs_find_channel(KviKvsModuleFunctionCall * c,TQString &szChan,bool noWarnings=false)
 {
 	if(szChan.isEmpty())
 	{
@@ -76,7 +76,7 @@ static KviChannel * chan_kvs_find_channel(KviKvsModuleFunctionCall * c,QString &
 
 static bool chan_kvs_fnc_name(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -105,7 +105,7 @@ static bool chan_kvs_fnc_name(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_getUrl(KviKvsModuleFunctionCall * c)
 {
-	QString szId,url;
+	TQString szId,url;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("channel id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -148,7 +148,7 @@ static bool chan_kvs_fnc_getUrl(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_isdead(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -182,7 +182,7 @@ static bool chan_kvs_fnc_isdead(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_topic(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -216,7 +216,7 @@ static bool chan_kvs_fnc_topic(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_topicsetby(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -250,7 +250,7 @@ static bool chan_kvs_fnc_topicsetby(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -281,7 +281,7 @@ static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -313,7 +313,7 @@ static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_ownercount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -345,7 +345,7 @@ static bool chan_kvs_fnc_ownercount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_admincount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -378,7 +378,7 @@ static bool chan_kvs_fnc_admincount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_opcount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -410,7 +410,7 @@ static bool chan_kvs_fnc_opcount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_voicecount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -442,7 +442,7 @@ static bool chan_kvs_fnc_voicecount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_halfopcount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -474,7 +474,7 @@ static bool chan_kvs_fnc_halfopcount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_useropcount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -506,7 +506,7 @@ static bool chan_kvs_fnc_useropcount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_bancount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -538,7 +538,7 @@ static bool chan_kvs_fnc_bancount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_banexceptioncount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -570,7 +570,7 @@ static bool chan_kvs_fnc_banexceptioncount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_invitecount(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -597,7 +597,7 @@ static bool chan_kvs_fnc_invitecount(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_ison(KviKvsModuleFunctionCall * c)
 {
-	QString szId,szNick;
+	TQString szId,szNick;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -634,7 +634,7 @@ static bool chan_kvs_fnc_ison(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_getflag(KviKvsModuleFunctionCall * c)
 {
-	QString szId,szNick;
+	TQString szId,szNick;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
@@ -642,10 +642,10 @@ static bool chan_kvs_fnc_getflag(KviKvsModuleFunctionCall * c)
 	KviChannel * ch = chan_kvs_find_channel(c,szId);
 	if(ch)
 	{
-		QChar cFlag = ch->userListView()->getUserFlag(szNick);
-		if(cFlag != QChar(0))
+		TQChar cFlag = ch->userListView()->getUserFlag(szNick);
+		if(cFlag != TQChar(0))
 		{
-			QString szFlag = cFlag;
+			TQString szFlag = cFlag;
 			c->returnValue()->setString(szFlag);
 		} else {
 			c->returnValue()->setNothing();
@@ -657,7 +657,7 @@ static bool chan_kvs_fnc_getflag(KviKvsModuleFunctionCall * c)
 #define IS_KVS_FUNC(__clbkname,__chanfunc) \
 static bool __clbkname(KviKvsModuleFunctionCall * c) \
 { \
-	QString szId,szNick;\
+	TQString szId,szNick;\
 	KVSM_PARAMETERS_BEGIN(c)\
 		KVSM_PARAMETER("nickname",KVS_PT_NONEMPTYSTRING,0,szNick)\
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)\
@@ -803,7 +803,7 @@ IS_KVS_FUNC(chan_kvs_fnc_isuserop,isUserOp)
 #define IS_ME_KVS_FUNC(__clbkname,__chanfunc) \
 static bool __clbkname(KviKvsModuleFunctionCall * c) \
 { \
-	QString szId;\
+	TQString szId;\
 	KVSM_PARAMETERS_BEGIN(c)\
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)\
 	KVSM_PARAMETERS_END(c)\
@@ -934,14 +934,14 @@ IS_ME_KVS_FUNC(chan_kvs_fnc_ismeuserop,isMeUserOp)
 
 static bool chan_kvs_fnc_mode(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
 	KviChannel * ch = chan_kvs_find_channel(c,szId);
 	if(ch)
 	{
-		QString chMode;
+		TQString chMode;
 		ch->getChannelModeString(chMode);
 		c->returnValue()->setString(chMode);
 	}
@@ -970,7 +970,7 @@ static bool chan_kvs_fnc_mode(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_key(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
@@ -1000,13 +1000,13 @@ static bool chan_kvs_fnc_key(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 {
-	QString szId;
+	TQString szId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
 	KviChannel * ch = chan_kvs_find_channel(c,szId);
 	kvs_int_t limit=0;
-	QString lim;
+	TQString lim;
 	if (ch) 
 	{
 		if(ch->hasChannelLimit())
@@ -1029,21 +1029,21 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns an array of channel user nicknames
 	@syntax:
-		<array> $chan.users([window_id:string],[mask:string],[flags:string])
+		<array> $chan.users([window_id:string],[tqmask:string],[flags:string])
 	@description:
 		Returns an array of nicknames on the channel specified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
-		If [mask] is given, each user is added to the array only
-		if it matches the [mask].[br]
+		If [tqmask] is given, each user is added to the array only
+		if it matches the [tqmask].[br]
 		[flags] may contain a subset of the letters "aovhnmi":[br]
 		"ovhn" are mode flags: the users are added to the array only if they are channel administrators ('a'), operators ('o'),
 		voiced users ('v'), half-operators ('h'), user-operators ('u') or unflagged ('n') users. (Unflagged means not operators, not
 		voiced and not half-operators). If none of the "ovhun" flags are used, KVIrc behaves like all five were passed.[br]
-		The flag 'm' causes the entire user masks to be added to the 
+		The flag 'm' causes the entire user tqmasks to be added to the 
 		array entries, as known by KVIrc at the moment of this function call.[br]
-		The flag 'i' causes KVIrc to invert the match and add only the users that do NOT match [mask].[br]
-		Please note that on really large channels this function may be time consuming (especially if [mask] is used):
+		The flag 'i' causes KVIrc to invert the match and add only the users that do NOT match [tqmask].[br]
+		Please note that on really large channels this function may be time consuming (especially if [tqmask] is used):
 		use with care.[br]
 	@example:
 		[example]
@@ -1069,7 +1069,7 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 			%test[] = $chan.users(,,o)
 			echo %test[]
 			[comment]# Find all the voiced users that do NOT come from *.edu[/comment]
-			[comment]# See also their whole mask[/comment]
+			[comment]# See also their whole tqmask[/comment]
 			%test[] = $chan.users(,*!*@*.edu,vim)
 			echo %test[]
 		[/example]
@@ -1078,10 +1078,10 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 {
-	QString szWinId,szMask,szFlags;
+	TQString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
-		KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
+		KVSM_PARAMETER("tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
 		KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
 	KVSM_PARAMETERS_END(c)
 
@@ -1094,21 +1094,21 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 	KviUserListEntry * e = ch->userListView()->firstItem(); // Thnx Julien :)
 
 	bool bCheckMask = !szMask.isEmpty();
-	bool bOp = szFlags.find('o',false) != -1;
-	bool bVoice = szFlags.find('v',false) != -1;
-	bool bHalfOp = szFlags.find('h',false) != -1;
-	bool bChanAdmins = szFlags.find('a',false) != -1;
-	bool bUserOp = szFlags.find('u',false) != -1;
-	bool bNone = szFlags.find('n',false) != -1;
+	bool bOp = szFlags.tqfind('o',false) != -1;
+	bool bVoice = szFlags.tqfind('v',false) != -1;
+	bool bHalfOp = szFlags.tqfind('h',false) != -1;
+	bool bChanAdmins = szFlags.tqfind('a',false) != -1;
+	bool bUserOp = szFlags.tqfind('u',false) != -1;
+	bool bNone = szFlags.tqfind('n',false) != -1;
 	bool bCheckFlags = bOp || bVoice || bHalfOp || bNone || bChanAdmins || bUserOp;
-	bool bAddMask = szFlags.find('m',false) != -1;
+	bool bAddMask = szFlags.tqfind('m',false) != -1;
 
 	int idx = 0;
 
 	if(bAddMask || bCheckFlags || bCheckMask)
 	{
-		bool bMaskMustMatch = szFlags.find('i',false) == -1;
-		KviIrcMask mask(szMask);
+		bool bMaskMustMatch = szFlags.tqfind('i',false) == -1;
+		KviIrcMask tqmask(szMask);
 
 		while(e)
 		{
@@ -1116,40 +1116,40 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 			{
 				if(bChanAdmins)
 				{
-					if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_mask;
+					if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_tqmask;
 				}
 				if(bOp)
 				{
-					if(e->flags() & KVI_USERFLAG_OP)goto check_mask;
+					if(e->flags() & KVI_USERFLAG_OP)goto check_tqmask;
 				}
 				if(bVoice)
 				{
-					if(e->flags() & KVI_USERFLAG_VOICE)goto check_mask;
+					if(e->flags() & KVI_USERFLAG_VOICE)goto check_tqmask;
 				}
 				if(bHalfOp)
 				{
-					if(e->flags() & KVI_USERFLAG_HALFOP)goto check_mask;
+					if(e->flags() & KVI_USERFLAG_HALFOP)goto check_tqmask;
 				}
 				if(bUserOp)
 				{
-					if(e->flags() & KVI_USERFLAG_USEROP)goto check_mask;
+					if(e->flags() & KVI_USERFLAG_USEROP)goto check_tqmask;
 				}
 				if(bNone)
 				{
-					if(!(e->flags() & KVI_USERFLAG_MASK))goto check_mask;
+					if(!(e->flags() & KVI_USERFLAG_MASK))goto check_tqmask;
 				}
 				goto next_item;
 			}
-check_mask:
+check_tqmask:
 			if(bCheckMask)
 			{
-				if(mask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item;
+				if(tqmask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item;
 				goto next_item;
 			}
 add_item:
 			if(bAddMask)
 			{
-				QString x(e->nick());
+				TQString x(e->nick());
 				x.append('!');
 				x.append(e->globalData()->user());
 				x.append('@');
@@ -1182,18 +1182,18 @@ next_item:
 	@title:
 		$chan.banlist
 	@short:
-		Returns an array of channel ban masks
+		Returns an array of channel ban tqmasks
 	@syntax:
 		$chan.banlist([window_id])
 	@description:
-		Returns an array of ban masks set ont the channel identified by [window_id].[br]
+		Returns an array of ban tqmasks set ont the channel identified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
 */
 
 static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
 {
-	QString szWinId,szMask,szFlags;
+	TQString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
 	KVSM_PARAMETERS_END(c)
@@ -1225,18 +1225,18 @@ static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.banexceptionlist
 	@short:
-		Returns an array of channel ban exception masks
+		Returns an array of channel ban exception tqmasks
 	@syntax:
 		<array> $chan.banexceptionlist([window_id])
 	@description:
-		Returns an array of ban exception masks set ont the channel identified by [window_id].[br]
+		Returns an array of ban exception tqmasks set ont the channel identified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
 */
 
 static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
 {
-	QString szWinId,szMask,szFlags;
+	TQString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
 	KVSM_PARAMETERS_END(c)
@@ -1268,18 +1268,18 @@ static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.invitelist
 	@short:
-		Returns an array of channel invite masks
+		Returns an array of channel invite tqmasks
 	@syntax:
 		<array> $chan.banexceptionlist([window_id])
 	@description:
-		Returns an array of invite masks set ont the channel identified by [window_id].[br]
+		Returns an array of invite tqmasks set ont the channel identified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
 */
 
 static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 {
-	QString szWinId,szMask,szFlags;
+	TQString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
 	KVSM_PARAMETERS_END(c)
@@ -1311,12 +1311,12 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchban
 	@short:
-		Matches a mask agains the channel ban list
+		Matches a tqmask agains the channel ban list
 	@syntax:
-		<string> $chan.matchban([window_id],<complete_mask>)
+		<string> $chan.matchban([window_id],<complete_tqmask>)
 	@description:
-		Returns the ban mask that matches <complete_mask> on channel identified by [window_id].[br]
-		If no ban mask matches <complete_mask> an empty string is returned.[br]
+		Returns the ban tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
+		If no ban tqmask matches <complete_tqmask> an empty string is returned.[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br]
 		This function is useful to determine if a ban set on the channel matches an user.[br]
@@ -1324,10 +1324,10 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 {
-	QString szWinId,szMask;
+	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@@ -1342,7 +1342,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
-		if(KviQString::matchStringCI(e->szMask,szMask))
+		if(KviTQString::matchStringCI(e->szMask,szMask))
 		{
 			c->returnValue()->setString(e->szMask);
 			return true;
@@ -1360,12 +1360,12 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchbanexception
 	@short:
-		Matches a mask agains the channel ban exception list
+		Matches a tqmask agains the channel ban exception list
 	@syntax:
-		<string> $chan.matchbanexception([window_id],<complete_mask>)
+		<string> $chan.matchbanexception([window_id],<complete_tqmask>)
 	@description:
-		Returns the ban exception mask that matches <complete_mask> on channel identified by [window_id].[br]
-		If no ban exception mask matches <complete_mask> an empty string is returned.[br]
+		Returns the ban exception tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
+		If no ban exception tqmask matches <complete_tqmask> an empty string is returned.[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br]
 		This function is useful to determine if a ban exception set on the channel matches an user.[br]
@@ -1373,10 +1373,10 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 {
-	QString szWinId,szMask;
+	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@@ -1391,7 +1391,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
-		if(KviQString::matchStringCI(e->szMask,szMask))
+		if(KviTQString::matchStringCI(e->szMask,szMask))
 		{
 			c->returnValue()->setString(e->szMask);
 			return true;
@@ -1409,12 +1409,12 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchinvite
 	@short:
-		Matches a mask agains the channel invite list
+		Matches a tqmask agains the channel invite list
 	@syntax:
-		<string> $chan.matchinvite([window_id:string],<complete_mask>)
+		<string> $chan.matchinvite([window_id:string],<complete_tqmask>)
 	@description:
-		Returns the invite mask that matches <complete_mask> on channel identified by [window_id].[br]
-		If no invite mask matches <complete_mask> an empty string is returned.[br]
+		Returns the invite tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
+		If no invite tqmask matches <complete_tqmask> an empty string is returned.[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br]
 		This function is useful to determine if a invite set on the channel matches an user.[br]
@@ -1422,10 +1422,10 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 {
-	QString szWinId,szMask;
+	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@@ -1440,7 +1440,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
-		if(KviQString::matchStringCI(e->szMask,szMask))
+		if(KviTQString::matchStringCI(e->szMask,szMask))
 		{
 			c->returnValue()->setString(e->szMask);
 			return true;
@@ -1479,7 +1479,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_usermodelevel(KviKvsModuleFunctionCall * c)
 {
-	QString szNick,szWinId;
+	TQString szNick,szWinId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
@@ -1515,7 +1515,7 @@ static bool chan_kvs_fnc_usermodelevel(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_userjointime(KviKvsModuleFunctionCall * c)
 {
-	QString szNick,szWinId;
+	TQString szNick,szWinId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
@@ -1552,7 +1552,7 @@ static bool chan_kvs_fnc_userjointime(KviKvsModuleFunctionCall * c)
 
 static bool chan_kvs_fnc_userlastactiontime(KviKvsModuleFunctionCall * c)
 {
-	QString szNick,szWinId;
+	TQString szNick,szWinId;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)