From 9ca32ef31a2566af48c06f258722738df92366af Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/chan/libkvichan.cpp | 62 ++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'src/modules/chan/libkvichan.cpp') diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 174f28be..a540e238 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -1029,21 +1029,21 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c) @short: Returns an array of channel user nicknames @syntax: - $chan.users([window_id:string],[tqmask:string],[flags:string]) + $chan.users([window_id:string],[mask: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 [tqmask] is given, each user is added to the array only - if it matches the [tqmask].[br] + If [mask] is given, each user is added to the array only + if it matches the [mask].[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 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 [tqmask].[br] - Please note that on really large channels this function may be time consuming (especially if [tqmask] is used): + 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): 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 tqmask[/comment] + [comment]# See also their whole mask[/comment] %test[] = $chan.users(,*!*@*.edu,vim) echo %test[] [/example] @@ -1081,7 +1081,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c) TQString szWinId,szMask,szFlags; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId) - KVSM_PARAMETER("tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) + KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags) KVSM_PARAMETERS_END(c) @@ -1108,7 +1108,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c) if(bAddMask || bCheckFlags || bCheckMask) { bool bMaskMustMatch = szFlags.find('i',false) == -1; - KviIrcMask tqmask(szMask); + KviIrcMask mask(szMask); while(e) { @@ -1116,34 +1116,34 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c) { if(bChanAdmins) { - if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_tqmask; + if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_mask; } if(bOp) { - if(e->flags() & KVI_USERFLAG_OP)goto check_tqmask; + if(e->flags() & KVI_USERFLAG_OP)goto check_mask; } if(bVoice) { - if(e->flags() & KVI_USERFLAG_VOICE)goto check_tqmask; + if(e->flags() & KVI_USERFLAG_VOICE)goto check_mask; } if(bHalfOp) { - if(e->flags() & KVI_USERFLAG_HALFOP)goto check_tqmask; + if(e->flags() & KVI_USERFLAG_HALFOP)goto check_mask; } if(bUserOp) { - if(e->flags() & KVI_USERFLAG_USEROP)goto check_tqmask; + if(e->flags() & KVI_USERFLAG_USEROP)goto check_mask; } if(bNone) { - if(!(e->flags() & KVI_USERFLAG_MASK))goto check_tqmask; + if(!(e->flags() & KVI_USERFLAG_MASK))goto check_mask; } goto next_item; } -check_tqmask: +check_mask: if(bCheckMask) { - if(tqmask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item; + if(mask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item; goto next_item; } add_item: @@ -1311,12 +1311,12 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c) @title: $chan.matchban @short: - Matches a tqmask agains the channel ban list + Matches a mask agains the channel ban list @syntax: - $chan.matchban([window_id],) + $chan.matchban([window_id],) @description: - Returns the ban tqmask that matches on channel identified by [window_id].[br] - If no ban tqmask matches an empty string is returned.[br] + Returns the ban mask that matches on channel identified by [window_id].[br] + If no ban mask matches 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] @@ -1327,7 +1327,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c) TQString szWinId,szMask; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId) - KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) + KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) KVSM_PARAMETERS_END(c) KviChannel * ch = chan_kvs_find_channel(c,szWinId); @@ -1360,12 +1360,12 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c) @title: $chan.matchbanexception @short: - Matches a tqmask agains the channel ban exception list + Matches a mask agains the channel ban exception list @syntax: - $chan.matchbanexception([window_id],) + $chan.matchbanexception([window_id],) @description: - Returns the ban exception tqmask that matches on channel identified by [window_id].[br] - If no ban exception tqmask matches an empty string is returned.[br] + Returns the ban exception mask that matches on channel identified by [window_id].[br] + If no ban exception mask matches 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] @@ -1376,7 +1376,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c) TQString szWinId,szMask; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId) - KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) + KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) KVSM_PARAMETERS_END(c) KviChannel * ch = chan_kvs_find_channel(c,szWinId); @@ -1409,12 +1409,12 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c) @title: $chan.matchinvite @short: - Matches a tqmask agains the channel invite list + Matches a mask agains the channel invite list @syntax: - $chan.matchinvite([window_id:string],) + $chan.matchinvite([window_id:string],) @description: - Returns the invite tqmask that matches on channel identified by [window_id].[br] - If no invite tqmask matches an empty string is returned.[br] + Returns the invite mask that matches on channel identified by [window_id].[br] + If no invite mask matches 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] @@ -1425,7 +1425,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c) TQString szWinId,szMask; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId) - KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) + KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) KVSM_PARAMETERS_END(c) KviChannel * ch = chan_kvs_find_channel(c,szWinId); -- cgit v1.2.1