TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 72aaee9802
commit 9ca32ef31a
230 changed files with 1599 additions and 1599 deletions
Show Stats Download Patch File Download Diff File

30
data/defscript/aliases.kvs
Unescape Escape View File

@ -234,9 +234,9 @@ alias(kb)
{
if(%nick)
{
%tqmask = $tqmask(%nick,$option(uintDefaultBanType));
%mask = $mask(%nick,$option(uintDefaultBanType));
if(!%tqmask)%tqmask = %nick; # plain ban
if(!%mask)%mask = %nick; # plain ban
%reason = $1-
#if(!%reason)%reason = "You're not welcome here!"
@ -250,8 +250,8 @@ alias(kb)
# kick %nick %reason
if($chan.isOp(%nick))%raw2 = "mode $target -o+b %nick %tqmask"
else %raw2 = "mode $target +b %tqmask"
if($chan.isOp(%nick))%raw2 = "mode $target -o+b %nick %mask"
else %raw2 = "mode $target +b %mask"
raw -q %raw2$cr$lf%raw
}
@ -484,28 +484,28 @@ alias(awayall)
alias(notify)
{
# This one adds a registered users database entry
# For the specified nick and uses the specified tqmask
# If no tqmask is specified , a default one is constructed
# For the specified nick and uses the specified mask
# If no mask is specified , a default one is constructed
# Then the "notify" property is set for the user
if(!$0)
{
echo $tr("Usage:")
echo " /notify <nick> [tqmask]"
echo " /notify <nick> [mask]"
halt
}
# Get the tqmask
# Get the mask
%tqmask = $1
%mask = $1
# no tqmask specified ? build it
# no mask specified ? build it
if(!%tqmask)%tqmask = $0!*@*
if(!%mask)%mask = $0!*@*
# Now add the user (but do not replace old entries)
reguser.add -f -q $0 %tqmask
reguser.add -f -q $0 %mask
# Merge the notify property part with the old one (if any)
@ -526,8 +526,8 @@ alias(notify)
alias(ignore)
{
# This one adds a registered users database entry
# For the specified nick and uses the specified tqmask
# If no tqmask is specified , a default one is constructed
# For the specified nick and uses the specified mask
# If no mask is specified , a default one is constructed
# Then the "ignore" property is set for the user to 1
if(!$0)
@ -539,7 +539,7 @@ alias(ignore)
# Now add the user (but do not replace old entries)
reguser.add $0 $tqmask($0,15);
reguser.add $0 $mask($0,15);
# And finally set the property (use -n so the notify lists will be restarted)
# Check if ignore or unignore the user

174
data/defscript/popups.kvs
Unescape Escape View File

@ -9,7 +9,7 @@ defpopup(highlight)
prologue
{
if($0!=""){
%:regName = $reguser.match($tqmask($0))
%:regName = $reguser.match($mask($0))
%:beingHl = $reguser.property(%:regName,highlight)
%:beingHlTmp = $tmphighlight.ishighlighted($0)
}
@ -27,34 +27,34 @@ defpopup(highlight)
popup($tr("Always Highlight")) (!%:beingHl && !%:regName)
{
item($tr("Highlight as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
item($tr("Highlight as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
{
reguser.add $0 $tqmask($0,11); reguser.setproperty $0 highlight 1;
reguser.add $0 $mask($0,11); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
item($tr("Highlight as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
{
reguser.add $0 $tqmask($0,12); reguser.setproperty $0 highlight 1;
reguser.add $0 $mask($0,12); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
item($tr("Highlight as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
{
reguser.add $0 $tqmask($0,13); reguser.setproperty $0 highlight 1;
reguser.add $0 $mask($0,13); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
item($tr("Highlight as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
{
reguser.add $0 $tqmask($0,3); reguser.setproperty $0 highlight 1;
reguser.add $0 $mask($0,3); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
item($tr("Highlight as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
{
reguser.add $0 $tqmask($0,4); reguser.setproperty $0 highlight 1;
reguser.add $0 $mask($0,4); reguser.setproperty $0 highlight 1;
}
item($tr("Highlight as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
item($tr("Highlight as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
{
reguser.add $0 $tqmask($0,5); reguser.setproperty $0 highlight 1;
reguser.add $0 $mask($0,5); reguser.setproperty $0 highlight 1;
}
}
@ -74,7 +74,7 @@ defpopup(ignore)
prologue
{
%:inIgnoreList = 0
%:regName = $reguser.match($tqmask($0))
%:regName = $reguser.match($mask($0))
%:ignLabelText = "<p><b>$0</b> "
if(%:regName)
{
@ -97,191 +97,191 @@ defpopup(ignore)
popup($tr("Ignore as..."),44) (!%:inIgnoreList)
{
item($tr("Ignore as") $0 "("$tqmask($0,0)")") ("$reguser.exactMatch($tqmask($0,0))" == "")
item($tr("Ignore as") $0 "("$mask($0,0)")") ("$reguser.exactMatch($mask($0,0))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,0);
if(!%:regName) reguser.add $0 $mask($0,0);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,1)")") ("$reguser.exactMatch($tqmask($0,1))" == "")
item($tr("Ignore as") $0 "("$mask($0,1)")") ("$reguser.exactMatch($mask($0,1))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,1);
if(!%:regName) reguser.add $0 $mask($0,1);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,2)")") ("$reguser.exactMatch($tqmask($0,2))" == "")
item($tr("Ignore as") $0 "("$mask($0,2)")") ("$reguser.exactMatch($mask($0,2))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,2);
if(!%:regName) reguser.add $0 $mask($0,2);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
item($tr("Ignore as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,3);
if(!%:regName) reguser.add $0 $mask($0,3);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
item($tr("Ignore as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,4);
if(!%:regName) reguser.add $0 $mask($0,4);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
item($tr("Ignore as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,5);
if(!%:regName) reguser.add $0 $mask($0,5);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,6)")") ("$reguser.exactMatch($tqmask($0,6))" == "")
item($tr("Ignore as") $0 "("$mask($0,6)")") ("$reguser.exactMatch($mask($0,6))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,6);
if(!%:regName) reguser.add $0 $mask($0,6);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,7)")") ("$reguser.exactMatch($tqmask($0,7))" == "")
item($tr("Ignore as") $0 "("$mask($0,7)")") ("$reguser.exactMatch($mask($0,7))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,7);
if(!%:regName) reguser.add $0 $mask($0,7);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,8)")") ("$reguser.exactMatch($tqmask($0,8))" == "")
item($tr("Ignore as") $0 "("$mask($0,8)")") ("$reguser.exactMatch($mask($0,8))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,8);
if(!%:regName) reguser.add $0 $mask($0,8);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,9)")") ("$reguser.exactMatch($tqmask($0,9))" == "")
item($tr("Ignore as") $0 "("$mask($0,9)")") ("$reguser.exactMatch($mask($0,9))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,9);
if(!%:regName) reguser.add $0 $mask($0,9);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,10)")") ("$reguser.exactMatch($tqmask($0,10))" == "")
item($tr("Ignore as") $0 "("$mask($0,10)")") ("$reguser.exactMatch($mask($0,10))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,10);
if(!%:regName) reguser.add $0 $mask($0,10);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
item($tr("Ignore as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,11);
if(!%:regName) reguser.add $0 $mask($0,11);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
item($tr("Ignore as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,12);
if(!%:regName) reguser.add $0 $mask($0,12);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
item($tr("Ignore as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,13);
if(!%:regName) reguser.add $0 $mask($0,13);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,14)")") ("$reguser.exactMatch($tqmask($0,14))" == "")
item($tr("Ignore as") $0 "("$mask($0,14)")") ("$reguser.exactMatch($mask($0,14))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,14);
if(!%:regName) reguser.add $0 $mask($0,14);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,15)")") ("$reguser.exactMatch($tqmask($0,15))" == "")
item($tr("Ignore as") $0 "("$mask($0,15)")") ("$reguser.exactMatch($mask($0,15))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,15);
if(!%:regName) reguser.add $0 $mask($0,15);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,16)")") ("$reguser.exactMatch($tqmask($0,16))" == "")
item($tr("Ignore as") $0 "("$mask($0,16)")") ("$reguser.exactMatch($mask($0,16))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,16);
if(!%:regName) reguser.add $0 $mask($0,16);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,17)")") ("$reguser.exactMatch($tqmask($0,17))" == "")
item($tr("Ignore as") $0 "("$mask($0,17)")") ("$reguser.exactMatch($mask($0,17))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,17);
if(!%:regName) reguser.add $0 $mask($0,17);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,18)")") ("$reguser.exactMatch($tqmask($0,18))" == "")
item($tr("Ignore as") $0 "("$mask($0,18)")") ("$reguser.exactMatch($mask($0,18))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,18);
if(!%:regName) reguser.add $0 $mask($0,18);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,19)")") ("$reguser.exactMatch($tqmask($0,19))" == "")
item($tr("Ignore as") $0 "("$mask($0,19)")") ("$reguser.exactMatch($mask($0,19))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,19);
if(!%:regName) reguser.add $0 $mask($0,19);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,20)")") ("$reguser.exactMatch($tqmask($0,20))" == "")
item($tr("Ignore as") $0 "("$mask($0,20)")") ("$reguser.exactMatch($mask($0,20))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,20);
if(!%:regName) reguser.add $0 $mask($0,20);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,21)")") ("$reguser.exactMatch($tqmask($0,21))" == "")
item($tr("Ignore as") $0 "("$mask($0,21)")") ("$reguser.exactMatch($mask($0,21))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,21);
if(!%:regName) reguser.add $0 $mask($0,21);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,22)")") ("$reguser.exactMatch($tqmask($0,22))" == "")
item($tr("Ignore as") $0 "("$mask($0,22)")") ("$reguser.exactMatch($mask($0,22))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,22);
if(!%:regName) reguser.add $0 $mask($0,22);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,23)")") ("$reguser.exactMatch($tqmask($0,23))" == "")
item($tr("Ignore as") $0 "("$mask($0,23)")") ("$reguser.exactMatch($mask($0,23))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,23);
if(!%:regName) reguser.add $0 $mask($0,23);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,24)")") ("$reguser.exactMatch($tqmask($0,24))" == "")
item($tr("Ignore as") $0 "("$mask($0,24)")") ("$reguser.exactMatch($mask($0,24))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,24);
if(!%:regName) reguser.add $0 $mask($0,24);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,25)")") ("$reguser.exactMatch($tqmask($0,25))" == "")
item($tr("Ignore as") $0 "("$mask($0,25)")") ("$reguser.exactMatch($mask($0,25))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,25);
if(!%:regName) reguser.add $0 $mask($0,25);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
item($tr("Ignore as") $0 "("$tqmask($0,26)")") ("$reguser.exactMatch($tqmask($0,26))" == "")
item($tr("Ignore as") $0 "("$mask($0,26)")") ("$reguser.exactMatch($mask($0,26))" == "")
{
if(!%:regName) reguser.add $0 $tqmask($0,26);
if(!%:regName) reguser.add $0 $mask($0,26);
reguser.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0;
}
@ -301,7 +301,7 @@ defpopup(registration)
# This is really smart...we are loading
# the reguser module only if this popup is being requested (the user effectively
# puts the mouse on the "Registration" item and the sub-popup is being shown)
%:regName = $reguser.match($tqmask($0))
%:regName = $reguser.match($mask($0))
%:labelText = "<p><b>$0</b>";
if(%:regName)
{
@ -322,39 +322,39 @@ defpopup(registration)
item($tr("Register")"...") (!%:regName)
{
reguser.wizard $tqmask($0)
reguser.wizard $mask($0)
}
popup($tr("Quick Registration")) (!%:regName)
{
item($tr("Register as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
item($tr("Register as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
{
reguser.add $0 $tqmask($0,11)
reguser.add $0 $mask($0,11)
}
item($tr("Register as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
item($tr("Register as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
{
reguser.add $0 $tqmask($0,12)
reguser.add $0 $mask($0,12)
}
item($tr("Register as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
item($tr("Register as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
{
reguser.add $0 $tqmask($0,13)
reguser.add $0 $mask($0,13)
}
item($tr("Register as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
item($tr("Register as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
{
reguser.add $0 $tqmask($0,3)
reguser.add $0 $mask($0,3)
}
item($tr("Register as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
item($tr("Register as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
{
reguser.add $0 $tqmask($0,4)
reguser.add $0 $mask($0,4)
}
item($tr("Register as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
item($tr("Register as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
{
reguser.add $0 $tqmask($0,5)
reguser.add $0 $mask($0,5)
}
}
@ -439,7 +439,7 @@ defpopup(channel)
%:itemBanMask = "*!user@*.host.tld"
%:itemBanNick = "nick"
} else {
%:itemBanMask = $tqmask(%:visible,$option(uintDefaultBanType))
%:itemBanMask = $mask(%:visible,$option(uintDefaultBanType))
if("%:itemBanMask" == "*!*@*")%:itemBanName = $tr("&Ban")
%:itemBanNick = %:visible
}
@ -498,7 +498,7 @@ defpopup(channel)
item($tr("Mask for") %:visible,75) (!%:multiple)
{
echo $tqmask($0,11)
echo $mask($0,11)
}
}
@ -576,7 +576,7 @@ defpopup(channel)
item($tr("&Ban") %:visible "("%:itemBanMask")",67) (("%:itemBanMask" != "*!*@*") && %:bCanKB)
{
ban $tqmask($0,$option(uintDefaultBanType))
ban $mask($0,$option(uintDefaultBanType))
}
item(%:itemBanName %:visible "("%:itemBanNick!*@*")",67) (%:bCanKB)
@ -601,7 +601,7 @@ defpopup(channel)
}
separator
item($tr("Configure ban tqmask..."),20)
item($tr("Configure ban mask..."),20)
{
options.edit KviChannelAdvancedOptionsWidget
}
@ -1119,7 +1119,7 @@ defpopup(querytextview)
item($tr("Mask for") $0,75) (!%:multiple)
{
echo $tqmask($0,11)
echo $mask($0,11)
}
}

86
data/doctemplates/rfc2812.template
Unescape Escape View File

@ -281,7 +281,7 @@ the only restriction on a channel name is that it SHALL NOT contain
any spaces (' '), a control G (^G or ASCII 7), a comma (','). Space
is used as parameter separator and command is used as a list item
separator by the protocol). A colon (':') can also be used as a
delimiter for the channel tqmask. Channel names are case insensitive.
delimiter for the channel mask. Channel names are case insensitive.
See the protocol grammar rules (section 2.3.1) for the exact syntax
of a channel name.[br]
[p]
@ -414,7 +414,7 @@ The extracted message is parsed into the components <prefix>,
target = nickname / server
msgtarget = msgto *( "," msgto )
msgto = channel / ( user [ "%" host ] "@" servername )
msgto =/ ( user "%" host ) / targettqmask
msgto =/ ( user "%" host ) / targetmask
msgto =/ nickname / ( nickname "!" user "@" host )
channel = ( "#" / "+" / ( "!" channelid ) / "&" ) chanstring
[ ":" chanstring ]
@ -429,7 +429,7 @@ The extracted message is parsed into the components <prefix>,
ip6addr = 1*hexdigit 7( ":" 1*hexdigit )
ip6addr =/ "0:0:0:0:0:" ( "0" / "FFFF" ) ":" ip4addr
nickname = ( letter / special ) *8( letter / digit / special / "-" )
targettqmask = ( "$" / "#" ) tqmask
targetmask = ( "$" / "#" ) mask
; see details on allowed masks in section 3.3.1
chanstring = %x01-07 / %x08-09 / %x0B-0C / %x0E-1F / %x21-2B
chanstring =/ %x2D-39 / %x3B-FF
@ -493,7 +493,7 @@ is supplied in section 5 (Replies).
[/td][/tr]
[tr][td]
When wildcards are allowed in a string, it is referred as a "tqmask".
When wildcards are allowed in a string, it is referred as a "mask".
[p]
For string matching purposes, the protocol allows the use of two
special characters: '?' (%x3F) to match one and only one character,
@ -503,7 +503,7 @@ characters can be escaped using the character '\' (%x5C).
[pre]
The Augmented BNF syntax for this is:
tqmask = *( nowild / noesc wildone / noesc wildmany )
mask = *( nowild / noesc wildone / noesc wildmany )
wildone = %x3F
wildmany = %x2A
nowild = %x01-29 / %x2B-3E / %x40-FF
@ -638,7 +638,7 @@ the username, hostname and realname of a new user.
The <mode> parameter should be a numeric, and can be used to
automatically set user modes when registering with the server. This
parameter is a bittqmask, with only 2 bits having any signification: if
parameter is a bitmask, with only 2 bits having any signification: if
the bit 2 is set, the user mode 'w' will be set and if the bit 3 is
set, the user mode 'i' will be set. (See Section 3.1.5 "User
Modes").
@ -769,7 +769,7 @@ service. The service may only be known to servers which have a name
matching the distribution. For a matching server to have knowledge
of the service, the network path between that server and the server
on which the service is connected MUST be composed of servers which
names all match the tqmask.
names all match the mask.
The <type> parameter is currently reserved for future usage.
@ -1266,9 +1266,9 @@ PRIVMSG is used to send private messages between users, as well as to
send messages to channels. <msgtarget> is usually the nickname of
the recipient of the message, or a channel name.
The <msgtarget> parameter may also be a host tqmask (#<tqmask>) or server
tqmask ($<tqmask>). In both cases the server will only send the PRIVMSG
to those who have a server or host matching the tqmask. The tqmask MUST
The <msgtarget> parameter may also be a host mask (#<mask>) or server
mask ($<mask>). In both cases the server will only send the PRIVMSG
to those who have a server or host matching the mask. The mask MUST
have at least 1 (one) "." in it and no wildcards following the last
".". This requirement exists to prevent people sending messages to
"#*" or "$*", which would broadcast to all users. Wildcards are the
@ -1389,13 +1389,13 @@ Wildcards are allowed in the <target> parameter.
[tr][td][pre]
Command: LUSERS
Parameters: [ <tqmask> [ <target> ] ]
Parameters: [ <mask> [ <target> ] ]
The LUSERS command is used to get statistics about the size of the
IRC network. If no parameter is given, the reply will be about the
whole net. If a <tqmask> is specified, then the reply will only
whole net. If a <mask> is specified, then the reply will only
concern the part of the network formed by the servers matching the
tqmask. Finally, if the <target> parameter is specified, the request
mask. Finally, if the <target> parameter is specified, the request
is forwarded to that server which will generate the reply.
Wildcards are allowed in the <target> parameter.
@ -1486,13 +1486,13 @@ published this way.
[tr][td][pre]
Command: LINKS
Parameters: [ [ <remote server> ] <server tqmask> ]
Parameters: [ [ <remote server> ] <server mask> ]
With LINKS, a user can list all servernames, which are known by the
server answering the query. The returned list of servers MUST match
the tqmask, or if no tqmask is given, the full list is returned.
the mask, or if no mask is given, the full list is returned.
If <remote server> is given in addition to <server tqmask>, the LINKS
If <remote server> is given in addition to <server mask>, the LINKS
command is forwarded to the first server found that matches that name
(if any), and that server is then required to answer the query.
@ -1545,7 +1545,7 @@ Parameters: <target server> <port> [ <remote server> ]
The CONNECT command can be used to request a server to try to
establish a new connection to another server immediately. CONNECT is
a privileged command and SHOULD be available only to IRC Operators.
If a <remote server> is given and its tqmask doesn't match name of the
If a <remote server> is given and its mask doesn't match name of the
parsing server, the CONNECT attempt is sent to the first match of
remote server. Otherwise the CONNECT attempt is made by the server
processing the request.
@ -1698,7 +1698,7 @@ information about any service which is connected to the network.
[tr][td][pre]
Command: SERVLIST
Parameters: [ <tqmask> [ <type> ] ]
Parameters: [ <mask> [ <type> ] ]
The SERVLIST command is used to list services currently connected to
the network and visible to the user issuing the command. The
@ -1756,20 +1756,20 @@ allowed to.
[tr][td][pre]
Command: WHO
Parameters: [ <tqmask> [ "o" ] ]
Parameters: [ <mask> [ "o" ] ]
The WHO command is used by a client to generate a query which returns
a list of information which 'matches' the <tqmask> parameter given by
the client. In the absence of the <tqmask> parameter, all visible
a list of information which 'matches' the <mask> parameter given by
the client. In the absence of the <mask> parameter, all visible
(users who aren't invisible (user mode +i) and who don't have a
common channel with the requesting client) are listed. The same
result can be achieved by using a <tqmask> of "0" or any wildcard which
result can be achieved by using a <mask> of "0" or any wildcard which
will end up matching every visible user.
The <tqmask> passed to WHO is matched against users' host, server, real
name and nickname if the channel <tqmask> cannot be found.
The <mask> passed to WHO is matched against users' host, server, real
name and nickname if the channel <mask> cannot be found.
If the "o" parameter is passed only operators are returned according
to the <tqmask> supplied.
to the <mask> supplied.
Numeric Replies:
@ -1792,13 +1792,13 @@ to the <tqmask> supplied.
[tr][td][pre]
Command: WHOIS
Parameters: [ <target> ] <tqmask> *( "," <tqmask> )
Parameters: [ <target> ] <mask> *( "," <mask> )
This command is used to query information about particular user.
The server will answer this command with several numeric messages
indicating different statuses of each user which matches the tqmask (if
indicating different statuses of each user which matches the mask (if
you are entitled to see them). If no wildcard is present in the
<tqmask>, any information about that nick which you are allowed to see
<mask>, any information about that nick which you are allowed to see
is presented.
If the <target> parameter is specified, it sends the query to a
@ -2477,26 +2477,26 @@ to 399.
indicate that it is summoning that user.
346 RPL_INVITELIST
"<channel> <invitetqmask>"
"<channel> <invitemask>"
347 RPL_ENDOFINVITELIST
"<channel> :End of channel invite list"
- When listing the 'invitations masks' for a given channel,
a server is required to send the list back using the
RPL_INVITELIST and RPL_ENDOFINVITELIST messages. A
separate RPL_INVITELIST is sent for each active tqmask.
separate RPL_INVITELIST is sent for each active mask.
After the masks have been listed (or if none present) a
RPL_ENDOFINVITELIST MUST be sent.
348 RPL_EXCEPTLIST
"<channel> <exceptiontqmask>"
"<channel> <exceptionmask>"
349 RPL_ENDOFEXCEPTLIST
"<channel> :End of channel exception list"
- When listing the 'exception masks' for a given channel,
a server is required to send the list back using the
RPL_EXCEPTLIST and RPL_ENDOFEXCEPTLIST messages. A
separate RPL_EXCEPTLIST is sent for each active tqmask.
separate RPL_EXCEPTLIST is sent for each active mask.
After the masks have been listed (or if none present)
a RPL_ENDOFEXCEPTLIST MUST be sent.
@ -2548,23 +2548,23 @@ to 399.
the end.
364 RPL_LINKS
"<tqmask> <server> :<hopcount> <server info>"
"<mask> <server> :<hopcount> <server info>"
365 RPL_ENDOFLINKS
"<tqmask> :End of LINKS list"
"<mask> :End of LINKS list"
- In replying to the LINKS message, a server MUST send
replies back using the RPL_LINKS numeric and mark the
end of the list using an RPL_ENDOFLINKS reply.
367 RPL_BANLIST
"<channel> <bantqmask>"
"<channel> <banmask>"
368 RPL_ENDOFBANLIST
"<channel> :End of channel ban list"
- When listing the active 'bans' for a given channel,
a server is required to send the list back using the
RPL_BANLIST and RPL_ENDOFBANLIST messages. A separate
RPL_BANLIST is sent for each active bantqmask. After the
RPL_BANLIST is sent for each active banmask. After the
banmasks have been listed (or if none present) a
RPL_ENDOFBANLIST MUST be sent.
@ -2719,7 +2719,7 @@ to 399.
- reports the server uptime.
243 RPL_STATSOLINE
"O <hosttqmask> * <name>"
"O <hostmask> * <name>"
- reports the allowed hosts from where user may become IRC
operators.
@ -2731,10 +2731,10 @@ to 399.
RPL_UMODEIS is sent back.
234 RPL_SERVLIST
"<name> <server> <tqmask> <type> <hopcount> <info>"
"<name> <server> <mask> <type> <hopcount> <info>"
235 RPL_SERVLISTEND
"<tqmask> <type> :End of service listing"
"<mask> <type> :End of service listing"
- When listing services in reply to a SERVLIST message,
a server is required to send the list back using the
@ -2869,11 +2869,11 @@ to 399.
412 ERR_NOTEXTTOSEND
":No text to send"
413 ERR_NOTOPLEVEL
"<tqmask> :No toplevel domain specified"
"<mask> :No toplevel domain specified"
414 ERR_WILDTOPLEVEL
"<tqmask> :Wildcard in toplevel domain"
"<mask> :Wildcard in toplevel domain"
415 ERR_BADMASK
"<tqmask> :Bad Server/host tqmask"
"<mask> :Bad Server/host mask"
- 412 - 415 are returned by PRIVMSG to indicate that
the message wasn't delivered for some reason.
@ -3180,7 +3180,7 @@ both will removed by use of a server KILL (See Section 3.7.1).
[tr][td]
There is no way to escape the escape character "\" (%x5C). While
this isn't usually a problem, it makes it impossible to form a tqmask
this isn't usually a problem, it makes it impossible to form a mask
with a backslash character ("\") preceding a wildcard.
[/td][/tr]

10
src/kvilib/core/kvi_qstring.cpp
Unescape Escape View File

@ -765,8 +765,8 @@ namespace KviTQString
// s1
// m1
// tqmask1 : *xor
// tqmask2 : xorand*xor
// mask1 : *xor
// mask2 : xorand*xor
// m2
// s2
@ -794,7 +794,7 @@ namespace KviTQString
const TQChar * savePos2 = m2;
while(m1->tqunicode())
{
//loop managed by m1 (initially first tqmask)
//loop managed by m1 (initially first mask)
if(m1->tqunicode()=='*')
{
//Found a wildcard in m1
@ -825,8 +825,8 @@ namespace KviTQString
if(m2->tqunicode() == '*')
{
//A wlidcard in the second string
//Invert the game : tqmask1 <-> tqmask2
//tqmask2 now leads the game...
//Invert the game : mask1 <-> mask2
//mask2 now leads the game...
savePos1 = m1; //aux
m1 = m2; //...swap
m2 = savePos1; //...swap

22
src/kvilib/core/kvi_string.cpp
Unescape Escape View File

@ -402,8 +402,8 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
// s1
// m1
// tqmask1 : *xor
// tqmask2 : xorand*xor
// mask1 : *xor
// mask2 : xorand*xor
// m2
// s2
@ -423,7 +423,7 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
const char * savePos2 = m2;
while(*m1)
{
//loop managed by m1 (initially first tqmask)
//loop managed by m1 (initially first mask)
if(*m1=='*')
{
//Found a wildcard in m1
@ -450,8 +450,8 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
if(*m2 == '*')
{
//A wlidcard in the second string
//Invert the game : tqmask1 <-> tqmask2
//tqmask2 now leads the game...
//Invert the game : mask1 <-> mask2
//mask2 now leads the game...
savePos1 = m1; //aux
m1 = m2; //...swap
m2 = savePos1; //...swap
@ -497,7 +497,7 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2)
if(!(m1 && m2 && (*m1)))return false;
const char * savePos1 = 0;
const char * savePos2 = m2;
while(*m1){ //loop managed by m1 (initially first tqmask)
while(*m1){ //loop managed by m1 (initially first mask)
if(*m1=='*'){
//Found a wildcard in m1
savePos1 = ++m1; //move to the next char and save the position...this is our jolly
@ -520,8 +520,8 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2)
} else {
if(*m2 == '*'){
//A wlidcard in the second string
//Invert the game : tqmask1 <-> tqmask2
//tqmask2 now leads the game...
//Invert the game : mask1 <-> mask2
//mask2 now leads the game...
savePos1 = m1; //aux
m1 = m2; //...swap
m2 = savePos1; //...swap
@ -554,7 +554,7 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char
const char * savePos2 = m2;
while(NOT_AT_END(m1))
{
//loop managed by m1 (initially first tqmask)
//loop managed by m1 (initially first mask)
if(*m1=='*')
{
//Found a wildcard in m1
@ -588,8 +588,8 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char
if(*m2 == '*')
{
//A wlidcard in the second string
//Invert the game : tqmask1 <-> tqmask2
//tqmask2 now leads the game...
//Invert the game : mask1 <-> mask2
//mask2 now leads the game...
bSwapped = !bSwapped;
savePos1 = m1; //aux
m1 = m2; //...swap

16
src/kvilib/ext/kvi_mediatype.cpp
Unescape Escape View File

@ -98,13 +98,13 @@ KviMediaType * KviMediaManager::findMediaTypeByIanaType(const char * ianaType)
return 0;
}
KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filetqmask)
KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filemask)
{
__range_valid(locked());
for(KviMediaType * mt = m_pMediaTypeList->first();mt;mt = m_pMediaTypeList->next())
{
// FIXME: #warning "Should this be case sensitive ?"
if(kvi_strEqualCI(mt->szFileMask.ptr(),filetqmask))return mt;
if(kvi_strEqualCI(mt->szFileMask.ptr(),filemask))return mt;
}
return 0;
@ -137,7 +137,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
{
if(iWildCount)
{
// the new tqmask has wildcards... if the current one has none, skip it
// the new mask has wildcards... if the current one has none, skip it
int iWildCountExisting = mt->szFileMask.occurences('*');
if(iWildCountExisting)
{
@ -164,7 +164,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
}
} // else the current has no wildcards...skip
} else {
// the new tqmask has no wildcards....
// the new mask has no wildcards....
if(mt->szFileMask.contains('*'))
{
// current one has wildcards...insert
@ -433,7 +433,7 @@ KviMediaType * KviMediaManager::findMediaTypeForRegularFile(const char * szFullP
typedef struct _KviDefaultMediaType
{
const char * filetqmask;
const char * filemask;
const char * magicbytes;
const char * ianatype;
const char * description;
@ -489,12 +489,12 @@ void KviMediaManager::load(const char * filename)
insertMediaType(m);
}
for(int u = 0;g_defMediaTypes[u].filetqmask;u++)
for(int u = 0;g_defMediaTypes[u].filemask;u++)
{
if(!findMediaTypeByFileMask(g_defMediaTypes[u].filetqmask))
if(!findMediaTypeByFileMask(g_defMediaTypes[u].filemask))
{
KviMediaType * m = new KviMediaType;
m->szFileMask = g_defMediaTypes[u].filetqmask;
m->szFileMask = g_defMediaTypes[u].filemask;
m->szMagicBytes = g_defMediaTypes[u].magicbytes;
m->szIanaType = g_defMediaTypes[u].ianatype;
m->szDescription = g_defMediaTypes[u].description;

2
src/kvilib/ext/kvi_mediatype.h
Unescape Escape View File

@ -67,7 +67,7 @@ private:
KviMediaType * findMediaTypeForRegularFile(const char * szFullPath,const char * szFileName,bool bCheckMagic);
public:
KviPointerList<KviMediaType> * mediaTypeList(){ return m_pMediaTypeList; };
KviMediaType * findMediaTypeByFileMask(const char * filetqmask);
KviMediaType * findMediaTypeByFileMask(const char * filemask);
KviMediaType * findMediaTypeByIanaType(const char * ianaType);
bool removeMediaType(KviMediaType * t){ return m_pMediaTypeList->removeRef(t); };
void clear(){ m_pMediaTypeList->clear(); };

8
src/kvilib/ext/kvi_regchan.cpp
Unescape Escape View File

@ -28,10 +28,10 @@
#include "kvi_config.h"
#include "kvi_qstring.h"
KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &nettqmask)
KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &netmask)
{
m_szName = name;
m_szNetMask = nettqmask;
m_szNetMask = netmask;
m_pPropertyDict = new KviPointerHashTable<const char *,KviStr>(7,false,true);
m_pPropertyDict->setAutoDelete(true);
}
@ -111,13 +111,13 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::find(const char * name,cons
return 0;
}
KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * nettqmask)
KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * netmask)
{
KviRegisteredChannelList * l = m_pChannelDict->find(name);
if(!l)return 0;
for(KviRegisteredChannel * c = l->first();c;c = l->next())
{
if(kvi_strEqualCI(c->netMask().ptr(),nettqmask))return c;
if(kvi_strEqualCI(c->netMask().ptr(),netmask))return c;
}
return 0;
}

4
src/kvilib/ext/kvi_regchan.h
Unescape Escape View File

@ -35,7 +35,7 @@ class KVILIB_API KviRegisteredChannel : public KviHeapObject
{
friend class KviRegisteredChannelDataBase;
public:
KviRegisteredChannel(const KviStr &name,const KviStr &nettqmask);
KviRegisteredChannel(const KviStr &name,const KviStr &netmask);
~KviRegisteredChannel();
protected:
KviStr m_szName;
@ -63,7 +63,7 @@ protected:
public:
KviPointerHashTable<const char *,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; };
KviRegisteredChannel * find(const char * name,const char * net);
KviRegisteredChannel * findExact(const char * name,const char * nettqmask);
KviRegisteredChannel * findExact(const char * name,const char * netmask);
void remove(KviRegisteredChannel * c);
void add(KviRegisteredChannel * c);
void load(const char * filename);

150
src/kvilib/ext/kvi_regusersdb.cpp
Unescape Escape View File

@ -42,7 +42,7 @@
@short:
Registration of users in KVIrc
@keyterms:
registered users, registration tqmask, registered user properties,
registered users, registration mask, registered user properties,
user properties, notify property, avatar property
@body:
[big]Introduction[/big][br]
@ -59,7 +59,7 @@
are used to recognize the user on irc.[br]
[br]
[big]Registration masks[/big][br]
The masks have the common IRC tqmask format: [b]<nick>!<user>@<host>[/b][br]
The masks have the common IRC mask format: [b]<nick>!<user>@<host>[/b][br]
The masks may contain '*' and '?' wildcards that match any portion of text.[br]
[b]*!*@*[/b][br]
[b]Pragma!*@*[/b][br]
@ -69,33 +69,33 @@
[b]Pragma!~daemon@some.host.it[/b][br]
Are examples of valid registration masks.[br]
The masks with wildcards can actually match more than a single user.[br]
For example the tqmask *!root@*.host.com will match all the users
For example the mask *!root@*.host.com will match all the users
having root as username and coming from the host.com domain.[br]
For this reason putting wildcards in nicknames could become a problem
if not used carefully (but may also be used to achieve interesting tricks).[br]
If you don't use wildcards in nicknames you are sure that
in a single irc connection , a tqmask will always refer to a single user.[br]
in a single irc connection , a mask will always refer to a single user.[br]
You will commonly use the following format:[br]
<nick>!*<username>@*.<host>.<top>[br]
or[br]
<nick>!*<username>@<number>.<number>.<number>.*[br]
In this way you can be 95% sure that the tqmask will really match the correct user.[br]
In this way you can be 95% sure that the mask will really match the correct user.[br]
[br]
[big]Example of registration and lookups[/big]
Assume that you want to registere a friend of yours: Derek Riggs.[br]
Derek often uses "Eddie" as his nickname
"stranger" as username and has a dial-up connection that makes his IP address appear as
<variable-number>.somewhere.in.time.org.[br]
You will add an entry with name "Derek Riggs" and a registration tqmask like the following:
You will add an entry with name "Derek Riggs" and a registration mask like the following:
Eddie!stranger@*.somewhere.in.time.org.[br]
If the IRC servers keep adding strange characters ([doc:irc_masks]prefixes[/doc]) at the beginning of his username you may use
Eddie!*stranger@*.somewhere.in.time.org.[br]
If Eddie also often connects from the wasted.years.org domain and gets 'eddie' as username there, you might add a second registration tqmask as follows:
If Eddie also often connects from the wasted.years.org domain and gets 'eddie' as username there, you might add a second registration mask as follows:
Eddie!*eddie@*.wasted.years.org.[br]
An alternative could be use only one tqmask with *.org as domain and allow any username (Eddie!*@*.org) but this
An alternative could be use only one mask with *.org as domain and allow any username (Eddie!*@*.org) but this
could become dangerous since it could match the users that you don't want to.[br]
On the other hand, if you dislike the users with the nickname Eddie that come from .org
and you're implementing an auto-kick system, the correct tqmask to register is "Eddie!*@*.org".[br]
and you're implementing an auto-kick system, the correct mask to register is "Eddie!*@*.org".[br]
[br]
KVirc ties to be smart , and always find the most correct match for an user:
If you have two masks registered: Pragma!*xor@*.myisp.it and *!*@*.myisp.it,
@ -162,47 +162,47 @@ bool KviRegisteredUser::isIgnoreEnabledFor(IgnoreFlags flag)
return m_iIgnoreFlags & flag;
}
KviIrcMask * KviRegisteredUser::findMask(const KviIrcMask &tqmask)
KviIrcMask * KviRegisteredUser::findMask(const KviIrcMask &mask)
{
for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
{
if(*m == tqmask)return m;
if(*m == mask)return m;
}
return 0;
}
bool KviRegisteredUser::addMask(KviIrcMask * tqmask)
bool KviRegisteredUser::addMask(KviIrcMask * mask)
{
if(findMask(*tqmask))
if(findMask(*mask))
{
delete tqmask;
tqmask = 0;
delete mask;
mask = 0;
return false;
}
m_pMaskList->append(tqmask);
m_pMaskList->append(mask);
return true;
}
bool KviRegisteredUser::removeMask(KviIrcMask * tqmask)
bool KviRegisteredUser::removeMask(KviIrcMask * mask)
{
if(!tqmask)return false;
return m_pMaskList->removeRef(tqmask);
if(!mask)return false;
return m_pMaskList->removeRef(mask);
}
bool KviRegisteredUser::matches(const KviIrcMask &tqmask)
bool KviRegisteredUser::matches(const KviIrcMask &mask)
{
for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
{
if(m->matches(tqmask))return true;
if(m->matches(mask))return true;
}
return false;
}
bool KviRegisteredUser::matchesFixed(const KviIrcMask &tqmask)
bool KviRegisteredUser::matchesFixed(const KviIrcMask &mask)
{
for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
{
if(m->matchesFixed(tqmask))return true;
if(m->matchesFixed(mask))return true;
}
return false;
}
@ -359,9 +359,9 @@ KviRegisteredUser * KviRegisteredUserDataBase::getUser(const TQString & name)
return u;
}
static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,KviIrcMask *tqmask)
static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,KviIrcMask *mask)
{
KviRegisteredMask * newMask = new KviRegisteredMask(u,tqmask);
KviRegisteredMask * newMask = new KviRegisteredMask(u,mask);
int idx = 0;
for(KviRegisteredMask * m = l->first();m;m = l->next())
{
@ -375,20 +375,20 @@ static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,Kv
l->append(newMask);
}
KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,KviIrcMask * tqmask)
KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,KviIrcMask * mask)
{
if(!u || !tqmask) return 0;
if(!u || !mask) return 0;
__range_valid(u == m_pUserDict->find(u->name()));
KviRegisteredMaskList * l;
if(tqmask->hasWildNick())
if(mask->hasWildNick())
{
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
{
if(*(m->tqmask()) == *tqmask)
if(*(m->mask()) == *mask)
{
delete tqmask;
tqmask = 0;
delete mask;
mask = 0;
return m->user();
}
}
@ -396,44 +396,44 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
// masks with more info go first in the list
l = m_pWildMaskList;
} else {
l = m_pMaskDict->find(tqmask->nick());
l = m_pMaskDict->find(mask->nick());
if(l)
{
// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
for(KviRegisteredMask * m = l->first();m;m = l->next())
{
if(*(m->tqmask()) == *tqmask)
if(*(m->mask()) == *mask)
{
delete tqmask;
tqmask = 0;
delete mask;
mask = 0;
return m->user();
}
}
// not found ...ok... add it
} else {
// not found ...ok... add it
// this is the first tqmask in the list
// this is the first mask in the list
l = new KviRegisteredMaskList;
l->setAutoDelete(true);
if(!u->addMask(tqmask))
if(!u->addMask(mask))
{
debug(" Ops...got an incoherent regusers action...recovered ?");
delete l;
l = 0;
} else {
append_mask_to_list(l,u,tqmask);
m_pMaskDict->insert(tqmask->nick(),l);
append_mask_to_list(l,u,mask);
m_pMaskDict->insert(mask->nick(),l);
}
return 0;
}
}
// Ok...add it
if(!u->addMask(tqmask))
if(!u->addMask(mask))
{
debug("ops...got an incoherent regusers action...recovered ?");
return 0; // ops...already there ?
}
append_mask_to_list(l,u,tqmask);
append_mask_to_list(l,u,mask);
return 0;
}
@ -488,9 +488,9 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name)
if(name.isEmpty()) return false;
KviRegisteredUser * u = m_pUserDict->find(name);
if(!u)return false;
while(KviIrcMask * tqmask = u->maskList()->first())
while(KviIrcMask * mask = u->maskList()->first())
{
if(!removeMaskByPointer(tqmask))
if(!removeMaskByPointer(mask))
debug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data());
}
emit(userRemoved(name));
@ -504,13 +504,13 @@ bool KviRegisteredUserDataBase::removeGroup(const TQString & name)
return true;
}
bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &tqmask)
bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &mask)
{
// find the tqmask pointer
KviRegisteredMask * m = findExactMask(tqmask);
// find the mask pointer
KviRegisteredMask * m = findExactMask(mask);
// and remove it
if(m){
if(removeMaskByPointer(m->tqmask()))
if(removeMaskByPointer(m->mask()))
{
return true;
}
@ -518,36 +518,36 @@ bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &tqmask)
return 0;
}
bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * mask)
{
if(!tqmask) return 0;
if(tqmask->hasWildNick())
if(!mask) return 0;
if(mask->hasWildNick())
{
// remove from the wild list
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
{
if(m->tqmask() == tqmask)
if(m->mask() == mask)
{
// ok..got it, remove from the list and from the user struct (user struct deletes it!)
emit(userChanged(tqmask->nick()));
m->user()->removeMask(tqmask); // this one deletes m->tqmask()
emit(userChanged(mask->nick()));
m->user()->removeMask(mask); // this one deletes m->mask()
m_pWildMaskList->removeRef(m); // this one deletes m
return true;
}
}
// not found ...opz :)
} else {
KviRegisteredMaskList * l = m_pMaskDict->find(tqmask->nick());
KviRegisteredMaskList * l = m_pMaskDict->find(mask->nick());
if(l)
{
// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
for(KviRegisteredMask * m = l->first();m;m = l->next())
{
if(m->tqmask() == tqmask)
if(m->mask() == mask)
{
TQString nick = tqmask->nick();
TQString nick = mask->nick();
emit(userChanged(nick));
m->user()->removeMask(tqmask); // this one deletes m->tqmask() (or tqmask)
m->user()->removeMask(mask); // this one deletes m->mask() (or mask)
l->removeRef(m); // this one deletes m
if(l->count() == 0)m_pMaskDict->remove(nick);
return true;
@ -563,21 +563,21 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
/*
KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &tqmask)
KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &mask)
{
// first lookup the nickname in the maskDict
KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
KviRegisteredMaskList * l = m_pMaskDict->find(mask.nick());
if(l)
{
for(KviRegisteredMask *m = l->first();m;m = l->next())
{
if(m->tqmask()->matchesFixed(0,tqmask.user(),tqmask.host()))return m->user();
if(m->mask()->matchesFixed(0,mask.user(),mask.host()))return m->user();
}
}
// not found....lookup the wild ones
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
{
if(m->tqmask()->matchesFixed(tqmask))return m->user();
if(m->mask()->matchesFixed(mask))return m->user();
}
return 0; // no match at all
}
@ -598,40 +598,40 @@ KviRegisteredMask * KviRegisteredUserDataBase::findMatchingMask(const TQString &
{
for(KviRegisteredMask *m = l->first();m;m = l->next())
{
if(m->tqmask()->matchesFixed(nick,user,host))return m;
if(m->mask()->matchesFixed(nick,user,host))return m;
}
}
// not found....lookup the wild ones
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
{
if(m->tqmask()->matchesFixed(nick,user,host))return m;
if(m->mask()->matchesFixed(nick,user,host))return m;
}
return 0; // no match at all
}
KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask &tqmask)
KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask &mask)
{
KviRegisteredMask * m = findExactMask(tqmask);
KviRegisteredMask * m = findExactMask(mask);
if(m)return m->user();
return 0;
}
KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &tqmask)
KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &mask)
{
// first lookup the nickname in the maskDict
if(tqmask.nick()=="") return 0;
KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
if(mask.nick()=="") return 0;
KviRegisteredMaskList * l = m_pMaskDict->find(mask.nick());
if(l)
{
for(KviRegisteredMask *m = l->first();m;m = l->next())
{
if(*(m->tqmask()) == tqmask)return m;
if(*(m->mask()) == mask)return m;
}
}
// not found....lookup the wild ones
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
{
if(*(m->tqmask()) == tqmask)return m;
if(*(m->mask()) == mask)return m;
}
return 0; // no match at all
}
@ -674,8 +674,8 @@ void KviRegisteredUserDataBase::load(const TQString & filename)
u->setProperty(tmp,*(sdi.current()));
} else if(KviTQString::equalCSN("mask_",tmp,5))
{
KviIrcMask * tqmask = new KviIrcMask(*(sdi.current()));
addMask(u,tqmask);
KviIrcMask * mask = new KviIrcMask(*(sdi.current()));
addMask(u,mask);
} else if(KviTQString::equalCI(tmp,"Group"))
{
u->setGroup(*(sdi.current()));
@ -722,9 +722,9 @@ void KviRegisteredUserDataBase::save(const TQString & filename)
{
TQString tmp;
KviTQString::sprintf(tmp,"mask_%d",idx);
TQString tqmask;
m->tqmask(tqmask,KviIrcMask::NickUserHost);
cfg.writeEntry(tmp,tqmask);
TQString mask;
m->mask(mask,KviIrcMask::NickUserHost);
cfg.writeEntry(tmp,mask);
++idx;
}
cfg.writeEntry("Group",it.current()->group());

30
src/kvilib/ext/kvi_regusersdb.h
Unescape Escape View File

@ -27,7 +27,7 @@
//
// REGISTERED USERS
//
// Here we manage users resigered by tqmask and their (generic!) properties
// Here we manage users resigered by mask and their (generic!) properties
//
#include "kvi_settings.h"
@ -74,10 +74,10 @@ private:
KviPointerHashTable<TQString,TQString> * m_pPropertyDict; // owned properties
KviPointerList<KviIrcMask> * m_pMaskList; // owned masks
protected:
// tqmask ownership is transferred! (always!) returns false if the tqmask was already there
bool addMask(KviIrcMask * tqmask);
bool removeMask(KviIrcMask * tqmask);
KviIrcMask * findMask(const KviIrcMask &tqmask);
// mask ownership is transferred! (always!) returns false if the mask was already there
bool addMask(KviIrcMask * mask);
bool removeMask(KviIrcMask * mask);
KviIrcMask * findMask(const KviIrcMask &mask);
public:
int ignoreFlags() { return m_iIgnoreFlags; };
void setIgnoreFlags(int flags) {m_iIgnoreFlags=flags; };
@ -86,8 +86,8 @@ public:
bool isIgnoreEnabledFor(IgnoreFlags flag);
const TQString &name(){ return m_szName; };
bool matches(const KviIrcMask &tqmask);
bool matchesFixed(const KviIrcMask &tqmask);
bool matches(const KviIrcMask &mask);
bool matchesFixed(const KviIrcMask &mask);
bool matchesFixed(const TQString &nick,const TQString &user,const TQString &host);
void setProperty(const TQString &name,const TQString &value);
@ -139,7 +139,7 @@ public:
public:
int nonWildChars(){ return m_iMaskNonWildChars; };
KviRegisteredUser * user(){ return m_pUser; };
KviIrcMask * tqmask(){ return m_pMask; };
KviIrcMask * mask(){ return m_pMask; };
};
typedef KviPointerList<KviRegisteredMask> KviRegisteredMaskList;
@ -173,14 +173,14 @@ public:
bool removeUser(const TQString &name);
bool removeGroup(const TQString &name);
KviRegisteredUser * findUserByName(const TQString &name){ return m_pUserDict->find(name); };
// tqmask must be allocated on the heap and the ownership is transferred!
// returns non zero if there is already an user with this tqmask (returns the pointer to it!)
KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * tqmask);
bool removeMaskByPointer(KviIrcMask * tqmask);
bool removeMask(const KviIrcMask &tqmask);
// mask must be allocated on the heap and the ownership is transferred!
// returns non zero if there is already an user with this mask (returns the pointer to it!)
KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * mask);
bool removeMaskByPointer(KviIrcMask * mask);
bool removeMask(const KviIrcMask &mask);
KviRegisteredUser * findMatchingUser(const TQString &nick,const TQString &user,const TQString &host);
KviRegisteredUser * findUserWithMask(const KviIrcMask &tqmask);
KviRegisteredMask * findExactMask(const KviIrcMask &tqmask);
KviRegisteredUser * findUserWithMask(const KviIrcMask &mask);
KviRegisteredMask * findExactMask(const KviIrcMask &mask);
KviRegisteredMask * findMatchingMask(const TQString &nick,const TQString &user,const TQString &host);
//Only used in few places (actually one) of the code, but lot of times;perfect for inlining...
//bool isIgnoredUser(const char * nick,const char * user,const char * host);

16
src/kvilib/ext/kvi_sharedfiles.cpp
Unescape Escape View File

@ -60,7 +60,7 @@
with /usr/arch/mp3/SonataArctica_SingInSilence_Live.mp3 as real file path , something like
"SonataArctica_SingInSilence.mp3". A remote user will then request you a DCC GET SonataArctica_SingInSilence.mp3
and KVIrc will automatically send the file.[br]
Each file offer has an "user tqmask" that the requesting remote users must match to
Each file offer has an "user mask" that the requesting remote users must match to
obtain the file: *!*@* matches any user, Pragma!*@* matches any user with nickname pragma,
*!*@*.omnikron.net matches any user coming from the omnikron.net domain.[br]
Each offer can have an expire time: the offer will be automatically removed after
@ -69,8 +69,8 @@
use an additional "size" parameter in the DCC GET request.[br]
[big]Security issues[/big]
This is a nice but unsecure method of sharing files.[br]
The user tqmask is a good protection but you have to use it properly!.[br]
Setting the user tqmask to Nick!*@* can be easily exploited (just by making an user disconnect
The user mask is a good protection but you have to use it properly!.[br]
Setting the user mask to Nick!*@* can be easily exploited (just by making an user disconnect
in one of the well known ways and then by using his nickname).[br]
On the other side, the remote end must know exactly the visible name of the offer to request
and noone but you will tell him that name.[br]
@ -175,7 +175,7 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
{
if(o->wildcardCount() > 0)
{
// the new tqmask has wildcards... if the current one has none, skip it
// the new mask has wildcards... if the current one has none, skip it
if(fo->wildcardCount() > 0)
{
// the one in the list has wildcards too...
@ -200,7 +200,7 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
}
} // else the current has no wildcards...skip
} else {
// the new tqmask has no wildcards....
// the new mask has no wildcards....
if(fo->wildcardCount() > 0)
{
// current one has wildcards...insert
@ -275,7 +275,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
}
}
KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,KviIrcMask * tqmask,unsigned int uFileSize)
KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,KviIrcMask * mask,unsigned int uFileSize)
{
KviSharedFileList * l = m_pSharedListDict->find(szName);
if(!l)return 0;
@ -283,10 +283,10 @@ KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,K
for(KviSharedFile * o = l->first();o;o = l->next())
{
bool bMatch;
if(tqmask)
if(mask)
{
KviIrcMask umask(o->userMask());
bMatch = tqmask->matchedBy(umask);
bMatch = mask->matchedBy(umask);
} else bMatch = KviTQString::equalCS(o->userMask(),"*!*@*");
if(bMatch)
{

2
src/kvilib/ext/kvi_sharedfiles.h
Unescape Escape View File

@ -84,7 +84,7 @@ private:
public:
void addSharedFile(KviSharedFile * f);
KviSharedFile * addSharedFile(const TQString &szName,const TQString &szAbsPath,const TQString &szMask,int timeoutInSecs);
KviSharedFile * lookupSharedFile(const TQString &szName,KviIrcMask * tqmask,unsigned int uFileSize = 0);
KviSharedFile * lookupSharedFile(const TQString &szName,KviIrcMask * mask,unsigned int uFileSize = 0);
bool removeSharedFile(const TQString &szName,const TQString &szMask,unsigned int uFileSize);
bool removeSharedFile(const TQString &szName,KviSharedFile * off);
void load(const TQString &filename);

2
src/kvilib/file/kvi_packagefile.cpp
Unescape Escape View File

@ -98,7 +98,7 @@
// FieldData Variable FieldLen The data of the field, see below for defined values
// FieldData for FieldType 1 (file field)
// Flags uint32 4 Bittqmask. Bits: 1=FileIsDeflated
// Flags uint32 4 Bitmask. Bits: 1=FileIsDeflated
// Path UniString Variable A relative path expressed as utf8 string. \ AND / are considered to be separators
// Size uint32 4 Size of the following file data
// FilePayload Bytes Variable

12
src/kvilib/irc/kvi_avatarcache.cpp
Unescape Escape View File

@ -76,11 +76,11 @@ KviAvatarCache::~KviAvatarCache()
}
void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork)
void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &mask,const TQString &szNetwork)
{
TQString szKey;
tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
szKey.append(TQChar('+'));
szKey.append(szNetwork);
@ -96,11 +96,11 @@ void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask
}
}
void KviAvatarCache::remove(const KviIrcMask &tqmask,const TQString &szNetwork)
void KviAvatarCache::remove(const KviIrcMask &mask,const TQString &szNetwork)
{
TQString szKey;
tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
szKey.append(TQChar('+'));
szKey.append(szNetwork);
@ -109,11 +109,11 @@ void KviAvatarCache::remove(const KviIrcMask &tqmask,const TQString &szNetwork)
const TQString & KviAvatarCache::lookup(const KviIrcMask &tqmask,const TQString &szNetwork)
const TQString & KviAvatarCache::lookup(const KviIrcMask &mask,const TQString &szNetwork)
{
TQString szKey;
tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
szKey.append(TQChar('+'));
szKey.append(szNetwork);

6
src/kvilib/irc/kvi_avatarcache.h
Unescape Escape View File

@ -55,9 +55,9 @@ public:
static KviAvatarCache * instance(){ return m_pAvatarCacheInstance; };
void replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork);
void remove(const KviIrcMask &tqmask,const TQString &szNetwork);
const TQString & lookup(const KviIrcMask &tqmask,const TQString &szNetwork);
void replace(const TQString &szIdString,const KviIrcMask &mask,const TQString &szNetwork);
void remove(const KviIrcMask &mask,const TQString &szNetwork);
const TQString & lookup(const KviIrcMask &mask,const TQString &szNetwork);
void cleanup();

34
src/kvilib/irc/kvi_ircmask.cpp
Unescape Escape View File

@ -40,7 +40,7 @@
irc masks , nickname , username , hostname , wildcard
@body:
[big]Simple masks[/big][br]
An irc tqmask is a string in a special format that identifies an user on irc.[br]
An irc mask is a string in a special format that identifies an user on irc.[br]
The standard basic format is:[br]
[b]<nick>!<username>@<host>[/b][br]
The <nick> part contains the nickname with that the user is widely known across the network.[br]
@ -81,7 +81,7 @@
The wild masks are used to "match" an user within a set of them.[br]
'*' matches any sequence (eventually empty) of characters and '?' matches a single character.[br]
Wildcards are allowed only in the <nick> , <user> and <host> part: so the
"wildest" tqmask possible is:[br]
"wildest" mask possible is:[br]
[b]*!*@*[/b][br]
that designates "any nickname, any username on any host".[br]
Here are some examples of wild masks:[br]
@ -315,8 +315,8 @@ bool KviIrcMask::hasNumericHost() const
/**
* Retuns in szMask the specified (if possible) tqmask of this user.<br>
* If the host or username are not known , the tqmask may contain less information
* Retuns in szMask the specified (if possible) mask of this user.<br>
* If the host or username are not known , the mask may contain less information
* than requested.<br>
* Mask types:<br>
* 0 : nick!user@machine.host.top (nick!user@XXX.XXX.XXX.XXX) (default)<br>
@ -349,7 +349,7 @@ bool KviIrcMask::hasNumericHost() const
* 25: nick!*user@*.host.top (nick!*user@XXX.XXX.*)
* 26: *!*user@*.host.top (*!user@*XXX.XXX.*)
* If some data is missing , these types may change:<br>
* For example , if hostname is missing , the tqmask type 3 or 4 may be reduced to type 5
* For example , if hostname is missing , the mask type 3 or 4 may be reduced to type 5
*/
/*
@ -365,10 +365,10 @@ bool KviIrcMask::hasNumericHost() const
static unsigned char maskTable[27][3] = {
{ 0 , 0 , 0 }, //0 means normal block
{ 0 , 0 , 2 }, //2 in the third field means type *.abc.host.top (or XXX.XXX.XXX.*) host tqmask
{ 0 , 0 , 2 }, //2 in the third field means type *.abc.host.top (or XXX.XXX.XXX.*) host mask
{ 0 , 0 , 1 }, //2 in the second field means *user (strip prefixes)
{ 0 , 1 , 0 }, //1 means *
{ 0 , 1 , 2 }, //3 in the third field means type *.host.top (or XXX.XXX.*) host tqmask
{ 0 , 1 , 2 }, //3 in the third field means type *.host.top (or XXX.XXX.*) host mask
{ 0 , 1 , 1 }, //4 in the third field is like 3 but tries to detect masked ip addresses too
{ 1 , 0 , 0 },
{ 1 , 0 , 2 },
@ -393,7 +393,7 @@ static unsigned char maskTable[27][3] = {
{ 1 , 2 , 4 }
};
void KviIrcMask::tqmask(TQString &szMask,MaskType eMaskType) const
void KviIrcMask::mask(TQString &szMask,MaskType eMaskType) const
{
if((((int)eMaskType) > 26)||(((int)eMaskType) < 0))eMaskType = NickUserHost;
szMask = maskTable[((int)eMaskType)][0] ? m_szWild : m_szNick;
@ -556,25 +556,25 @@ bool KviIrcMask::matchedBy(const TQString &szMask) const
}
*/
bool KviIrcMask::matches(const KviIrcMask &tqmask) const
bool KviIrcMask::matches(const KviIrcMask &mask) const
{
if(KviTQString::matchWildExpressionsCI(m_szNick,tqmask.m_szNick))
if(KviTQString::matchWildExpressionsCI(m_szNick,mask.m_szNick))
{
if(KviTQString::matchWildExpressionsCI(m_szUser,tqmask.m_szUser))
if(KviTQString::matchWildExpressionsCI(m_szUser,mask.m_szUser))
{
if(KviTQString::matchWildExpressionsCI(m_szHost,tqmask.m_szHost))return true;
if(KviTQString::matchWildExpressionsCI(m_szHost,mask.m_szHost))return true;
}
}
return false;
}
bool KviIrcMask::matchesFixed(const KviIrcMask &tqmask) const
bool KviIrcMask::matchesFixed(const KviIrcMask &mask) const
{
if(KviTQString::matchStringCI(m_szNick,tqmask.m_szNick,0,1))
if(KviTQString::matchStringCI(m_szNick,mask.m_szNick,0,1))
{
if(KviTQString::matchStringCI(m_szUser,tqmask.m_szUser,0,1))
if(KviTQString::matchStringCI(m_szUser,mask.m_szUser,0,1))
{
if(KviTQString::matchStringCI(m_szHost,tqmask.m_szHost,0,1))return true;
if(KviTQString::matchStringCI(m_szHost,mask.m_szHost,0,1))return true;
}
}
return false;
@ -609,7 +609,7 @@ bool KviIrcMask::matchesFixed(const TQString &nick,const TQString &user,const TQ
return true;
}
//Internals for tqmask()
//Internals for mask()
int KviIrcMask::getIpDomainMaskLen() const
{

30
src/kvilib/irc/kvi_ircmask.h
Unescape Escape View File

@ -3,7 +3,7 @@
//=============================================================================
//
// File : kvi_irctqmask.h
// File : kvi_ircmask.h
// Creation date : Fri Jan 8 1999 19:50:35 by Szymon Stefanek
//
// This file is part of the KVirc irc client distribution
@ -33,7 +33,7 @@
#include "kvi_qstring.h"
//=============================================================================
// Irc user tqmask abstraction
// Irc user mask abstraction
//=============================================================================
class KVILIB_API KviIrcMask : public KviHeapObject
@ -56,14 +56,14 @@ public:
// Sets the host for this user.<br>
// If szHost is NULL or it points to an empty string the host is set to "*".<br>
void setHost(const TQString &szHost){ m_szHost = szHost.isEmpty() ? m_szWild : szHost; };
// Sets the host , nick and username extracting it from an irc tqmask:<br>
// Sets the host , nick and username extracting it from an irc mask:<br>
// nick!user@host<br>
// The tqmask is terminated by end-of string null character or a character equal to c in the string.<br>
// Returns the pointer to the end of the tqmask in the szMask string.(c or null-terminator)<br>
// The mask is terminated by end-of string null character or a character equal to c in the string.<br>
// Returns the pointer to the end of the mask in the szMask string.(c or null-terminator)<br>
//const char * setMask(const TQString &szMask,char c=' ');
// Sets the host , nick and username extracting it from an userhost tqmask:<br>
// Sets the host , nick and username extracting it from an userhost mask:<br>
// nick[*]=<+|->user@host<br>
// The tqmask is terminated by end-of string null char or a space character.<br>
// The mask is terminated by end-of string null char or a space character.<br>
// Returns the pointer to the next non-space char in the szMask string or to the null-terminator<br>
// If there are no more masks avaiable.
// WARNING : the szMask pointer can NOT be NULL
@ -80,8 +80,8 @@ public:
bool hasHost() const { return !(m_szHost.isEmpty() || (m_szHost == m_szWild)); };
bool hasNumericHost() const;
// Retuns in szMask the specified (if possible) tqmask of this user.<br>
// If the host or username are not known , the tqmask may contain less information
// Retuns in szMask the specified (if possible) mask of this user.<br>
// If the host or username are not known , the mask may contain less information
// than requested.<br>
enum MaskType
@ -117,7 +117,7 @@ public:
CleanUserSmartNet = 26 // 26 : *!*user@*.host.top (*!user@*XXX.XXX.*)
};
void tqmask(TQString &szMask,MaskType eMaskType = NickCleanUserHost) const;
void mask(TQString &szMask,MaskType eMaskType = NickCleanUserHost) const;
bool hasWildNick();
// Wild external matches (this and external are wild)
@ -125,24 +125,24 @@ public:
// bool matches(const char *szMask);
// // passing 0 as one of params here means that it is a match by default
// bool matches(const char *nick,const char *user,const char *host);
bool matches(const KviIrcMask &tqmask) const;
bool matches(const KviIrcMask &mask) const;
// Fixed external matches (this is wild , external is fixed)
bool matchesFixed(const TQString &nick,const TQString &user,const TQString &host) const;
// bool matchesFixed(const TQString &szMask) const;
bool matchesFixed(const KviIrcMask &tqmask) const;
bool matchesFixed(const KviIrcMask &mask) const;
// Fixed internal matches (this is fixed , external is wild)
//bool matchedBy(const TQString &szMask) const;
bool matchedBy(const KviIrcMask &tqmask) const { return tqmask.matchesFixed(*this); };
bool matchedBy(const KviIrcMask &mask) const { return mask.matchesFixed(*this); };
int nonWildChars();
bool operator==(const KviIrcMask &user);
public:
// Constructs an empty tqmask (*!*@*)
// Constructs an empty mask (*!*@*)
KviIrcMask();
// Constructs this KviIrcMask object from a string tqmask
// Constructs this KviIrcMask object from a string mask
KviIrcMask(const TQString &szMask);
// Carbon copy
KviIrcMask(const KviIrcMask &ircUser)

4
src/kvilib/irc/kvi_nickserv.h
Unescape Escape View File

@ -36,10 +36,10 @@ class KVILIB_API KviNickServRule : public KviHeapObject
{
protected:
TQString m_szRegisteredNick; // my registered nickname
TQString m_szNickServMask; // the NickServ service tqmask
TQString m_szNickServMask; // the NickServ service mask
TQString m_szMessageRegexp; // the NickServ message regexp
TQString m_szIdentifyCommand; // the IDENTIFY command to send to server
TQString m_szServerMask; // the tqmask that the server must match (not used in per-network rules)
TQString m_szServerMask; // the mask that the server must match (not used in per-network rules)
public:
KviNickServRule() : KviHeapObject() {};
KviNickServRule(

2
src/kvilib/system/kvi_locale.h
Unescape Escape View File

@ -129,7 +129,7 @@ class KVILIB_API KviTranslator : public TQTranslator
Q_OBJECT
TQ_OBJECT
public:
KviTranslator(TQObject * tqparent,const char * name);
KviTranslator(TQObject * parent,const char * name);
~KviTranslator();
public:
#ifdef COMPILE_USE_QT4

12
src/kvilib/tal/kvi_tal_filedialog.cpp
Unescape Escape View File

@ -31,8 +31,8 @@
#include <tqdir.h>
KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
: TQFileDialog(tqparent,"",dirName,filter)
KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
: TQFileDialog(parent,"",dirName,filter)
{
setModal(modal);
}
@ -78,8 +78,8 @@
#ifdef COMPILE_KDE_SUPPORT
KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
: KFileDialog(dirName,filter,tqparent,name,modal)
KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
: KFileDialog(dirName,filter,parent,name,modal)
{
clearWFlags(WDestructiveClose);
}
@ -129,8 +129,8 @@
#include <tqdir.h>
KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
: TQFileDialog(dirName,filter,tqparent,name,modal)
KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
: TQFileDialog(dirName,filter,parent,name,modal)
{
clearWFlags(WDestructiveClose);
}

8
src/kvilib/tal/kvi_tal_filedialog_kde.h
Unescape Escape View File

@ -31,7 +31,7 @@ class KVILIB_API KviTalFileDialog : public KFileDialog
Q_OBJECT
TQ_OBJECT
public:
KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
~KviTalFileDialog();
public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@ -40,11 +40,11 @@ public:
void setDirectory(const TQString &szDirectory);
static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
{
// TQFileDialog allows making new directories...kfiledialog not :/
return TQFileDialog::getExistingDirectory(dir,tqparent,0,caption);
//return getExistingDirectory(dir,tqparent,caption);
return TQFileDialog::getExistingDirectory(dir,parent,0,caption);
//return getExistingDirectory(dir,parent,caption);
};
};

6
src/kvilib/tal/kvi_tal_filedialog_qt.h
Unescape Escape View File

@ -30,7 +30,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
Q_OBJECT
TQ_OBJECT
public:
KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
~KviTalFileDialog();
public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@ -38,8 +38,8 @@ public:
void setFileMode(FileMode m);
void setDirectory(const TQString &szDirectory);
static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
{ return getExistingDirectory(dir,tqparent,0 /* name */,caption); };
static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
{ return getExistingDirectory(dir,parent,0 /* name */,caption); };
};
#endif // _KVI_TAL_FILEDIALOG_TQT_H_

6
src/kvilib/tal/kvi_tal_filedialog_qt4.h
Unescape Escape View File

@ -32,7 +32,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
Q_OBJECT
TQ_OBJECT
public:
KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
~KviTalFileDialog();
public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@ -40,8 +40,8 @@ public:
void setFileMode(FileMode m);
void setDirectory(const TQString &szDirectory);
static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
{ return getExistingDirectory(tqparent,caption,dir); };
static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
{ return getExistingDirectory(parent,caption,dir); };
};
#endif // _KVI_TAL_FILEDIALOG_TQT_H_

16
src/kvilib/tal/kvi_tal_groupbox_qt3.h
Unescape Escape View File

@ -32,14 +32,14 @@ class KVILIB_API KviTalGroupBox : public TQGroupBox
Q_OBJECT
TQ_OBJECT
public:
KviTalGroupBox(TQWidget * tqparent = 0)
: TQGroupBox(tqparent) {};
KviTalGroupBox(const TQString & title,TQWidget * tqparent = 0)
: TQGroupBox(title,tqparent) {};
KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * tqparent = 0)
: TQGroupBox(strips,orientation,tqparent) {};
KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * tqparent = 0)
: TQGroupBox(strips,orientation,title,tqparent) {};
KviTalGroupBox(TQWidget * parent = 0)
: TQGroupBox(parent) {};
KviTalGroupBox(const TQString & title,TQWidget * parent = 0)
: TQGroupBox(title,parent) {};
KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0)
: TQGroupBox(strips,orientation,parent) {};
KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0)
: TQGroupBox(strips,orientation,title,parent) {};
~KviTalGroupBox() {};
};

16
src/kvilib/tal/kvi_tal_groupbox_qt4.h
Unescape Escape View File

@ -32,14 +32,14 @@ class KVILIB_API KviTalGroupBox : public Q3GroupBox
Q_OBJECT
TQ_OBJECT
public:
KviTalGroupBox(TQWidget * tqparent = 0)
: Q3GroupBox(tqparent) {};
KviTalGroupBox(const TQString & title,TQWidget * tqparent = 0)
: Q3GroupBox(title,tqparent) {};
KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * tqparent = 0)
: Q3GroupBox(strips,orientation,tqparent) {};
KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * tqparent = 0)
: Q3GroupBox(strips,orientation,title,tqparent) {};
KviTalGroupBox(TQWidget * parent = 0)
: Q3GroupBox(parent) {};
KviTalGroupBox(const TQString & title,TQWidget * parent = 0)
: Q3GroupBox(title,parent) {};
KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0)
: Q3GroupBox(strips,orientation,parent) {};
KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0)
: Q3GroupBox(strips,orientation,title,parent) {};
~KviTalGroupBox() {};
};

24
src/kvilib/tal/kvi_tal_iconview_qt3.h
Unescape Escape View File

@ -79,18 +79,18 @@ public:
class KVILIB_API KviTalIconViewItem : public TQIconViewItem
{
public:
KviTalIconViewItem(KviTalIconView * tqparent)
: TQIconViewItem(tqparent) {};
KviTalIconViewItem(KviTalIconView * tqparent,KviTalIconViewItem * after)
: TQIconViewItem(tqparent,after) {};
KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text)
: TQIconViewItem(tqparent,text) {};
KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text)
: TQIconViewItem(tqparent,after,text) {};
KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text, const TQPixmap & icon)
: TQIconViewItem(tqparent,text,icon) {};
KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
: TQIconViewItem(tqparent,after,text,icon) {};
KviTalIconViewItem(KviTalIconView * parent)
: TQIconViewItem(parent) {};
KviTalIconViewItem(KviTalIconView * parent,KviTalIconViewItem * after)
: TQIconViewItem(parent,after) {};
KviTalIconViewItem(KviTalIconView * parent, const TQString & text)
: TQIconViewItem(parent,text) {};
KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text)
: TQIconViewItem(parent,after,text) {};
KviTalIconViewItem(KviTalIconView * parent, const TQString & text, const TQPixmap & icon)
: TQIconViewItem(parent,text,icon) {};
KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
: TQIconViewItem(parent,after,text,icon) {};
public:
KviTalIconView * iconView() const { return (KviTalIconView *)TQIconViewItem::iconView(); };
KviTalIconViewItem * prevItem() const { return (KviTalIconViewItem *)TQIconViewItem::prevItem(); };

24
src/kvilib/tal/kvi_tal_iconview_qt4.h
Unescape Escape View File

@ -78,18 +78,18 @@ public:
class KVILIB_API KviTalIconViewItem : public Q3IconViewItem
{
public:
KviTalIconViewItem(KviTalIconView * tqparent)
: Q3IconViewItem(tqparent) {};
KviTalIconViewItem(KviTalIconView * tqparent,KviTalIconViewItem * after)
: Q3IconViewItem(tqparent,after) {};
KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text)
: Q3IconViewItem(tqparent,text) {};
KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text)
: Q3IconViewItem(tqparent,after,text) {};
KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text, const TQPixmap & icon)
: Q3IconViewItem(tqparent,text,icon) {};
KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
: Q3IconViewItem(tqparent,after,text,icon) {};
KviTalIconViewItem(KviTalIconView * parent)
: Q3IconViewItem(parent) {};
KviTalIconViewItem(KviTalIconView * parent,KviTalIconViewItem * after)
: Q3IconViewItem(parent,after) {};
KviTalIconViewItem(KviTalIconView * parent, const TQString & text)
: Q3IconViewItem(parent,text) {};
KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text)
: Q3IconViewItem(parent,after,text) {};
KviTalIconViewItem(KviTalIconView * parent, const TQString & text, const TQPixmap & icon)
: Q3IconViewItem(parent,text,icon) {};
KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
: Q3IconViewItem(parent,after,text,icon) {};
public:
KviTalIconView * iconView() const { return (KviTalIconView *)Q3IconViewItem::iconView(); };
KviTalIconViewItem * prevItem() const { return (KviTalIconViewItem *)Q3IconViewItem::prevItem(); };

164
src/kvilib/tal/kvi_tal_listview.cpp
Unescape Escape View File

@ -69,8 +69,8 @@
lvi.features |= TQStyleOptionQ3ListViewItem::MultiLine;
if (item->isVisible())
lvi.features |= TQStyleOptionQ3ListViewItem::Visible;
if (item->tqparent() && item->tqparent()->rtti() == 1
&& static_cast<Q3CheckListItem *>(item->tqparent())->type() == Q3CheckListItem::Controller)
if (item->parent() && item->parent()->rtti() == 1
&& static_cast<Q3CheckListItem *>(item->parent())->type() == Q3CheckListItem::Controller)
lvi.features |= TQStyleOptionQ3ListViewItem::ParentControl;
opt.items.append(lvi);
if (!firstItem) {
@ -210,39 +210,39 @@
bool tristate;
};
KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,
Type tt)
: KviTalListViewItem(tqparent, text, TQString())
: KviTalListViewItem(parent, text, TQString())
{
myType = tt;
init();
if (myType == RadioButton) {
if (tqparent->type() != RadioButtonController)
if (parent->type() != RadioButtonController)
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller");
else
d->exclusive = tqparent;
d->exclusive = parent;
}
}
KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,
KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,
const TQString &text, Type tt)
: KviTalListViewItem(tqparent, after, text)
: KviTalListViewItem(parent, after, text)
{
myType = tt;
init();
if (myType == RadioButton) {
if (tqparent->type() != RadioButtonController)
if (parent->type() != RadioButtonController)
qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller");
else
d->exclusive = tqparent;
d->exclusive = parent;
}
}
KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
Type tt)
: KviTalListViewItem(tqparent, text, TQString())
: KviTalListViewItem(parent, text, TQString())
{
myType = tt;
if (myType == RadioButton) {
@ -252,9 +252,9 @@
init();
}
KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, KviTalListViewItem *after,
KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, KviTalListViewItem *after,
const TQString &text, Type tt)
: KviTalListViewItem(tqparent, after, text)
: KviTalListViewItem(parent, after, text)
{
myType = tt;
if (myType == RadioButton) {
@ -264,9 +264,9 @@
init();
}
KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, const TQString &text,
Type tt)
: KviTalListViewItem(tqparent, text)
: KviTalListViewItem(parent, text)
{
myType = tt;
if (tt == RadioButton)
@ -275,9 +275,9 @@
init();
}
KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, KviTalListViewItem *after,
KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, KviTalListViewItem *after,
const TQString &text, Type tt)
: KviTalListViewItem(tqparent, after, text)
: KviTalListViewItem(parent, after, text)
{
myType = tt;
if (tt == RadioButton)
@ -291,18 +291,18 @@
return RTTI;
}
KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, const TQString &text,
const TQPixmap & p)
: KviTalListViewItem(tqparent, text)
: KviTalListViewItem(parent, text)
{
myType = RadioButtonController;
setPixmap(0, p);
init();
}
KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
const TQPixmap & p)
: KviTalListViewItem(tqparent, text)
: KviTalListViewItem(parent, text)
{
myType = RadioButtonController;
setPixmap(0, p);
@ -373,9 +373,9 @@
if (myType == CheckBox) {
setCurrentState(s);
stateChange(state());
if (update && tqparent() && tqparent()->rtti() == 1
&& ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
((KviTalCheckListItem*)tqparent())->updateController(update, store);
if (update && parent() && parent()->rtti() == 1
&& ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
((KviTalCheckListItem*)parent())->updateController(update, store);
} else if (myType == CheckBoxController) {
if (s == NoChange && childCount()) {
restoreState(this);
@ -397,18 +397,18 @@
ToggleState oldState = internalState();
updateController(false, false);
if (oldState != internalState() &&
tqparent() && tqparent()->rtti() == 1 &&
((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
((KviTalCheckListItem*)tqparent())->updateController(update, store);
parent() && parent()->rtti() == 1 &&
((KviTalCheckListItem*)parent())->type() == CheckBoxController)
((KviTalCheckListItem*)parent())->updateController(update, store);
updateController(update, store);
} else {
// if there are no tqchildren we simply set the CheckBoxController and update its tqparent
// if there are no tqchildren we simply set the CheckBoxController and update its parent
setCurrentState(s);
stateChange(state());
if (tqparent() && tqparent()->rtti() == 1
&& ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
((KviTalCheckListItem*)tqparent())->updateController(update, store);
if (parent() && parent()->rtti() == 1
&& ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
((KviTalCheckListItem*)parent())->updateController(update, store);
}
} else {
setCurrentState(s);
@ -482,8 +482,8 @@
int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
if (activatedPos(pos)) {
bool parentControl = false;
if (tqparent() && tqparent()->rtti() == 1 &&
((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
if (parent() && parent()->rtti() == 1 &&
((KviTalCheckListItem*) parent())->type() == RadioButtonController)
parentControl = true;
int x = parentControl ? 0 : 3;
@ -588,10 +588,10 @@
return;
KviTalCheckListItem *controller = 0;
// checks if this CheckBoxController has another CheckBoxController as tqparent
if (tqparent() && tqparent()->rtti() == 1
&& ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
controller = (KviTalCheckListItem*)tqparent();
// checks if this CheckBoxController has another CheckBoxController as parent
if (parent() && parent()->rtti() == 1
&& ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
controller = (KviTalCheckListItem*)parent();
ToggleState theState = Off;
bool first = true;
@ -695,8 +695,8 @@
}
bool parentControl = false;
if (tqparent() && tqparent()->rtti() == 1 &&
((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
if (parent() && parent()->rtti() == 1 &&
((KviTalCheckListItem*) parent())->type() == RadioButtonController)
parentControl = true;
TQFontMetrics fm(lv->fontMetrics());
@ -775,8 +775,8 @@
intersect = r.intersects(TQRect(p, r.y(), xdepth - p + 1, r.height()));
}
bool parentControl = false;
if (tqparent() && tqparent()->rtti() == 1 &&
((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
if (parent() && parent()->rtti() == 1 &&
((KviTalCheckListItem*) parent())->type() == RadioButtonController)
parentControl = true;
if (myType != RadioButtonController && intersect &&
(lv->rootIsDecorated() || myType == RadioButton ||
@ -935,39 +935,39 @@
// ### obscenity is warranted.
KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *parent, const TQString &text,
Type tt )
: KviTalListViewItem( tqparent, text, TQString() )
: KviTalListViewItem( parent, text, TQString() )
{
myType = tt;
init();
if ( myType == RadioButton ) {
if ( tqparent->type() != RadioButtonController )
if ( parent->type() != RadioButtonController )
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller" );
else
d->exclusive = tqparent;
d->exclusive = parent;
}
}
KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *tqparent, KviTalListViewItem *after,
KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *parent, KviTalListViewItem *after,
const TQString &text, Type tt )
: KviTalListViewItem( tqparent, after, text )
: KviTalListViewItem( parent, after, text )
{
myType = tt;
init();
if ( myType == RadioButton ) {
if ( tqparent->type() != RadioButtonController )
if ( parent->type() != RadioButtonController )
qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
"child of a controller" );
else
d->exclusive = tqparent;
d->exclusive = parent;
}
}
KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,
Type tt )
: KviTalListViewItem( tqparent, text, TQString() )
: KviTalListViewItem( parent, text, TQString() )
{
myType = tt;
if ( myType == RadioButton ) {
@ -977,9 +977,9 @@
init();
}
KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, KviTalListViewItem *after,
KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, KviTalListViewItem *after,
const TQString &text, Type tt )
: KviTalListViewItem( tqparent, after, text )
: KviTalListViewItem( parent, after, text )
{
myType = tt;
if ( myType == RadioButton ) {
@ -989,9 +989,9 @@
init();
}
KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, const TQString &text,
Type tt )
: KviTalListViewItem( tqparent, text )
: KviTalListViewItem( parent, text )
{
myType = tt;
if ( tt == RadioButton )
@ -1000,9 +1000,9 @@
init();
}
KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, KviTalListViewItem *after,
KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, KviTalListViewItem *after,
const TQString &text, Type tt )
: KviTalListViewItem( tqparent, after, text )
: KviTalListViewItem( parent, after, text )
{
myType = tt;
if ( tt == RadioButton )
@ -1019,18 +1019,18 @@
return RTTI;
}
KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, const TQString &text,
const TQPixmap & p )
: KviTalListViewItem( tqparent, text )
: KviTalListViewItem( parent, text )
{
myType = RadioButtonController;
setPixmap( 0, p );
init();
}
KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,
KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,
const TQPixmap & p )
: KviTalListViewItem( tqparent, text )
: KviTalListViewItem( parent, text )
{
myType = RadioButtonController;
setPixmap( 0, p );
@ -1107,9 +1107,9 @@
if ( myType == CheckBox ) {
setCurrentState( s );
stateChange( state() );
if ( update && tqparent() && tqparent()->rtti() == 1
&& ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
((KviTalCheckListItem*)tqparent())->updateController( update, store );
if ( update && parent() && parent()->rtti() == 1
&& ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
((KviTalCheckListItem*)parent())->updateController( update, store );
} else if ( myType == CheckBoxController ) {
if ( s == NoChange && childCount()) {
restoreState( (void*) this );
@ -1131,18 +1131,18 @@
ToggleState oldState = internalState();
updateController( FALSE, FALSE );
if ( oldState != internalState() &&
tqparent() && tqparent()->rtti() == 1 &&
((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
((KviTalCheckListItem*)tqparent())->updateController( update, store );
parent() && parent()->rtti() == 1 &&
((KviTalCheckListItem*)parent())->type() == CheckBoxController )
((KviTalCheckListItem*)parent())->updateController( update, store );
updateController( update, store );
} else {
// if there are no tqchildren we simply set the CheckBoxController and update its tqparent
// if there are no tqchildren we simply set the CheckBoxController and update its parent
setCurrentState( s );
stateChange( state() );
if ( tqparent() && tqparent()->rtti() == 1
&& ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
((KviTalCheckListItem*)tqparent())->updateController( update, store );
if ( parent() && parent()->rtti() == 1
&& ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
((KviTalCheckListItem*)parent())->updateController( update, store );
}
} else {
setCurrentState( s );
@ -1219,8 +1219,8 @@
int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
if ( activatedPos( pos ) ) {
bool parentControl = FALSE;
if ( tqparent() && tqparent()->rtti() == 1 &&
((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
if ( parent() && parent()->rtti() == 1 &&
((KviTalCheckListItem*) parent())->type() == RadioButtonController )
parentControl = TRUE;
int x = parentControl ? 0 : 3;
@ -1324,10 +1324,10 @@
return;
KviTalCheckListItem *controller = 0;
// checks if this CheckBoxController has another CheckBoxController as tqparent
if ( tqparent() && tqparent()->rtti() == 1
&& ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
controller = (KviTalCheckListItem*)tqparent();
// checks if this CheckBoxController has another CheckBoxController as parent
if ( parent() && parent()->rtti() == 1
&& ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
controller = (KviTalCheckListItem*)parent();
ToggleState theState = Off;
bool first = TRUE;
@ -1432,8 +1432,8 @@
}
bool parentControl = FALSE;
if ( tqparent() && tqparent()->rtti() == 1 &&
((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
if ( parent() && parent()->rtti() == 1 &&
((KviTalCheckListItem*) parent())->type() == RadioButtonController )
parentControl = TRUE;
TQFontMetrics fm( lv->fontMetrics() );
@ -1512,8 +1512,8 @@
intersect = r.intersects( TQRect( p, r.y(), xdepth - p + 1, r.height() ) );
}
bool parentControl = FALSE;
if ( tqparent() && tqparent()->rtti() == 1 &&
((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
if ( parent() && parent()->rtti() == 1 &&
((KviTalCheckListItem*) parent())->type() == RadioButtonController )
parentControl = TRUE;
if ( myType != RadioButtonController && intersect &&
(lv->rootIsDecorated() || myType == RadioButton ||

18
src/kvilib/tal/kvi_tal_listview_qt3.h
Unescape Escape View File

@ -113,7 +113,7 @@ public:
// Shadow the internal TQt methods
KviTalListViewItem * firstChild() const { return (KviTalListViewItem *)TQListViewItem::firstChild(); };
KviTalListViewItem * nextSibling() const { return (KviTalListViewItem *)TQListViewItem::nextSibling(); };
KviTalListViewItem * tqparent() const { return (KviTalListViewItem *)TQListViewItem::tqparent(); };
KviTalListViewItem * parent() const { return (KviTalListViewItem *)TQListViewItem::parent(); };
KviTalListView * listView() const { return (KviTalListView *)TQListViewItem::listView(); };
KviTalListViewItem * itemAbove() { return (KviTalListViewItem *)TQListViewItem::itemAbove(); };
KviTalListViewItem * itemBelow() { return (KviTalListViewItem *)TQListViewItem::itemBelow(); };
@ -133,14 +133,14 @@ public:
};
enum ToggleState { Off, NoChange, On };
KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,Type = RadioButtonController);
KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController);
KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,Type = RadioButtonController );
KviTalCheckListItem( KviTalListViewItem *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,Type = RadioButtonController );
KviTalCheckListItem( KviTalListView *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,const TQPixmap & );
KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,const TQPixmap & );
KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,Type = RadioButtonController);
KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController);
KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,Type = RadioButtonController );
KviTalCheckListItem( KviTalListViewItem *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
KviTalCheckListItem( KviTalListView *parent, const TQString &text,Type = RadioButtonController );
KviTalCheckListItem( KviTalListView *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,const TQPixmap & );
KviTalCheckListItem( KviTalListView *parent, const TQString &text,const TQPixmap & );
~KviTalCheckListItem();
void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int tqalignment );

18
src/kvilib/tal/kvi_tal_listview_qt4.h
Unescape Escape View File

@ -114,7 +114,7 @@ public:
// Shadow the internal TQt methods
KviTalListViewItem * firstChild() const { return (KviTalListViewItem *)Q3ListViewItem::firstChild(); };
KviTalListViewItem * nextSibling() const { return (KviTalListViewItem *)Q3ListViewItem::nextSibling(); };
KviTalListViewItem * tqparent() const { return (KviTalListViewItem *)Q3ListViewItem::tqparent(); };
KviTalListViewItem * parent() const { return (KviTalListViewItem *)Q3ListViewItem::parent(); };
KviTalListView * listView() const { return (KviTalListView *)Q3ListViewItem::listView(); };
KviTalListViewItem * itemAbove() { return (KviTalListViewItem *)Q3ListViewItem::itemAbove(); };
KviTalListViewItem * itemBelow() { return (KviTalListViewItem *)Q3ListViewItem::itemBelow(); };
@ -133,21 +133,21 @@ public:
enum ToggleState { Off, NoChange, On };
KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,
KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,
Type = RadioButtonController);
KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,
KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,
const TQString &text, Type = RadioButtonController);
KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
Type = RadioButtonController);
KviTalCheckListItem(KviTalListViewItem *tqparent, KviTalListViewItem *after,
KviTalCheckListItem(KviTalListViewItem *parent, KviTalListViewItem *after,
const TQString &text, Type = RadioButtonController);
KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
KviTalCheckListItem(KviTalListView *parent, const TQString &text,
Type = RadioButtonController);
KviTalCheckListItem(KviTalListView *tqparent, KviTalListViewItem *after,
KviTalCheckListItem(KviTalListView *parent, KviTalListViewItem *after,
const TQString &text, Type = RadioButtonController);
KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
const TQPixmap &);
KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
KviTalCheckListItem(KviTalListView *parent, const TQString &text,
const TQPixmap &);
~KviTalCheckListItem();

2
src/kvirc/kernel/kvi_coreactions.cpp
Unescape Escape View File

@ -72,7 +72,7 @@
void register_core_actions(KviActionManager * m)
{
m->registerAction(new KviConnectAction(m)); // this as tqparent will destroy it on exit!
m->registerAction(new KviConnectAction(m)); // this as parent will destroy it on exit!
m->registerAction(new KviSeparatorAction(m));
m->registerAction(new KviIrcContextDisplayAction(m));
m->registerAction(new KviJoinChannelAction(m));

4
src/kvirc/kernel/kvi_ipc.cpp
Unescape Escape View File

@ -107,11 +107,11 @@
}
}
Window root,tqparent;
Window root,parent;
Window * tqchildren;
unsigned int nChildren;
if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&tqparent,&tqchildren,&nChildren))
if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&parent,&tqchildren,&nChildren))
{
if(tqchildren)XFree((char *)tqchildren);
return 0;

60
src/kvirc/kernel/kvi_notifylist.cpp
Unescape Escape View File

@ -70,7 +70,7 @@
So for example, assume to register a frend of yours like Szymon:[br]
[example]
[cmd:reguser.add]reguser.add[/cmd] Szymon
[cmd:reguser.addtqmask]reguser.addtqmask[/cmd] Szymon Pragma!*@*.it
[cmd:reguser.addmask]reguser.addmask[/cmd] Szymon Pragma!*@*.it
[/example]
And then want it in the notify list; nothing easier, just set
hist "notify" property to the nickname that you want him to be "looked for":[br]
@ -82,7 +82,7 @@
"Pragma [someuser@somehost.it] is on IRC".[br]
If Szymon uses often "[Pragma]" as his secondary nickname , you can do the following:[br]
[example]
[cmd:reguser.addtqmask]reguser.addtqmask[/cmd] Szymon [Pragma]*@*.it
[cmd:reguser.addmask]reguser.addmask[/cmd] Szymon [Pragma]*@*.it
[cmd:reguser.setproperty]reguser.setproperty[/cmd] Szymon notify "Pragma [Pragma]"
[/example]
KVIrc will then look for both nicknames getting online.[br]
@ -592,7 +592,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
if(KviUserListEntry * ent = m_pConsole->notifyListView()->findEntry(*s))
{
// the user was online from a previous notify session
// might the tqmask have been changed ? (heh...this is tricky, maybe too much even)
// might the mask have been changed ? (heh...this is tricky, maybe too much even)
if(KVI_OPTION_BOOL(KviOption_boolNotifyListSendUserhostForOnlineUsers))
{
// user wants to be sure about online users....
@ -621,15 +621,15 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
//l.append(s); // we will remove him from the list
} else {
// the user was not online!
// check if we have a cached tqmask
// check if we have a cached mask
if(db)
{
if(KviIrcUserEntry * ue = db->find(*s))
{
// already in the db... do we have a tqmask ?
// already in the db... do we have a mask ?
if(ue->hasUser() && ue->hasHost())
{
// yup! we have a complete tqmask to match on
// yup! we have a complete mask to match on
KviIrcMask mk(*s,ue->user(),ue->host());
// lookup the user's name in the m_pRegUserDict
if(!doMatchUser(*s,mk))return true; // critical problems = have to restart!!!
@ -656,7 +656,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
// FIXME: #warning "Nickname escapes (links) in the notifylist messages!"
bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const KviIrcMask & tqmask)
bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const KviIrcMask & mask)
{
TQString * nam = m_pRegUserDict->find(notifyString);
if(nam)
@ -665,25 +665,25 @@ bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const Kv
if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam))
{
// ok ... match the user
if(u->matchesFixed(tqmask))
if(u->matchesFixed(mask))
{
// new user online
if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick())))
if(!(m_pConsole->notifyListView()->findEntry(mask.nick())))
{
notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host());
notifyOnLine(mask.nick(),mask.user(),mask.host());
} // else already online , and matching...all ok
} else {
// not matched.... has he been online before ?
if(m_pConsole->notifyListView()->findEntry(tqmask.nick()))
if(m_pConsole->notifyListView()->findEntry(mask.nick()))
{
// has been online just a sec ago , but now the tqmask does not match
// has been online just a sec ago , but now the mask does not match
// either reguserdb has changed , or the user went offline and another one got his nick
// in the meantime... (ugly situation anyway)
notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(),__tr2qs("registration tqmask changed, or nickname is being used by someone else"));
notifyOffLine(mask.nick(),mask.user(),mask.host(),__tr2qs("registration mask changed, or nickname is being used by someone else"));
} else {
// has never been online
if(_OUTPUT_VERBOSE)
m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the tqmask [%Q@\r!h\r%Q\r] does not match (registration tqmask does not match, or nickname is being used by someone else)"),&(tqmask.nick()),&(tqmask.user()),&(tqmask.host()));
m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (registration mask does not match, or nickname is being used by someone else)"),&(mask.nick()),&(mask.user()),&(mask.host()));
}
}
} else {
@ -784,7 +784,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg)
aux = kvi_extractToken(nk,aux,' ');
if(nk.hasData())
{
// split it in a tqmask
// split it in a mask
KviStr nick;
KviStr user;
KviStr host;
@ -1146,7 +1146,7 @@ void KviWatchNotifyListManager::stop()
m_pRegUserDict->clear();
}
bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &notifyString,const KviIrcMask & tqmask)
bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &notifyString,const KviIrcMask & mask)
{
TQString * nam = m_pRegUserDict->find(notifyString);
@ -1156,39 +1156,39 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &
if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam))
{
// ok ... match the user
if(u->matchesFixed(tqmask))
if(u->matchesFixed(mask))
{
// new user online
if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick())))
if(!(m_pConsole->notifyListView()->findEntry(mask.nick())))
{
notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),"watch");
notifyOnLine(mask.nick(),mask.user(),mask.host(),"watch");
} else {
// else already online , and matching...all ok
if(msg->numeric() == RPL_NOWON)
{
// This is a reply to a /watch +something (should not happen, unless the user is messing) or to /watch l (user requested)
notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),
notifyOnLine(mask.nick(),mask.user(),mask.host(),
__tr2qs("watch entry listing requested by user"),false);
} else {
// This is a RPL_LOGON....we're desynched ?
notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),
notifyOnLine(mask.nick(),mask.user(),mask.host(),
__tr2qs("possible watch list desync"),false);
}
}
} else {
// not matched.... has he been online before ?
if(m_pConsole->notifyListView()->findEntry(tqmask.nick()))
if(m_pConsole->notifyListView()->findEntry(mask.nick()))
{
// has been online just a sec ago , but now the tqmask does not match
// has been online just a sec ago , but now the mask does not match
// prolly the reguserdb has been changed
notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(),
__tr2qs("registration tqmask changed or desync with the watch service"));
notifyOffLine(mask.nick(),mask.user(),mask.host(),
__tr2qs("registration mask changed or desync with the watch service"));
} else {
// has never been online
if(_OUTPUT_VERBOSE)
m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
__tr("Notify list: \r!n\r%Q\r appears to be online, but the tqmask [%Q@\r!h\r%Q\r] does not match (watch: registration tqmask does not match, or nickname is being used by someone else)"),
&(tqmask.nick()),&(tqmask.user()),&(tqmask.host()));
__tr("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (watch: registration mask does not match, or nickname is being used by someone else)"),
&(mask.nick()),&(mask.user()),&(mask.host()));
}
}
} else {
@ -1202,9 +1202,9 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &
} else {
// not in our dictionary
// prolly someone used /WATCH behind our back... bad boy!
if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick())))
if(!(m_pConsole->notifyListView()->findEntry(mask.nick())))
{
notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),__tr2qs("watch entry added by user"));
notifyOnLine(mask.nick(),mask.user(),mask.host(),__tr2qs("watch entry added by user"));
}
}
return true;
@ -1263,7 +1263,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg)
if(_OUTPUT_VERBOSE)
m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r is offline (watch)"),&dnk);
} else {
// This is a RPL_LOGOFF for an user that has not matched the reg-tqmask
// This is a RPL_LOGOFF for an user that has not matched the reg-mask
notifyOffLine(dnk,dus,dho,__tr2qs("unmatched watch list entry"));
}
}

4
src/kvirc/kernel/kvi_notifylist.h
Unescape Escape View File

@ -110,7 +110,7 @@ private slots:
void buildNotifyList();
void sendIsOn();
void sendUserhost();
bool doMatchUser(const TQString &notifyString,const KviIrcMask & tqmask);
bool doMatchUser(const TQString &notifyString,const KviIrcMask & mask);
};
@ -158,7 +158,7 @@ protected:
virtual void start();
virtual void stop();
virtual bool handleWatchReply(KviIrcMessage *msg);
bool doMatchUser(KviIrcMessage *msg,const TQString &notifyString,const KviIrcMask & tqmask);
bool doMatchUser(KviIrcMessage *msg,const TQString &notifyString,const KviIrcMask & mask);
};

12
src/kvirc/kernel/kvi_options.cpp
Unescape Escape View File

@ -776,12 +776,12 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
MSGTYPE_OPTION("MeDeVoice",__tr_no_lookup("Am devoiced"),KVI_SMALLICON_MEDEVOICE,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeHalfOp",__tr_no_lookup("Am halfop'd"),KVI_SMALLICON_MEHALFOP,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeDeHalfOp",__tr_no_lookup("Am de-halfop'd"),KVI_SMALLICON_MEDEHALFOP,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my tqmask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my tqmask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my tqmask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my tqmask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my tqmask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my tqmask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my mask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my mask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my mask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my mask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my mask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my mask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5),
MSGTYPE_OPTION("Ignore",__tr_no_lookup("Ignored user message"),KVI_SMALLICON_IGNORE,KVI_MSGTYPE_LEVEL_3),
MSGTYPE_OPTION("Stats",__tr_no_lookup("Server statistics"),KVI_SMALLICON_STATS,KVI_MSGTYPE_LEVEL_1),
MSGTYPE_OPTION("SSL",__tr_no_lookup("SSL message"),KVI_SMALLICON_SSL,KVI_MSGTYPE_LEVEL_1),

2
src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
Unescape Escape View File

@ -618,7 +618,7 @@ namespace KviKvsCoreCallbackCommands
Trigger <callback command> with "ping" events every <timeout> milliseconds.
!sw: -w | --bind-to-window
Kill the process if the current window is closed. In this case the
termination event is NOT triggered (since the tqparent window has been lost).
termination event is NOT triggered (since the parent window has been lost).
If this switch is not used then the process is rebound to
the active console window and continues running.
!sw: -s=<interpreter command> | --shell=<interpreter command>

2
src/kvirc/kvs/kvi_kvs_corefunctions.cpp
Unescape Escape View File

@ -93,7 +93,7 @@ namespace KviKvsCoreFunctions
_REGFNC("length",length)
_REGFNC("lf",lf)
// m_r
_REGFNC("tqmask",tqmask)
_REGFNC("mask",mask)
_REGFNC("me",me)
_REGFNC("msgtype",msgtype)
_REGFNC("new",newCKEYWORDWORKAROUND)

2
src/kvirc/kvs/kvi_kvs_corefunctions.h
Unescape Escape View File

@ -101,7 +101,7 @@ namespace KviKvsCoreFunctions
KVSCF(length);
KVSCF(lf);
// m_r
KVSCF(tqmask);
KVSCF(mask);
KVSCF(me);
KVSCF(msgtype);
KVSCF(newCKEYWORDWORKAROUND);

26
src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
Unescape Escape View File

@ -48,22 +48,22 @@ namespace KviKvsCoreFunctions
///////////////////////////////////////////////////////////////////////////////////////////////
/*
@doc: tqmask
@doc: mask
@type:
function
@title:
$tqmask
$mask
@short:
Retrieves the host tqmask of a user
Retrieves the host mask of a user
@syntax:
$tqmask[(<nickname>[,<mask_type>])]
$mask[(<nickname>[,<mask_type>])]
@description:
Returns the specified type of tqmask for the user with <nickname>.[br]
If the host or username are not known, the tqmask may contain less information
Returns the specified type of mask for the user with <nickname>.[br]
If the host or username are not known, the mask may contain less information
than requested.[br]
If the <nickname> is not given it is assumed to be the current nickname.[br]
If <mask_type> is not given or is invalid, it is assumed to be 0.[br]
Available tqmask types:[br]
Available mask types:[br]
0 : nick!user@machine.host.top (nick!user@XXX.XXX.XXX.XXX) (default)[br]
1 : nick!user@*.abc.host.top (nick!user@XXX.XXX.XXX.*)[br]
2 : nick!user@*[br]
@ -92,17 +92,17 @@ namespace KviKvsCoreFunctions
25: nick!*user@*.host.top (nick!*user@XXX.XXX.*)[br]
26: *!*user@*.host.top (*!user@*XXX.XXX.*)[br]
If some data is missing, these types may change:[br]
For example, if the hostname is missing, the tqmask type 3 or 4 may be reduced to type 5.[br]
For example, if the hostname is missing, the mask type 3 or 4 may be reduced to type 5.[br]
If the user with <nickname> is not found in the current IRC context user database,
an empty string is returned.[br]
The masks 22-26 are the smart versions of the masks 17-21 that try take care of masked ip addresses
in the form xxx.xxx.INVALID-TOP-MASK. If a masked ip address is found then
the XXX.XXX.* or XXX.* host tqmask is returned instead of the (wrong) *.INVALID-TOP-MASK
the XXX.XXX.* or XXX.* host mask is returned instead of the (wrong) *.INVALID-TOP-MASK
@examples:
@seealso:
*/
KVSCF(tqmask)
KVSCF(mask)
{
TQString szNick;
kvs_uint_t maskType;
@ -127,7 +127,7 @@ namespace KviKvsCoreFunctions
u.setHost(e->host());
TQString tmp;
u.tqmask(tmp,(KviIrcMask::MaskType)maskType);
u.mask(tmp,(KviIrcMask::MaskType)maskType);
KVSCF_pRetBuffer->setString(tmp);
return true;
}
@ -260,7 +260,7 @@ namespace KviKvsCoreFunctions
$new(<className>,[<parentHandle> [,<name>[,<param>[,<param>[...]]]])
@description:
Creates a new instance of the object <class> with
the tqparent object <parent_id> and the specified <name>.[br]
the parent object <parent_id> and the specified <name>.[br]
<name> and <parent_id> are optional: if not specified, <name>
is assumed to be an empty string and <parent_id> default to 0 (parentless object).[br]
Please see the [doc:objects]objects documentation[/doc] for more information.[br]
@ -300,7 +300,7 @@ namespace KviKvsCoreFunctions
pParent = KviKvsKernel::instance()->objectController()->lookupObject(hParent);
if(!pParent)
{
KVSCF_pContext->error(__tr2qs("The specified tqparent object does not exist"));
KVSCF_pContext->error(__tr2qs("The specified parent object does not exist"));
return false;
}
} else {

10
src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
Unescape Escape View File

@ -328,19 +328,19 @@ namespace KviKvsCoreSimpleCommands
XGetKeyboardControl(get_xdisplay(),&st);
unsigned long tqmask = KBBellPercent;
unsigned long mask = KBBellPercent;
ctl.bell_percent = uVolume;
if(pitch >= 0)
{
ctl.bell_pitch = pitch;
tqmask |= KBBellPitch;
mask |= KBBellPitch;
}
if(duration >= 0)
{
ctl.bell_duration = duration;
tqmask |= KBBellDuration;
mask |= KBBellDuration;
}
XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl);
XChangeKeyboardControl(get_xdisplay(),mask,&ctl);
XBell(get_xdisplay(),100);
@ -354,7 +354,7 @@ namespace KviKvsCoreSimpleCommands
ctl.bell_duration = st.bell_duration;
ctl.bell_percent = st.bell_percent;
XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl);
XChangeKeyboardControl(get_xdisplay(),mask,&ctl);
#endif //COMPILE_NO_X_BELL
#endif

8
src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ namespace KviKvsCoreSimpleCommands
help run
help help
help index
help $tqmask
help $mask
help /home/pragma/myfile.html
[/example]
*/
@ -674,15 +674,15 @@ try_again:
@title:
lusers
@syntax:
lusers [ <tqmask> [ <target> ] ]
lusers [ <mask> [ <target> ] ]
@short:
Requests statistics about users on IRC
@description:
The LUSERS command is used to get statistics about the size of the
IRC network.[br]If no parameter is given, the reply will be about the
whole net.[br]If a <tqmask> is specified, then the reply will only
whole net.[br]If a <mask> is specified, then the reply will only
concern the part of the network formed by the servers matching the
tqmask.[br]Finally, if the <target> parameter is specified, the request
mask.[br]Finally, if the <target> parameter is specified, the request
is forwarded to that server which will generate the reply.[br]
This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br]
*/

6
src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
Unescape Escape View File

@ -445,12 +445,12 @@ namespace KviKvsCoreSimpleCommands
@title:
sockets
@syntax:
sockets [[remote server] server tqmask]
sockets [[remote server] server mask]
@short:
Requests the sockets info from a server
@description:
Requests the sockets information from the specified server or the current server if no [remote server] is specified.[br]
The reply can be filtered by <server tqmask>.[br]
The reply can be filtered by <server mask>.[br]
This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br]
*/
// RFC2821 wrapper
@ -875,7 +875,7 @@ namespace KviKvsCoreSimpleCommands
@title:
who
@syntax:
who {[tqmask] | [channel]}
who {[mask] | [channel]}
@short:
Requests WHO information
@description:

64
src/kvirc/kvs/kvi_kvs_eventtable.cpp
Unescape Escape View File

@ -1035,7 +1035,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
$0 = source nick
$1 = source username
$2 = source hostname
$3 = ban tqmask
$3 = ban mask
@window:
Channel window
@description:
@ -1043,7 +1043,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
@seealso:
[event:onunban]OnUnban[/event]
*/
EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"),
EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"),
/*
@doc: onunban
@type:
@ -1056,7 +1056,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
$0 = source nick
$1 = source username
$2 = source hostname
$3 = unban tqmask
$3 = unban mask
@window:
Channel window
@description:
@ -1064,7 +1064,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
@seealso:
[event:onban]OnBan[/event]
*/
EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"),
EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"),
/*
@doc: onmeban
@type:
@ -1077,15 +1077,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
$0 = source nickname
$1 = source username
$2 = source hostname
$3 = ban tqmask
$3 = ban mask
@window:
Channel
@description:
Triggered when someone has set a +b flag that matches your tqmask (bans you) in the channel.[br]
Triggered when someone has set a +b flag that matches your mask (bans you) in the channel.[br]
@seealso:
[event:onmeunban]OnMeUnban[/event]
*/
EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"),
EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"),
/*
@doc: onmeunban
@type:
@ -1098,15 +1098,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
$0 = source nickname
$1 = source username
$2 = source hostname
$3 = ban tqmask
$3 = ban mask
@window:
Channel
@description:
Triggered when someone has set a -b flag that matches your tqmask (debans you) in the channel.[br]
Triggered when someone has set a -b flag that matches your mask (debans you) in the channel.[br]
@seealso:
[event:onmeban]OnMeBan[/event]
*/
EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"),
EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"),
/*
@doc: onbanexception
@type:
@ -1119,7 +1119,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
$0 = source nick
$1 = source username
$2 = source hostname
$3 = banexception tqmask
$3 = banexception mask
@window:
Channel window
@description:
@ -1128,7 +1128,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
[event:onbanexceptionremove]OnBanExceptionRemove[/event]
*/
EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"),
EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"),
/*
@doc: onbanexceptionremove
@type:
@ -1141,7 +1141,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
$0 = source nick
$1 = source username
$2 = source hostname
$3 = unban tqmask
$3 = unban mask
@window:
Channel window
@description:
@ -1149,7 +1149,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
@seealso:
[event:onbanexception]OnBanException[/event]
*/
EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"),
EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"),
/*
@doc: onmebanexception
@type:
@ -1162,7 +1162,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
$0 = source nick
$1 = source username
$2 = source hostname
$3 = tqmask
$3 = mask
@window:
Channel window
@description:
@ -1171,7 +1171,7 @@ channel
@seealso:
[event:onmebanexceptionremove]OnMeBanExceptionRemove[/event]
*/
EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"),
EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"),
/*
@doc: onmebanexceptionremove
@type:
@ -1184,7 +1184,7 @@ channel
$0 = source nick
$1 = source username
$2 = source hostname
$3 = tqmask
$3 = mask
@window:
Channel window
@description:
@ -1192,7 +1192,7 @@ channel
@seealso:
[event:onmebanexception]OnMeBanException[/event]
*/
EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"),
EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"),
/*
@doc: onop
@type:
@ -1622,7 +1622,7 @@ channel
@short:
An unhandled literal server message has been received
@parameters:
$0 = source tqmask
$0 = source mask
$1 = message (literal)
$2- = parameters
@window:
@ -1636,7 +1636,7 @@ channel
raw numeric events to handle them.[br]
@seealso:
*/
EVENT("OnUnhandledLiteral","$0 = source tqmask\n$1 = message\n$2- parameters"),
EVENT("OnUnhandledLiteral","$0 = source mask\n$1 = message\n$2- parameters"),
/*
@doc: onmehalfop
@type:
@ -1731,7 +1731,7 @@ channel
$0 = source nick
$1 = source username
$2 = source host
$3 = target tqmask
$3 = target mask
@window:
Channels window
@description:
@ -1739,7 +1739,7 @@ channel
@seealso:
[event:oninviteexceptionremove]OnInviteExceptionRemove[/event]
*/
EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"),
EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"),
/*
@doc: oninviteexceptionremove
@type:
@ -1752,7 +1752,7 @@ channel
$0 = source nick
$1 = source username
$2 = source host
$3 = target tqmask
$3 = target mask
@window:
Channels window
@description:
@ -1760,7 +1760,7 @@ channel
@seealso:
[event:oninviteexceptionremove]OnInviteExceptionRemove[/event]
*/
EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"),
EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"),
/*
@doc: onmeinviteexception
@type:
@ -1773,16 +1773,16 @@ channel
$0 = source nick
$1 = source username
$2 = source host
$3 = tqmask
$3 = mask
@window:
Channels window
@description:
Someone has set mode +I on a channel with a target tqmask that matches
the local user tqmask
Someone has set mode +I on a channel with a target mask that matches
the local user mask
@seealso:
[event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event]
*/
EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"),
EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"),
/*
@doc: onmeinviteexceptionremove
@type:
@ -1795,16 +1795,16 @@ channel
$0 = source nick
$1 = source username
$2 = source host
$3 = tqmask
$3 = mask
@window:
Channels window
@description:
Someone has set mode -I on a channel with a target tqmask that matches
the local user tqmask
Someone has set mode -I on a channel with a target mask that matches
the local user mask
@seealso:
[event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event]
*/
EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"),
EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"),
/*
@doc: onaction
@type:

16
src/kvirc/kvs/kvi_kvs_object.cpp
Unescape Escape View File

@ -95,7 +95,7 @@
To create an object you must use the [fnc]$new[/fnc]()
function. [fnc]$new[/fnc]() requires three parameters:[br]
- The object class (more about object classes later in this document)[br]
- The ID of the tqparent object , (that can be 0 for toplevel objects).[br]
- The ID of the parent object , (that can be 0 for toplevel objects).[br]
- The object name (eventually empty)[br]
[example]
%myobject = [fnc]$new[/fnc]([class]object[/class],0,theName)
@ -113,7 +113,7 @@
[example]
[cmd]if[/cmd](%myobject == %anotherobject)[cmd]echo[/cmd] "This is the same object!";
[/example]
The tqparent object id is optional, if not specified it is assumed to be 0.
The parent object id is optional, if not specified it is assumed to be 0.
The object name is optional , but it may help you later in finding the object.[br][br]
To destroy an object use the [cmd]delete[/cmd] command. (In previous versions
@ -242,12 +242,12 @@
[/example]
In the example above four objects have been created.
A "tqparent" object named "myobject" , and three tqchildren objects.
A "parent" object named "myobject" , and three tqchildren objects.
The destructor has been reimplemented for each child object,
to make it "say" its name (Please note the usage of [fnc]$this[/fnc]).
In the tqparent destructor the tqchildren have been counted and listed.[br]
Then the tqparent object is destroyed causing to:[br]
- trigger the tqparent destructor.[br]
In the parent destructor the tqchildren have been counted and listed.[br]
Then the parent object is destroyed causing to:[br]
- trigger the parent destructor.[br]
- destroy all the tqchildren (and conseguently trigger all the "individual" destructors).[br][br]
Not all the object functions must return a value:
@ -499,8 +499,8 @@
The default implementation emits the signal "[classsignal]destroyed[/classsignal]".
!fn: $name()
Returns the name of this object.
!fn: $tqparent()
Returns the tqparent object of this object or 0 if this object has no tqparent.
!fn: $parent()
Returns the parent object of this object or 0 if this object has no parent.
!fn: $timerEvent(<timerId>)
Handler for the timer events.
The default implementation does nothing.

2
src/kvirc/kvs/kvi_kvs_object.h
Unescape Escape View File

@ -92,7 +92,7 @@ public:
const TQString & getName(){ return m_szName; };
KviKvsObject * parentObject(){ return (KviKvsObject *)tqparent(); };
KviKvsObject * parentObject(){ return (KviKvsObject *)parent(); };
TQWidget * parentScriptWidget();
bool connectSignal(const TQString &sigName,KviKvsObject * target,const TQString &slotName);

2
src/kvirc/kvs/kvi_kvs_object_class.cpp
Unescape Escape View File

@ -79,7 +79,7 @@ KviKvsObjectClass::~KviKvsObjectClass()
// then kill all objects that belong to our class
KviKvsKernel::instance()->objectController()->killAllObjectsWithClass(this);
// now we're quite clean: should have no object depending on us alive
// unregister from the tqparent, if any
// unregister from the parent, if any
if(m_pParentClass)m_pParentClass->unregisterChildClass(this);
// unregister from the object controller
KviKvsKernel::instance()->objectController()->unregisterClass(this);

6
src/kvirc/kvs/kvi_kvs_object_class.h
Unescape Escape View File

@ -38,7 +38,7 @@ class KviKvsRunTimeContext;
class KviKvsVariantList;
// Object allocation function
// parameters are: the class, the tqparent object (eventually 0), the object name (eventually empty)
// parameters are: the class, the parent object (eventually 0), the object name (eventually empty)
typedef KviKvsObject * (*KviKvsObjectAllocateInstanceProc)(KviKvsObjectClass *,KviKvsObject *,const TQString &);
// An object function callback
@ -53,14 +53,14 @@ class KVIRC_API KviKvsObjectClass
friend class KviKvsObjectController;
public:
KviKvsObjectClass(
KviKvsObjectClass * pParent, // tqparent class
KviKvsObjectClass * pParent, // parent class
const TQString & szName, // class name
KviKvsObjectAllocateInstanceProc proc, // intance allocation proc
bool bBuiltin = true // this is a builtin or script based class ?
);
~KviKvsObjectClass();
protected:
KviKvsObjectClass * m_pParentClass; // the tqparent (base) class
KviKvsObjectClass * m_pParentClass; // the parent (base) class
TQString m_szName; // the class name
bool m_bBuiltin; // is this a builtin or script based class ?
KviPointerHashTable<TQString,KviKvsObjectFunctionHandler> * m_pFunctionHandlers; // all our function handlers

6
src/kvirc/kvs/kvi_kvs_object_controller.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ void KviKvsObjectController::init()
m_pObjectClass->registerFunctionHandler("signalSender",KVI_PTR2MEMBER(KviKvsObject::function_signalSender));
m_pObjectClass->registerFunctionHandler("signalName",KVI_PTR2MEMBER(KviKvsObject::function_signalName));
m_pObjectClass->registerFunctionHandler("destructor",KVI_PTR2MEMBER(KviKvsObject::function_destructor));
m_pObjectClass->registerFunctionHandler("tqparent",KVI_PTR2MEMBER(KviKvsObject::function_parent));
m_pObjectClass->registerFunctionHandler("parent",KVI_PTR2MEMBER(KviKvsObject::function_parent));
m_pObjectClass->registerFunctionHandler("property",KVI_PTR2MEMBER(KviKvsObject::function_property));
m_pObjectClass->registerFunctionHandler("setProperty",KVI_PTR2MEMBER(KviKvsObject::function_setProperty));
m_pObjectClass->registerFunctionHandler("listProperties",KVI_PTR2MEMBER(KviKvsObject::function_listProperties));
@ -145,13 +145,13 @@ void KviKvsObjectController::unregisterClass(KviKvsObjectClass *pClass)
void KviKvsObjectController::registerObject(KviKvsObject *pObject)
{
m_pObjectDict->insert(pObject->handle(),pObject);
if(pObject->tqparent() == 0)m_pTopLevelObjectList->append(pObject);
if(pObject->parent() == 0)m_pTopLevelObjectList->append(pObject);
}
void KviKvsObjectController::unregisterObject(KviKvsObject *pObject)
{
m_pObjectDict->remove(pObject->handle());
if(pObject->tqparent() == 0)m_pTopLevelObjectList->removeRef(pObject);
if(pObject->parent() == 0)m_pTopLevelObjectList->removeRef(pObject);
}
void KviKvsObjectController::flushUserClasses()

2
src/kvirc/kvs/kvi_kvs_parser.h
Unescape Escape View File

@ -68,7 +68,7 @@ private:
int m_iFlags; // the current parsing flags
bool m_bError; // error(..) was called ?
// this stuff is used only for reporting errors and warnings
KviKvsScript * m_pScript; // tqparent script
KviKvsScript * m_pScript; // parent script
KviWindow * m_pWindow; // output window
public: // public interface
enum Flags { AssumeLocals = 1, Pedantic = 2 };

2
src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
Unescape Escape View File

@ -302,7 +302,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
if(bInObjScope)
{
// object function call (our tqparent will be a scope operator)
// object function call (our parent will be a scope operator)
if(pId2)
{
// base class object function call

2
src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
Unescape Escape View File

@ -332,7 +332,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
of an expression, so it is terminated by a closed parenthesis.
It's rather dangerous to use this command inside an object
function handler: if the class definition <class> was already
existing and it is a tqparent of the object's class, you might
existing and it is a parent of the object's class, you might
end up executing "inexisting" code.[br]
As a thumb rule, use this command only outside object function handlers.[br]
[br][br]

2
src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
Unescape Escape View File

@ -132,7 +132,7 @@ void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const TQStr
}
pCallStack->append(pString);
iFrame++;
pNode = pNode->tqparent();
pNode = pNode->parent();
}
if(pNode)
pCallStack->append(new TQString("#12 ..."));

2
src/kvirc/kvs/kvi_kvs_runtimecontext.h
Unescape Escape View File

@ -153,7 +153,7 @@ public:
KviKvsVariantList * parameterList()
{ return m_pParameterList; };
// tqparent script, may be 0!
// parent script, may be 0!
KviKvsScript * script()
{ return m_pScript; };

2
src/kvirc/kvs/kvi_kvs_rwevaluationresult.h
Unescape Escape View File

@ -30,7 +30,7 @@
class KVIRC_API KviKvsRWEvaluationResult
{
public:
// this result becomes the owner of the tqparent result!!!!
// this result becomes the owner of the parent result!!!!
KviKvsRWEvaluationResult(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant);
// the destructor must do (in order):
// check if variant is empty and if it is then remove it from the container (destroy it)

2
src/kvirc/kvs/kvi_kvs_treenode_base.h
Unescape Escape View File

@ -42,7 +42,7 @@ protected:
// this is called only by KviKvsParser
void setLocation(const TQChar * pLocation){ m_pLocation = pLocation; };
public:
KviKvsTreeNode * tqparent(){ return m_pParent; };
KviKvsTreeNode * parent(){ return m_pParent; };
const TQChar * location(){ return m_pLocation; };
virtual void dump(const char * prefix) = 0;
virtual void contextDescription(TQString &szBuffer) = 0;

2
src/kvirc/sparser/kvi_ircmessage.h
Unescape Escape View File

@ -100,7 +100,7 @@ public:
bool unrecognized(){ return (m_iFlags & KVI_IRCMSG_FLAG_UNRECOGNIZED); };
void decodeAndSplitPrefix(TQString &szNick,TQString &szUser,TQString &szHost);
void decodeAndSplitMask(char * tqmask,TQString &szNick,TQString &szUser,TQString &szHost);
void decodeAndSplitMask(char * mask,TQString &szNick,TQString &szUser,TQString &szHost);
};
#endif //_KVI_IRCMESSAGE_H_

10
src/kvirc/sparser/kvi_numeric.h
Unescape Escape View File

@ -61,7 +61,7 @@
#define RPL_MAPEND 7 /* :End of /MAP [U] # */
//[03:45:18] [dune.webchat.org][007] newbie dune.webchat.org 1037760291 :Tue, 19 Nov 2002 18:44:51 -0800
#define RPL_SNOMASK 8 /* %d :: Server notice tqmask (%#x) [U] # */
#define RPL_SNOMASK 8 /* %d :: Server notice mask (%#x) [U] # */
//[03:45:18] [dune.webchat.org][008] newbie -/NAJgAxq7HTQPwnkK^ 124963541 :This is your Session ID and Session Key.
#define RPL_STATMEMTOT 9 /* %u %u :Bytes Blocks [U] # */
@ -216,9 +216,9 @@
#define RPL_INVITING 341 /* [I,E,U,D] */
#define RPL_SUMMONING 342 /* [I,E,D] */
// RPL_????????? 343-345
#define RPL_INVITELIST 346 /* "<channel> <exceptiontqmask>" [I] # */
#define RPL_INVITELIST 346 /* "<channel> <exceptionmask>" [I] # */
#define RPL_ENDOFINVITELIST 347 /* "<channel> :End of Channel Invite List" [I] # */
#define RPL_EXCEPTLIST 348 /* "<channel> <exceptiontqmask>" [I] # */
#define RPL_EXCEPTLIST 348 /* "<channel> <exceptionmask>" [I] # */
#define RPL_ENDOFEXCEPTLIST 349 /* "<channel> :End of Channel Exception List" [I] # */
// RPL_?????????? 350
#define RPL_VERSION 351 /* "%s.%s %s :%s" [I,E,U,D] # */
@ -229,10 +229,10 @@
#define RPL_KILLDONE 361 /* [I,E,U,D] */
#define RPL_CLOSING 362 /* [I,E,U,D] */
#define RPL_CLOSEEND 363 /* [I,E,U,D] */
#define RPL_LINKS 364 /* "<host> <tqparent> :<hops> <description>" [I,E,U,D] # */
#define RPL_LINKS 364 /* "<host> <parent> :<hops> <description>" [I,E,U,D] # */
#define RPL_ENDOFLINKS 365 /* %s :End of /LINKS" [I,E,U,D] # */
#define RPL_ENDOFNAMES 366 /* "%s :End of /NAMES list." [I,E,U,D] # */
#define RPL_BANLIST 367 /* "<channel> <bantqmask>" [I,E,U,D] # */
#define RPL_BANLIST 367 /* "<channel> <banmask>" [I,E,U,D] # */
#define RPL_ENDOFBANLIST 368 /* "<channel> :End of channel Ban List" [I,E,U,D] # */
#define RPL_ENDOFWHOWAS 369 /* "%s :END of /WHOWAS" [I,E,U,D] # */
#define RPL_INFO 371 /* ":%s" [I,E,U,D] # */

6
src/kvirc/sparser/kvi_sp_ctcp.cpp
Unescape Escape View File

@ -97,8 +97,8 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
use the symbol <0x01> for this delimiter.
You may receive a CTCP message from server in one of the
following two ways:[br]
[b]:<source_tqmask> PRIVMSG <target> :<0x01><ctcp message><0x01>[/b][br]
[b]:<source_tqmask> NOTICE <target>:<0x01><ctcp message><0x01>[/b][br]
[b]:<source_mask> PRIVMSG <target> :<0x01><ctcp message><0x01>[/b][br]
[b]:<source_mask> NOTICE <target>:<0x01><ctcp message><0x01>[/b][br]
The PRIVMSG is used for CTCP REQUESTS, the NOTICE for CTCP REPLIES.
The NOTICE form should never generate an automatic reply.[br]
The two delimiters were used to begin and terminate the
@ -1506,7 +1506,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg)
{
// FIXME: #warning "OPTION FOR SETTING A FIXED BIND ADDRESS FOR OUTGOING DCC OFFERS"
TQString szUserMask;
msg->pSource->tqmask(szUserMask);
msg->pSource->mask(szUserMask);
TQString szReply,szFileName;
szFileName=a->name();

16
src/kvirc/sparser/kvi_sp_literal.cpp
Unescape Escape View File

@ -167,7 +167,7 @@ void KviServerParser::parseLiteralError(KviIrcMessage *msg)
void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
{
// JOIN
// :<joiner_tqmask> JOIN :<channel>
// :<joiner_mask> JOIN :<channel>
TQString szNick,szUser,szHost;
msg->decodeAndSplitPrefix(szNick,szUser,szHost);
@ -345,7 +345,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
{
// PART
// :<source_tqmask> PART <channel> :<part message>
// :<source_mask> PART <channel> :<part message>
TQString szNick,szUser,szHost;
msg->decodeAndSplitPrefix(szNick,szUser,szHost);
@ -444,7 +444,7 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
{
// TQUIT
// :<source_tqmask> TQUIT :<quit message>
// :<source_mask> TQUIT :<quit message>
TQString szNick,szUser,szHost;
msg->decodeAndSplitPrefix(szNick,szUser,szHost);
@ -580,7 +580,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
{
// KICK
// :<source_tqmask> KICK <channel> <nick> :<kick message>
// :<source_mask> KICK <channel> <nick> :<kick message>
TQString szNick,szUser,szHost;
msg->decodeAndSplitPrefix(szNick,szUser,szHost);
@ -1381,7 +1381,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
void KviServerParser::parseLiteralTopic(KviIrcMessage *msg)
{
// TOPIC
// :<source_tqmask> TOPIC <channel> :<topic>
// :<source_mask> TOPIC <channel> :<topic>
TQString szNick,szUser,szHost;
msg->decodeAndSplitPrefix(szNick,szUser,szHost);
TQString szTarget = msg->connection()->decodeText(msg->safeParam(0));
@ -1666,9 +1666,9 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
// FIXME: freenode has two ugly incompatible extensions:
// mode e: that is NOT viewable (???)
// mode q that stands for "quiet-ban"
// mode #chan +q tqmask
// adds tqmask to the banlist with the prefix %
// and doesn't allow the users matching the tqmask to talk to the channel
// mode #chan +q mask
// adds mask to the banlist with the prefix %
// and doesn't allow the users matching the mask to talk to the channel
bool bSet = true;
const char * aux = modefl.ptr();

24
src/kvirc/sparser/kvi_sp_numeric.cpp
Unescape Escape View File

@ -72,7 +72,7 @@
void KviServerParser::parseNumeric001(KviIrcMessage *msg)
{
// 001: RPL_WELCOME
// :prefix 001 target :Welcome to the Internet Relay Network <usertqmask>
// :prefix 001 target :Welcome to the Internet Relay Network <usermask>
// FIXME: #warning "SET THE USERMASK FROM SERVER"
TQString szText = msg->connection()->decodeText(msg->safeTrailing());
TQRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" );
@ -442,11 +442,11 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg)
char save = *aux;
*aux = 0;
// NAMESX + UHNAMES support
KviIrcMask tqmask(msg->connection()->decodeText(begin));
KviIrcMask mask(msg->connection()->decodeText(begin));
// and make it join
if(!tqmask.nick().isEmpty())chan->join(tqmask.nick(),
tqmask.hasUser() ? tqmask.user() : TQString(),
tqmask.hasHost() ? tqmask.host() : TQString(),
if(!mask.nick().isEmpty())chan->join(mask.nick(),
mask.hasUser() ? mask.user() : TQString(),
mask.hasHost() ? mask.host() : TQString(),
iFlags);
*aux = ' ';
*aux = save;
@ -640,7 +640,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
void KviServerParser::__funcname(KviIrcMessage *msg) \
{ \
TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); \
TQString bantqmask = msg->connection()->decodeText(msg->safeParam(2)); \
TQString banmask = msg->connection()->decodeText(msg->safeParam(2)); \
TQString bansetby = msg->connection()->decodeText(msg->safeParam(3)); \
TQString bansetat; \
getDateTimeStringFromCharTimeT(bansetat,msg->safeParam(4)); \
@ -648,7 +648,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
KviChannel * chan = msg->connection()->findChannel(szChan); \
if(chan) \
{ \
chan->setMask(__modechar,bantqmask,true,bansetby,TQString(msg->safeParam(4)).toUInt()); \
chan->setMask(__modechar,banmask,true,bansetby,TQString(msg->safeParam(4)).toUInt()); \
if(chan->__sentRequest())return; \
} \
if(!msg->haltOutput()) \
@ -656,18 +656,18 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \
msg->console()->activeWindow() : (KviWindow *)(msg->console()); \
pOut->output(__ico,__tr2qs("%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"), \
&(__szWhatTQString),&szChan,__modechar,&bantqmask,&bansetby,&bansetat); \
&(__szWhatTQString),&szChan,__modechar,&banmask,&bansetby,&bansetat); \
} \
}
// 367: RPL_BANLIST [I,E,U,D]
// :prefix 367 target <channel> <bantqmask> [bansetby] [bansetat]
// :prefix 367 target <channel> <banmask> [bansetby] [bansetat]
PARSE_NUMERIC_LIST(parseNumericBanList,'b',sentBanListRequest,KVI_OUT_BAN,__tr2qs("Ban listing"))
// 346: RPL_INVITELIST [I,E,U,D]
// :prefix 346 target <channel> <invitetqmask> [invitesetby] [invitesetat]
// :prefix 346 target <channel> <invitemask> [invitesetby] [invitesetat]
PARSE_NUMERIC_LIST(parseNumericInviteList,'I',sentInviteListRequest,KVI_OUT_INVITEEXCEPT,__tr2qs("Invite listing"))
// 346: RPL_EXCEPTLIST [I,E,U,D]
// :prefix 346 target <channel> <bantqmask> [bansetby] [bansetat]
// :prefix 346 target <channel> <banmask> [bansetby] [bansetat]
PARSE_NUMERIC_LIST(parseNumericExceptList,'e',sentBanExceptionListRequest,KVI_OUT_BANEXCEPT,__tr2qs("Ban exception listing"));
@ -1578,7 +1578,7 @@ void KviServerParser::parseNumericListEnd(KviIrcMessage *msg)
void KviServerParser::parseNumericLinks(KviIrcMessage *msg)
{
// 364: RPL_LINKS [I,E,U,D]
// :prefix 364 <target> <host> <tqparent> :<hops> <description>
// :prefix 364 <target> <host> <parent> :<hops> <description>
if(!(msg->console()->ircContext()->linksWindow()))
{
// attempt to load the module...

14
src/kvirc/ui/kvi_channel.cpp
Unescape Escape View File

@ -209,7 +209,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
// m_pEditorsContainer->raiseWidget(m_pUserListView);
// And finally the input line on the bottom
m_pInput = new KviInput(this,m_pUserListView);
// no tqmask editors yet
// no mask editors yet
m_pBanEditor = 0;
m_pBanExceptionEditor = 0;
m_pInviteEditor = 0;
@ -1424,7 +1424,7 @@ int KviChannel::myFlags()
}
void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt)
void KviChannel::setMask(char flag, const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt)
{
if(!connection())return;
KviPointerList<KviMaskEntry> * list = m_pBanList;
@ -1446,21 +1446,21 @@ void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQStr
break;
}
internalMask(tqmask,bAdd,setBy,setAt,list,&editor);
internalMask(mask,bAdd,setBy,setAt,list,&editor);
m_pUserListView->setMaskEntries(flag,(int)list->count());
}
void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd)
void KviChannel::internalMask(const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd)
{
KviMaskEntry * e = 0;
if(bAdd)
{
for(e = l->first();e;e = l->next())
{
if(KviTQString::equalCI(e->szMask,tqmask))return; //already there
if(KviTQString::equalCI(e->szMask,mask))return; //already there
}
e = new KviMaskEntry;
e->szMask = tqmask;
e->szMask = mask;
e->szSetBy = (!setBy.isEmpty()) ? setBy : __tr2qs("(Unknown)");
e->uSetAt = setAt;
l->append(e);
@ -1468,7 +1468,7 @@ void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &s
} else {
for(e = l->first();e;e = l->next())
{
if(KviTQString::equalCI(e->szMask,tqmask))break;
if(KviTQString::equalCI(e->szMask,mask))break;
}
if(e)
{

4
src/kvirc/ui/kvi_channel.h
Unescape Escape View File

@ -160,7 +160,7 @@ protected:
virtual void getBaseLogFileName(TQString &buffer);
virtual void triggerCreationEvents();
void toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPointerList<KviMaskEntry> *l,char flag,const char *edName);
void internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd);
void internalMask(const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd);
void checkChannelSync();
void showDoubleView(bool bShow);
void fixActionHistory();
@ -192,7 +192,7 @@ public:
const TQString & nameWithUserFlag(){ return m_szNameWithUserFlag; };
virtual const TQString & target(){ return windowName(); };
// void appendSelectedNicknames(KviStr &buffer);
void setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt);
void setMask(char flag, const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt);
kvi_time_t lastReceivedWhoReply(){ return m_tLastReceivedWhoReply; };
void setLastReceivedWhoReply(kvi_time_t tTime){ m_tLastReceivedWhoReply = tTime; };

6
src/kvirc/ui/kvi_console.cpp
Unescape Escape View File

@ -374,8 +374,8 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString
if(u)
{
TQString tqmask;
u->tqmask()->tqmask(tqmask);
TQString mask;
u->mask()->mask(mask);
buffer += "<tr bgcolor=\"#F0F0F0\"><td>";
buffer += __tr2qs("Registered as");
buffer += " <b>";
@ -385,7 +385,7 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString
buffer += "</td></tr><tr bgcolor=\"#F0F0F0\"><td><font size=\"-1\">";
buffer += __tr2qs("(Matched by");
buffer += " ";
buffer += tqmask;
buffer += mask;
buffer += ")</td></tr>";
}

2
src/kvirc/ui/kvi_cryptcontroller.h
Unescape Escape View File

@ -76,7 +76,7 @@
Q_OBJECT
TQ_OBJECT
public:
KviCryptController(TQWidget * tqparent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur);
KviCryptController(TQWidget * parent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur);
~KviCryptController();
protected:
KviWindow * m_pWindow;

10
src/kvirc/ui/kvi_dynamictooltip.cpp
Unescape Escape View File

@ -22,8 +22,8 @@
#define __KVIRC__
#include "kvi_dynamictooltip.h"
KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip)
: KviTalToolTip(tqparent)
KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * parent,KviDynamicToolTip * parToolTip)
: KviTalToolTip(parent)
{
m_pParentToolTip = parToolTip;
}
@ -37,10 +37,10 @@ void KviDynamicToolTipHelper::maybeTip(const TQPoint & pnt)
m_pParentToolTip->maybeTip(pnt);
}
KviDynamicToolTip::KviDynamicToolTip(TQWidget * tqparent,const char * name)
: TQObject(tqparent,name)
KviDynamicToolTip::KviDynamicToolTip(TQWidget * parent,const char * name)
: TQObject(parent,name)
{
m_pHelper = new KviDynamicToolTipHelper(tqparent,this);
m_pHelper = new KviDynamicToolTipHelper(parent,this);
}
KviDynamicToolTip::~KviDynamicToolTip()

4
src/kvirc/ui/kvi_dynamictooltip.h
Unescape Escape View File

@ -33,7 +33,7 @@ class KVIRC_API KviDynamicToolTipHelper : public KviTalToolTip
{
friend class KviDynamicToolTip;
protected:
KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip);
KviDynamicToolTipHelper(TQWidget * parent,KviDynamicToolTip * parToolTip);
virtual ~KviDynamicToolTipHelper();
protected:
KviDynamicToolTip * m_pParentToolTip;
@ -47,7 +47,7 @@ class KVIRC_API KviDynamicToolTip : public TQObject
Q_OBJECT
TQ_OBJECT
public:
KviDynamicToolTip(TQWidget * tqparent,const char * name = 0);
KviDynamicToolTip(TQWidget * parent,const char * name = 0);
virtual ~KviDynamicToolTip();
protected:
KviDynamicToolTipHelper * m_pHelper;

32
src/kvirc/ui/kvi_filedialog.cpp
Unescape Escape View File

@ -37,8 +37,8 @@ extern KviMediaManager * g_pMediaManager;
KviFileDialog::KviFileDialog(const TQString &dirName, const TQString &filter,
TQWidget *tqparent, const char *name, bool modal)
: KviTalFileDialog(dirName,filter,tqparent,name,modal)
TQWidget *parent, const char *name, bool modal)
: KviTalFileDialog(dirName,filter,parent,name,modal)
{
setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)));
@ -70,17 +70,17 @@ void KviFileDialog::goHome()
bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* tqparent)
bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* parent)
{
#ifdef COMPILE_ON_WINDOWS
if(showNative)
{
buffer=TQFileDialog::getOpenFileName(initial,filter,tqparent,"open_file_name_dialog",caption);
buffer=TQFileDialog::getOpenFileName(initial,filter,parent,"open_file_name_dialog",caption);
KviFileUtils::adjustFilePath(buffer);
return !buffer.isEmpty();
}
#endif
KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"open_file_name_dialog",true);
KviFileDialog * d = new KviFileDialog(initial,filter,parent,"open_file_name_dialog",true);
d->setCaption(caption);
d->setMode(TQFileDialog::ExistingFile);
//d->setShowHiddenFiles(showHidden);
@ -96,14 +96,14 @@ bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,
}
bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* tqparent)
bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* parent)
{
#ifdef COMPILE_ON_WINDOWS
if (showNative)
{
while (1)
{
buffer=TQFileDialog::getSaveFileName(initial,filter,tqparent,"save_file_name_dialog",caption);
buffer=TQFileDialog::getSaveFileName(initial,filter,parent,"save_file_name_dialog",caption);
KviFileUtils::adjustFilePath(buffer);
//return !buffer.isEmpty();
if(buffer.isEmpty()) return false;
@ -112,7 +112,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption
if(!KviFileUtils::fileExists(buffer)) return true;
TQString tmp;
KviTQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data());
switch(TQMessageBox::information(tqparent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape))
switch(TQMessageBox::information(parent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape))
{
case TQMessageBox::Cancel: return false; break;
case TQMessageBox::Yes: return true; break;
@ -125,7 +125,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption
#endif
KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"save_file_name_dialog",true);
KviFileDialog * d = new KviFileDialog(initial,filter,parent,"save_file_name_dialog",true);
d->setCaption(caption);
d->setMode(TQFileDialog::AnyFile);
//d->setShowHiddenFiles(showHidden);
@ -167,24 +167,24 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption
}
bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent)
bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* parent)
{
#ifdef COMPILE_ON_WINDOWS
if(showNative)
{
buffer = TQFileDialog::getExistingDirectory(initial,tqparent,"open_file_name_dialog",caption);
buffer = TQFileDialog::getExistingDirectory(initial,parent,"open_file_name_dialog",caption);
return !buffer.isEmpty();
}
#else
#ifdef COMPILE_KDE_SUPPORT
// the KDE based dir selection dialog is now quite nice
buffer = KFileDialog::getExistingDirectory(initial,tqparent,caption);
buffer = KFileDialog::getExistingDirectory(initial,parent,caption);
return !buffer.isEmpty();
#endif
#endif
KviFileDialog * d = new KviFileDialog(initial,
filter,tqparent,"directory_name_dialog",true);
filter,parent,"directory_name_dialog",true);
d->setCaption(caption);
d->setMode(TQFileDialog::Directory);
//d->setShowHiddenFiles(showHidden);
@ -201,17 +201,17 @@ bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & captio
}
bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent)
bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* parent)
{
#ifdef COMPILE_ON_WINDOWS
if (showNative)
{
buffer=TQFileDialog::getOpenFileNames(filter,initial,tqparent,"open_file_name_dialog",caption);
buffer=TQFileDialog::getOpenFileNames(filter,initial,parent,"open_file_name_dialog",caption);
return (buffer.count()>0);
}
#endif
KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),tqparent,"open_file_names_dialog",true);
KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),parent,"open_file_names_dialog",true);
d->setCaption(caption);
d->setMode(TQFileDialog::ExistingFiles);
//d->setShowHiddenFiles(showHidden);

10
src/kvirc/ui/kvi_filedialog.h
Unescape Escape View File

@ -41,14 +41,14 @@ class KVIRC_API KviFileDialog : public KviTalFileDialog
TQ_OBJECT
public:
KviFileDialog(const TQString &dirName, const TQString &filter=TQString(),
TQWidget *tqparent=0, const char *name=0, bool modal=false);
TQWidget *parent=0, const char *name=0, bool modal=false);
~KviFileDialog();
public:
static bool askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* tqparent=0);
static bool askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,TQWidget* tqparent=0);
static bool askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* parent=0);
static bool askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,TQWidget* parent=0);
static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0);
static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0);
static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* parent=0);
static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* parent=0);
};

4
src/kvirc/ui/kvi_frame.cpp
Unescape Escape View File

@ -1176,9 +1176,9 @@ bool KviFrame::focusNextPrevChild(bool next)
//TQVariant v = w->property("KviProperty_FocusOwner");
//if(v.isValid())return false; // Do NOT change the focus widget!
if(w->tqparent())
if(w->parent())
{
TQVariant v = w->tqparent()->property("KviProperty_ChildFocusOwner");
TQVariant v = w->parent()->property("KviProperty_ChildFocusOwner");
if(v.isValid())return false; // Do NOT change the focus widget!
}
}

2
src/kvirc/ui/kvi_input.cpp
Unescape Escape View File

@ -2274,7 +2274,7 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords)
Ctrl+Shift+CursorLeft: Moves the selection one word left<br>
Ctrl+Shift+CursorRight: Moves the selection one word right<br>
Tab: Nickname, function/command, or filename completion (see below)<br>
Shift+Tab: Hosttqmask or function/command completion (see below)<br>
Shift+Tab: Hostmask or function/command completion (see below)<br>
Alt+&lt;numeric_sequence&gt;: Inserts the character by ASCII/Unicode code<br>
<example>
Alt+32: Inserts ASCII/Unicode character 32: ' ' (a space)

4
src/kvirc/ui/kvi_ipeditor.cpp
Unescape Escape View File

@ -33,8 +33,8 @@
// FIXME: #warning "THIS COULD GO INTO libkvioptions ?"
KviIpEditor::KviIpEditor(TQWidget * tqparent,AddressType addrType,const TQString &ipAddr,const char *name)
:TQFrame(tqparent,name)
KviIpEditor::KviIpEditor(TQWidget * parent,AddressType addrType,const TQString &ipAddr,const char *name)
:TQFrame(parent,name)
{
for(int i=0;i<7;i++)

2
src/kvirc/ui/kvi_ipeditor.h
Unescape Escape View File

@ -38,7 +38,7 @@ class KVIRC_API KviIpEditor : public TQFrame
TQ_OBJECT
public:
enum AddressType { IpV4 , IpV6 };
KviIpEditor(TQWidget * tqparent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0);
KviIpEditor(TQWidget * parent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0);
~KviIpEditor();
private:
TQLabel * m_pLabel[7];

10
src/kvirc/ui/kvi_ircview.cpp
Unescape Escape View File

@ -281,8 +281,8 @@ void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t *
//
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviIrcView::KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd)
: TQWidget(tqparent,"irc_view")
KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
: TQWidget(parent,"irc_view")
{
// Ok...here we go
// initialize the initializable
@ -2920,7 +2920,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p)
//Calculate the position of the image
//imageYPos = curBottomCoord - (pixmapHeight(16) + ((m_iFontLineSpacing - 16)/2) );
int imageYPos = curBottomCoord - m_iRelativePixmapY;
//Set the tqmask if needed
//Set the mask if needed
int iPixId = KVI_OPTION_MSGTYPE(pCurTextLine->iMsgType).pixId();
if(iPixId > 0)
pa.drawPixmap(KVI_IRCVIEW_HORIZONTAL_BORDER,imageYPos,*(g_pIconManager->getSmallIcon(iPixId)));
@ -3263,7 +3263,7 @@ no_selection_paint:
int wdth = block->block_width;
if(wdth < 0)wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER);
int imageYPos = curBottomCoord - m_iRelativePixmapY;
//Set the tqmask if needed
//Set the mask if needed
if(curBack != KVI_TRANSPARENT && curBack < 16)
{
pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack));
@ -4429,7 +4429,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect
These links are used internally in KVIrc , but you can use them too.[br]
The <escape_command> is a single letter this time: it defines the type of the link.[br]
Currently KVIrc uses six types of builtin links : 'n' for nickname links, 'u' for url links,
'c' for channel links, 'h' for hostname links, 'm' for tqmask links and 's' for server links.[br]
'c' for channel links, 'h' for hostname links, 'm' for mask links and 's' for server links.[br]
Theoretically you can also use your own link types: just use any other letter or digit (you can't use ']' and <cr>),
but probably you will prefer a completely user defined link in that case anyway.[br]
Once the user interacts with the link , kvirc executes the predefined events:[br]

2
src/kvirc/ui/kvi_ircview.h
Unescape Escape View File

@ -62,7 +62,7 @@ public:
friend class KviIrcViewToolTip;
friend class KviIrcViewToolWidget;
public:
KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd);
KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd);
~KviIrcView();
public:
int dummyRead() const { return 0; };

4
src/kvirc/ui/kvi_listview.cpp
Unescape Escape View File

@ -32,8 +32,8 @@
#include "kvi_doublebuffer.h"
KviListView::KviListView( TQWidget * tqparent, const char * name)
:KviTalListView(tqparent)
KviListView::KviListView( TQWidget * parent, const char * name)
:KviTalListView(parent)
{
m_pBackgroundOverlayPixmap=0;
m_iBackgroundOverlayAlignment=TQt::AlignAuto;

2
src/kvirc/ui/kvi_listview.h
Unescape Escape View File

@ -37,7 +37,7 @@ class KVIRC_API KviListView : public KviTalListView
Q_OBJECT
TQ_OBJECT
public:
KviListView( TQWidget * tqparent = 0, const char * name = 0);
KviListView( TQWidget * parent = 0, const char * name = 0);
~KviListView();
protected:
TQPixmap * m_pBackgroundOverlayPixmap;

40
src/kvirc/ui/kvi_maskeditor.cpp
Unescape Escape View File

@ -36,13 +36,13 @@
#include <tqlabel.h>
#include <tqvalidator.h>
KviMaskItem::KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry)
:KviTalListViewItem(tqparent), m_Mask(*entry)
KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry)
:KviTalListViewItem(parent), m_Mask(*entry)
{
TQDateTime date;
date.setTime_t(tqmask()->uSetAt);
setText(0,tqmask()->szMask);
setText(1,tqmask()->szSetBy);
date.setTime_t(mask()->uSetAt);
setText(0,mask()->szMask);
setText(1,mask()->szSetBy);
setText(2,date.toString());
}
@ -57,9 +57,9 @@ int KviMaskItem::compare ( TQListViewItem * i, int col, bool ascending ) const
{
if(col==2)
{
if( ((KviMaskItem*)i)->tqmask()->uSetAt > m_Mask.uSetAt ) return -1;
if( ((KviMaskItem*)i)->tqmask()->uSetAt == m_Mask.uSetAt ) return 0;
if( ((KviMaskItem*)i)->tqmask()->uSetAt < m_Mask.uSetAt ) return 1;
if( ((KviMaskItem*)i)->mask()->uSetAt > m_Mask.uSetAt ) return -1;
if( ((KviMaskItem*)i)->mask()->uSetAt == m_Mask.uSetAt ) return 0;
if( ((KviMaskItem*)i)->mask()->uSetAt < m_Mask.uSetAt ) return 1;
}
return KviTalListViewItem::compare(i,col,ascending);
}
@ -76,7 +76,7 @@ KviMaskInputDialog::KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEd
TQGridLayout * g = new TQGridLayout(this,2,3,5,5);
TQLabel * tl = new TQLabel(__tr2qs("New tqmask must match an *!*@* expression"),this);
TQLabel * tl = new TQLabel(__tr2qs("New mask must match an *!*@* expression"),this);
g->addMultiCellWidget(tl,0,0,0,3);
m_pEdit=new TQLineEdit(szMask,this);
@ -128,7 +128,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
{
bool isEnabled=1;
TQObject * w = tqparent();
TQObject * w = parent();
while(w)
{
if(w->inherits("KviChannel"))
@ -137,7 +137,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0;
break;
}
w = w->tqparent();
w = w->parent();
}
#ifdef COMPILE_USE_QT4
@ -254,7 +254,7 @@ void KviMaskEditor::searchTextChanged ( const TQString & text)
{
pMaskItem->setVisible(true);
} else {
if(pMaskItem->tqmask()->szMask.contains(text))
if(pMaskItem->mask()->szMask.contains(text))
pMaskItem->setVisible(true);
else
pMaskItem->setVisible(false);
@ -273,9 +273,9 @@ void KviMaskEditor::removeClicked()
if(it->isSelected())
{
KviMaskEntry * e = new KviMaskEntry;
e->szMask = it->tqmask()->szMask;
e->szSetBy = it->tqmask()->szSetBy;
e->uSetAt = it->tqmask()->uSetAt;
e->szMask = it->mask()->szMask;
e->szSetBy = it->mask()->szSetBy;
e->uSetAt = it->mask()->uSetAt;
l->append(e);
}
it = (KviMaskItem *)(it->nextSibling());
@ -286,7 +286,7 @@ void KviMaskEditor::removeClicked()
void KviMaskEditor::addClicked()
{
TQObject * w = tqparent();
TQObject * w = parent();
while(w)
{
if(w->inherits("KviChannel"))
@ -299,7 +299,7 @@ void KviMaskEditor::addClicked()
}
break;
}
w = w->tqparent();
w = w->parent();
}
}
@ -316,7 +316,7 @@ void KviMaskEditor::removeMask(KviMaskEntry *e)
KviMaskItem * it =(KviMaskItem *)(m_pMaskBox->firstChild());
while(it)
{
if(KviTQString::equalCI(it->tqmask()->szMask,e->szMask))
if(KviTQString::equalCI(it->mask()->szMask,e->szMask))
{
delete it;
return;
@ -329,7 +329,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem)
{
if(pItem)
{
TQObject * w = tqparent();
TQObject * w = parent();
while(w)
{
if(w->inherits("KviChannel"))
@ -342,7 +342,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem)
}
break;
}
w = w->tqparent();
w = w->parent();
}
}
}

4
src/kvirc/ui/kvi_maskeditor.h
Unescape Escape View File

@ -47,10 +47,10 @@ typedef struct _KviMaskEntry
class KviMaskItem: public KviTalListViewItem
{
public:
KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry);
KviMaskItem(KviTalListView* parent,KviMaskEntry* entry);
~KviMaskItem();
KviMaskEntry* tqmask() { return &m_Mask; };
KviMaskEntry* mask() { return &m_Mask; };
#ifdef COMPILE_USE_QT4
virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const;
#else

26
src/kvirc/ui/kvi_mdicaption.cpp
Unescape Escape View File

@ -55,8 +55,8 @@
#include <tqdrawutil.h>
#include <tqevent.h>
KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name)
: TQToolButton(tqparent,name)
KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * parent,const char * name)
: TQToolButton(parent,name)
{
setPixmap(pix);
//setAutoRaise(true);
@ -104,17 +104,17 @@ void KviMdiCaptionButton::drawButton(TQPainter *p)
KviMdiCaption::KviMdiCaption(KviMdiChild * tqparent,const char * name)
: TQWidget(tqparent,name)
KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name)
: TQWidget(parent,name)
{
m_pMaximizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),this,"maximize_button");
connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(maximize()));
connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(maximize()));
m_pMinimizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),this,"minimize_button");
connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(minimize()));
connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(minimize()));
m_pCloseButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),this,"close_button");
connect(m_pCloseButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(closeRequest()));
connect(m_pCloseButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(closeRequest()));
m_pSystemButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON)),this,"icon_button");
connect(m_pSystemButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(systemPopupSlot()));
connect(m_pSystemButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(systemPopupSlot()));
m_lastMousePos = TQPoint(-1,-1);
m_bMouseGrabbed = true;
@ -165,7 +165,7 @@ void KviMdiCaption::fontChange(const TQFont &old)
{
calcLineSpacing();
TQWidget::fontChange(old);
((KviMdiChild *)tqparent())->resizeEvent(0);
((KviMdiChild *)parent())->resizeEvent(0);
}
void KviMdiCaption::mousePressEvent(TQMouseEvent *e)
@ -177,7 +177,7 @@ void KviMdiCaption::mousePressEvent(TQMouseEvent *e)
#else
setCursor(TQCursor::sizeAllCursor);
#endif
((KviMdiChild *)tqparent())->activate(true);
((KviMdiChild *)parent())->activate(true);
}
void KviMdiCaption::mouseMoveEvent(TQMouseEvent *)
@ -187,7 +187,7 @@ void KviMdiCaption::mouseMoveEvent(TQMouseEvent *)
TQPoint p = TQCursor::pos();
int dx = m_lastMousePos.x() - p.x();
int dy = m_lastMousePos.y() - p.y();
KviMdiChild * c = (KviMdiChild *)tqparent();
KviMdiChild * c = (KviMdiChild *)parent();
int nx = c->manager()->childX(c) - dx;
int ny = c->manager()->childY(c) - dy;
@ -220,7 +220,7 @@ void KviMdiCaption::mouseMoveEvent(TQMouseEvent *)
void KviMdiCaption::mouseDoubleClickEvent(TQMouseEvent *e)
{
((KviMdiChild *)tqparent())->maximize();
((KviMdiChild *)parent())->maximize();
}
void KviMdiCaption::paintEvent(TQPaintEvent * e)
@ -228,7 +228,7 @@ void KviMdiCaption::paintEvent(TQPaintEvent * e)
TQRect r = e->rect();
TQPainter p(this);
p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive));
TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)tqparent())->xmlActiveCaption() : ((KviMdiChild *)tqparent())->xmlInactiveCaption(),font());
TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font());
rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup());
}

4
src/kvirc/ui/kvi_mdicaption.h
Unescape Escape View File

@ -39,7 +39,7 @@ class KVIRC_API KviMdiCaptionButton : public TQToolButton
Q_OBJECT
TQ_OBJECT
public:
KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name);
KviMdiCaptionButton(const TQPixmap &pix,TQWidget * parent,const char * name);
~KviMdiCaptionButton();
protected:
virtual void drawButton(TQPainter * p);
@ -67,7 +67,7 @@ class KVIRC_API KviMdiCaption : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
KviMdiCaption(KviMdiChild * tqparent,const char * name);
KviMdiCaption(KviMdiChild * parent,const char * name);
~KviMdiCaption();
protected:
TQPoint m_lastMousePos;

4
src/kvirc/ui/kvi_mdichild.cpp
Unescape Escape View File

@ -490,8 +490,8 @@ void KviMdiChild::setClient(TQWidget *w)
int clientYPos=m_pCaption->heightHint()+KVI_MDICHILD_SPACING+KVI_MDICHILD_BORDER;
resize(w->width()+(KVI_MDICHILD_BORDER << 1),w->height()+KVI_MDICHILD_BORDER+clientYPos);
//Retqparent if needed
if(TQT_BASE_OBJECT(w->tqparent())!=TQT_BASE_OBJECT(this)){
//Reparent if needed
if(TQT_BASE_OBJECT(w->parent())!=TQT_BASE_OBJECT(this)){
//reparent to this widget , no flags , point , show it
TQPoint pnt2(KVI_MDICHILD_BORDER,clientYPos);
w->reparent(this,pnt2,true);

4
src/kvirc/ui/kvi_mdimanager.cpp
Unescape Escape View File

@ -57,8 +57,8 @@
KviMdiManager::KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name)
: KviTalScrollView(tqparent)
KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name)
: KviTalScrollView(parent)
{
setFrameShape(NoFrame);
m_pZ = new KviPointerList<KviMdiChild>;

2
src/kvirc/ui/kvi_mdimanager.h
Unescape Escape View File

@ -61,7 +61,7 @@ class KVIRC_API KviMdiManager : public KviTalScrollView
Q_OBJECT
TQ_OBJECT
public:
KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name);
KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name);
~KviMdiManager();
public:
KviMdiChild * topChild(){ return m_pZ->last(); };

4
src/kvirc/ui/kvi_modeeditor.cpp
Unescape Escape View File

@ -54,7 +54,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
m_szLimit = limit;
bool isEnabled=1;
TQObject * w = tqparent();
TQObject * w = parent();
while(w)
{
if(w->inherits("KviChannel"))
@ -63,7 +63,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) ) isEnabled=0;
break;
}
w = w->tqparent();
w = w->parent();
}
TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2);

4
src/kvirc/ui/kvi_optionswidget.cpp
Unescape Escape View File

@ -41,8 +41,8 @@
TQString KviOptionsWidget::m_szBasicTipStart; // empty decl
TQString KviOptionsWidget::m_szBasicTipEnd;
KviOptionsWidget::KviOptionsWidget(TQWidget * tqparent,const char * name,bool bSunken)
: TQFrame(tqparent,name), KviSelectorInterface()
KviOptionsWidget::KviOptionsWidget(TQWidget * parent,const char * name,bool bSunken)
: TQFrame(parent,name), KviSelectorInterface()
{
if(m_szBasicTipStart.isEmpty())
{

2
src/kvirc/ui/kvi_optionswidget.h
Unescape Escape View File

@ -41,7 +41,7 @@ class KVIRC_API KviOptionsWidget : public TQFrame, public KviSelectorInterface
Q_OBJECT
TQ_OBJECT
public:
KviOptionsWidget(TQWidget * tqparent,const char * name = 0,bool bSunken = true);
KviOptionsWidget(TQWidget * parent,const char * name = 0,bool bSunken = true);
~KviOptionsWidget();
private:
TQGridLayout * m_pLayout;

6
src/kvirc/ui/kvi_selectors.cpp
Unescape Escape View File

@ -735,9 +735,9 @@ KviChanListViewItem::KviChanListViewItem(KviTalListView* pList,TQString szChan,T
:KviTalListViewItem(pList,szChan)
{
m_szPass=szPass;
TQString tqmask;
tqmask.fill('*',szPass.length());
setText(1,tqmask);
TQString mask;
mask.fill('*',szPass.length());
setText(1,mask);
}
KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled)

16
src/kvirc/ui/kvi_styled_controls.cpp
Unescape Escape View File

@ -142,15 +142,15 @@ void KviStyledControl::leaveEvent ( TQEvent * )
}
KviStyledCheckBox::KviStyledCheckBox ( TQWidget * tqparent, const char * name )
: TQCheckBox(tqparent,name), KviStyledControl(this)
KviStyledCheckBox::KviStyledCheckBox ( TQWidget * parent, const char * name )
: TQCheckBox(parent,name), KviStyledControl(this)
{
setWFlags(WNoAutoErase);
}
KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name )
: TQCheckBox(text,tqparent,name), KviStyledControl(this)
KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name )
: TQCheckBox(text,parent,name), KviStyledControl(this)
{
setWFlags(WNoAutoErase);
}
@ -234,15 +234,15 @@ void KviStyledCheckBox::paintEvent ( TQPaintEvent * event)
TQCheckBox::paintEvent(event);
}
KviStyledToolButton::KviStyledToolButton( TQWidget * tqparent, const char * name )
: TQToolButton(tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false)
KviStyledToolButton::KviStyledToolButton( TQWidget * parent, const char * name )
: TQToolButton(parent,name), KviStyledControl(this), bShowSubmenuIndicator(false)
{
setWFlags(WNoAutoErase);
resizeEvent(0);
}
KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name )
: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false)
KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * parent, const char * name )
: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,parent,name), KviStyledControl(this), bShowSubmenuIndicator(false)
{
setWFlags(WNoAutoErase);
resizeEvent(0);

8
src/kvirc/ui/kvi_styled_controls.h
Unescape Escape View File

@ -87,8 +87,8 @@ class KVIRC_API KviStyledCheckBox : public TQCheckBox, public KviStyledControl
Q_OBJECT
TQ_OBJECT
public:
KviStyledCheckBox ( TQWidget * tqparent, const char * name = 0 );
KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name = 0 );
KviStyledCheckBox ( TQWidget * parent, const char * name = 0 );
KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name = 0 );
~KviStyledCheckBox();
protected:
virtual void paintEvent ( TQPaintEvent * );
@ -101,8 +101,8 @@ class KVIRC_API KviStyledToolButton : public TQToolButton, public KviStyledContr
private:
bool bShowSubmenuIndicator;
public:
KviStyledToolButton ( TQWidget * tqparent, const char * name = 0 );
KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name = 0 );
KviStyledToolButton ( TQWidget * parent, const char * name = 0 );
KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * parent, const char * name = 0 );
~KviStyledToolButton();
void setShowSubmenuIndicator(bool bShow);

16
src/kvirc/ui/kvi_taskbar.cpp
Unescape Escape View File

@ -1373,9 +1373,9 @@ void KviTreeTaskBar::setActiveItem(KviTaskBarItem * it)
{
cur->setActive(false);
}
if(((KviTreeTaskBarItem *)it)->tqparent())
if(((KviTreeTaskBarItem *)it)->parent())
{
if(!((KviTreeTaskBarItem *)it)->tqparent()->isOpen())((KviTreeTaskBarItem *)it)->tqparent()->setOpen(true);
if(!((KviTreeTaskBarItem *)it)->parent()->isOpen())((KviTreeTaskBarItem *)it)->parent()->setOpen(true);
}
((KviTreeTaskBarItem *)it)->setActive(true);
m_pListView->setSelected(((KviTreeTaskBarItem *)it),true); // this MUST go after it->setActive()
@ -1410,10 +1410,10 @@ KviTaskBarItem * KviTreeTaskBar::nextItem()
{
m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling();
} else {
if(m_pCurrentItem->tqparent())
if(m_pCurrentItem->parent())
{
// child with not siblings : try the sibling of the tqparent
m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->nextSibling();
// child with not siblings : try the sibling of the parent
m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->nextSibling();
} else {
m_pCurrentItem = 0; // toplevel with no siblings
}
@ -1428,10 +1428,10 @@ KviTaskBarItem * KviTreeTaskBar::prevItem()
if(!m_pCurrentItem)return 0;
if(m_pCurrentItem->tqparent())
if(m_pCurrentItem->parent())
{
// a child item
it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->firstChild();
it = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->firstChild();
while(it)
{
@ -1440,7 +1440,7 @@ KviTaskBarItem * KviTreeTaskBar::prevItem()
}
if(!it)
{
it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent();
it = (KviTreeTaskBarItem *)m_pCurrentItem->parent();
}
} else {

4
src/kvirc/ui/kvi_themedlabel.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ void KviThemedLabel::setText(const char * text)
{
int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4;
setMinimumHeight(iHeight);
//g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize));
//g_pApp->postEvent(parent(),new TQEvent(TQEvent::Resize));
}
update();
}
@ -71,7 +71,7 @@ void KviThemedLabel::setText(const TQString& text)
{
int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4;
setMinimumHeight(iHeight);
//g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize));
//g_pApp->postEvent(parent(),new TQEvent(TQEvent::Resize));
}
update();
}

10
src/kvirc/ui/kvi_toolwindows_container.cpp
Unescape Escape View File

@ -13,10 +13,10 @@
#include "kvi_iconmanager.h"
KviWindowToolWidget::KviWindowToolWidget(TQWidget * tqparent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ )
:TQWidget(tqparent/*,name,f*/)
KviWindowToolWidget::KviWindowToolWidget(TQWidget * parent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ )
:TQWidget(parent/*,name,f*/)
{
// m_pContainer=tqparent;
// m_pContainer=parent;
m_pButton=button;
m_bAutoDelete=1;
m_bHidden=0;
@ -77,8 +77,8 @@ void KviWindowToolWidget::unregisterSelf()
m_bHidden=0;
}*/
KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn, const char * name )
:TOOL_PAGE_PARENT(tqparent)
KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * parent,bool bOn, const char * name )
:TOOL_PAGE_PARENT(parent)
{
#ifdef COMPILE_USE_QT4
setFlat(true);

4
src/kvirc/ui/kvi_toolwindows_container.h
Unescape Escape View File

@ -26,7 +26,7 @@ class KVIRC_API KviWindowToolWidget : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
KviWindowToolWidget( TQWidget * tqparent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */);
KviWindowToolWidget( TQWidget * parent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */);
~KviWindowToolWidget();
void setAutoDelete(bool b) { m_bAutoDelete=b; };
@ -58,7 +58,7 @@ class KVIRC_API KviWindowToolPageButton : public TOOL_PAGE_PARENT
Q_OBJECT
TQ_OBJECT
public:
KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn=0,const char * name = 0 );
KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * parent,bool bOn=0,const char * name = 0 );
~KviWindowToolPageButton();
/*protected:
virtual void drawButton ( TQPainter * painter);*/

12
src/kvirc/ui/kvi_topicw.cpp
Unescape Escape View File

@ -553,7 +553,7 @@ TQSize KviTopicWidget::tqsizeHint() const
void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *)
{
int maxlen=-1;
TQObject * w = tqparent();
TQObject * w = parent();
TQString szModes;
bool bCanEdit = TRUE;
while(w)
@ -568,7 +568,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *)
}
break;
}
w = w->tqparent();
w = w->parent();
}
if(m_pInput == 0)
{
@ -728,9 +728,9 @@ void KviTopicWidget::deactivate()
m_pDiscard = 0;
}
// try to find a KviWindow tqparent and give it the focus
// try to find a KviWindow parent and give it the focus
TQObject * w = tqparent();
TQObject * w = parent();
while(w)
{
if(w->inherits("KviWindow"))
@ -738,11 +738,11 @@ void KviTopicWidget::deactivate()
((KviWindow *)w)->setFocus();
return;
}
w = w->tqparent();
w = w->parent();
}
// no KviWindow on the path
w = tqparent();
w = parent();
if(w)
{
if(w->inherits(TQWIDGET_OBJECT_NAME_STRING))

10
src/kvirc/ui/kvi_userlistview.cpp
Unescape Escape View File

@ -91,10 +91,10 @@ void KviUserListToolTip::maybeTip(const TQPoint &pnt)
KviUserListEntry::KviUserListEntry(KviUserListView * tqparent,const TQString &nick,
KviUserListEntry::KviUserListEntry(KviUserListView * parent,const TQString &nick,
KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown)
{
m_pListView = tqparent;
m_pListView = parent;
m_szNick = nick;
m_pGlobalData = e;
m_iFlags = iFlags;
@ -184,8 +184,8 @@ void KviUserListEntry::recalcSize()
KviUserListView::KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name)
: KviWindowToolWidget(tqparent,button)
KviUserListView::KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name)
: KviWindowToolWidget(parent,button)
{
setAutoDelete(0);
m_pKviWindow = pWnd;
@ -1476,7 +1476,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
// FIXME:
//
// this is slow... VERY slow when one has a lot of registered users.
// (this is NOT a simple lookup in the user db... it is a tqmask match)
// (this is NOT a simple lookup in the user db... it is a mask match)
// if we REALLY need to use custom colors for regged users then
// they should be updated ONCE and stored (cached) in the KviUserListEntry structure
//

4
src/kvirc/ui/kvi_userlistview.h
Unescape Escape View File

@ -74,7 +74,7 @@ class KVIRC_API KviUserListEntry
friend class KviUserListView;
friend class KviUserListViewArea;
public:
KviUserListEntry(KviUserListView * tqparent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true);
KviUserListEntry(KviUserListView * parent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true);
~KviUserListEntry();
protected:
KviUserListView * m_pListView;
@ -128,7 +128,7 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget
Q_OBJECT
TQ_OBJECT
public:
KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0);
KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0);
~KviUserListView();
protected:
KviPointerHashTable<TQString,KviUserListEntry> * m_pEntryDict;

14
src/kvirc/ui/kvi_window.cpp
Unescape Escape View File

@ -296,12 +296,12 @@ bool KviWindow::focusNextPrevChild(bool next)
//TQVariant v = w->property("KviProperty_FocusOwner");
//if(v.isValid())return false; // Do NOT change the focus widget!
if(w->tqparent())
if(w->parent())
{
#ifdef COMPILE_USE_QT4
if(w->tqparent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
if(w->parent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
#else
if(w->tqparent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
if(w->parent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
#endif
return false; // Do NOT change the focus widget!
}
@ -936,9 +936,9 @@ void KviWindow::closeEvent(TQCloseEvent *e)
void KviWindow::updateIcon()
{
if(tqparent())
if(parent())
{
((KviMdiChild *)tqparent())->setIcon(*myIconPtr());
((KviMdiChild *)parent())->setIcon(*myIconPtr());
} else {
setIcon(*myIconPtr());
}
@ -951,9 +951,9 @@ void KviWindow::youAreDocked()
delete m_pAccel;
m_pAccel = 0;
}
((KviMdiChild *)tqparent())->setIcon(*myIconPtr());
((KviMdiChild *)parent())->setIcon(*myIconPtr());
updateCaption();
connect(((KviMdiChild *)tqparent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &)));
connect(((KviMdiChild *)parent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &)));
}
void KviWindow::youAreUndocked()

2
src/kvirc/ui/kvi_window.h
Unescape Escape View File

@ -206,7 +206,7 @@ public:
// The KviIrcView of this window: may be NULL if the window has no KviIrcView (and thus supports no direct output)
KviIrcView * view() const { return m_pIrcView; };
// The mdiParent widget: may be nulll if the window is undocked
KviMdiChild * mdiParent(){ return (KviMdiChild *)tqparent(); };
KviMdiChild * mdiParent(){ return (KviMdiChild *)parent(); };
// The console that this window belongs to: may be null for windows that aren't bound to irc contexts
KviConsole * console(){ return m_pConsole; };
// same as above

8
src/modules/aliaseditor/aliaseditor.cpp
Unescape Escape View File

@ -822,7 +822,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll
{
while(it)
{
KviAliasEditorListViewItem * par = (KviAliasEditorListViewItem *)(it->tqparent());
KviAliasEditorListViewItem * par = (KviAliasEditorListViewItem *)(it->parent());
delete it;
if(par)
{
@ -992,10 +992,10 @@ TQString KviAliasEditor::askForNamespaceName(const TQString &szAction,const TQSt
void KviAliasEditor::openParentItems(KviTalListViewItem * it)
{
if(it->tqparent())
if(it->parent())
{
it->tqparent()->setOpen(true);
openParentItems(it->tqparent());
it->parent()->setOpen(true);
openParentItems(it->parent());
}
}

62
src/modules/chan/libkvichan.cpp
Unescape Escape View File

@ -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],[tqmask:string],[flags:string])
<array> $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:
<string> $chan.matchban([window_id],<complete_tqmask>)
<string> $chan.matchban([window_id],<complete_mask>)
@description:
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]
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]
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:
<string> $chan.matchbanexception([window_id],<complete_tqmask>)
<string> $chan.matchbanexception([window_id],<complete_mask>)
@description:
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]
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]
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:
<string> $chan.matchinvite([window_id:string],<complete_tqmask>)
<string> $chan.matchinvite([window_id:string],<complete_mask>)
@description:
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]
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]
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);

4
src/modules/channelsjoin/channelsjoinwindow.cpp
Unescape Escape View File

@ -200,7 +200,7 @@ void KviChannelsJoinWindow::fillListView()
void KviChannelsJoinWindow::itemClicked(KviTalListViewItem * it)
{
if(!it)return;
if(!it->tqparent())return;
if(!it->parent())return;
KviStr tmp = it->text(0);
m_pChannelEdit->setText(tmp.ptr());
enableJoin();
@ -209,7 +209,7 @@ void KviChannelsJoinWindow::itemClicked(KviTalListViewItem * it)
void KviChannelsJoinWindow::itemDoubleClicked(KviTalListViewItem * it)
{
if(!it)return;
if(!it->tqparent())return;
if(!it->parent())return;
KviStr tmp = it->text(0);
m_pChannelEdit->setText(tmp.ptr());
enableJoin();

4
src/modules/dcc/chat.cpp
Unescape Escape View File

@ -714,7 +714,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
kvi_free(data->buffer);
data->buffer = end = aux = 0;
}
postEvent(tqparent(),e);
postEvent(parent(),e);
} else aux++;
// debug("PASSING CHAR %c",*aux);
}
@ -732,7 +732,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
data->iLen = 0;
kvi_free(data->buffer);
data->buffer = 0;
postEvent(tqparent(),e);
postEvent(parent(),e);
}
}
return true;

2
src/modules/dcc/libkvidcc.cpp
Unescape Escape View File

@ -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 tqmask "<nickname>!*@*".
A 120 seconds file offer is added for the specified file and mask "<nickname>!*@*".
@examples:
*/

4
src/modules/dcc/requests.cpp
Unescape Escape View File

@ -878,7 +878,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
// now add a file offer , so he we will accept it automatically
// 120 secs is a reasonable timeout
TQString szMask;
dcc->ctcpMsg->pSource->tqmask(szMask,KviIrcMask::NickUserHost);
dcc->ctcpMsg->pSource->mask(szMask,KviIrcMask::NickUserHost);
KviSharedFile * pOld = o;
o = g_pSharedFilesManager->addSharedFile(szFileName,o->absFilePath(),szMask,120);
@ -1081,7 +1081,7 @@ static void dccModuleParseDccCanvas(KviDccRequest *dcc)
static void dccModuleParseDccList(KviDccRequest *dcc)
{
// DCC LIST <tqmask> <ipaddr> <port>
// DCC LIST <mask> <ipaddr> <port>
// FIXME!
}

16
src/modules/dcc/send.cpp
Unescape Escape View File

@ -158,7 +158,7 @@ void KviDccRecvThread::postMessageEvent(const char * m)
{
KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
e->setData(new KviStr(m));
postEvent(tqparent(),e);
postEvent(parent(),e);
}
// FIXME: This stuff should be somewhat related to the 1448 bytes TCP basic packet size
@ -292,7 +292,7 @@ void KviDccRecvThread::run()
{
// Received the whole file...die
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e);
postEvent(parent(),e);
break;
}
}
@ -327,7 +327,7 @@ void KviDccRecvThread::run()
{
// success if we got the whole file or if we don't know the file size (we trust the peer)
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e);
postEvent(parent(),e);
break;
}
}
@ -368,7 +368,7 @@ void KviDccRecvThread::run()
// success if we got the whole file or if we don't know the file size (we trust the peer)
postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc"));
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e);
postEvent(parent(),e);
break;
}
}
@ -572,7 +572,7 @@ void KviDccSendThread::run()
if(iLastAck >= pFile->size())
{
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e);
postEvent(parent(),e);
break;
}
} else {
@ -589,7 +589,7 @@ void KviDccSendThread::run()
// done...success
updateStats();
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e);
postEvent(parent(),e);
break;
} else {
if(readLen < 0)
@ -598,7 +598,7 @@ void KviDccSendThread::run()
} else {
KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
e->setData(new KviStr(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc")));
postEvent(tqparent(),e);
postEvent(parent(),e);
}
}
}
@ -672,7 +672,7 @@ void KviDccSendThread::run()
// not in a tdcc: we can close the file...
updateStats();
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e);
postEvent(parent(),e);
break;
} else {
// upload finished but we're waiting for the last ack

2
src/modules/dcc/thread.h
Unescape Escape View File

@ -66,7 +66,7 @@ protected:
protected:
bool handleInvalidSocketRead(int readLen);
public:
TQObject * tqparent(){ return m_pParent; };
TQObject * parent(){ return m_pParent; };
void postErrorEvent(int err);
// Warning!..newer call __tr() here!...use __tr_no_lookup()
void postMessageEvent(const char * message);

8
src/modules/dcc/voice.cpp
Unescape Escape View File

@ -533,7 +533,7 @@ void KviDccVoiceThread::startRecording()
// debug("Posting event");
KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_RECORDING));
postEvent(tqparent(),e);
postEvent(parent(),e);
m_bRecording = true;
m_bRecordingRequestPending = false;
@ -552,7 +552,7 @@ void KviDccVoiceThread::stopRecording()
KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_STOP_RECORDING));
postEvent(tqparent(),e);
postEvent(parent(),e);
m_bRecording = false;
if(!m_bPlaying)closeSoundcard();
@ -569,7 +569,7 @@ void KviDccVoiceThread::startPlaying()
{
KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_PLAYING));
postEvent(tqparent(),e);
postEvent(parent(),e);
m_bPlaying = true;
}
#endif
@ -583,7 +583,7 @@ void KviDccVoiceThread::stopPlaying()
KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_STOP_PLAYING));
postEvent(tqparent(),e);
postEvent(parent(),e);
m_bPlaying = false;
if(!m_bRecording)closeSoundcard();

8
src/modules/dialog/libkvidialog.cpp
Unescape Escape View File

@ -147,7 +147,7 @@ void KviKvsCallbackMessageBox::done(int code)
<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
to the <callback_command> as positional parameters.[br]
If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
it will appear above its tqparent widget and block its input until it's closed.[br]
it will appear above its parent widget and block its input until it's closed.[br]
Once the dialog has been shown , the user will click one of the buttons. At this point the dialog
is hidden and the <callback_command> is executed passing the number of the button clicked
as $0 and the magic parameters as positional parameters $1 , $2 , $3....[br]
@ -417,7 +417,7 @@ void KviKvsCallbackTextInput::showEvent(TQShowEvent *e)
If the -d switch is used , the initial text input value is set to <default text>.[br]
If the -i switch is used , the dialog displays also the icon <icon> , just on the left ot the <info_text>[br]
If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
it will appear above its tqparent widget and block its input until it's closed.[br]
it will appear above its parent widget and block its input until it's closed.[br]
In that case <icon> is an [doc:image_id]image identifier[/doc] (can be a relative or absolute
path to an image file or a signed number (in that case it defines an internal KVIrc image).[br]
<magic1>,<magic2>... are the magic parameters: evaluated at dialog.textinput call time and passed
@ -573,7 +573,7 @@ void KviKvsCallbackFileDialog::done(int code)
<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
to the <callback_command> as positional parameters.[br]
If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
it will appear above its tqparent widget and block its input until it's closed.[br]
it will appear above its parent widget and block its input until it's closed.[br]
Once the dialog has been shown , the user will select an EXISTING file and click either
Ok or Cancel. At this point the dialog is hidden and the <callback_command> is executed passing the selected file(s) as $0
and the magic parameters as positional parameters $1 , $2 , $3....[br]
@ -704,7 +704,7 @@ void KviKvsCallbackImageDialog::done(int code)
<magic1>,<magic2>... are the magic parameters: evaluated at dialog.image call time and passed
to the <callback_command> as positional parameters.[br]
If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
it will appear above its tqparent widget and block its input until it's closed.[br]
it will appear above its parent widget and block its input until it's closed.[br]
Once the dialog has been shown , the user will select an EXISTING file and click either
Ok or Cancel. At this point the dialog is hidden and the <callback_command> is executed passing the selected file(s) as $0
and the magic parameters as positional parameters $1 , $2 , $3....[br]

10
src/modules/dockwidget/libkvidockwidget_qt3.cpp
Unescape Escape View File

@ -199,8 +199,8 @@ void KviDockWidget::createTaskbarIcon()
ICONINFO inf;
g_pCurrentPixmap=new TQPixmap(*g_pDock1);
inf.hbmColor = g_pCurrentPixmap->hbm();
if(!g_pCurrentPixmap->tqmask())g_pCurrentPixmap->setMask(g_pCurrentPixmap->createHeuristicMask());
inf.hbmMask = g_pCurrentPixmap->tqmask()->hbm();
if(!g_pCurrentPixmap->mask())g_pCurrentPixmap->setMask(g_pCurrentPixmap->createHeuristicMask());
inf.hbmMask = g_pCurrentPixmap->mask()->hbm();
g_pCurrentIcon=CreateIconIndirect(&inf);
NOTIFYICONDATA nid;
@ -229,8 +229,8 @@ void KviDockWidget::updateTaskbarIcon()
ICONINFO inf;
TQPixmap* pix = m_bFlashed ? g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE) : g_pCurrentPixmap;
inf.hbmColor = pix->hbm();
if(!pix->tqmask())pix->setMask(pix->createHeuristicMask());
inf.hbmMask = pix->tqmask()->hbm();
if(!pix->mask())pix->setMask(pix->createHeuristicMask());
inf.hbmMask = pix->mask()->hbm();
HICON hIcon=CreateIconIndirect(&inf);
NOTIFYICONDATA nid;
@ -719,7 +719,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
{
KviDockWidget * w= dockwidget_find(c->window()->frame());
if(w)delete w;
// show the tqparent frame.. otherwise there will be no way to get it back
// show the parent frame.. otherwise there will be no way to get it back
if(!c->window()->frame()->isVisible())
{
c->window()->frame()->show();

2
src/modules/dockwidget/libkvidockwidget_qt4.cpp
Unescape Escape View File

@ -550,7 +550,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
{
KviDockWidget * w= dockwidget_find(c->window()->frame());
if(w)delete w;
// show the tqparent frame.. otherwise there will be no way to get it back
// show the parent frame.. otherwise there will be no way to get it back
if(!c->window()->frame()->isVisible())
{
c->window()->frame()->show();

4
src/modules/editor/libkvieditor.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ static bool editor_module_cleanup(KviModule *m)
{
while(g_pScriptEditorWindowList->first())
{
TQObject * w = g_pScriptEditorWindowList->first()->tqparent();;
TQObject * w = g_pScriptEditorWindowList->first()->parent();;
while(w)
{
//debug("%s %s %i %s",__FILE__,__FUNCTION__,__LINE__,w->className());
@ -54,7 +54,7 @@ static bool editor_module_cleanup(KviModule *m)
// debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
break;
}
w = w->tqparent();
w = w->parent();
}
delete g_pScriptEditorWindowList->first();
}

12
src/modules/editor/scripteditor.cpp
Unescape Escape View File

@ -74,8 +74,8 @@ static TQColor g_clrFind(0,0,0);
static TQFont g_fntNormal("Courier New",8);
KviCompletionBox::KviCompletionBox(TQWidget * tqparent = 0)
: KviTalListBox(tqparent)
KviCompletionBox::KviCompletionBox(TQWidget * parent = 0)
: KviTalListBox(parent)
{
setPaletteForegroundColor(TQColor(0,0,0));
setPaletteBackgroundColor(TQColor(255,255,255));
@ -323,7 +323,7 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e)
case TQt::Key_Return:
case TQt::Key_Backspace:
case TQt::Key_PageUp:
e->ignore(); // allow the tqparent to process it
e->ignore(); // allow the parent to process it
return;
break;
}
@ -1117,10 +1117,10 @@ void KviScriptEditorImplementation::configureColors()
saveOptions();
}
}
KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* tqparent, const char* name)
: TQDialog( tqparent)
KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, const char* name)
: TQDialog( parent)
{
m_pParent=tqparent;
m_pParent=parent;
emit initFind();
setPaletteForegroundColor( TQColor( 0, 0, 0 ) );
setPaletteBackgroundColor( TQColor( 236, 233, 216 ) );

4
src/modules/editor/scripteditor.h
Unescape Escape View File

@ -47,7 +47,7 @@ class KviCompletionBox: public KviTalListBox
Q_OBJECT
TQ_OBJECT
public:
KviCompletionBox(TQWidget * tqparent);
KviCompletionBox(TQWidget * parent);
~KviCompletionBox(){};
void updateContents(TQString word);
@ -176,7 +176,7 @@ class KviScriptEditorReplaceDialog: public TQDialog
Q_OBJECT
TQ_OBJECT
public:
KviScriptEditorReplaceDialog( TQWidget* tqparent = 0, const char* name = 0);
KviScriptEditorReplaceDialog( TQWidget* parent = 0, const char* name = 0);
~KviScriptEditorReplaceDialog();
TQLineEdit *m_pFindlineedit;
TQLineEdit *m_pReplacelineedit;

16
src/modules/eventeditor/eventeditor.cpp
Unescape Escape View File

@ -141,7 +141,7 @@ void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
if(it)
{
m_pContextPopup->clear();
if(it->tqparent())
if(it->parent())
{
TQString tmp;
if(!(((KviEventHandlerListViewItem *)it)->m_bEnabled))
@ -210,7 +210,7 @@ void KviEventEditor::addHandlerForCurrentEvent()
KviTalListViewItem * it = m_pListView->selectedItem();
if(it)
{
if(it->tqparent() == 0)
if(it->parent() == 0)
{
TQString buffer = __tr2qs("default");
getUniqueHandlerName((KviEventListViewItem *)it,buffer);
@ -284,7 +284,7 @@ void KviEventEditor::saveLastEditedItem()
TQString buffer = m_pNameEditor->text();
if(!KviTQString::equalCI(buffer,m_pLastEditedItem->m_szName))
{
getUniqueHandlerName((KviEventListViewItem *)(m_pLastEditedItem->tqparent()),buffer);
getUniqueHandlerName((KviEventListViewItem *)(m_pLastEditedItem->parent()),buffer);
}
m_pLastEditedItem->m_szName = buffer;
@ -298,7 +298,7 @@ void KviEventEditor::selectionChanged(KviTalListViewItem * it)
{
__range_valid(m_bOneTimeSetupDone);
saveLastEditedItem();
if(it->tqparent())
if(it->parent())
{
m_pLastEditedItem = (KviEventHandlerListViewItem *)it;
m_pNameEditor->setEnabled(true);
@ -330,14 +330,14 @@ void KviEventEditor::showEvent(TQShowEvent *e)
void KviEventEditor::getExportEventBuffer(TQString &buffer,KviEventHandlerListViewItem * it)
{
if(!it->tqparent())return;
if(!it->parent())return;
TQString szBuf = it->m_szBuffer;
KviCommandFormatter::blockFromBuffer(szBuf);
buffer = "event(";
buffer += ((KviEventListViewItem *)(it->tqparent()))->m_szName;
buffer += ((KviEventListViewItem *)(it->parent()))->m_szName;
buffer += ",";
buffer += it->m_szName;
buffer += ")\n";
@ -348,7 +348,7 @@ void KviEventEditor::getExportEventBuffer(TQString &buffer,KviEventHandlerListVi
{
buffer += "\n";
buffer += "eventctl -d ";
buffer += ((KviEventListViewItem *)(it->tqparent()))->m_szName;
buffer += ((KviEventListViewItem *)(it->parent()))->m_szName;
buffer += " ";
buffer += it->m_szName;
}
@ -362,7 +362,7 @@ void KviEventEditor::exportCurrentHandler()
TQString szName = TQDir::homeDirPath();
if(!szName.endsWith(TQString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
szName += ((KviEventListViewItem *)(m_pLastEditedItem->tqparent()))->m_szName;
szName += ((KviEventListViewItem *)(m_pLastEditedItem->parent()))->m_szName;
szName += ".";
szName += m_pLastEditedItem->m_szName;
szName += ".kvs";

12
src/modules/links/linkswindow.cpp
Unescape Escape View File

@ -232,10 +232,10 @@ void KviLinksWindow::endOfLinks()
if(l->host.contains('*'))wildServers++;
it = insertLink(l);
if(!it){
output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing tqparent (%s) for %s (%d hops): %s (used /LINKS <tqmask> ?)"),
l->tqparent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing parent (%s) for %s (%d hops): %s (used /LINKS <mask> ?)"),
l->parent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
brokenLinks++;
KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->tqparent.ptr());
KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
KviStr tmp2(KviStr::Format,"%d",l->hops);
if(root)it = new KviTalListViewItem(m_pListView,root,TQString(l->host.ptr()),TQString(tmp2.ptr()),TQString(tmp.ptr()));
else {
@ -243,7 +243,7 @@ void KviLinksWindow::endOfLinks()
it = new KviTalListViewItem(m_pListView,TQString(l->host.ptr()),TQString(tmp2.ptr()),TQString(tmp.ptr()));
}
} else {
it = it->tqparent();
it = it->parent();
if(it)
{
int links = it->childCount() + 1;
@ -307,7 +307,7 @@ void KviLinksWindow::endOfLinks()
KviTalListViewItem * KviLinksWindow::insertLink(KviLink *l)
{
__range_valid(l->hops > 0);
KviTalListViewItem * i = getItemByHost(l->tqparent.ptr(),0);
KviTalListViewItem * i = getItemByHost(l->parent.ptr(),0);
KviTalListViewItem * it = 0;
if(!i)return 0;
else {
@ -405,7 +405,7 @@ void KviLinksWindow::processData(KviIrcMessage *msg)
KviLink * l = new KviLink;
l->host = msg->safeParam(1);
l->tqparent = msg->safeParam(2);
l->parent = msg->safeParam(2);
const char * tr = msg->safeTrailing();

2
src/modules/links/linkswindow.h
Unescape Escape View File

@ -39,7 +39,7 @@ class KviThemedLabel;
typedef struct _KviLink
{
KviStr host;
KviStr tqparent;
KviStr parent;
int hops;
KviStr description;
} KviLink;

8
src/modules/logview/logviewmdiwindow.cpp
Unescape Escape View File

@ -116,13 +116,13 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
l = new TQLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);
tqlayout->addMultiCellWidget(l,5,5,0,1);
l = new TQLabel(__tr2qs_ctx("Log name tqmask:","logview"),m_pSearchTab);
l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
m_pFileNameMask = new TQLineEdit(m_pSearchTab);
connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
tqlayout->addWidget(l,6,0);
tqlayout->addWidget(m_pFileNameMask,6,1);
l = new TQLabel(__tr2qs_ctx("Log contents tqmask:","logview"),m_pSearchTab);
l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
m_pContentsMask = new TQLineEdit(m_pSearchTab);
connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
tqlayout->addWidget(l,7,0);
@ -340,9 +340,9 @@ void KviLogViewMDIWindow::cacheFileList()
void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
{
bool bCompressed=0;
//A tqparent node
//A parent node
m_pIrcView->clearBuffer();
if(!it || !it->tqparent() || !(((KviLogListViewItem *)it)->m_pFileData) )
if(!it || !it->parent() || !(((KviLogListViewItem *)it)->m_pFileData) )
{
return;
}

2
src/modules/logview/logviewmdiwindow.h
Unescape Escape View File

@ -93,7 +93,7 @@ protected:
TQLineEdit * m_pFileNameMask;
TQLineEdit * m_pContentsMask;
// Date/time tqmask
// Date/time mask
TQCheckBox * m_pEnableFromFilter;
TQCheckBox * m_pEnableToFilter;
TQDateEdit * m_pFromDateEdit;

90
src/modules/mask/libkvimask.cpp
Unescape Escape View File

@ -28,140 +28,140 @@
#include "kvi_ircmask.h"
/*
@doc: tqmask.match
@doc: mask.match
@type:
function
@title:
$tqmask.match
$mask.match
@short:
Matches a tqmask agains a wildcarded one
Matches a mask agains a wildcarded one
@syntax:
<boolean> $tqmask.match(<wildcard_tqmask:string>,<fixed_tqmask:string>)
<boolean> $mask.match(<wildcard_mask:string>,<fixed_mask:string>)
@description:
Returns 1 if the <wildcard_tqmask> matches <fixed_tqmask> and 0 otherwise.
<wildcard_tqmask> can obviously contain wildcards ('*' and '?').
Returns 1 if the <wildcard_mask> matches <fixed_mask> and 0 otherwise.
<wildcard_mask> can obviously contain wildcards ('*' and '?').
@example:
[example]
[cmd]if[/cmd]($tqmask.match(*!*@*.linux.it,$0))
[cmd]op[/cmd] [fnc]$tqmask.nick[/fnc]($0)
[cmd]if[/cmd]($mask.match(*!*@*.linux.it,$0))
[cmd]op[/cmd] [fnc]$mask.nick[/fnc]($0)
[/example]
*/
static bool mask_kvs_fnc_match(KviKvsModuleFunctionCall * c)
{
TQString wildtqmask,fixedtqmask;
TQString wildmask,fixedmask;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("wildcard tqmask",KVS_PT_STRING,0,wildtqmask)
KVSM_PARAMETER("fixed tqmask",KVS_PT_STRING,0,fixedtqmask)
KVSM_PARAMETER("wildcard mask",KVS_PT_STRING,0,wildmask)
KVSM_PARAMETER("fixed mask",KVS_PT_STRING,0,fixedmask)
KVSM_PARAMETERS_END(c)
KviIrcMask mk1(wildtqmask);
KviIrcMask mk2(fixedtqmask);
KviIrcMask mk1(wildmask);
KviIrcMask mk2(fixedmask);
c->returnValue()->setBoolean(mk1.matchesFixed(mk2.nick(),mk2.user(),mk2.host()));
return true;
}
/*
@doc: tqmask.nick
@doc: mask.nick
@type:
function
@title:
$tqmask.nick
$mask.nick
@short:
Returns the nick part of an IRC tqmask
Returns the nick part of an IRC mask
@syntax:
<string> $tqmask.nick(<tqmask:string>)
<string> $mask.nick(<mask:string>)
@description:
Returns the nickname part of an IRC tqmask.
Returns the nickname part of an IRC mask.
*/
static bool mask_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
{
TQString tqmask;
TQString mask;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
KVSM_PARAMETERS_END(c)
KviIrcMask mk(tqmask);
KviIrcMask mk(mask);
c->returnValue()->setString(mk.nick());
return true;
}
/*
@doc: tqmask.user
@doc: mask.user
@type:
function
@title:
$tqmask.user
$mask.user
@short:
Returns the username part of an IRC tqmask
Returns the username part of an IRC mask
@syntax:
<string> $tqmask.user(<tqmask:string>)
<string> $mask.user(<mask:string>)
@description:
Returns the username part of an IRC tqmask.
Returns the username part of an IRC mask.
*/
static bool mask_kvs_fnc_user(KviKvsModuleFunctionCall * c)
{
TQString tqmask;
TQString mask;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
KVSM_PARAMETERS_END(c)
KviIrcMask mk(tqmask);
KviIrcMask mk(mask);
c->returnValue()->setString(mk.user());
return true;
}
/*
@doc: tqmask.host
@doc: mask.host
@type:
function
@title:
$tqmask.host
$mask.host
@short:
Returns the hostname part of an IRC tqmask
Returns the hostname part of an IRC mask
@syntax:
<string> $tqmask.host(<tqmask:string>)
<string> $mask.host(<mask:string>)
@description:
Returns the hostname part of an IRC tqmask.
Returns the hostname part of an IRC mask.
*/
static bool mask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
{
TQString tqmask;
TQString mask;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
KVSM_PARAMETERS_END(c)
KviIrcMask mk(tqmask);
KviIrcMask mk(mask);
c->returnValue()->setString(mk.host());
return true;
}
/*
@doc: tqmask.hasnumerichost
@doc: mask.hasnumerichost
@type:
function
@title:
$tqmask.hasNumericHost
$mask.hasNumericHost
@short:
Checks if a host part of a tqmask is numeric
Checks if a host part of a mask is numeric
@syntax:
<boolean> $tqmask.hasNumericHost(<tqmask: string>)
<boolean> $mask.hasNumericHost(<mask: string>)
@description:
Returns 1 if the hostname part of the tqmask is numeric (e.g : unresolved IPV4 or IPV6 address)
Returns 1 if the hostname part of the mask is numeric (e.g : unresolved IPV4 or IPV6 address)
*/
static bool mask_kvs_fnc_hasnumerichost(KviKvsModuleFunctionCall * c)
{
TQString tqmask;
TQString mask;
KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
KVSM_PARAMETERS_END(c)
KviIrcMask mk(tqmask);
KviIrcMask mk(mask);
c->returnValue()->setBoolean(mk.hasNumericHost());
return true;
}

2
src/modules/objects/class_buttongroup.cpp
Unescape Escape View File

@ -47,7 +47,7 @@
[class]widget[/class]
@description:
This widget organizes buttons in a group.
It will be usually a tqparent for other child controls.
It will be usually a parent for other child controls.
You can either use a child tqlayout to manage the tqchildren geometries
or use $setColumnLayout function to manage the tqlayout automatically.
The class ineriths groupbox.

6
src/modules/objects/class_dialog.cpp
Unescape Escape View File

@ -46,10 +46,10 @@
@description:
Rappresents a dialog object. The class is really
similar to the widget class, it has only a couple of minor differences.
A dialog is always a top-level widget, but if it has a tqparent, its default
location is centered on top of the tqparent. It will also share the tqparent's taskbar entry.
A dialog is always a top-level widget, but if it has a parent, its default
location is centered on top of the parent. It will also share the parent's taskbar entry.
If you call $setModal(1) then the dialog will have non-blocking modal behaviour:
it will appear above its tqparent widget and block its input until it's closed.
it will appear above its parent widget and block its input until it's closed.
@functions:
*/

2
src/modules/objects/class_dockwindow.cpp
Unescape Escape View File

@ -141,7 +141,7 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
return true;
}
if(((TQWidget *)(pWidget->object()))->tqparent() != (TQObject *)_pDockWindow)
if(((TQWidget *)(pWidget->object()))->parent() != (TQObject *)_pDockWindow)
{
c->warning(__tr2qs("The added widget is not a child of this dock window"));
}

2
src/modules/objects/class_groupbox.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ const int align_cod[] = {
[class]widget[/class]
@description:
This widget can be used to display a groupbox.
It will be usually a tqparent for other child controls.
It will be usually a parent for other child controls.
You can either use a child tqlayout to manage the tqchildren geometries
or use $setColumnLayout to manage the tqlayout automatically.
@functions:

4
src/modules/objects/class_label.cpp
Unescape Escape View File

@ -196,9 +196,9 @@ const int frame_cod[] = {
[pre]
Plain - no 3D effect (draws using foreground color)[br]
Raised - makes the label look like it was raised above the
tqparent widget[br]
parent widget[br]
Sunken - makes the label look like it was "pushed" inside
the tqparent widget[br]
the parent widget[br]
[/pre]
!fn: $setImage(<image_id>)
Sets the image to be displayed on this label.

12
src/modules/objects/class_layout.cpp
Unescape Escape View File

@ -55,7 +55,7 @@
The tqlayout is a tqgeometry management tool for child widgets.
You create a tqlayout , give it some widgets to manage and it will tqlayout them
automatically.[br]
The tqparent of the tqlayout must be the widget for which child widget geometries have to be managed.
The parent of the tqlayout must be the widget for which child widget geometries have to be managed.
A tqlayout is a grid of NxM cells in which you insert child widgets with [classfnc:tqlayout]$addWidget[/classfnc]().[br]
Widgets that must span multiple cells can be added to the tqlayout with [classfnc:tqlayout]$addMultiCellWidget[/classfnc]().[br]
@functions:
@ -80,12 +80,12 @@
!fn: $setMargin(<margin:uint>)
Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
!fn: $setResizeMode(<resize_mode:string>)
Sets the resize mode of the tqparent widget in relation to this tqlayout.
Sets the resize mode of the parent widget in relation to this tqlayout.
<mode> can be one of:[br]
-Auto: this is the default[br]
-Fixed: the tqparent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br]
-Minimum: the minimum size of the tqparent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
-FreeResize: the tqparent widget of this tqlayout is not constrained at all[br]
-Fixed: the parent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br]
-Minimum: the minimum size of the parent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
-FreeResize: the parent widget of this tqlayout is not constrained at all[br]
*/
@ -116,7 +116,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
if(!w)
{
pContext->warning(__tr2qs("The tqparent of a tqlayout must be a widget!"));
pContext->warning(__tr2qs("The parent of a tqlayout must be a widget!"));
return false;
}
setObject(TQT_TQOBJECT(new TQGridLayout(w)));

10
src/modules/objects/class_lineedit.cpp
Unescape Escape View File

@ -128,8 +128,8 @@ static const int mode_cod[] = {
With this property user can drag text in the lineedit.
!fn: $setReadOnly(<bReadonly:boolean>)
Sets the lineedit to read only mode.
!fn: $setInputMask(<tqmask:string>)
Sets the validation input tqmask to inputMask.[br]
!fn: $setInputMask(<mask:string>)
Sets the validation input mask to inputMask.[br]
Example:[br]
[br]
%esempio->$setInputMask( "+99 99 99 99 99;_" );[br]
@ -137,7 +137,7 @@ static const int mode_cod[] = {
%esempio->Ip Number Mask.[br]
%esempio->setInputMask( ">AAAAA-AAAAA-AAAAA-AAAAA-AAAAA;#" );[br]
[br]
The tqmask format understands these tqmask characters:[br]
The mask format understands these mask characters:[br]
Character Meaning[br]
A ASCII alphabetic character required. A-Z, a-z.[br]
a ASCII alphabetic character permitted but not required.[br]
@ -155,7 +155,7 @@ static const int mode_cod[] = {
! Switch off case conversion.[br]
\ Use \ to escape the special characters listed above to use them as separators.[br]
[br]
The tqmask consists of a string of tqmask characters and separators, optionally[br]
The mask consists of a string of mask characters and separators, optionally[br]
followed by a semi-colon and the character used for blanks: the blank characters [br]
are always removed from the text after editing. The default blank character is space. [br]
!fn: $returnPressedEvent()
@ -407,7 +407,7 @@ bool KviKvsObject_lineedit::functionSetInputMask(KviKvsObjectFunctionCall *c)
{
TQString szMask;
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
KVSO_PARAMETER("mask",KVS_PT_STRING,0,szMask)
KVSO_PARAMETERS_END(c)
if (widget())
((TQLineEdit *)widget())->setInputMask(szMask);

6
src/modules/objects/class_listview.cpp
Unescape Escape View File

@ -59,7 +59,7 @@
will add the items to the listview and simply deleting them will remove them.
Allocating a [class]listviewitem[/class] item2 as a child of item1 will insert it to the same listview creating
a subtree of items spannig from item1. The subtree can be opened or closed by a simple click either
on the tqparent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc]
on the parent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc]
is set to $true. The listview can be in Single, Multi, Extended or NoSelection selection mode.
In single selection mode there can be only one selected item at a time and the selected item is also
the current item (this mode is the default). In Multi and Extended selection mode there can be multiple selected items
@ -510,10 +510,10 @@ void KviKvsObject_listview::fileDropped(TQString &szFile,KviTalListViewItem *ite
callFunction(this,"fileDroppedEvent",0,&params);
}
KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObject_listview *tqparent)
KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObject_listview *parent)
:KviTalListView(par)
{
m_pParentScript=tqparent;
m_pParentScript=parent;
setAcceptDrops(true);
viewport()->setAcceptDrops( TRUE );

8
src/modules/objects/class_listviewitem.cpp
Unescape Escape View File

@ -46,7 +46,7 @@
The listviewitem class implements a list view item.
A list view item is a multi-column object capable of displaying itself in a [class]listview[/class].
To use this class you must instantiate it with another listviewitem or a [class]listview[/class]
as tqparent. The item will be automatically displayed.
as parent. The item will be automatically displayed.
You can set the text and a pixmap in each column and you can make it checkable
with [classfnc:listviewitem]$setCheckable[/classfnc]().
A checkable listviewitem will display a small check mark in the first column.
@ -149,7 +149,7 @@ bool KviKvsObject_listviewitem::init(KviKvsRunTimeContext * pContext,KviKvsVaria
if(parentObject()->inherits("KviKvsObject_listview"))
m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)parentScriptWidget()));
else {
pContext->error(__tr2qs("The tqparent of the listviewitem must be either another listviewitem or a listview"));
pContext->error(__tr2qs("The parent of the listviewitem must be either another listviewitem or a listview"));
return false;
}
}
@ -335,7 +335,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
if(bCheckable)
{
if(m_pListViewItem->rtti() == 1)return true; // a TQCheckListItem already
KviTalListViewItem * pParent = m_pListViewItem->tqparent();
KviTalListViewItem * pParent = m_pListViewItem->parent();
KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
// swap the items, so we don't die now
KviTalListViewItem * pThis = m_pListViewItem;
@ -347,7 +347,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pLV);
} else {
if(m_pListViewItem->rtti() != 1)return true; // not a TQCheckListItem yet
KviTalListViewItem * pParent = m_pListViewItem->tqparent();
KviTalListViewItem * pParent = m_pListViewItem->parent();
KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
// swap the items, so we don't die now
KviTalListViewItem * pThis = m_pListViewItem;

6
src/modules/objects/class_painter.cpp
Unescape Escape View File

@ -311,14 +311,14 @@
[br]
privateimpl(%Btn,mousepressevent)[br]
{[br]
if ($$->$tqparent->%nextanim==0) [br]
if ($$->$parent->%nextanim==0) [br]
{[br]
$$->$tqparent->%nextanim=1[br]
$$->$parent->%nextanim=1[br]
$$->$settext(Prev)[br]
} [br]
else[br]
{[br]
$$->$tqparent->%nextanim=0[br]
$$->$parent->%nextanim=0[br]
$$->$settext(Next)[br]
}[br]
}[br]

4
src/modules/objects/class_toolbar.cpp
Unescape Escape View File

@ -81,7 +81,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
{
if (!parentObject())
{
pContext->warning(__tr2qs("the toolbar cannot be a tqparent-widget!"));
pContext->warning(__tr2qs("the toolbar cannot be a parent-widget!"));
return true;
}
if(parentObject()->inherits("KviKvsObject_mainwindow"))
@ -90,7 +90,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
}
else
{
pContext->warning(__tr2qs("The tqparent-widget isn't a MainWindow."));
pContext->warning(__tr2qs("The parent-widget isn't a MainWindow."));
}
return true;

22
src/modules/objects/class_widget.cpp
Unescape Escape View File

@ -147,11 +147,11 @@ const int widgettypes_cod[] = {
If erase is TRUE, erases the widget before the $paintEvent() call.
!fn: $x()
Returns the x coordinate of the upper-left corner
of this widget relative to the tqparent widget,
of this widget relative to the parent widget,
or to the desktop if this widget is a toplevel one.
!fn: $y()
Returns the y coordinate of the uspper-left corner
of this widget relative to the tqparent widget,
of this widget relative to the parent widget,
or to the desktop if this widget is a toplevel one.
!fn: $width()
Returns the width of this widget in pixels.
@ -162,7 +162,7 @@ const int widgettypes_cod[] = {
x, y, width, height.
</