rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 72aaee9802
commit 9ca32ef31a

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

@ -9,7 +9,7 @@ defpopup(highlight)
prologue prologue
{ {
if($0!=""){ if($0!=""){
%:regName = $reguser.match($tqmask($0)) %:regName = $reguser.match($mask($0))
%:beingHl = $reguser.property(%:regName,highlight) %:beingHl = $reguser.property(%:regName,highlight)
%:beingHlTmp = $tmphighlight.ishighlighted($0) %:beingHlTmp = $tmphighlight.ishighlighted($0)
} }
@ -27,34 +27,34 @@ defpopup(highlight)
popup($tr("Always Highlight")) (!%:beingHl && !%:regName) 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 prologue
{ {
%:inIgnoreList = 0 %:inIgnoreList = 0
%:regName = $reguser.match($tqmask($0)) %:regName = $reguser.match($mask($0))
%:ignLabelText = "<p><b>$0</b> " %:ignLabelText = "<p><b>$0</b> "
if(%:regName) if(%:regName)
{ {
@ -97,191 +97,191 @@ defpopup(ignore)
popup($tr("Ignore as..."),44) (!%:inIgnoreList) 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; 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.setIgnoreEnabled $0 1;
reguser.setIgnoreFlags -p -c -n -t -i -d $0; reguser.setIgnoreFlags -p -c -n -t -i -d $0;
} }
@ -301,7 +301,7 @@ defpopup(registration)
# This is really smart...we are loading # This is really smart...we are loading
# the reguser module only if this popup is being requested (the user effectively # 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) # 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>"; %:labelText = "<p><b>$0</b>";
if(%:regName) if(%:regName)
{ {
@ -322,39 +322,39 @@ defpopup(registration)
item($tr("Register")"...") (!%:regName) item($tr("Register")"...") (!%:regName)
{ {
reguser.wizard $tqmask($0) reguser.wizard $mask($0)
} }
popup($tr("Quick Registration")) (!%:regName) 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" %:itemBanMask = "*!user@*.host.tld"
%:itemBanNick = "nick" %:itemBanNick = "nick"
} else { } else {
%:itemBanMask = $tqmask(%:visible,$option(uintDefaultBanType)) %:itemBanMask = $mask(%:visible,$option(uintDefaultBanType))
if("%:itemBanMask" == "*!*@*")%:itemBanName = $tr("&Ban") if("%:itemBanMask" == "*!*@*")%:itemBanName = $tr("&Ban")
%:itemBanNick = %:visible %:itemBanNick = %:visible
} }
@ -498,7 +498,7 @@ defpopup(channel)
item($tr("Mask for") %:visible,75) (!%:multiple) 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) item($tr("&Ban") %:visible "("%:itemBanMask")",67) (("%:itemBanMask" != "*!*@*") && %:bCanKB)
{ {
ban $tqmask($0,$option(uintDefaultBanType)) ban $mask($0,$option(uintDefaultBanType))
} }
item(%:itemBanName %:visible "("%:itemBanNick!*@*")",67) (%:bCanKB) item(%:itemBanName %:visible "("%:itemBanNick!*@*")",67) (%:bCanKB)
@ -601,7 +601,7 @@ defpopup(channel)
} }
separator separator
item($tr("Configure ban tqmask..."),20) item($tr("Configure ban mask..."),20)
{ {
options.edit KviChannelAdvancedOptionsWidget options.edit KviChannelAdvancedOptionsWidget
} }
@ -1119,7 +1119,7 @@ defpopup(querytextview)
item($tr("Mask for") $0,75) (!%:multiple) item($tr("Mask for") $0,75) (!%:multiple)
{ {
echo $tqmask($0,11) echo $mask($0,11)
} }
} }

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

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

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

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

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

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

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

@ -42,7 +42,7 @@
@short: @short:
Registration of users in KVIrc Registration of users in KVIrc
@keyterms: @keyterms:
registered users, registration tqmask, registered user properties, registered users, registration mask, registered user properties,
user properties, notify property, avatar property user properties, notify property, avatar property
@body: @body:
[big]Introduction[/big][br] [big]Introduction[/big][br]
@ -59,7 +59,7 @@
are used to recognize the user on irc.[br] are used to recognize the user on irc.[br]
[br] [br]
[big]Registration masks[/big][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] The masks may contain '*' and '?' wildcards that match any portion of text.[br]
[b]*!*@*[/b][br] [b]*!*@*[/b][br]
[b]Pragma!*@*[/b][br] [b]Pragma!*@*[/b][br]
@ -69,33 +69,33 @@
[b]Pragma!~daemon@some.host.it[/b][br] [b]Pragma!~daemon@some.host.it[/b][br]
Are examples of valid registration masks.[br] Are examples of valid registration masks.[br]
The masks with wildcards can actually match more than a single user.[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] having root as username and coming from the host.com domain.[br]
For this reason putting wildcards in nicknames could become a problem 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 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 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] You will commonly use the following format:[br]
<nick>!*<username>@*.<host>.<top>[br] <nick>!*<username>@*.<host>.<top>[br]
or[br] or[br]
<nick>!*<username>@<number>.<number>.<number>.*[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] [br]
[big]Example of registration and lookups[/big] [big]Example of registration and lookups[/big]
Assume that you want to registere a friend of yours: Derek Riggs.[br] Assume that you want to registere a friend of yours: Derek Riggs.[br]
Derek often uses "Eddie" as his nickname Derek often uses "Eddie" as his nickname
"stranger" as username and has a dial-up connection that makes his IP address appear as "stranger" as username and has a dial-up connection that makes his IP address appear as
<variable-number>.somewhere.in.time.org.[br] <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] 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 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] 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] 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] 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 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] [br]
KVirc ties to be smart , and always find the most correct match for an user: 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, 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; 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()) for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
{ {
if(*m == tqmask)return m; if(*m == mask)return m;
} }
return 0; return 0;
} }
bool KviRegisteredUser::addMask(KviIrcMask * tqmask) bool KviRegisteredUser::addMask(KviIrcMask * mask)
{ {
if(findMask(*tqmask)) if(findMask(*mask))
{ {
delete tqmask; delete mask;
tqmask = 0; mask = 0;
return false; return false;
} }
m_pMaskList->append(tqmask); m_pMaskList->append(mask);
return true; return true;
} }
bool KviRegisteredUser::removeMask(KviIrcMask * tqmask) bool KviRegisteredUser::removeMask(KviIrcMask * mask)
{ {
if(!tqmask)return false; if(!mask)return false;
return m_pMaskList->removeRef(tqmask); 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()) 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; 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()) 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; return false;
} }
@ -359,9 +359,9 @@ KviRegisteredUser * KviRegisteredUserDataBase::getUser(const TQString & name)
return u; 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; int idx = 0;
for(KviRegisteredMask * m = l->first();m;m = l->next()) 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); 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())); __range_valid(u == m_pUserDict->find(u->name()));
KviRegisteredMaskList * l; KviRegisteredMaskList * l;
if(tqmask->hasWildNick()) if(mask->hasWildNick())
{ {
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next()) for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
{ {
if(*(m->tqmask()) == *tqmask) if(*(m->mask()) == *mask)
{ {
delete tqmask; delete mask;
tqmask = 0; mask = 0;
return m->user(); return m->user();
} }
} }
@ -396,44 +396,44 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
// masks with more info go first in the list // masks with more info go first in the list
l = m_pWildMaskList; l = m_pWildMaskList;
} else { } else {
l = m_pMaskDict->find(tqmask->nick()); l = m_pMaskDict->find(mask->nick());
if(l) if(l)
{ {
// FIXME: #warning "Here we could compare the host and username only: nick matches for sure" // FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
for(KviRegisteredMask * m = l->first();m;m = l->next()) for(KviRegisteredMask * m = l->first();m;m = l->next())
{ {
if(*(m->tqmask()) == *tqmask) if(*(m->mask()) == *mask)
{ {
delete tqmask; delete mask;
tqmask = 0; mask = 0;
return m->user(); return m->user();
} }
} }
// not found ...ok... add it // not found ...ok... add it
} else { } else {
// not found ...ok... add it // 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 = new KviRegisteredMaskList;
l->setAutoDelete(true); l->setAutoDelete(true);
if(!u->addMask(tqmask)) if(!u->addMask(mask))
{ {
debug(" Ops...got an incoherent regusers action...recovered ?"); debug(" Ops...got an incoherent regusers action...recovered ?");
delete l; delete l;
l = 0; l = 0;
} else { } else {
append_mask_to_list(l,u,tqmask); append_mask_to_list(l,u,mask);
m_pMaskDict->insert(tqmask->nick(),l); m_pMaskDict->insert(mask->nick(),l);
} }
return 0; return 0;
} }
} }
// Ok...add it // Ok...add it
if(!u->addMask(tqmask)) if(!u->addMask(mask))
{ {
debug("ops...got an incoherent regusers action...recovered ?"); debug("ops...got an incoherent regusers action...recovered ?");
return 0; // ops...already there ? return 0; // ops...already there ?
} }
append_mask_to_list(l,u,tqmask); append_mask_to_list(l,u,mask);
return 0; return 0;
} }
@ -488,9 +488,9 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name)
if(name.isEmpty()) return false; if(name.isEmpty()) return false;
KviRegisteredUser * u = m_pUserDict->find(name); KviRegisteredUser * u = m_pUserDict->find(name);
if(!u)return false; 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()); debug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data());
} }
emit(userRemoved(name)); emit(userRemoved(name));
@ -504,13 +504,13 @@ bool KviRegisteredUserDataBase::removeGroup(const TQString & name)
return true; return true;
} }
bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &tqmask) bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &mask)
{ {
// find the tqmask pointer // find the mask pointer
KviRegisteredMask * m = findExactMask(tqmask); KviRegisteredMask * m = findExactMask(mask);
// and remove it // and remove it
if(m){ if(m){
if(removeMaskByPointer(m->tqmask())) if(removeMaskByPointer(m->mask()))
{ {
return true; return true;
} }
@ -518,36 +518,36 @@ bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &tqmask)
return 0; return 0;
} }
bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask) bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * mask)
{ {
if(!tqmask) return 0; if(!mask) return 0;
if(tqmask->hasWildNick()) if(mask->hasWildNick())
{ {
// remove from the wild list // remove from the wild list
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next()) 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!) // ok..got it, remove from the list and from the user struct (user struct deletes it!)
emit(userChanged(tqmask->nick())); emit(userChanged(mask->nick()));
m->user()->removeMask(tqmask); // this one deletes m->tqmask() m->user()->removeMask(mask); // this one deletes m->mask()
m_pWildMaskList->removeRef(m); // this one deletes m m_pWildMaskList->removeRef(m); // this one deletes m
return true; return true;
} }
} }
// not found ...opz :) // not found ...opz :)
} else { } else {
KviRegisteredMaskList * l = m_pMaskDict->find(tqmask->nick()); KviRegisteredMaskList * l = m_pMaskDict->find(mask->nick());
if(l) if(l)
{ {
// FIXME: #warning "Here we could compare the host and username only: nick matches for sure" // FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
for(KviRegisteredMask * m = l->first();m;m = l->next()) 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)); 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 l->removeRef(m); // this one deletes m
if(l->count() == 0)m_pMaskDict->remove(nick); if(l->count() == 0)m_pMaskDict->remove(nick);
return true; 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 // first lookup the nickname in the maskDict
KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick()); KviRegisteredMaskList * l = m_pMaskDict->find(mask.nick());
if(l) if(l)
{ {
for(KviRegisteredMask *m = l->first();m;m = l->next()) 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 // not found....lookup the wild ones
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next()) 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 return 0; // no match at all
} }
@ -598,40 +598,40 @@ KviRegisteredMask * KviRegisteredUserDataBase::findMatchingMask(const TQString &
{ {
for(KviRegisteredMask *m = l->first();m;m = l->next()) 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 // not found....lookup the wild ones
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next()) 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 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(); if(m)return m->user();
return 0; return 0;
} }
KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &tqmask) KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &mask)
{ {
// first lookup the nickname in the maskDict // first lookup the nickname in the maskDict
if(tqmask.nick()=="") return 0; if(mask.nick()=="") return 0;
KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick()); KviRegisteredMaskList * l = m_pMaskDict->find(mask.nick());
if(l) if(l)
{ {
for(KviRegisteredMask *m = l->first();m;m = l->next()) 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 // not found....lookup the wild ones
for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next()) 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 return 0; // no match at all
} }
@ -674,8 +674,8 @@ void KviRegisteredUserDataBase::load(const TQString & filename)
u->setProperty(tmp,*(sdi.current())); u->setProperty(tmp,*(sdi.current()));
} else if(KviTQString::equalCSN("mask_",tmp,5)) } else if(KviTQString::equalCSN("mask_",tmp,5))
{ {
KviIrcMask * tqmask = new KviIrcMask(*(sdi.current())); KviIrcMask * mask = new KviIrcMask(*(sdi.current()));
addMask(u,tqmask); addMask(u,mask);
} else if(KviTQString::equalCI(tmp,"Group")) } else if(KviTQString::equalCI(tmp,"Group"))
{ {
u->setGroup(*(sdi.current())); u->setGroup(*(sdi.current()));
@ -722,9 +722,9 @@ void KviRegisteredUserDataBase::save(const TQString & filename)
{ {
TQString tmp; TQString tmp;
KviTQString::sprintf(tmp,"mask_%d",idx); KviTQString::sprintf(tmp,"mask_%d",idx);
TQString tqmask; TQString mask;
m->tqmask(tqmask,KviIrcMask::NickUserHost); m->mask(mask,KviIrcMask::NickUserHost);
cfg.writeEntry(tmp,tqmask); cfg.writeEntry(tmp,mask);
++idx; ++idx;
} }
cfg.writeEntry("Group",it.current()->group()); cfg.writeEntry("Group",it.current()->group());

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

@ -60,7 +60,7 @@
with /usr/arch/mp3/SonataArctica_SingInSilence_Live.mp3 as real file path , something like 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 "SonataArctica_SingInSilence.mp3". A remote user will then request you a DCC GET SonataArctica_SingInSilence.mp3
and KVIrc will automatically send the file.[br] 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, 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] *!*@*.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 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] use an additional "size" parameter in the DCC GET request.[br]
[big]Security issues[/big] [big]Security issues[/big]
This is a nice but unsecure method of sharing files.[br] 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] The user mask 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 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] 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 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] 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) 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) if(fo->wildcardCount() > 0)
{ {
// the one in the list has wildcards too... // 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 current has no wildcards...skip
} else { } else {
// the new tqmask has no wildcards.... // the new mask has no wildcards....
if(fo->wildcardCount() > 0) if(fo->wildcardCount() > 0)
{ {
// current one has wildcards...insert // 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); KviSharedFileList * l = m_pSharedListDict->find(szName);
if(!l)return 0; if(!l)return 0;
@ -283,10 +283,10 @@ KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,K
for(KviSharedFile * o = l->first();o;o = l->next()) for(KviSharedFile * o = l->first();o;o = l->next())
{ {
bool bMatch; bool bMatch;
if(tqmask) if(mask)
{ {
KviIrcMask umask(o->userMask()); KviIrcMask umask(o->userMask());
bMatch = tqmask->matchedBy(umask); bMatch = mask->matchedBy(umask);
} else bMatch = KviTQString::equalCS(o->userMask(),"*!*@*"); } else bMatch = KviTQString::equalCS(o->userMask(),"*!*@*");
if(bMatch) if(bMatch)
{ {

@ -84,7 +84,7 @@ private:
public: public:
void addSharedFile(KviSharedFile * f); void addSharedFile(KviSharedFile * f);
KviSharedFile * addSharedFile(const TQString &szName,const TQString &szAbsPath,const TQString &szMask,int timeoutInSecs); 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,const TQString &szMask,unsigned int uFileSize);
bool removeSharedFile(const TQString &szName,KviSharedFile * off); bool removeSharedFile(const TQString &szName,KviSharedFile * off);
void load(const TQString &filename); void load(const TQString &filename);

@ -98,7 +98,7 @@
// FieldData Variable FieldLen The data of the field, see below for defined values // FieldData Variable FieldLen The data of the field, see below for defined values
// FieldData for FieldType 1 (file field) // 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 // 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 // Size uint32 4 Size of the following file data
// FilePayload Bytes Variable // FilePayload Bytes Variable

@ -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; TQString szKey;
tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet); mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
szKey.append(TQChar('+')); szKey.append(TQChar('+'));
szKey.append(szNetwork); 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; TQString szKey;
tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet); mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
szKey.append(TQChar('+')); szKey.append(TQChar('+'));
szKey.append(szNetwork); 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; TQString szKey;
tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet); mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
szKey.append(TQChar('+')); szKey.append(TQChar('+'));
szKey.append(szNetwork); szKey.append(szNetwork);

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

@ -40,7 +40,7 @@
irc masks , nickname , username , hostname , wildcard irc masks , nickname , username , hostname , wildcard
@body: @body:
[big]Simple masks[/big][br] [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] The standard basic format is:[br]
[b]<nick>!<username>@<host>[/b][br] [b]<nick>!<username>@<host>[/b][br]
The <nick> part contains the nickname with that the user is widely known across the network.[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] 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] '*' 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 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] [b]*!*@*[/b][br]
that designates "any nickname, any username on any host".[br] that designates "any nickname, any username on any host".[br]
Here are some examples of wild masks:[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> * Retuns in szMask the specified (if possible) mask of this user.<br>
* If the host or username are not known , the tqmask may contain less information * If the host or username are not known , the mask may contain less information
* than requested.<br> * than requested.<br>
* Mask types:<br> * Mask types:<br>
* 0 : nick!user@machine.host.top (nick!user@XXX.XXX.XXX.XXX) (default)<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.*) * 25: nick!*user@*.host.top (nick!*user@XXX.XXX.*)
* 26: *!*user@*.host.top (*!user@*XXX.XXX.*) * 26: *!*user@*.host.top (*!user@*XXX.XXX.*)
* If some data is missing , these types may change:<br> * 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] = { static unsigned char maskTable[27][3] = {
{ 0 , 0 , 0 }, //0 means normal block { 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 , 0 , 1 }, //2 in the second field means *user (strip prefixes)
{ 0 , 1 , 0 }, //1 means * { 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 { 0 , 1 , 1 }, //4 in the third field is like 3 but tries to detect masked ip addresses too
{ 1 , 0 , 0 }, { 1 , 0 , 0 },
{ 1 , 0 , 2 }, { 1 , 0 , 2 },
@ -393,7 +393,7 @@ static unsigned char maskTable[27][3] = {
{ 1 , 2 , 4 } { 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; if((((int)eMaskType) > 26)||(((int)eMaskType) < 0))eMaskType = NickUserHost;
szMask = maskTable[((int)eMaskType)][0] ? m_szWild : m_szNick; 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; 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; return false;
@ -609,7 +609,7 @@ bool KviIrcMask::matchesFixed(const TQString &nick,const TQString &user,const TQ
return true; return true;
} }
//Internals for tqmask() //Internals for mask()
int KviIrcMask::getIpDomainMaskLen() const int KviIrcMask::getIpDomainMaskLen() const
{ {

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

@ -36,10 +36,10 @@ class KVILIB_API KviNickServRule : public KviHeapObject
{ {
protected: protected:
TQString m_szRegisteredNick; // my registered nickname 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_szMessageRegexp; // the NickServ message regexp
TQString m_szIdentifyCommand; // the IDENTIFY command to send to server 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: public:
KviNickServRule() : KviHeapObject() {}; KviNickServRule() : KviHeapObject() {};
KviNickServRule( KviNickServRule(

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

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

@ -31,7 +31,7 @@ class KVILIB_API KviTalFileDialog : public KFileDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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(); ~KviTalFileDialog();
public: public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly }; enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@ -40,11 +40,11 @@ public:
void setDirectory(const TQString &szDirectory); 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 :/ // TQFileDialog allows making new directories...kfiledialog not :/
return TQFileDialog::getExistingDirectory(dir,tqparent,0,caption); return TQFileDialog::getExistingDirectory(dir,parent,0,caption);
//return getExistingDirectory(dir,tqparent,caption); //return getExistingDirectory(dir,parent,caption);
}; };
}; };

@ -30,7 +30,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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(); ~KviTalFileDialog();
public: public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly }; enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@ -38,8 +38,8 @@ public:
void setFileMode(FileMode m); void setFileMode(FileMode m);
void setDirectory(const TQString &szDirectory); 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)
{ return getExistingDirectory(dir,tqparent,0 /* name */,caption); }; { return getExistingDirectory(dir,parent,0 /* name */,caption); };
}; };
#endif // _KVI_TAL_FILEDIALOG_TQT_H_ #endif // _KVI_TAL_FILEDIALOG_TQT_H_

@ -32,7 +32,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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(); ~KviTalFileDialog();
public: public:
enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly }; enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@ -40,8 +40,8 @@ public:
void setFileMode(FileMode m); void setFileMode(FileMode m);
void setDirectory(const TQString &szDirectory); 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)
{ return getExistingDirectory(tqparent,caption,dir); }; { return getExistingDirectory(parent,caption,dir); };
}; };
#endif // _KVI_TAL_FILEDIALOG_TQT_H_ #endif // _KVI_TAL_FILEDIALOG_TQT_H_

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

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

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

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

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

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

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

@ -72,7 +72,7 @@
void register_core_actions(KviActionManager * m) 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 KviSeparatorAction(m));
m->registerAction(new KviIrcContextDisplayAction(m)); m->registerAction(new KviIrcContextDisplayAction(m));
m->registerAction(new KviJoinChannelAction(m)); m->registerAction(new KviJoinChannelAction(m));

@ -107,11 +107,11 @@
} }
} }
Window root,tqparent; Window root,parent;
Window * tqchildren; Window * tqchildren;
unsigned int nChildren; 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); if(tqchildren)XFree((char *)tqchildren);
return 0; return 0;

@ -70,7 +70,7 @@
So for example, assume to register a frend of yours like Szymon:[br] So for example, assume to register a frend of yours like Szymon:[br]
[example] [example]
[cmd:reguser.add]reguser.add[/cmd] Szymon [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] [/example]
And then want it in the notify list; nothing easier, just set 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] 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] "Pragma [someuser@somehost.it] is on IRC".[br]
If Szymon uses often "[Pragma]" as his secondary nickname , you can do the following:[br] If Szymon uses often "[Pragma]" as his secondary nickname , you can do the following:[br]
[example] [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]" [cmd:reguser.setproperty]reguser.setproperty[/cmd] Szymon notify "Pragma [Pragma]"
[/example] [/example]
KVIrc will then look for both nicknames getting online.[br] 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)) if(KviUserListEntry * ent = m_pConsole->notifyListView()->findEntry(*s))
{ {
// the user was online from a previous notify session // 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)) if(KVI_OPTION_BOOL(KviOption_boolNotifyListSendUserhostForOnlineUsers))
{ {
// user wants to be sure about online users.... // 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 //l.append(s); // we will remove him from the list
} else { } else {
// the user was not online! // the user was not online!
// check if we have a cached tqmask // check if we have a cached mask
if(db) if(db)
{ {
if(KviIrcUserEntry * ue = db->find(*s)) 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()) 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()); KviIrcMask mk(*s,ue->user(),ue->host());
// lookup the user's name in the m_pRegUserDict // lookup the user's name in the m_pRegUserDict
if(!doMatchUser(*s,mk))return true; // critical problems = have to restart!!! 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!" // 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); TQString * nam = m_pRegUserDict->find(notifyString);
if(nam) if(nam)
@ -665,25 +665,25 @@ bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const Kv
if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam)) if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam))
{ {
// ok ... match the user // ok ... match the user
if(u->matchesFixed(tqmask)) if(u->matchesFixed(mask))
{ {
// new user online // 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 already online , and matching...all ok
} else { } else {
// not matched.... has he been online before ? // 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 // either reguserdb has changed , or the user went offline and another one got his nick
// in the meantime... (ugly situation anyway) // 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 { } else {
// has never been online // has never been online
if(_OUTPUT_VERBOSE) 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 { } else {
@ -784,7 +784,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg)
aux = kvi_extractToken(nk,aux,' '); aux = kvi_extractToken(nk,aux,' ');
if(nk.hasData()) if(nk.hasData())
{ {
// split it in a tqmask // split it in a mask
KviStr nick; KviStr nick;
KviStr user; KviStr user;
KviStr host; KviStr host;
@ -1146,7 +1146,7 @@ void KviWatchNotifyListManager::stop()
m_pRegUserDict->clear(); 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); TQString * nam = m_pRegUserDict->find(notifyString);
@ -1156,39 +1156,39 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &
if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam)) if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam))
{ {
// ok ... match the user // ok ... match the user
if(u->matchesFixed(tqmask)) if(u->matchesFixed(mask))
{ {
// new user online // 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 {
// else already online , and matching...all ok // else already online , and matching...all ok
if(msg->numeric() == RPL_NOWON) 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) // 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); __tr2qs("watch entry listing requested by user"),false);
} else { } else {
// This is a RPL_LOGON....we're desynched ? // 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); __tr2qs("possible watch list desync"),false);
} }
} }
} else { } else {
// not matched.... has he been online before ? // 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 // prolly the reguserdb has been changed
notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(), notifyOffLine(mask.nick(),mask.user(),mask.host(),
__tr2qs("registration tqmask changed or desync with the watch service")); __tr2qs("registration mask changed or desync with the watch service"));
} else { } else {
// has never been online // has never been online
if(_OUTPUT_VERBOSE) if(_OUTPUT_VERBOSE)
m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, 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)"), __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)"),
&(tqmask.nick()),&(tqmask.user()),&(tqmask.host())); &(mask.nick()),&(mask.user()),&(mask.host()));
} }
} }
} else { } else {
@ -1202,9 +1202,9 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &
} else { } else {
// not in our dictionary // not in our dictionary
// prolly someone used /WATCH behind our back... bad boy! // 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; return true;
@ -1263,7 +1263,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg)
if(_OUTPUT_VERBOSE) if(_OUTPUT_VERBOSE)
m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r is offline (watch)"),&dnk); m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r is offline (watch)"),&dnk);
} else { } 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")); notifyOffLine(dnk,dus,dho,__tr2qs("unmatched watch list entry"));
} }
} }

@ -110,7 +110,7 @@ private slots:
void buildNotifyList(); void buildNotifyList();
void sendIsOn(); void sendIsOn();
void sendUserhost(); 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 start();
virtual void stop(); virtual void stop();
virtual bool handleWatchReply(KviIrcMessage *msg); 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);
}; };

@ -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("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("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("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("MeBan",__tr_no_lookup("Ban matching my mask"),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("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 tqmask"),KVI_SMALLICON_MEBANEXCEPT,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 tqmask"),KVI_SMALLICON_MEBANUNEXCEPT,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 tqmask"),KVI_SMALLICON_MEINVITEEXCEPT,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 tqmask"),KVI_SMALLICON_MEINVITEUNEXCEPT,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("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("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), MSGTYPE_OPTION("SSL",__tr_no_lookup("SSL message"),KVI_SMALLICON_SSL,KVI_MSGTYPE_LEVEL_1),

@ -618,7 +618,7 @@ namespace KviKvsCoreCallbackCommands
Trigger <callback command> with "ping" events every <timeout> milliseconds. Trigger <callback command> with "ping" events every <timeout> milliseconds.
!sw: -w | --bind-to-window !sw: -w | --bind-to-window
Kill the process if the current window is closed. In this case the 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 If this switch is not used then the process is rebound to
the active console window and continues running. the active console window and continues running.
!sw: -s=<interpreter command> | --shell=<interpreter command> !sw: -s=<interpreter command> | --shell=<interpreter command>

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

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

@ -48,22 +48,22 @@ namespace KviKvsCoreFunctions
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
/* /*
@doc: tqmask @doc: mask
@type: @type:
function function
@title: @title:
$tqmask $mask
@short: @short:
Retrieves the host tqmask of a user Retrieves the host mask of a user
@syntax: @syntax:
$tqmask[(<nickname>[,<mask_type>])] $mask[(<nickname>[,<mask_type>])]
@description: @description:
Returns the specified type of tqmask for the user with <nickname>.[br] Returns the specified type of mask for the user with <nickname>.[br]
If the host or username are not known, the tqmask may contain less information If the host or username are not known, the mask may contain less information
than requested.[br] than requested.[br]
If the <nickname> is not given it is assumed to be the current nickname.[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] 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] 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] 1 : nick!user@*.abc.host.top (nick!user@XXX.XXX.XXX.*)[br]
2 : nick!user@*[br] 2 : nick!user@*[br]
@ -92,17 +92,17 @@ namespace KviKvsCoreFunctions
25: nick!*user@*.host.top (nick!*user@XXX.XXX.*)[br] 25: nick!*user@*.host.top (nick!*user@XXX.XXX.*)[br]
26: *!*user@*.host.top (*!user@*XXX.XXX.*)[br] 26: *!*user@*.host.top (*!user@*XXX.XXX.*)[br]
If some data is missing, these types may change:[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, If the user with <nickname> is not found in the current IRC context user database,
an empty string is returned.[br] 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 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 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: @examples:
@seealso: @seealso:
*/ */
KVSCF(tqmask) KVSCF(mask)
{ {
TQString szNick; TQString szNick;
kvs_uint_t maskType; kvs_uint_t maskType;
@ -127,7 +127,7 @@ namespace KviKvsCoreFunctions
u.setHost(e->host()); u.setHost(e->host());
TQString tmp; TQString tmp;
u.tqmask(tmp,(KviIrcMask::MaskType)maskType); u.mask(tmp,(KviIrcMask::MaskType)maskType);
KVSCF_pRetBuffer->setString(tmp); KVSCF_pRetBuffer->setString(tmp);
return true; return true;
} }
@ -260,7 +260,7 @@ namespace KviKvsCoreFunctions
$new(<className>,[<parentHandle> [,<name>[,<param>[,<param>[...]]]]) $new(<className>,[<parentHandle> [,<name>[,<param>[,<param>[...]]]])
@description: @description:
Creates a new instance of the object <class> with 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> <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] 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] Please see the [doc:objects]objects documentation[/doc] for more information.[br]
@ -300,7 +300,7 @@ namespace KviKvsCoreFunctions
pParent = KviKvsKernel::instance()->objectController()->lookupObject(hParent); pParent = KviKvsKernel::instance()->objectController()->lookupObject(hParent);
if(!pParent) 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; return false;
} }
} else { } else {

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

@ -94,7 +94,7 @@ namespace KviKvsCoreSimpleCommands
help run help run
help help help help
help index help index
help $tqmask help $mask
help /home/pragma/myfile.html help /home/pragma/myfile.html
[/example] [/example]
*/ */
@ -674,15 +674,15 @@ try_again:
@title: @title:
lusers lusers
@syntax: @syntax:
lusers [ <tqmask> [ <target> ] ] lusers [ <mask> [ <target> ] ]
@short: @short:
Requests statistics about users on IRC Requests statistics about users on IRC
@description: @description:
The LUSERS command is used to get statistics about the size of the 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 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 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] 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] This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br]
*/ */

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

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

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

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

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

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

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

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

@ -302,7 +302,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
if(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) if(pId2)
{ {
// base class object function call // base class object function call

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

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

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

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

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

@ -100,7 +100,7 @@ public:
bool unrecognized(){ return (m_iFlags & KVI_IRCMSG_FLAG_UNRECOGNIZED); }; bool unrecognized(){ return (m_iFlags & KVI_IRCMSG_FLAG_UNRECOGNIZED); };
void decodeAndSplitPrefix(TQString &szNick,TQString &szUser,TQString &szHost); 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_ #endif //_KVI_IRCMESSAGE_H_

@ -61,7 +61,7 @@
#define RPL_MAPEND 7 /* :End of /MAP [U] # */ #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 //[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. //[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] # */ #define RPL_STATMEMTOT 9 /* %u %u :Bytes Blocks [U] # */
@ -216,9 +216,9 @@
#define RPL_INVITING 341 /* [I,E,U,D] */ #define RPL_INVITING 341 /* [I,E,U,D] */
#define RPL_SUMMONING 342 /* [I,E,D] */ #define RPL_SUMMONING 342 /* [I,E,D] */
// RPL_????????? 343-345 // 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_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] # */ #define RPL_ENDOFEXCEPTLIST 349 /* "<channel> :End of Channel Exception List" [I] # */
// RPL_?????????? 350 // RPL_?????????? 350
#define RPL_VERSION 351 /* "%s.%s %s :%s" [I,E,U,D] # */ #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_KILLDONE 361 /* [I,E,U,D] */
#define RPL_CLOSING 362 /* [I,E,U,D] */ #define RPL_CLOSING 362 /* [I,E,U,D] */
#define RPL_CLOSEEND 363 /* [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_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_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_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_ENDOFWHOWAS 369 /* "%s :END of /WHOWAS" [I,E,U,D] # */
#define RPL_INFO 371 /* ":%s" [I,E,U,D] # */ #define RPL_INFO 371 /* ":%s" [I,E,U,D] # */

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

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

@ -72,7 +72,7 @@
void KviServerParser::parseNumeric001(KviIrcMessage *msg) void KviServerParser::parseNumeric001(KviIrcMessage *msg)
{ {
// 001: RPL_WELCOME // 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" // FIXME: #warning "SET THE USERMASK FROM SERVER"
TQString szText = msg->connection()->decodeText(msg->safeTrailing()); TQString szText = msg->connection()->decodeText(msg->safeTrailing());
TQRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" ); TQRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" );
@ -442,11 +442,11 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg)
char save = *aux; char save = *aux;
*aux = 0; *aux = 0;
// NAMESX + UHNAMES support // NAMESX + UHNAMES support
KviIrcMask tqmask(msg->connection()->decodeText(begin)); KviIrcMask mask(msg->connection()->decodeText(begin));
// and make it join // and make it join
if(!tqmask.nick().isEmpty())chan->join(tqmask.nick(), if(!mask.nick().isEmpty())chan->join(mask.nick(),
tqmask.hasUser() ? tqmask.user() : TQString(), mask.hasUser() ? mask.user() : TQString(),
tqmask.hasHost() ? tqmask.host() : TQString(), mask.hasHost() ? mask.host() : TQString(),
iFlags); iFlags);
*aux = ' '; *aux = ' ';
*aux = save; *aux = save;
@ -640,7 +640,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
void KviServerParser::__funcname(KviIrcMessage *msg) \ void KviServerParser::__funcname(KviIrcMessage *msg) \
{ \ { \
TQString szChan = msg->connection()->decodeText(msg->safeParam(1)); \ 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 bansetby = msg->connection()->decodeText(msg->safeParam(3)); \
TQString bansetat; \ TQString bansetat; \
getDateTimeStringFromCharTimeT(bansetat,msg->safeParam(4)); \ getDateTimeStringFromCharTimeT(bansetat,msg->safeParam(4)); \
@ -648,7 +648,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
KviChannel * chan = msg->connection()->findChannel(szChan); \ KviChannel * chan = msg->connection()->findChannel(szChan); \
if(chan) \ 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(chan->__sentRequest())return; \
} \ } \
if(!msg->haltOutput()) \ if(!msg->haltOutput()) \
@ -656,18 +656,18 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \ KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \
msg->console()->activeWindow() : (KviWindow *)(msg->console()); \ 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)"), \ 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] // 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")) PARSE_NUMERIC_LIST(parseNumericBanList,'b',sentBanListRequest,KVI_OUT_BAN,__tr2qs("Ban listing"))
// 346: RPL_INVITELIST [I,E,U,D] // 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")) PARSE_NUMERIC_LIST(parseNumericInviteList,'I',sentInviteListRequest,KVI_OUT_INVITEEXCEPT,__tr2qs("Invite listing"))
// 346: RPL_EXCEPTLIST [I,E,U,D] // 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")); 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) void KviServerParser::parseNumericLinks(KviIrcMessage *msg)
{ {
// 364: RPL_LINKS [I,E,U,D] // 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())) if(!(msg->console()->ircContext()->linksWindow()))
{ {
// attempt to load the module... // attempt to load the module...

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

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

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

@ -76,7 +76,7 @@
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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(); ~KviCryptController();
protected: protected:
KviWindow * m_pWindow; KviWindow * m_pWindow;

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

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

@ -37,8 +37,8 @@ extern KviMediaManager * g_pMediaManager;
KviFileDialog::KviFileDialog(const TQString &dirName, const TQString &filter, KviFileDialog::KviFileDialog(const TQString &dirName, const TQString &filter,
TQWidget *tqparent, const char *name, bool modal) TQWidget *parent, const char *name, bool modal)
: KviTalFileDialog(dirName,filter,tqparent,name,modal) : KviTalFileDialog(dirName,filter,parent,name,modal)
{ {
setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER))); 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 #ifdef COMPILE_ON_WINDOWS
if(showNative) 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); KviFileUtils::adjustFilePath(buffer);
return !buffer.isEmpty(); return !buffer.isEmpty();
} }
#endif #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->setCaption(caption);
d->setMode(TQFileDialog::ExistingFile); d->setMode(TQFileDialog::ExistingFile);
//d->setShowHiddenFiles(showHidden); //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 #ifdef COMPILE_ON_WINDOWS
if (showNative) if (showNative)
{ {
while (1) 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); KviFileUtils::adjustFilePath(buffer);
//return !buffer.isEmpty(); //return !buffer.isEmpty();
if(buffer.isEmpty()) return false; if(buffer.isEmpty()) return false;
@ -112,7 +112,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption
if(!KviFileUtils::fileExists(buffer)) return true; if(!KviFileUtils::fileExists(buffer)) return true;
TQString tmp; TQString tmp;
KviTQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data()); 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::Cancel: return false; break;
case TQMessageBox::Yes: return true; break; case TQMessageBox::Yes: return true; break;
@ -125,7 +125,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption
#endif #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->setCaption(caption);
d->setMode(TQFileDialog::AnyFile); d->setMode(TQFileDialog::AnyFile);
//d->setShowHiddenFiles(showHidden); //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 #ifdef COMPILE_ON_WINDOWS
if(showNative) 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(); return !buffer.isEmpty();
} }
#else #else
#ifdef COMPILE_KDE_SUPPORT #ifdef COMPILE_KDE_SUPPORT
// the KDE based dir selection dialog is now quite nice // 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(); return !buffer.isEmpty();
#endif #endif
#endif #endif
KviFileDialog * d = new KviFileDialog(initial, KviFileDialog * d = new KviFileDialog(initial,
filter,tqparent,"directory_name_dialog",true); filter,parent,"directory_name_dialog",true);
d->setCaption(caption); d->setCaption(caption);
d->setMode(TQFileDialog::Directory); d->setMode(TQFileDialog::Directory);
//d->setShowHiddenFiles(showHidden); //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 #ifdef COMPILE_ON_WINDOWS
if (showNative) 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); return (buffer.count()>0);
} }
#endif #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->setCaption(caption);
d->setMode(TQFileDialog::ExistingFiles); d->setMode(TQFileDialog::ExistingFiles);
//d->setShowHiddenFiles(showHidden); //d->setShowHiddenFiles(showHidden);

@ -41,14 +41,14 @@ class KVIRC_API KviFileDialog : public KviTalFileDialog
TQ_OBJECT TQ_OBJECT
public: public:
KviFileDialog(const TQString &dirName, const TQString &filter=TQString(), 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(); ~KviFileDialog();
public: 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 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* 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* 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 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* tqparent=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);
}; };

@ -1176,9 +1176,9 @@ bool KviFrame::focusNextPrevChild(bool next)
//TQVariant v = w->property("KviProperty_FocusOwner"); //TQVariant v = w->property("KviProperty_FocusOwner");
//if(v.isValid())return false; // Do NOT change the focus widget! //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! if(v.isValid())return false; // Do NOT change the focus widget!
} }
} }

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

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

@ -38,7 +38,7 @@ class KVIRC_API KviIpEditor : public TQFrame
TQ_OBJECT TQ_OBJECT
public: public:
enum AddressType { IpV4 , IpV6 }; 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(); ~KviIpEditor();
private: private:
TQLabel * m_pLabel[7]; TQLabel * m_pLabel[7];

@ -281,8 +281,8 @@ void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t *
// //
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviIrcView::KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd) KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
: TQWidget(tqparent,"irc_view") : TQWidget(parent,"irc_view")
{ {
// Ok...here we go // Ok...here we go
// initialize the initializable // initialize the initializable
@ -2920,7 +2920,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p)
//Calculate the position of the image //Calculate the position of the image
//imageYPos = curBottomCoord - (pixmapHeight(16) + ((m_iFontLineSpacing - 16)/2) ); //imageYPos = curBottomCoord - (pixmapHeight(16) + ((m_iFontLineSpacing - 16)/2) );
int imageYPos = curBottomCoord - m_iRelativePixmapY; int imageYPos = curBottomCoord - m_iRelativePixmapY;
//Set the tqmask if needed //Set the mask if needed
int iPixId = KVI_OPTION_MSGTYPE(pCurTextLine->iMsgType).pixId(); int iPixId = KVI_OPTION_MSGTYPE(pCurTextLine->iMsgType).pixId();
if(iPixId > 0) if(iPixId > 0)
pa.drawPixmap(KVI_IRCVIEW_HORIZONTAL_BORDER,imageYPos,*(g_pIconManager->getSmallIcon(iPixId))); pa.drawPixmap(KVI_IRCVIEW_HORIZONTAL_BORDER,imageYPos,*(g_pIconManager->getSmallIcon(iPixId)));
@ -3263,7 +3263,7 @@ no_selection_paint:
int wdth = block->block_width; int wdth = block->block_width;
if(wdth < 0)wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER); if(wdth < 0)wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER);
int imageYPos = curBottomCoord - m_iRelativePixmapY; int imageYPos = curBottomCoord - m_iRelativePixmapY;
//Set the tqmask if needed //Set the mask if needed
if(curBack != KVI_TRANSPARENT && curBack < 16) if(curBack != KVI_TRANSPARENT && curBack < 16)
{ {
pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack)); 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] 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] 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, 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>), 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] 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] Once the user interacts with the link , kvirc executes the predefined events:[br]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -87,8 +87,8 @@ class KVIRC_API KviStyledCheckBox : public TQCheckBox, public KviStyledControl
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviStyledCheckBox ( TQWidget * tqparent, const char * name = 0 ); KviStyledCheckBox ( TQWidget * parent, const char * name = 0 );
KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name = 0 ); KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name = 0 );
~KviStyledCheckBox(); ~KviStyledCheckBox();
protected: protected:
virtual void paintEvent ( TQPaintEvent * ); virtual void paintEvent ( TQPaintEvent * );
@ -101,8 +101,8 @@ class KVIRC_API KviStyledToolButton : public TQToolButton, public KviStyledContr
private: private:
bool bShowSubmenuIndicator; bool bShowSubmenuIndicator;
public: public:
KviStyledToolButton ( TQWidget * 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 * tqparent, 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(); ~KviStyledToolButton();
void setShowSubmenuIndicator(bool bShow); void setShowSubmenuIndicator(bool bShow);

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

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

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

@ -26,7 +26,7 @@ class KVIRC_API KviWindowToolWidget : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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(); ~KviWindowToolWidget();
void setAutoDelete(bool b) { m_bAutoDelete=b; }; void setAutoDelete(bool b) { m_bAutoDelete=b; };
@ -58,7 +58,7 @@ class KVIRC_API KviWindowToolPageButton : public TOOL_PAGE_PARENT
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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(); ~KviWindowToolPageButton();
/*protected: /*protected:
virtual void drawButton ( TQPainter * painter);*/ virtual void drawButton ( TQPainter * painter);*/

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

@ -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) KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown)
{ {
m_pListView = tqparent; m_pListView = parent;
m_szNick = nick; m_szNick = nick;
m_pGlobalData = e; m_pGlobalData = e;
m_iFlags = iFlags; 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) KviUserListView::KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name)
: KviWindowToolWidget(tqparent,button) : KviWindowToolWidget(parent,button)
{ {
setAutoDelete(0); setAutoDelete(0);
m_pKviWindow = pWnd; m_pKviWindow = pWnd;
@ -1476,7 +1476,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
// FIXME: // FIXME:
// //
// this is slow... VERY slow when one has a lot of registered users. // 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 // if we REALLY need to use custom colors for regged users then
// they should be updated ONCE and stored (cached) in the KviUserListEntry structure // they should be updated ONCE and stored (cached) in the KviUserListEntry structure
// //

@ -74,7 +74,7 @@ class KVIRC_API KviUserListEntry
friend class KviUserListView; friend class KviUserListView;
friend class KviUserListViewArea; friend class KviUserListViewArea;
public: 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(); ~KviUserListEntry();
protected: protected:
KviUserListView * m_pListView; KviUserListView * m_pListView;
@ -128,7 +128,7 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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(); ~KviUserListView();
protected: protected:
KviPointerHashTable<TQString,KviUserListEntry> * m_pEntryDict; KviPointerHashTable<TQString,KviUserListEntry> * m_pEntryDict;

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

@ -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) // 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; }; KviIrcView * view() const { return m_pIrcView; };
// The mdiParent widget: may be nulll if the window is undocked // 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 // The console that this window belongs to: may be null for windows that aren't bound to irc contexts
KviConsole * console(){ return m_pConsole; }; KviConsole * console(){ return m_pConsole; };
// same as above // same as above

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

@ -1029,21 +1029,21 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
@short: @short:
Returns an array of channel user nicknames Returns an array of channel user nicknames
@syntax: @syntax:
<array> $chan.users([window_id:string],[tqmask:string],[flags:string]) <array> $chan.users([window_id:string],[mask:string],[flags:string])
@description: @description:
Returns an array of nicknames on the channel specified by [window_id].[br] 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 [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 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 [mask] is given, each user is added to the array only
if it matches the [tqmask].[br] if it matches the [mask].[br]
[flags] may contain a subset of the letters "aovhnmi":[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'), "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 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] voiced and not half-operators). If none of the "ovhun" flags are used, KVIrc behaves like all five were passed.[br]
The flag 'm' causes the entire user masks to be added to the The flag 'm' causes the entire user masks to be added to the
array entries, as known by KVIrc at the moment of this function call.[br] 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] 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 [tqmask] is used): Please note that on really large channels this function may be time consuming (especially if [mask] is used):
use with care.[br] use with care.[br]
@example: @example:
[example] [example]
@ -1069,7 +1069,7 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
%test[] = $chan.users(,,o) %test[] = $chan.users(,,o)
echo %test[] echo %test[]
[comment]# Find all the voiced users that do NOT come from *.edu[/comment] [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) %test[] = $chan.users(,*!*@*.edu,vim)
echo %test[] echo %test[]
[/example] [/example]
@ -1081,7 +1081,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
TQString szWinId,szMask,szFlags; TQString szWinId,szMask,szFlags;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId) 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_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
@ -1108,7 +1108,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
if(bAddMask || bCheckFlags || bCheckMask) if(bAddMask || bCheckFlags || bCheckMask)
{ {
bool bMaskMustMatch = szFlags.find('i',false) == -1; bool bMaskMustMatch = szFlags.find('i',false) == -1;
KviIrcMask tqmask(szMask); KviIrcMask mask(szMask);
while(e) while(e)
{ {
@ -1116,34 +1116,34 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
{ {
if(bChanAdmins) if(bChanAdmins)
{ {
if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_tqmask; if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_mask;
} }
if(bOp) if(bOp)
{ {
if(e->flags() & KVI_USERFLAG_OP)goto check_tqmask; if(e->flags() & KVI_USERFLAG_OP)goto check_mask;
} }
if(bVoice) if(bVoice)
{ {
if(e->flags() & KVI_USERFLAG_VOICE)goto check_tqmask; if(e->flags() & KVI_USERFLAG_VOICE)goto check_mask;
} }
if(bHalfOp) if(bHalfOp)
{ {
if(e->flags() & KVI_USERFLAG_HALFOP)goto check_tqmask; if(e->flags() & KVI_USERFLAG_HALFOP)goto check_mask;
} }
if(bUserOp) if(bUserOp)
{ {
if(e->flags() & KVI_USERFLAG_USEROP)goto check_tqmask; if(e->flags() & KVI_USERFLAG_USEROP)goto check_mask;
} }
if(bNone) if(bNone)
{ {
if(!(e->flags() & KVI_USERFLAG_MASK))goto check_tqmask; if(!(e->flags() & KVI_USERFLAG_MASK))goto check_mask;
} }
goto next_item; goto next_item;
} }
check_tqmask: check_mask:
if(bCheckMask) 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; goto next_item;
} }
add_item: add_item:
@ -1311,12 +1311,12 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
@title: @title:
$chan.matchban $chan.matchban
@short: @short:
Matches a tqmask agains the channel ban list Matches a mask agains the channel ban list
@syntax: @syntax:
<string> $chan.matchban([window_id],<complete_tqmask>) <string> $chan.matchban([window_id],<complete_mask>)
@description: @description:
Returns the ban tqmask that matches <complete_tqmask> on channel identified by [window_id].[br] Returns the ban mask that matches <complete_mask> on channel identified by [window_id].[br]
If no ban tqmask matches <complete_tqmask> an empty string is returned.[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 [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] 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] 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; TQString szWinId,szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId) 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) KVSM_PARAMETERS_END(c)
KviChannel * ch = chan_kvs_find_channel(c,szWinId); KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@ -1360,12 +1360,12 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
@title: @title:
$chan.matchbanexception $chan.matchbanexception
@short: @short:
Matches a tqmask agains the channel ban exception list Matches a mask agains the channel ban exception list
@syntax: @syntax:
<string> $chan.matchbanexception([window_id],<complete_tqmask>) <string> $chan.matchbanexception([window_id],<complete_mask>)
@description: @description:
Returns the ban exception tqmask that matches <complete_tqmask> on channel identified by [window_id].[br] Returns the ban exception mask that matches <complete_mask> on channel identified by [window_id].[br]
If no ban exception tqmask matches <complete_tqmask> an empty string is returned.[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 [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] 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] 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; TQString szWinId,szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId) 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) KVSM_PARAMETERS_END(c)
KviChannel * ch = chan_kvs_find_channel(c,szWinId); KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@ -1409,12 +1409,12 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
@title: @title:
$chan.matchinvite $chan.matchinvite
@short: @short:
Matches a tqmask agains the channel invite list Matches a mask agains the channel invite list
@syntax: @syntax:
<string> $chan.matchinvite([window_id:string],<complete_tqmask>) <string> $chan.matchinvite([window_id:string],<complete_mask>)
@description: @description:
Returns the invite tqmask that matches <complete_tqmask> on channel identified by [window_id].[br] Returns the invite mask that matches <complete_mask> on channel identified by [window_id].[br]
If no invite tqmask matches <complete_tqmask> an empty string is returned.[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 [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] 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] 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; TQString szWinId,szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId) 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) KVSM_PARAMETERS_END(c)
KviChannel * ch = chan_kvs_find_channel(c,szWinId); KviChannel * ch = chan_kvs_find_channel(c,szWinId);

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

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

@ -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. 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 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] 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: @examples:
*/ */

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

@ -158,7 +158,7 @@ void KviDccRecvThread::postMessageEvent(const char * m)
{ {
KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE); KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
e->setData(new KviStr(m)); 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 // 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 // Received the whole file...die
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS); KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e); postEvent(parent(),e);
break; 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) // 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); KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e); postEvent(parent(),e);
break; 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) // 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")); postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc"));
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS); KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e); postEvent(parent(),e);
break; break;
} }
} }
@ -572,7 +572,7 @@ void KviDccSendThread::run()
if(iLastAck >= pFile->size()) if(iLastAck >= pFile->size())
{ {
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS); KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e); postEvent(parent(),e);
break; break;
} }
} else { } else {
@ -589,7 +589,7 @@ void KviDccSendThread::run()
// done...success // done...success
updateStats(); updateStats();
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS); KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e); postEvent(parent(),e);
break; break;
} else { } else {
if(readLen < 0) if(readLen < 0)
@ -598,7 +598,7 @@ void KviDccSendThread::run()
} else { } else {
KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE); 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"))); 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... // not in a tdcc: we can close the file...
updateStats(); updateStats();
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS); KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(tqparent(),e); postEvent(parent(),e);
break; break;
} else { } else {
// upload finished but we're waiting for the last ack // upload finished but we're waiting for the last ack

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

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

@ -147,7 +147,7 @@ void KviKvsCallbackMessageBox::done(int code)
<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed <magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
to the <callback_command> as positional parameters.[br] to the <callback_command> as positional parameters.[br]
If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour: 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 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 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] 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 -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 -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: 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 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] 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 <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 <magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
to the <callback_command> as positional parameters.[br] to the <callback_command> as positional parameters.[br]
If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour: 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 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 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] 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 <magic1>,<magic2>... are the magic parameters: evaluated at dialog.image call time and passed
to the <callback_command> as positional parameters.[br] to the <callback_command> as positional parameters.[br]
If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour: 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 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 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] and the magic parameters as positional parameters $1 , $2 , $3....[br]

@ -199,8 +199,8 @@ void KviDockWidget::createTaskbarIcon()
ICONINFO inf; ICONINFO inf;
g_pCurrentPixmap=new TQPixmap(*g_pDock1); g_pCurrentPixmap=new TQPixmap(*g_pDock1);
inf.hbmColor = g_pCurrentPixmap->hbm(); inf.hbmColor = g_pCurrentPixmap->hbm();
if(!g_pCurrentPixmap->tqmask())g_pCurrentPixmap->setMask(g_pCurrentPixmap->createHeuristicMask()); if(!g_pCurrentPixmap->mask())g_pCurrentPixmap->setMask(g_pCurrentPixmap->createHeuristicMask());
inf.hbmMask = g_pCurrentPixmap->tqmask()->hbm(); inf.hbmMask = g_pCurrentPixmap->mask()->hbm();
g_pCurrentIcon=CreateIconIndirect(&inf); g_pCurrentIcon=CreateIconIndirect(&inf);
NOTIFYICONDATA nid; NOTIFYICONDATA nid;
@ -229,8 +229,8 @@ void KviDockWidget::updateTaskbarIcon()
ICONINFO inf; ICONINFO inf;
TQPixmap* pix = m_bFlashed ? g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE) : g_pCurrentPixmap; TQPixmap* pix = m_bFlashed ? g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE) : g_pCurrentPixmap;
inf.hbmColor = pix->hbm(); inf.hbmColor = pix->hbm();
if(!pix->tqmask())pix->setMask(pix->createHeuristicMask()); if(!pix->mask())pix->setMask(pix->createHeuristicMask());
inf.hbmMask = pix->tqmask()->hbm(); inf.hbmMask = pix->mask()->hbm();
HICON hIcon=CreateIconIndirect(&inf); HICON hIcon=CreateIconIndirect(&inf);
NOTIFYICONDATA nid; NOTIFYICONDATA nid;
@ -719,7 +719,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
{ {
KviDockWidget * w= dockwidget_find(c->window()->frame()); KviDockWidget * w= dockwidget_find(c->window()->frame());
if(w)delete w; 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()) if(!c->window()->frame()->isVisible())
{ {
c->window()->frame()->show(); c->window()->frame()->show();

@ -550,7 +550,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
{ {
KviDockWidget * w= dockwidget_find(c->window()->frame()); KviDockWidget * w= dockwidget_find(c->window()->frame());
if(w)delete w; 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()) if(!c->window()->frame()->isVisible())
{ {
c->window()->frame()->show(); c->window()->frame()->show();

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

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

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

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

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

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

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

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

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

@ -47,7 +47,7 @@
[class]widget[/class] [class]widget[/class]
@description: @description:
This widget organizes buttons in a group. 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 You can either use a child tqlayout to manage the tqchildren geometries
or use $setColumnLayout function to manage the tqlayout automatically. or use $setColumnLayout function to manage the tqlayout automatically.
The class ineriths groupbox. The class ineriths groupbox.

@ -46,10 +46,10 @@
@description: @description:
Rappresents a dialog object. The class is really Rappresents a dialog object. The class is really
similar to the widget class, it has only a couple of minor differences. 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 A dialog is always a top-level widget, but if it has a parent, its default
location is centered on top of the tqparent. It will also share the tqparent's taskbar entry. 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: 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: @functions:
*/ */

@ -141,7 +141,7 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
return true; 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")); c->warning(__tr2qs("The added widget is not a child of this dock window"));
} }

@ -59,7 +59,7 @@ const int align_cod[] = {
[class]widget[/class] [class]widget[/class]
@description: @description:
This widget can be used to display a groupbox. 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 You can either use a child tqlayout to manage the tqchildren geometries
or use $setColumnLayout to manage the tqlayout automatically. or use $setColumnLayout to manage the tqlayout automatically.
@functions: @functions:

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

@ -55,7 +55,7 @@
The tqlayout is a tqgeometry management tool for child widgets. 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 You create a tqlayout , give it some widgets to manage and it will tqlayout them
automatically.[br] 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] 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] Widgets that must span multiple cells can be added to the tqlayout with [classfnc:tqlayout]$addMultiCellWidget[/classfnc]().[br]
@functions: @functions:
@ -80,12 +80,12 @@
!fn: $setMargin(<margin:uint>) !fn: $setMargin(<margin:uint>)
Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges. Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
!fn: $setResizeMode(<resize_mode:string>) !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] <mode> can be one of:[br]
-Auto: this is the default[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] -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 tqparent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br] -Minimum: the minimum size of the parent 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] -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) 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; return false;
} }
setObject(TQT_TQOBJECT(new TQGridLayout(w))); setObject(TQT_TQOBJECT(new TQGridLayout(w)));

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

@ -59,7 +59,7 @@
will add the items to the listview and simply deleting them will remove them. 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 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 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. 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 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 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); 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) :KviTalListView(par)
{ {
m_pParentScript=tqparent; m_pParentScript=parent;
setAcceptDrops(true); setAcceptDrops(true);
viewport()->setAcceptDrops( TRUE ); viewport()->setAcceptDrops( TRUE );

@ -46,7 +46,7 @@
The listviewitem class implements a list view item. 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]. 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] 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 You can set the text and a pixmap in each column and you can make it checkable
with [classfnc:listviewitem]$setCheckable[/classfnc](). with [classfnc:listviewitem]$setCheckable[/classfnc]().
A checkable listviewitem will display a small check mark in the first column. 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")) if(parentObject()->inherits("KviKvsObject_listview"))
m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)parentScriptWidget())); m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)parentScriptWidget()));
else { 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; return false;
} }
} }
@ -335,7 +335,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
if(bCheckable) if(bCheckable)
{ {
if(m_pListViewItem->rtti() == 1)return true; // a TQCheckListItem already 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(); KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
// swap the items, so we don't die now // swap the items, so we don't die now
KviTalListViewItem * pThis = m_pListViewItem; KviTalListViewItem * pThis = m_pListViewItem;
@ -347,7 +347,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pLV); m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pLV);
} else { } else {
if(m_pListViewItem->rtti() != 1)return true; // not a TQCheckListItem yet 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(); KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
// swap the items, so we don't die now // swap the items, so we don't die now
KviTalListViewItem * pThis = m_pListViewItem; KviTalListViewItem * pThis = m_pListViewItem;

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

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

@ -147,11 +147,11 @@ const int widgettypes_cod[] = {
If erase is TRUE, erases the widget before the $paintEvent() call. If erase is TRUE, erases the widget before the $paintEvent() call.
!fn: $x() !fn: $x()
Returns the x coordinate of the upper-left corner 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. or to the desktop if this widget is a toplevel one.
!fn: $y() !fn: $y()
Returns the y coordinate of the uspper-left corner 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. or to the desktop if this widget is a toplevel one.
!fn: $width() !fn: $width()
Returns the width of this widget in pixels. Returns the width of this widget in pixels.
@ -162,7 +162,7 @@ const int widgettypes_cod[] = {
x, y, width, height. x, y, width, height.
!fn: $setGeometry(<x_or_array>,[<y>,<width>,<heigth>]) !fn: $setGeometry(<x_or_array>,[<y>,<width>,<heigth>])
Sets the tqgeometry of this widget. <x> and <y> are relative Sets the tqgeometry of this widget. <x> and <y> are relative
to the tqparent widget or to the desktop (if this widget is to the parent widget or to the desktop (if this widget is
a toplevel one). All the parameters are in pixels. a toplevel one). All the parameters are in pixels.
!fn: $setMinimumWidth(<value>) !fn: $setMinimumWidth(<value>)
Sets the minimum width of this widget to <value>. Sets the minimum width of this widget to <value>.
@ -182,7 +182,7 @@ const int widgettypes_cod[] = {
value. This value is also used by the [class:tqlayout]tqlayout class[/class]. value. This value is also used by the [class:tqlayout]tqlayout class[/class].
!fn: $move(<x_or_array>[,<y>]) !fn: $move(<x_or_array>[,<y>])
Moves this widget to the coordinate <x> and <y> relative to its Moves this widget to the coordinate <x> and <y> relative to its
tqparent widget (or the desktop if this widget is a toplevel one). parent widget (or the desktop if this widget is a toplevel one).
This is equivalent to [classfnc]$setGeometry[/classfnc](<x>,<y>, This is equivalent to [classfnc]$setGeometry[/classfnc](<x>,<y>,
[classfnc]$width[/classfnc](),[classfnc]$height[/classfnc]()). [classfnc]$width[/classfnc](),[classfnc]$height[/classfnc]()).
!fn: $resize(<w_or_array>,[height]) !fn: $resize(<w_or_array>,[height])
@ -212,10 +212,10 @@ const int widgettypes_cod[] = {
See also [classfnc]$show[/classfnc]() and [classfnc]$hide[/classfnc](). See also [classfnc]$show[/classfnc]() and [classfnc]$hide[/classfnc]().
!fn: $raise() !fn: $raise()
Moves this widget to the top of the stack of the widgets relative Moves this widget to the top of the stack of the widgets relative
to its tqparent. See also [classfnc]$lower[/classfnc]. to its parent. See also [classfnc]$lower[/classfnc].
!fn: $lower() !fn: $lower()
Moves this widget to the bottom of the stack of the widgets relative Moves this widget to the bottom of the stack of the widgets relative
to its tqparent. See also [classfnc]$raise[/classfnc] to its parent. See also [classfnc]$raise[/classfnc]
!fn: $hasFocus() !fn: $hasFocus()
Returns '1' if this widget has the keyboard focus. Returns '1' if this widget has the keyboard focus.
See also [classfnc]$setFocus[/classfnc]. See also [classfnc]$setFocus[/classfnc].
@ -223,7 +223,7 @@ const int widgettypes_cod[] = {
Sets this widget to be the one that receives keyboard events. Sets this widget to be the one that receives keyboard events.
See also [classfnc]$hasFocus[/classfnc] See also [classfnc]$hasFocus[/classfnc]
!fn: $parentWidget() !fn: $parentWidget()
Returns the object id of the tqparent widget, or '0' if this Returns the object id of the parent widget, or '0' if this
widget is a toplevel one. widget is a toplevel one.
!fn: $backgroundColor() !fn: $backgroundColor()
Returns the background color of this widget in hexadecimal Returns the background color of this widget in hexadecimal
@ -1708,12 +1708,12 @@ bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c)
} }
TQPixmap * pm=((KviKvsObject_pixmap *)obj)->getPixmap(); TQPixmap * pm=((KviKvsObject_pixmap *)obj)->getPixmap();
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
TQBitmap tqmask(pm->tqmask()); TQBitmap mask(pm->mask());
#else #else
TQBitmap tqmask(*pm->tqmask()); TQBitmap mask(*pm->mask());
#endif #endif
if (tqmask.isNull()) c->warning(__tr2qs("Null tqmask")); if (mask.isNull()) c->warning(__tr2qs("Null mask"));
widget()->setMask(tqmask); widget()->setMask(mask);
return true; return true;
} }
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4

@ -87,9 +87,9 @@ void KviKvsScriptWindowWindow::centralWidgetDestroyed()
[class]widget[/class] [class]widget[/class]
@description: @description:
This class rappresents a MDI window in a KVIrc frame. This class rappresents a MDI window in a KVIrc frame.
Regardless of the tqparent object passed, the window will be always Regardless of the parent object passed, the window will be always
a "physical" child of the frame window: you can't embed a window object a "physical" child of the frame window: you can't embed a window object
inside a widget or another window. The tqparent object will just "own" this inside a widget or another window. The parent object will just "own" this
window object and eventually destroy it when it dies. window object and eventually destroy it when it dies.
This class can manage only a single central child widget that must This class can manage only a single central child widget that must
be set with $setCentralWidget(). be set with $setCentralWidget().

@ -340,10 +340,10 @@ void KviKvsObject_wizard::backClicked()
KviKvsVariantList *params=0; KviKvsVariantList *params=0;
callFunction(this,"backClickedEvent",params); callFunction(this,"backClickedEvent",params);
} }
KviKvsMdmWizard::KviKvsMdmWizard(TQWidget * par,const char * name,KviKvsObject_wizard * tqparent) KviKvsMdmWizard::KviKvsMdmWizard(TQWidget * par,const char * name,KviKvsObject_wizard * parent)
:KviTalWizard(par) :KviTalWizard(par)
{ {
m_pParentScript=tqparent; m_pParentScript=parent;
connect (this->backButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotBackClicked())); connect (this->backButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotBackClicked()));
connect (this->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextClicked())); connect (this->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextClicked()));
} }

@ -86,7 +86,7 @@
#include "class_dockwindow.h" #include "class_dockwindow.h"
#include "class_vbox.h" #include "class_vbox.h"
#include "class_hbox.h" #include "class_hbox.h"
static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx); static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);
static bool objects_module_cleanup(KviModule *m) static bool objects_module_cleanup(KviModule *m)
{ {
@ -910,10 +910,10 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
return true; return true;
} }
static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx) static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
{ {
#ifdef COMPILE_USE_QT4 #ifdef COMPILE_USE_QT4
const TQObjectList list = tqparent->tqchildren(); const TQObjectList list = parent->tqchildren();
if( !list.count() ) return; if( !list.count() ) return;
TQString sp(spacing); TQString sp(spacing);
sp.append(">"); sp.append(">");
@ -942,7 +942,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *sp
} }
#else #else
const TQObjectList l = tqparent->childrenListObject(); const TQObjectList l = parent->childrenListObject();
if( l.isEmpty() ) return; if( l.isEmpty() ) return;
TQObjectListIt it(l); TQObjectListIt it(l);
TQString sp(spacing); TQString sp(spacing);

@ -94,7 +94,7 @@ void KviOptionsWidgetContainer::closeEvent(TQCloseEvent *e)
void KviOptionsWidgetContainer::showEvent(TQShowEvent *e) void KviOptionsWidgetContainer::showEvent(TQShowEvent *e)
{ {
if(tqparent() == 0) if(parent() == 0)
{ {
move((g_pApp->desktop()->width() - width()) / 2, move((g_pApp->desktop()->width() - width()) / 2,
(g_pApp->desktop()->height() - height()) / 2); (g_pApp->desktop()->height() - height()) / 2);

@ -61,8 +61,8 @@ extern KviPointerHashTable<TQString,KviOptionsDialog> * g_pOptionsDialogDict;
extern KVIRC_API KviApp * g_pApp; extern KVIRC_API KviApp * g_pApp;
extern KviOptionsInstanceManager * g_pOptionsInstanceManager; extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText) KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,const TQString &szText)
:KviOptionsWidget(tqparent,"general_options_front_widget") :KviOptionsWidget(parent,"general_options_front_widget")
{ {
createLayout(1,1); createLayout(1,1);
TQLabel * l = new TQLabel(szText,this); TQLabel * l = new TQLabel(szText,this);
@ -80,8 +80,8 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e) KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e)
:KviTalListViewItem(tqparent,e->szName) :KviTalListViewItem(parent,e->szName)
{ {
m_pInstanceEntry = e; m_pInstanceEntry = e;
m_pOptionsWidget = 0; m_pOptionsWidget = 0;
@ -89,8 +89,8 @@ KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptio
setPixmap(0,*(g_pIconManager->getSmallIcon(e->iIcon))); setPixmap(0,*(g_pIconManager->getSmallIcon(e->iIcon)));
} }
KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e) KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e)
:KviTalListViewItem(tqparent,e->szName) :KviTalListViewItem(parent,e->szName)
{ {
m_pInstanceEntry = e; m_pInstanceEntry = e;
m_pOptionsWidget = 0; m_pOptionsWidget = 0;
@ -272,7 +272,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
fillListView(0,g_pOptionsInstanceManager->instanceEntryTree(),szGroup); fillListView(0,g_pOptionsInstanceManager->instanceEntryTree(),szGroup);
if(!tqparent()) if(!parent())
{ {
if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5) if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5)
@ -293,7 +293,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
KviOptionsDialog::~KviOptionsDialog() KviOptionsDialog::~KviOptionsDialog()
{ {
if(!tqparent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = TQRect(pos().x(),pos().y(), if(!parent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = TQRect(pos().x(),pos().y(),
size().width(),size().height()); size().width(),size().height());
if(g_pOptionsDialogDict) if(g_pOptionsDialogDict)
g_pOptionsDialogDict->remove(m_szGroup); g_pOptionsDialogDict->remove(m_szGroup);
@ -378,8 +378,8 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
font.setUnderline(bOk); font.setUnderline(bOk);
pWidget->setFont(font); pWidget->setFont(font);
// if there is a TQTabWidget in the tqparent chain, signal it in the tab text // if there is a TQTabWidget in the parent chain, signal it in the tab text
TQObject * pParent = pWidget->tqparent(); TQObject * pParent = pWidget->parent();
while(pParent) while(pParent)
{ {
if(pParent->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) if(pParent->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
@ -387,13 +387,13 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
pTabWidgetToMark = (TQTabWidget *)pParent; pTabWidgetToMark = (TQTabWidget *)pParent;
break; break;
} }
pParent = pParent->tqparent(); pParent = pParent->parent();
} }
if(pTabWidgetToMark) if(pTabWidgetToMark)
{ {
// lookup the KviOptionsWidget tqparent // lookup the KviOptionsWidget parent
pParent = pWidget->tqparent(); pParent = pWidget->parent();
while(pParent) while(pParent)
{ {
if(pParent->inherits("KviOptionsWidget")) if(pParent->inherits("KviOptionsWidget"))
@ -408,7 +408,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
} }
break; break;
} }
pParent = pParent->tqparent(); pParent = pParent->parent();
} }
} }
} }
@ -549,13 +549,13 @@ void KviOptionsDialog::listViewItemSelectionChanged(KviTalListViewItem *it)
if(it) if(it)
{ {
TQString str = it->text(0); TQString str = it->text(0);
KviTalListViewItem * par = it->tqparent(); KviTalListViewItem * par = it->parent();
while(par) while(par)
{ {
str.prepend(" :: "); str.prepend(" :: ");
str.prepend(par->text(0)); str.prepend(par->text(0));
par = par->tqparent(); par = par->parent();
} }
str.prepend("<b>"); str.prepend("<b>");
str += "</b>"; str += "</b>";

@ -44,15 +44,15 @@ class KviGeneralOptionsFrontWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText); KviGeneralOptionsFrontWidget(TQWidget *parent,const TQString &szText);
~KviGeneralOptionsFrontWidget(); ~KviGeneralOptionsFrontWidget();
}; };
class KviOptionsListViewItem : public KviTalListViewItem class KviOptionsListViewItem : public KviTalListViewItem
{ {
public: public:
KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e); KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e);
KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e); KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e);
~KviOptionsListViewItem(); ~KviOptionsListViewItem();
public: public:
KviOptionsWidgetInstanceEntry * m_pInstanceEntry; KviOptionsWidgetInstanceEntry * m_pInstanceEntry;

@ -76,409 +76,409 @@
int g_iOptionWidgetInstances = 0; int g_iOptionWidgetInstances = 0;
KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviAntispamOptionsWidget(tqparent); return new KviAntispamOptionsWidget(parent);
} }
KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviAvatarAdvancedOptionsWidget(tqparent); return new KviAvatarAdvancedOptionsWidget(parent);
} }
KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviAwayOptionsWidget(tqparent); return new KviAwayOptionsWidget(parent);
} }
KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviConnectionOptionsWidget(tqparent); return new KviConnectionOptionsWidget(parent);
} }
KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviConnectionAdvancedOptionsWidget(tqparent); return new KviConnectionAdvancedOptionsWidget(parent);
} }
KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviSSLOptionsWidget(tqparent); return new KviSSLOptionsWidget(parent);
} }
KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTransportOptionsWidget(tqparent); return new KviTransportOptionsWidget(parent);
} }
KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIdentOptionsWidget(tqparent); return new KviIdentOptionsWidget(parent);
} }
KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviCtcpOptionsWidget(tqparent); return new KviCtcpOptionsWidget(parent);
} }
KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviCtcpFloodProtectionOptionsWidget(tqparent); return new KviCtcpFloodProtectionOptionsWidget(parent);
} }
KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviDccOptionsWidget(tqparent); return new KviDccOptionsWidget(parent);
} }
KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviDccGeneralOptionsWidget(tqparent); return new KviDccGeneralOptionsWidget(parent);
} }
KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviDccAdvancedOptionsWidget(tqparent); return new KviDccAdvancedOptionsWidget(parent);
} }
KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviDccSendOptionsWidget(tqparent); return new KviDccSendOptionsWidget(parent);
} }
KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviDccSendGeneralOptionsWidget(tqparent); return new KviDccSendGeneralOptionsWidget(parent);
} }
KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviDccSendAdvancedOptionsWidget(tqparent); return new KviDccSendAdvancedOptionsWidget(parent);
} }
KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviDccChatOptionsWidget(tqparent); return new KviDccChatOptionsWidget(parent);
} }
KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviDccVoiceOptionsWidget(tqparent); return new KviDccVoiceOptionsWidget(parent);
} }
KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviGeneralOptOptionsWidget(tqparent); return new KviGeneralOptOptionsWidget(parent);
} }
KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviAlertHighlightingOptionsWidget(tqparent); return new KviAlertHighlightingOptionsWidget(parent);
} }
KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviHighlightingOptionsWidget(tqparent); return new KviHighlightingOptionsWidget(parent);
} }
KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviAlertOptionsWidget(tqparent); return new KviAlertOptionsWidget(parent);
} }
KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIdentityOptionsWidget(tqparent); return new KviIdentityOptionsWidget(parent);
} }
KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIdentityGeneralOptionsWidget(tqparent); return new KviIdentityGeneralOptionsWidget(parent);
} }
KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIdentityAvatarOptionsWidget(tqparent); return new KviIdentityAvatarOptionsWidget(parent);
} }
KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIdentityAdvancedOptionsWidget(tqparent); return new KviIdentityAdvancedOptionsWidget(parent);
} }
KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIgnoreOptionsWidget(tqparent); return new KviIgnoreOptionsWidget(parent);
} }
KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviInputLookOptionsWidget(tqparent); return new KviInputLookOptionsWidget(parent);
} }
KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviInputFeaturesOptionsWidget(tqparent); return new KviInputFeaturesOptionsWidget(parent);
} }
KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviInterfaceFeaturesOptionsWidget(tqparent); return new KviInterfaceFeaturesOptionsWidget(parent);
} }
KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviThemeGeneralOptionsWidget(tqparent); return new KviThemeGeneralOptionsWidget(parent);
} }
KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviThemeTransparencyOptionsWidget(tqparent); return new KviThemeTransparencyOptionsWidget(parent);
} }
KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviThemeMdiCaptionsOptionsWidget(tqparent); return new KviThemeMdiCaptionsOptionsWidget(parent);
} }
KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviThemeMdiAreaOptionsWidget(tqparent); return new KviThemeMdiAreaOptionsWidget(parent);
} }
KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviThemeToolBarAppletsOptionsWidget(tqparent); return new KviThemeToolBarAppletsOptionsWidget(parent);
} }
KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIrcOptionsWidget(tqparent); return new KviIrcOptionsWidget(parent);
} }
KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIrcGeneralOptionsWidget(tqparent); return new KviIrcGeneralOptionsWidget(parent);
} }
KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIrcAdvancedOptionsWidget(tqparent); return new KviIrcAdvancedOptionsWidget(parent);
} }
KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviChannelOptionsWidget(tqparent); return new KviChannelOptionsWidget(parent);
} }
KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviChannelGeneralOptionsWidget(tqparent); return new KviChannelGeneralOptionsWidget(parent);
} }
KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviChannelAdvancedOptionsWidget(tqparent); return new KviChannelAdvancedOptionsWidget(parent);
} }
KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIrcOutputOptionsWidget(tqparent); return new KviIrcOutputOptionsWidget(parent);
} }
KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIrcViewThemeOptionsWidget(tqparent); return new KviIrcViewThemeOptionsWidget(parent);
} }
KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIrcViewLookOptionsWidget(tqparent); return new KviIrcViewLookOptionsWidget(parent);
} }
KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviIrcViewFeaturesOptionsWidget(tqparent); return new KviIrcViewFeaturesOptionsWidget(parent);
} }
KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviLagOptionsWidget(tqparent); return new KviLagOptionsWidget(parent);
} }
KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviLoggingOptionsWidget(tqparent); return new KviLoggingOptionsWidget(parent);
} }
KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviMediaTypesOptionsWidget(tqparent); return new KviMediaTypesOptionsWidget(parent);
} }
KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviMessageOptionsWidget(tqparent); return new KviMessageOptionsWidget(parent);
} }
KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviPrivmsgOptionsWidget(tqparent); return new KviPrivmsgOptionsWidget(parent);
} }
KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTimestampOptionsWidget(tqparent); return new KviTimestampOptionsWidget(parent);
} }
KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviMessageColorsOptionsWidget(tqparent); return new KviMessageColorsOptionsWidget(parent);
} }
KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviStandardColorsOptionsWidget(tqparent); return new KviStandardColorsOptionsWidget(parent);
} }
KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviNickServOptionsWidget(tqparent); return new KviNickServOptionsWidget(parent);
} }
KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviNotifyOptionsWidget(tqparent); return new KviNotifyOptionsWidget(parent);
} }
KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviNotifierOptionsWidget(tqparent); return new KviNotifierOptionsWidget(parent);
} }
KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviProtectionOptionsWidget(tqparent); return new KviProtectionOptionsWidget(parent);
} }
KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviProxyOptionsWidget(tqparent); return new KviProxyOptionsWidget(parent);
} }
KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviQueryOptionsWidget(tqparent); return new KviQueryOptionsWidget(parent);
} }
KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviServerOptionsWidget(tqparent); return new KviServerOptionsWidget(parent);
} }
KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviSoundOptionsWidget(tqparent); return new KviSoundOptionsWidget(parent);
} }
KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviSoundGeneralOptionsWidget(tqparent); return new KviSoundGeneralOptionsWidget(parent);
} }
KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviSoundsOptionsWidget(tqparent); return new KviSoundsOptionsWidget(parent);
} }
KviOptionsWidget * classKviTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTaskBarOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTaskBarOptionsWidget(tqparent); return new KviTaskBarOptionsWidget(parent);
} }
KviOptionsWidget * classKviTreeTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTreeTaskBarOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTreeTaskBarOptionsWidget(tqparent); return new KviTreeTaskBarOptionsWidget(parent);
} }
KviOptionsWidget * classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTreeTaskBarForegroundOptionsWidget(tqparent); return new KviTreeTaskBarForegroundOptionsWidget(parent);
} }
KviOptionsWidget * classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTreeTaskBarBackgroundOptionsWidget(tqparent); return new KviTreeTaskBarBackgroundOptionsWidget(parent);
} }
KviOptionsWidget * classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTreeTaskBarFeaturesOptionsWidget(tqparent); return new KviTreeTaskBarFeaturesOptionsWidget(parent);
} }
KviOptionsWidget * classKviClassicTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviClassicTaskBarOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviClassicTaskBarOptionsWidget(tqparent); return new KviClassicTaskBarOptionsWidget(parent);
} }
KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTextEncodingOptionsWidget(tqparent); return new KviTextEncodingOptionsWidget(parent);
} }
KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTextIconsOptionsWidget(tqparent); return new KviTextIconsOptionsWidget(parent);
} }
KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviToolsOptionsWidget(tqparent); return new KviToolsOptionsWidget(parent);
} }
KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTopicLabelLookOptionsWidget(tqparent); return new KviTopicLabelLookOptionsWidget(parent);
} }
KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviTrayOptionsWidget(tqparent); return new KviTrayOptionsWidget(parent);
} }
KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviUParserOptionsWidget(tqparent); return new KviUParserOptionsWidget(parent);
} }
KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviUrlHandlersOptionsWidget(tqparent); return new KviUrlHandlersOptionsWidget(parent);
} }
KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviUserListLookOptionsWidget(tqparent); return new KviUserListLookOptionsWidget(parent);
} }
KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviUserListLookBackgroundOptionsWidget(tqparent); return new KviUserListLookBackgroundOptionsWidget(parent);
} }
KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviUserListLookForegroundOptionsWidget(tqparent); return new KviUserListLookForegroundOptionsWidget(parent);
} }
KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviUserListGridOptionsWidget(tqparent); return new KviUserListGridOptionsWidget(parent);
} }
KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent) KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
{ {
return new KviUserListFeaturesOptionsWidget(tqparent); return new KviUserListFeaturesOptionsWidget(parent);
} }
@ -3460,10 +3460,10 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
{ {
if(e->pWidget) if(e->pWidget)
{ {
if(e->pWidget->tqparent()->inherits("KviOptionsWidgetContainer")) if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
{ {
disconnect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); disconnect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
delete e->pWidget->tqparent(); delete e->pWidget->parent();
e->pWidget = 0; e->pWidget = 0;
} else { } else {
debug("Ops...i have deleted the options dialog ?"); debug("Ops...i have deleted the options dialog ?");
@ -3504,9 +3504,9 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
g_iOptionWidgetInstances++; g_iOptionWidgetInstances++;
connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
} }
if(TQT_BASE_OBJECT(e->pWidget->tqparent()) != TQT_BASE_OBJECT(par)) if(TQT_BASE_OBJECT(e->pWidget->parent()) != TQT_BASE_OBJECT(par))
{ {
TQWidget * oldPar = (TQWidget *)e->pWidget->tqparent(); TQWidget * oldPar = (TQWidget *)e->pWidget->parent();
e->pWidget->reparent(par,TQPoint(0,0)); e->pWidget->reparent(par,TQPoint(0,0));
delete oldPar; delete oldPar;
} }

@ -103,12 +103,12 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
{ {
if(c->hasSwitch('t',"toplevel")) if(c->hasSwitch('t',"toplevel"))
{ {
if(d->tqparent()) if(d->parent())
{ {
d->reparent(0,TQPoint(0,0),true); d->reparent(0,TQPoint(0,0),true);
} }
} else { } else {
if(TQT_BASE_OBJECT(d->tqparent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter())) if(TQT_BASE_OBJECT(d->parent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter()))
{ {
d->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true); d->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true);
} }

@ -160,9 +160,9 @@ EOF
for aclass in $CLASS_LIST; do for aclass in $CLASS_LIST; do
echo -n "KviOptionsWidget * class$aclass" >> $TARGET echo -n "KviOptionsWidget * class$aclass" >> $TARGET
echo "_createInstanceProc(QWidget * tqparent)" >> $TARGET echo "_createInstanceProc(QWidget * parent)" >> $TARGET
echo "{" >> $TARGET echo "{" >> $TARGET
echo " return new $aclass(tqparent);" >> $TARGET echo " return new $aclass(parent);" >> $TARGET
echo "}" >> $TARGET echo "}" >> $TARGET
echo "" >> $TARGET echo "" >> $TARGET
done done
@ -308,10 +308,10 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
{ {
if(e->pWidget) if(e->pWidget)
{ {
if(e->pWidget->tqparent()->inherits("KviOptionsWidgetContainer")) if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
{ {
disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
delete e->pWidget->tqparent(); delete e->pWidget->parent();
e->pWidget = 0; e->pWidget = 0;
} else { } else {
debug("Ops...i have deleted the options dialog ?"); debug("Ops...i have deleted the options dialog ?");
@ -352,9 +352,9 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
g_iOptionWidgetInstances++; g_iOptionWidgetInstances++;
connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
} }
if(e->pWidget->tqparent() != par) if(e->pWidget->parent() != par)
{ {
QWidget * oldPar = (QWidget *)e->pWidget->tqparent(); QWidget * oldPar = (QWidget *)e->pWidget->parent();
e->pWidget->reparent(par,QPoint(0,0)); e->pWidget->reparent(par,QPoint(0,0));
delete oldPar; delete oldPar;
} }

@ -31,8 +31,8 @@
KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * tqparent) KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"antispam_options_widget") : KviOptionsWidget(parent,"antispam_options_widget")
{ {
createLayout(3,1); createLayout(3,1);

@ -33,7 +33,7 @@ class KviAntispamOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviAntispamOptionsWidget(TQWidget * tqparent); KviAntispamOptionsWidget(TQWidget * parent);
~KviAntispamOptionsWidget(); ~KviAntispamOptionsWidget();
protected: protected:
KviBoolSelector * m_b1; KviBoolSelector * m_b1;

@ -30,8 +30,8 @@
#include "kvi_tal_tooltip.h" #include "kvi_tal_tooltip.h"
KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * tqparent) KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"avatar_advanced_options_widget") : KviOptionsWidget(parent,"avatar_advanced_options_widget")
{ {
createLayout(4,1); createLayout(4,1);
// AVATAR // AVATAR

@ -39,7 +39,7 @@ class KviAvatarAdvancedOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviAvatarAdvancedOptionsWidget(TQWidget * tqparent); KviAvatarAdvancedOptionsWidget(TQWidget * parent);
~KviAvatarAdvancedOptionsWidget(); ~KviAvatarAdvancedOptionsWidget();
}; };

@ -31,8 +31,8 @@
//#warning "Info tips" //#warning "Info tips"
KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * tqparent) KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"away_options_widget") : KviOptionsWidget(parent,"away_options_widget")
{ {
createLayout(4,1); createLayout(4,1);

@ -33,7 +33,7 @@ class KviAwayOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviAwayOptionsWidget(TQWidget * tqparent); KviAwayOptionsWidget(TQWidget * parent);
~KviAwayOptionsWidget(); ~KviAwayOptionsWidget();
protected: protected:
KviBoolSelector * m_pEnableAwayNick; KviBoolSelector * m_pEnableAwayNick;

@ -31,8 +31,8 @@
#include <tqradiobutton.h> #include <tqradiobutton.h>
KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * tqparent) KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"connection_options_widget") : KviOptionsWidget(parent,"connection_options_widget")
{ {
createLayout(2,1); createLayout(2,1);
@ -114,8 +114,8 @@ KviConnectionOptionsWidget::~KviConnectionOptionsWidget()
KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * tqparent) KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ssl_options_widget") : KviOptionsWidget(parent,"ssl_options_widget")
{ {
#ifdef COMPILE_SSL_SUPPORT #ifdef COMPILE_SSL_SUPPORT
createLayout(3,1); createLayout(3,1);
@ -156,8 +156,8 @@ KviSSLOptionsWidget::~KviSSLOptionsWidget()
KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * tqparent) KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"transport_options_widget") : KviOptionsWidget(parent,"transport_options_widget")
{ {
createLayout(5,1); createLayout(5,1);
KviUIntSelector * u; KviUIntSelector * u;
@ -202,8 +202,8 @@ KviTransportOptionsWidget::~KviTransportOptionsWidget()
KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * tqparent) KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ident_options_widget") : KviOptionsWidget(parent,"ident_options_widget")
{ {
createLayout(6,1); createLayout(6,1);
@ -307,8 +307,8 @@ void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(TQWidget * tqparent) KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"connection_advanced_options_widget") : KviOptionsWidget(parent,"connection_advanced_options_widget")
{ {
} }

@ -33,7 +33,7 @@ class KviConnectionOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviConnectionOptionsWidget(TQWidget * tqparent); KviConnectionOptionsWidget(TQWidget * parent);
~KviConnectionOptionsWidget(); ~KviConnectionOptionsWidget();
}; };
@ -48,7 +48,7 @@ class KviConnectionAdvancedOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviConnectionAdvancedOptionsWidget(TQWidget * tqparent); KviConnectionAdvancedOptionsWidget(TQWidget * parent);
~KviConnectionAdvancedOptionsWidget(); ~KviConnectionAdvancedOptionsWidget();
}; };
@ -65,7 +65,7 @@ class KviSSLOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviSSLOptionsWidget(TQWidget * tqparent); KviSSLOptionsWidget(TQWidget * parent);
~KviSSLOptionsWidget(); ~KviSSLOptionsWidget();
}; };
@ -82,7 +82,7 @@ class KviTransportOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviTransportOptionsWidget(TQWidget * tqparent); KviTransportOptionsWidget(TQWidget * parent);
~KviTransportOptionsWidget(); ~KviTransportOptionsWidget();
}; };
@ -99,7 +99,7 @@ class KviIdentOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviIdentOptionsWidget(TQWidget * tqparent); KviIdentOptionsWidget(TQWidget * parent);
~KviIdentOptionsWidget(); ~KviIdentOptionsWidget();
virtual void commit(); virtual void commit();

@ -30,8 +30,8 @@
// #include "kvi_tal_tooltip.h" // #include "kvi_tal_tooltip.h"
//#endif //#endif
KviCtcpOptionsWidget::KviCtcpOptionsWidget(TQWidget * tqparent) KviCtcpOptionsWidget::KviCtcpOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ctcp_options_widget") : KviOptionsWidget(parent,"ctcp_options_widget")
{ {
createLayout(4,1); createLayout(4,1);

@ -34,7 +34,7 @@ class KviCtcpOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviCtcpOptionsWidget(TQWidget * tqparent); KviCtcpOptionsWidget(TQWidget * parent);
~KviCtcpOptionsWidget(); ~KviCtcpOptionsWidget();
}; };

@ -71,8 +71,8 @@
*/ */
KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidget * tqparent) KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ctcpfloodprotection_options_widget") : KviOptionsWidget(parent,"ctcpfloodprotection_options_widget")
{ {
createLayout(4,2); createLayout(4,2);

@ -35,7 +35,7 @@ class KviCtcpFloodProtectionOptionsWidget : public KviOptionsWidget
TQ_OBJECT TQ_OBJECT
// TQ_CLASSINFO("help","ctcpfloodprotectionoptions") // TQ_CLASSINFO("help","ctcpfloodprotectionoptions")
public: public:
KviCtcpFloodProtectionOptionsWidget(TQWidget * tqparent); KviCtcpFloodProtectionOptionsWidget(TQWidget * parent);
~KviCtcpFloodProtectionOptionsWidget(); ~KviCtcpFloodProtectionOptionsWidget();
}; };

@ -43,8 +43,8 @@ KviDccOptionsWidget::~KviDccOptionsWidget()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(TQWidget * tqparent) KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"dccgeneral_options_widget") : KviOptionsWidget(parent,"dccgeneral_options_widget")
{ {
createLayout(2,1); createLayout(2,1);
@ -65,8 +65,8 @@ KviDccGeneralOptionsWidget::~KviDccGeneralOptionsWidget()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * tqparent) KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"dccgeneral_options_widget") : KviOptionsWidget(parent,"dccgeneral_options_widget")
{ {
createLayout(5,1); createLayout(5,1);
@ -128,7 +128,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * tqparent)
mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \ mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \
"KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " \ "KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " \
"by the IRC server you're connected to.<br>This method is an exclusive alternative to the \"fixed address\" above.<br>" \ "by the IRC server you're connected to.<br>This method is an exclusive alternative to the \"fixed address\" above.<br>" \
"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not tqmask hostnames).</center>","options")); "It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not mask hostnames).</center>","options"));
#endif #endif
b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"), b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),
@ -177,8 +177,8 @@ KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviDccSendOptionsWidget::KviDccSendOptionsWidget(TQWidget * tqparent) KviDccSendOptionsWidget::KviDccSendOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"dccsend_options_widget") : KviOptionsWidget(parent,"dccsend_options_widget")
{ {
} }
@ -188,8 +188,8 @@ KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * tqparent) KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"dccsend_options_widget") : KviOptionsWidget(parent,"dccsend_options_widget")
{ {
createLayout(5,1); createLayout(5,1);
@ -230,8 +230,8 @@ KviDccSendGeneralOptionsWidget::~KviDccSendGeneralOptionsWidget()
} }
KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * tqparent) KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"dccsend_advanced_options_widget") : KviOptionsWidget(parent,"dccsend_advanced_options_widget")
{ {
createLayout(4,1); createLayout(4,1);
@ -341,8 +341,8 @@ KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
//} //}
KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * tqparent) KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"dccchat_options_widget") : KviOptionsWidget(parent,"dccchat_options_widget")
{ {
createLayout(3,1); createLayout(3,1);

@ -34,7 +34,7 @@ class KviDccOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviDccOptionsWidget(TQWidget * tqparent); KviDccOptionsWidget(TQWidget * parent);
~KviDccOptionsWidget(); ~KviDccOptionsWidget();
}; };
@ -50,7 +50,7 @@ class KviDccGeneralOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviDccGeneralOptionsWidget(TQWidget * tqparent); KviDccGeneralOptionsWidget(TQWidget * parent);
~KviDccGeneralOptionsWidget(); ~KviDccGeneralOptionsWidget();
}; };
@ -64,7 +64,7 @@ class KviDccAdvancedOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviDccAdvancedOptionsWidget(TQWidget * tqparent); KviDccAdvancedOptionsWidget(TQWidget * parent);
~KviDccAdvancedOptionsWidget(); ~KviDccAdvancedOptionsWidget();
}; };
@ -82,7 +82,7 @@ class KviDccSendOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviDccSendOptionsWidget(TQWidget * tqparent); KviDccSendOptionsWidget(TQWidget * parent);
~KviDccSendOptionsWidget(); ~KviDccSendOptionsWidget();
}; };
@ -96,7 +96,7 @@ class KviDccSendGeneralOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviDccSendGeneralOptionsWidget(TQWidget * tqparent); KviDccSendGeneralOptionsWidget(TQWidget * parent);
~KviDccSendGeneralOptionsWidget(); ~KviDccSendGeneralOptionsWidget();
}; };
@ -110,7 +110,7 @@ class KviDccSendAdvancedOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviDccSendAdvancedOptionsWidget(TQWidget * tqparent); KviDccSendAdvancedOptionsWidget(TQWidget * parent);
~KviDccSendAdvancedOptionsWidget(); ~KviDccSendAdvancedOptionsWidget();
}; };
@ -125,7 +125,7 @@ class KviDccChatOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviDccChatOptionsWidget(TQWidget * tqparent); KviDccChatOptionsWidget(TQWidget * parent);
~KviDccChatOptionsWidget(); ~KviDccChatOptionsWidget();
}; };

@ -29,8 +29,8 @@
#include "kvi_options.h" #include "kvi_options.h"
KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(TQWidget * tqparent) KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"generalopt_options_widget") : KviOptionsWidget(parent,"generalopt_options_widget")
{ {
createLayout(1,4); createLayout(1,4);

@ -33,7 +33,7 @@ class KviGeneralOptOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviGeneralOptOptionsWidget(TQWidget * tqparent); KviGeneralOptOptionsWidget(TQWidget * parent);
~KviGeneralOptOptionsWidget(); ~KviGeneralOptOptionsWidget();
}; };

@ -31,8 +31,8 @@
#include <tqlabel.h> #include <tqlabel.h>
KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(TQWidget * tqparent) KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"highlighting_options_widget") : KviOptionsWidget(parent,"highlighting_options_widget")
{ {
} }
@ -42,8 +42,8 @@ KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * tqparent) KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"highlighting_options_widget") : KviOptionsWidget(parent,"highlighting_options_widget")
{ {
createLayout(7,1); createLayout(7,1);
@ -81,8 +81,8 @@ KviHighlightingOptionsWidget::~KviHighlightingOptionsWidget()
KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * tqparent) KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"highlighting_options_widget") : KviOptionsWidget(parent,"highlighting_options_widget")
{ {
createLayout(2,1); createLayout(2,1);

@ -34,7 +34,7 @@ class KviAlertHighlightingOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviAlertHighlightingOptionsWidget(TQWidget * tqparent); KviAlertHighlightingOptionsWidget(TQWidget * parent);
~KviAlertHighlightingOptionsWidget(); ~KviAlertHighlightingOptionsWidget();
}; };
@ -48,7 +48,7 @@ class KviHighlightingOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviHighlightingOptionsWidget(TQWidget * tqparent); KviHighlightingOptionsWidget(TQWidget * parent);
~KviHighlightingOptionsWidget(); ~KviHighlightingOptionsWidget();
}; };
@ -62,7 +62,7 @@ class KviAlertOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviAlertOptionsWidget(TQWidget * tqparent); KviAlertOptionsWidget(TQWidget * parent);
~KviAlertOptionsWidget(); ~KviAlertOptionsWidget();
}; };

@ -290,8 +290,8 @@ void KviAvatarSelectionDialog::closeEvent(TQCloseEvent * e)
KviIdentityOptionsWidget::KviIdentityOptionsWidget(TQWidget * tqparent) KviIdentityOptionsWidget::KviIdentityOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
} }
@ -302,8 +302,8 @@ KviIdentityOptionsWidget::~KviIdentityOptionsWidget()
KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * tqparent) KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
m_szAltNicknames[0] = KVI_OPTION_STRING(KviOption_stringNickname2); m_szAltNicknames[0] = KVI_OPTION_STRING(KviOption_stringNickname2);
m_szAltNicknames[1] = KVI_OPTION_STRING(KviOption_stringNickname3); m_szAltNicknames[1] = KVI_OPTION_STRING(KviOption_stringNickname3);
@ -488,8 +488,8 @@ void KviIdentityGeneralOptionsWidget::commit()
} }
KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * tqparent) KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
createLayout(4,1); createLayout(4,1);
tqlayout()->setMargin(10); tqlayout()->setMargin(10);
@ -664,8 +664,8 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * tqparent) KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
m_pISelector=0; m_pISelector=0;
m_pWSelector=0; m_pWSelector=0;

@ -114,7 +114,7 @@ class KviIdentityOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviIdentityOptionsWidget(TQWidget * tqparent); KviIdentityOptionsWidget(TQWidget * parent);
~KviIdentityOptionsWidget(); ~KviIdentityOptionsWidget();
}; };

@ -30,8 +30,8 @@
//#warning "Info tips" //#warning "Info tips"
KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * tqparent) KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ignore_options_widget") : KviOptionsWidget(parent,"ignore_options_widget")
{ {
createLayout(3,1); createLayout(3,1);

@ -35,7 +35,7 @@ class KviIgnoreOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviIgnoreOptionsWidget(TQWidget * tqparent); KviIgnoreOptionsWidget(TQWidget * parent);
~KviIgnoreOptionsWidget(); ~KviIgnoreOptionsWidget();
public: public:
KviBoolSelector * m_pIgnorePrivmsg; KviBoolSelector * m_pIgnorePrivmsg;

@ -28,8 +28,8 @@
//#warning "Info tips" //#warning "Info tips"
KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * tqparent) KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ircviewlook_options_widget") : KviOptionsWidget(parent,"ircviewlook_options_widget")
{ {
createLayout(10,2); createLayout(10,2);
@ -133,8 +133,8 @@ void KviInputLookOptionsWidget::commit()
KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(TQWidget * tqparent) KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget") : KviOptionsWidget(parent,"ircviewfeatures_options_widget")
{ {
createLayout(6,1); createLayout(6,1);

@ -41,7 +41,7 @@ private:
TQComboBox* m_pHorizontalAlign; TQComboBox* m_pHorizontalAlign;
TQComboBox* m_pVerticalAlign; TQComboBox* m_pVerticalAlign;
public: public:
KviInputLookOptionsWidget(TQWidget * tqparent); KviInputLookOptionsWidget(TQWidget * parent);
~KviInputLookOptionsWidget(); ~KviInputLookOptionsWidget();
virtual void commit(); virtual void commit();
@ -56,7 +56,7 @@ class KviInputFeaturesOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviInputFeaturesOptionsWidget(TQWidget * tqparent); KviInputFeaturesOptionsWidget(TQWidget * parent);
~KviInputFeaturesOptionsWidget(); ~KviInputFeaturesOptionsWidget();
}; };

@ -33,8 +33,8 @@
#include "kvi_app.h" #include "kvi_app.h"
#include "kvi_fileutils.h" #include "kvi_fileutils.h"
KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(TQWidget * tqparent) KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"interfacefeatures_options_widget") : KviOptionsWidget(parent,"interfacefeatures_options_widget")
{ {
createLayout(8,1); createLayout(8,1);

@ -38,7 +38,7 @@ class KviInterfaceFeaturesOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviInterfaceFeaturesOptionsWidget(TQWidget * tqparent); KviInterfaceFeaturesOptionsWidget(TQWidget * parent);
~KviInterfaceFeaturesOptionsWidget(); ~KviInterfaceFeaturesOptionsWidget();
protected: protected:
TQCheckBox * m_pDisableSplash; TQCheckBox * m_pDisableSplash;

@ -31,8 +31,8 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * tqparent) KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
createLayout(4,2); createLayout(4,2);
@ -53,8 +53,8 @@ KviThemeGeneralOptionsWidget::~KviThemeGeneralOptionsWidget()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * tqparent) KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
#ifdef COMPILE_PSEUDO_TRANSPARENCY #ifdef COMPILE_PSEUDO_TRANSPARENCY
@ -147,8 +147,8 @@ void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bo
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * tqparent) KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
createLayout(7,1); createLayout(7,1);
@ -169,8 +169,8 @@ KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * tqparent) KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
createLayout(2,1); createLayout(2,1);
@ -187,8 +187,8 @@ KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * tqparent) KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
createLayout(9,1); createLayout(9,1);

@ -39,7 +39,7 @@ class KviThemeGeneralOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviThemeGeneralOptionsWidget(TQWidget * tqparent); KviThemeGeneralOptionsWidget(TQWidget * parent);
~KviThemeGeneralOptionsWidget(); ~KviThemeGeneralOptionsWidget();
}; };
@ -55,7 +55,7 @@ class KviThemeTransparencyOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviThemeTransparencyOptionsWidget(TQWidget * tqparent); KviThemeTransparencyOptionsWidget(TQWidget * parent);
~KviThemeTransparencyOptionsWidget(); ~KviThemeTransparencyOptionsWidget();
protected: protected:
#ifdef COMPILE_PSEUDO_TRANSPARENCY #ifdef COMPILE_PSEUDO_TRANSPARENCY
@ -82,7 +82,7 @@ class KviThemeMdiCaptionsOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviThemeMdiCaptionsOptionsWidget(TQWidget * tqparent); KviThemeMdiCaptionsOptionsWidget(TQWidget * parent);
~KviThemeMdiCaptionsOptionsWidget(); ~KviThemeMdiCaptionsOptionsWidget();
}; };
@ -96,7 +96,7 @@ class KviThemeMdiAreaOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviThemeMdiAreaOptionsWidget(TQWidget * tqparent); KviThemeMdiAreaOptionsWidget(TQWidget * parent);
~KviThemeMdiAreaOptionsWidget(); ~KviThemeMdiAreaOptionsWidget();
}; };
@ -111,7 +111,7 @@ class KviThemeToolBarAppletsOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviThemeToolBarAppletsOptionsWidget(TQWidget * tqparent); KviThemeToolBarAppletsOptionsWidget(TQWidget * parent);
~KviThemeToolBarAppletsOptionsWidget(); ~KviThemeToolBarAppletsOptionsWidget();
}; };

@ -31,8 +31,8 @@
#include <tqcombobox.h> #include <tqcombobox.h>
KviIrcOptionsWidget::KviIrcOptionsWidget(TQWidget * tqparent) KviIrcOptionsWidget::KviIrcOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"irc_options_widget") : KviOptionsWidget(parent,"irc_options_widget")
{ {
} }
@ -42,8 +42,8 @@ KviIrcOptionsWidget::~KviIrcOptionsWidget()
} }
KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(TQWidget * tqparent) KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"irc_options_widget") : KviOptionsWidget(parent,"irc_options_widget")
{ {
createLayout(3,1); createLayout(3,1);
KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize console after successful login","options"),KviOption_boolMinimizeConsoleAfterConnect); KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize console after successful login","options"),KviOption_boolMinimizeConsoleAfterConnect);
@ -68,8 +68,8 @@ KviIrcGeneralOptionsWidget::~KviIrcGeneralOptionsWidget()
KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * tqparent) KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"irc_advanced_options_widget") : KviOptionsWidget(parent,"irc_advanced_options_widget")
{ {
createLayout(3,1); createLayout(3,1);
KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit); KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit);
@ -167,20 +167,20 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pPar
KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory); KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory);
addLabel(0,1,0,1,__tr2qs_ctx("Default ban tqmask:","options")); addLabel(0,1,0,1,__tr2qs_ctx("Default ban mask:","options"));
m_pBanTypeCombo=new TQComboBox(this); m_pBanTypeCombo=new TQComboBox(this);
addWidgetToLayout(m_pBanTypeCombo,1,1,4,1); addWidgetToLayout(m_pBanTypeCombo,1,1,4,1);
KviIrcMask hosttqmask("nick!user@machine.host.top"); KviIrcMask hostmask("nick!user@machine.host.top");
KviIrcMask iptqmask("nick!user@192.168.1.2"); KviIrcMask ipmask("nick!user@192.168.1.2");
TQString tmp1; TQString tmp1;
TQString tmp2; TQString tmp2;
for(int i=0;i<=26;i++) for(int i=0;i<=26;i++)
{ {
hosttqmask.tqmask(tmp1,(KviIrcMask::MaskType)i); hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
iptqmask.tqmask(tmp2,(KviIrcMask::MaskType)i); ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2)); m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2));
} }
m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType)); m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType));

@ -38,7 +38,7 @@ class KviIrcOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviIrcOptionsWidget(TQWidget * tqparent); KviIrcOptionsWidget(TQWidget * parent);
~KviIrcOptionsWidget(); ~KviIrcOptionsWidget();
}; };
@ -52,7 +52,7 @@ class KviIrcGeneralOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviIrcGeneralOptionsWidget(TQWidget * tqparent); KviIrcGeneralOptionsWidget(TQWidget * parent);
~KviIrcGeneralOptionsWidget(); ~KviIrcGeneralOptionsWidget();
}; };
@ -67,7 +67,7 @@ class KviIrcAdvancedOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviIrcAdvancedOptionsWidget(TQWidget * tqparent); KviIrcAdvancedOptionsWidget(TQWidget * parent);
~KviIrcAdvancedOptionsWidget(); ~KviIrcAdvancedOptionsWidget();
}; };
@ -84,7 +84,7 @@ class KviChannelOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviChannelOptionsWidget(TQWidget * tqparent); KviChannelOptionsWidget(TQWidget * parent);
~KviChannelOptionsWidget(); ~KviChannelOptionsWidget();
}; };
@ -98,7 +98,7 @@ class KviChannelGeneralOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviChannelGeneralOptionsWidget(TQWidget * tqparent); KviChannelGeneralOptionsWidget(TQWidget * parent);
~KviChannelGeneralOptionsWidget(); ~KviChannelGeneralOptionsWidget();
}; };
@ -111,7 +111,7 @@ class KviChannelAdvancedOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviChannelAdvancedOptionsWidget(TQWidget * tqparent); KviChannelAdvancedOptionsWidget(TQWidget * parent);
~KviChannelAdvancedOptionsWidget(); ~KviChannelAdvancedOptionsWidget();
public: public:
virtual void commit(); virtual void commit();

@ -35,8 +35,8 @@
#include "kvi_tal_tooltip.h" #include "kvi_tal_tooltip.h"
#endif #endif
KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(TQWidget * tqparent) KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ircoutput_options_widget") : KviOptionsWidget(parent,"ircoutput_options_widget")
{ {
createLayout(7,2); createLayout(7,2);

@ -39,7 +39,7 @@ class KviIrcOutputOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviIrcOutputOptionsWidget(TQWidget * tqparent); KviIrcOutputOptionsWidget(TQWidget * parent);
~KviIrcOutputOptionsWidget(); ~KviIrcOutputOptionsWidget();
protected: protected:
TQComboBox * m_pVerbosityCombo; TQComboBox * m_pVerbosityCombo;

@ -38,8 +38,8 @@ KviIrcViewThemeOptionsWidget::~KviIrcViewThemeOptionsWidget()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * tqparent) KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ircviewlook_options_widget") : KviOptionsWidget(parent,"ircviewlook_options_widget")
{ {
createLayout(6,2); createLayout(6,2);
@ -139,8 +139,8 @@ void KviIrcViewLookOptionsWidget::commit()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent) KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget") : KviOptionsWidget(parent,"ircviewfeatures_options_widget")
{ {
createLayout(14,1); createLayout(14,1);

@ -60,7 +60,7 @@ private:
TQComboBox* m_pHorizontalAlign; TQComboBox* m_pHorizontalAlign;
TQComboBox* m_pVerticalAlign; TQComboBox* m_pVerticalAlign;
public: public:
KviIrcViewLookOptionsWidget(TQWidget * tqparent); KviIrcViewLookOptionsWidget(TQWidget * parent);
~KviIrcViewLookOptionsWidget(); ~KviIrcViewLookOptionsWidget();
public: public:
virtual void commit(); virtual void commit();
@ -77,7 +77,7 @@ class KviIrcViewFeaturesOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent); KviIrcViewFeaturesOptionsWidget(TQWidget * parent);
~KviIrcViewFeaturesOptionsWidget(); ~KviIrcViewFeaturesOptionsWidget();
}; };

@ -32,8 +32,8 @@
//#warning "Info tips" //#warning "Info tips"
KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * tqparent) KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"lag_options_widget") : KviOptionsWidget(parent,"lag_options_widget")
{ {
createLayout(3,1); createLayout(3,1);

@ -34,7 +34,7 @@ class KviLagOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviLagOptionsWidget(TQWidget * tqparent); KviLagOptionsWidget(TQWidget * parent);
~KviLagOptionsWidget(); ~KviLagOptionsWidget();
}; };

@ -31,8 +31,8 @@
//#warning "Info tips" //#warning "Info tips"
KviLoggingOptionsWidget::KviLoggingOptionsWidget(TQWidget * tqparent) KviLoggingOptionsWidget::KviLoggingOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"logging_options_widget") : KviOptionsWidget(parent,"logging_options_widget")
{ {
createLayout(4,1); createLayout(4,1);

@ -36,7 +36,7 @@ class KviLoggingOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviLoggingOptionsWidget(TQWidget * tqparent); KviLoggingOptionsWidget(TQWidget * parent);
~KviLoggingOptionsWidget(); ~KviLoggingOptionsWidget();
}; };

@ -62,8 +62,8 @@ void KviMediaTypeListViewItem::copyData(KviMediaType * t)
setText(2,m_data.szDescription.ptr()); setText(2,m_data.szDescription.ptr());
} }
KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * tqparent) KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"mediatypes_options_widget") : KviOptionsWidget(parent,"mediatypes_options_widget")
{ {
createLayout(11,3); createLayout(11,3);

@ -54,7 +54,7 @@ class KviMediaTypesOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviMediaTypesOptionsWidget(TQWidget * tqparent); KviMediaTypesOptionsWidget(TQWidget * parent);
~KviMediaTypesOptionsWidget(); ~KviMediaTypesOptionsWidget();
private: private:
KviTalListView * m_pListView; KviTalListView * m_pListView;

@ -68,8 +68,8 @@ KviMessageOptionsWidget::~KviMessageOptionsWidget()
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * tqparent) KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"privmsg_options_widget") : KviOptionsWidget(parent,"privmsg_options_widget")
{ {
createLayout(4,1); createLayout(4,1);
@ -162,8 +162,8 @@ void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * tqparent) KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"stdcolors") : KviOptionsWidget(parent,"stdcolors")
{ {
createLayout(5,4); createLayout(5,4);
@ -370,8 +370,8 @@ int KviMessageColorListBoxItem::height(const KviTalListBox *) const
*/ */
/* /*
KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(TQWidget * tqparent) KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"irccolors","options") : KviOptionsWidget(parent,"irccolors","options")
{ {
createLayout(5,4); createLayout(5,4);
@ -383,8 +383,8 @@ KviIrcColorsOptionsWidget::~KviIrcColorsOptionsWidget()
} }
*/ */
KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * tqparent) KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"messages") : KviOptionsWidget(parent,"messages")
{ {
int i; int i;

@ -61,7 +61,7 @@ class KviPrivmsgOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviPrivmsgOptionsWidget(TQWidget * tqparent); KviPrivmsgOptionsWidget(TQWidget * parent);
~KviPrivmsgOptionsWidget(); ~KviPrivmsgOptionsWidget();
}; };
@ -77,7 +77,7 @@ class KviTimestampOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviTimestampOptionsWidget(TQWidget * tqparent); KviTimestampOptionsWidget(TQWidget * parent);
~KviTimestampOptionsWidget(); ~KviTimestampOptionsWidget();
public: public:
KviBoolSelector * m_pUseTimestampSelector; KviBoolSelector * m_pUseTimestampSelector;
@ -144,7 +144,7 @@ class KviMessageColorsOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviMessageColorsOptionsWidget(TQWidget * tqparent); KviMessageColorsOptionsWidget(TQWidget * parent);
~KviMessageColorsOptionsWidget(); ~KviMessageColorsOptionsWidget();
public: public:
KviMessageListView * m_pListView; KviMessageListView * m_pListView;

@ -67,11 +67,11 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
m_pNickServMaskEdit = new TQLineEdit(this); m_pNickServMaskEdit = new TQLineEdit(this);
#ifdef COMPILE_INFO_TIPS #ifdef COMPILE_INFO_TIPS
KviTalToolTip::add(m_pNickServMaskEdit, KviTalToolTip::add(m_pNickServMaskEdit,
html_center_begin + __tr2qs_ctx("This is the tqmask that NickServ must match to be correctly identified as the NickServ service. " \ html_center_begin + __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. " \
"This usually will be something like <b>NickServ!service@services.dalnet</b>.<br>" \ "This usually will be something like <b>NickServ!service@services.dalnet</b>.<br>" \
"You can use wildcards for this field, but generally it is a security flaw. " \ "You can use wildcards for this field, but generally it is a security flaw. " \
"If you're 100%% sure that NO user on the network can use the nickname \"NickServ\", " \ "If you're 100%% sure that NO user on the network can use the nickname \"NickServ\", " \
"the tqmask <b>NickServ!*@*</b> may be safe to use in this field.","options") + html_center_end); "the mask <b>NickServ!*@*</b> may be safe to use in this field.","options") + html_center_end);
#endif #endif
gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3); gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3);
@ -96,7 +96,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
#ifdef COMPILE_INFO_TIPS #ifdef COMPILE_INFO_TIPS
KviTalToolTip::add(m_pIdentifyCommandEdit, KviTalToolTip::add(m_pIdentifyCommandEdit,
html_center_begin + __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication " \ html_center_begin + __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication " \
"for the nickname described in this rule (if the both server and NickServ tqmask are matched). " \ "for the nickname described in this rule (if the both server and NickServ mask are matched). " \
"This usually will be something like <b>msg NickServ identify &lt;yourpassword&gt;</b>.<br>" \ "This usually will be something like <b>msg NickServ identify &lt;yourpassword&gt;</b>.<br>" \
"You can use <b>msg -q</b> if you don't want the password echoed on the screen. " \ "You can use <b>msg -q</b> if you don't want the password echoed on the screen. " \
"Please note that there is no leading slash in this command.","options") + html_center_end); "Please note that there is no leading slash in this command.","options") + html_center_end);
@ -108,13 +108,13 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
if(bUseServerMaskField) if(bUseServerMaskField)
{ {
l = new TQLabel(__tr2qs_ctx("Server tqmask","options"),this); l = new TQLabel(__tr2qs_ctx("Server mask","options"),this);
gl->addWidget(l,4,0); gl->addWidget(l,4,0);
m_pServerMaskEdit = new TQLineEdit(this); m_pServerMaskEdit = new TQLineEdit(this);
#ifdef COMPILE_INFO_TIPS #ifdef COMPILE_INFO_TIPS
KviTalToolTip::add(m_pServerMaskEdit, KviTalToolTip::add(m_pServerMaskEdit,
html_center_begin + __tr2qs_ctx("This is the tqmask that the current server must match in order " \ html_center_begin + __tr2qs_ctx("This is the mask that the current server must match in order " \
"for this rule to apply. It can contain * and ? wildcards.<br>Do NOT use simply \"*\" here...","options") + html_center_end); "for this rule to apply. It can contain * and ? wildcards.<br>Do NOT use simply \"*\" here...","options") + html_center_end);
#endif #endif
gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3); gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3);
@ -180,7 +180,7 @@ bool KviNickServRuleEditor::validate()
if(s.isEmpty()) if(s.isEmpty())
{ {
TQMessageBox::warning(this,m,__tr2qs_ctx("The NickServ tqmask can't be empty!<br>You must put at least * there.","options"),o); TQMessageBox::warning(this,m,__tr2qs_ctx("The NickServ mask can't be empty!<br>You must put at least * there.","options"),o);
return false; return false;
} }
@ -231,8 +231,8 @@ bool KviNickServRuleEditor::editRule(KviNickServRule * r)
KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * tqparent) KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"nickserv_options_widget") : KviOptionsWidget(parent,"nickserv_options_widget")
{ {
createLayout(3,3); createLayout(3,3);
@ -253,7 +253,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * tqparent)
m_pNickServListView->setSelectionMode(KviTalListView::Single); m_pNickServListView->setSelectionMode(KviTalListView::Single);
m_pNickServListView->setAllColumnsShowFocus(true); m_pNickServListView->setAllColumnsShowFocus(true);
m_pNickServListView->addColumn(__tr2qs_ctx("Nickname","options")); m_pNickServListView->addColumn(__tr2qs_ctx("Nickname","options"));
m_pNickServListView->addColumn(__tr2qs_ctx("Server tqmask","options")); m_pNickServListView->addColumn(__tr2qs_ctx("Server mask","options"));
m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options")); m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options"));
m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options")); m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options"));
m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options")); m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options"));

@ -71,7 +71,7 @@ class KviNickServOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviNickServOptionsWidget(TQWidget * tqparent); KviNickServOptionsWidget(TQWidget * parent);
~KviNickServOptionsWidget(); ~KviNickServOptionsWidget();
protected: protected:
KviTalListView * m_pNickServListView; KviTalListView * m_pNickServListView;

@ -31,8 +31,8 @@
//#warning "Info tips" //#warning "Info tips"
KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * tqparent) KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"notify_options_widget") : KviOptionsWidget(parent,"notify_options_widget")
{ {
createLayout(5,1); createLayout(5,1);
@ -104,8 +104,8 @@ KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
KviNotifierOptionsWidget::KviNotifierOptionsWidget(TQWidget * tqparent) KviNotifierOptionsWidget::KviNotifierOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"notifier_options_widget") : KviOptionsWidget(parent,"notifier_options_widget")
{ {
createLayout(3,1); createLayout(3,1);

@ -35,7 +35,7 @@ class KviNotifyOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviNotifyOptionsWidget(TQWidget * tqparent); KviNotifyOptionsWidget(TQWidget * parent);
~KviNotifyOptionsWidget(); ~KviNotifyOptionsWidget();
}; };
@ -49,7 +49,7 @@ class KviNotifierOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviNotifierOptionsWidget(TQWidget * tqparent); KviNotifierOptionsWidget(TQWidget * parent);
~KviNotifierOptionsWidget(); ~KviNotifierOptionsWidget();
}; };

@ -30,8 +30,8 @@
#include "kvi_options.h" #include "kvi_options.h"
#include "kvi_locale.h" #include "kvi_locale.h"
KviProtectionOptionsWidget::KviProtectionOptionsWidget(TQWidget * tqparent) KviProtectionOptionsWidget::KviProtectionOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"protection_options_widget") : KviOptionsWidget(parent,"protection_options_widget")
{ {
createLayout(1,1); createLayout(1,1);

@ -42,7 +42,7 @@ class KviProtectionOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviProtectionOptionsWidget(TQWidget * tqparent); KviProtectionOptionsWidget(TQWidget * parent);
~KviProtectionOptionsWidget(); ~KviProtectionOptionsWidget();
}; };

@ -41,8 +41,8 @@
#include <tqtoolbutton.h> #include <tqtoolbutton.h>
KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx) KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,KviProxy * prx)
: KviTalListViewItem(tqparent,prx->m_szHostname.ptr()) : KviTalListViewItem(parent,prx->m_szHostname.ptr())
{ {
setPixmap(0,pm); setPixmap(0,pm);
m_pProxyData = new KviProxy(*prx); m_pProxyData = new KviProxy(*prx);
@ -53,8 +53,8 @@ KviProxyOptionsListViewItem::~KviProxyOptionsListViewItem()
delete m_pProxyData; delete m_pProxyData;
} }
KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * tqparent) KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"proxy_options_widget") : KviOptionsWidget(parent,"proxy_options_widget")
{ {
createLayout(3,2); createLayout(3,2);

@ -35,7 +35,7 @@ extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
class KviProxyOptionsListViewItem : public KviTalListViewItem class KviProxyOptionsListViewItem : public KviTalListViewItem
{ {
public: public:
KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx); KviProxyOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,KviProxy * prx);
~KviProxyOptionsListViewItem(); ~KviProxyOptionsListViewItem();
public: public:
KviProxy * m_pProxyData; KviProxy * m_pProxyData;
@ -59,7 +59,7 @@ class KviProxyOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviProxyOptionsWidget(TQWidget * tqparent); KviProxyOptionsWidget(TQWidget * parent);
~KviProxyOptionsWidget(); ~KviProxyOptionsWidget();
protected: protected:
KviTalListView * m_pListView; KviTalListView * m_pListView;

@ -34,8 +34,8 @@
#include <kdeversion.h> #include <kdeversion.h>
#endif #endif
KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * tqparent) KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"query_options_widget") : KviOptionsWidget(parent,"query_options_widget")
{ {
createLayout(8,1); createLayout(8,1);

@ -36,7 +36,7 @@ class KviQueryOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviQueryOptionsWidget(TQWidget * tqparent); KviQueryOptionsWidget(TQWidget * parent);
~KviQueryOptionsWidget(); ~KviQueryOptionsWidget();
protected: protected:
}; };

@ -973,8 +973,8 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
// kvi_app.cpp // kvi_app.cpp
extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase; extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase;
KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n) KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,const KviIrcNetwork *n)
: KviTalListViewItem(tqparent) : KviTalListViewItem(parent)
{ {
setPixmap(0,pm); setPixmap(0,pm);
m_pServerData = 0; m_pServerData = 0;
@ -983,8 +983,8 @@ KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *tqpar
setText(1,n->description()); setText(1,n->description());
} }
KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s) KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *parent,const TQPixmap &pm,const KviIrcServer *s)
: KviTalListViewItem(tqparent) : KviTalListViewItem(parent)
{ {
setPixmap(0,pm); setPixmap(0,pm);
m_pServerData = new KviIrcServer(*s); m_pServerData = new KviIrcServer(*s);
@ -1021,8 +1021,8 @@ void KviServerOptionsListViewItem::updateVisibleStrings()
KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * tqparent) KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"server_options_widget") : KviOptionsWidget(parent,"server_options_widget")
{ {
createLayout(4,2); createLayout(4,2);
@ -1565,7 +1565,7 @@ void KviServerOptionsWidget::newServer()
KviServerOptionsListViewItem * net; KviServerOptionsListViewItem * net;
if(m_pLastEditedItem->m_pServerData) if(m_pLastEditedItem->m_pServerData)
{ {
net = (KviServerOptionsListViewItem *)m_pLastEditedItem->tqparent(); net = (KviServerOptionsListViewItem *)m_pLastEditedItem->parent();
if(!net)return; if(!net)return;
} }
else net = m_pLastEditedItem; else net = m_pLastEditedItem;
@ -1607,7 +1607,7 @@ void KviServerOptionsWidget::pasteServer()
KviServerOptionsListViewItem * net; KviServerOptionsListViewItem * net;
if(m_pLastEditedItem->m_pServerData) if(m_pLastEditedItem->m_pServerData)
{ {
net = (KviServerOptionsListViewItem *)m_pLastEditedItem->tqparent(); net = (KviServerOptionsListViewItem *)m_pLastEditedItem->parent();
if(!net)return; if(!net)return;
} }
else net = m_pLastEditedItem; else net = m_pLastEditedItem;

@ -41,8 +41,8 @@ class KviMexServerImport;
class KviServerOptionsListViewItem : public KviTalListViewItem class KviServerOptionsListViewItem : public KviTalListViewItem
{ {
public: public:
KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n); KviServerOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,const KviIrcNetwork *n);
KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s); KviServerOptionsListViewItem(KviTalListViewItem *parent,const TQPixmap &pm,const KviIrcServer *s);
~KviServerOptionsListViewItem(); ~KviServerOptionsListViewItem();
public: public:
KviIrcServer * m_pServerData; KviIrcServer * m_pServerData;
@ -158,7 +158,7 @@ class KviServerOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviServerOptionsWidget(TQWidget * tqparent); KviServerOptionsWidget(TQWidget * parent);
~KviServerOptionsWidget(); ~KviServerOptionsWidget();
protected: protected:
KviTalListView * m_pListView; KviTalListView * m_pListView;

@ -53,8 +53,8 @@ KviSoundOptionsWidget::~KviSoundOptionsWidget()
} }
KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * tqparent) KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"sound_system_options_widget") : KviOptionsWidget(parent,"sound_system_options_widget")
{ {
#ifdef COMPILE_ON_WINDOWS #ifdef COMPILE_ON_WINDOWS
createLayout(4,1); createLayout(4,1);
@ -283,8 +283,8 @@ void KviSoundGeneralOptionsWidget::commit()
#endif #endif
} }
KviSoundsOptionsWidget::KviSoundsOptionsWidget(TQWidget * tqparent) KviSoundsOptionsWidget::KviSoundsOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"sound_options_widget") : KviOptionsWidget(parent,"sound_options_widget")
{ {
createLayout(5,2); createLayout(5,2);
addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options")); addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options"));

@ -39,7 +39,7 @@ class KviSoundOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviSoundOptionsWidget(TQWidget * tqparent); KviSoundOptionsWidget(TQWidget * parent);
~KviSoundOptionsWidget(); ~KviSoundOptionsWidget();
}; };
@ -54,7 +54,7 @@ class KviSoundGeneralOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviSoundGeneralOptionsWidget(TQWidget * tqparent); KviSoundGeneralOptionsWidget(TQWidget * parent);
~KviSoundGeneralOptionsWidget(); ~KviSoundGeneralOptionsWidget();
protected: protected:
TQComboBox * m_pSoundSystemBox; TQComboBox * m_pSoundSystemBox;
@ -90,7 +90,7 @@ class KviSoundsOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviSoundsOptionsWidget(TQWidget * tqparent); KviSoundsOptionsWidget(TQWidget * parent);
~KviSoundsOptionsWidget(); ~KviSoundsOptionsWidget();
}; };

@ -27,8 +27,8 @@
#include "kvi_options.h" #include "kvi_options.h"
KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(TQWidget * tqparent) KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"taskbar_options_widget") : KviOptionsWidget(parent,"taskbar_options_widget")
{ {
createLayout(7,1); createLayout(7,1);
@ -60,8 +60,8 @@ KviTaskBarOptionsWidget::~KviTaskBarOptionsWidget()
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(TQWidget * tqparent) KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"treetaskbar_options_widget") : KviOptionsWidget(parent,"treetaskbar_options_widget")
{ {
} }
@ -72,8 +72,8 @@ KviTreeTaskBarOptionsWidget::~KviTreeTaskBarOptionsWidget()
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent) KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"treetaskbar_options_widget") : KviOptionsWidget(parent,"treetaskbar_options_widget")
{ {
createLayout(3,1); createLayout(3,1);
@ -102,8 +102,8 @@ KviTreeTaskBarForegroundOptionsWidget::~KviTreeTaskBarForegroundOptionsWidget()
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent) KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"treetaskbar_options_widget") : KviOptionsWidget(parent,"treetaskbar_options_widget")
{ {
createLayout(4,2); createLayout(4,2);
@ -204,8 +204,8 @@ void KviTreeTaskBarBackgroundOptionsWidget::commit()
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent) KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"treetaskbar_options_widget") : KviOptionsWidget(parent,"treetaskbar_options_widget")
{ {
createLayout(4,1); createLayout(4,1);
@ -225,8 +225,8 @@ KviTreeTaskBarFeaturesOptionsWidget::~KviTreeTaskBarFeaturesOptionsWidget()
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(TQWidget * tqparent) KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"classictaskbar_options_widget") : KviOptionsWidget(parent,"classictaskbar_options_widget")
{ {
createLayout(8,1); createLayout(8,1);
addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar); addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar);

@ -40,7 +40,7 @@ class KviTaskBarOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviTaskBarOptionsWidget(TQWidget * tqparent); KviTaskBarOptionsWidget(TQWidget * parent);
~KviTaskBarOptionsWidget(); ~KviTaskBarOptionsWidget();
}; };
@ -72,7 +72,7 @@ class KviTreeTaskBarForegroundOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent); KviTreeTaskBarForegroundOptionsWidget(TQWidget * parent);
~KviTreeTaskBarForegroundOptionsWidget(); ~KviTreeTaskBarForegroundOptionsWidget();
}; };
@ -91,7 +91,7 @@ private:
TQComboBox* m_pHorizontalAlign; TQComboBox* m_pHorizontalAlign;
TQComboBox* m_pVerticalAlign; TQComboBox* m_pVerticalAlign;
public: public:
KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent); KviTreeTaskBarBackgroundOptionsWidget(TQWidget * parent);
~KviTreeTaskBarBackgroundOptionsWidget(); ~KviTreeTaskBarBackgroundOptionsWidget();
virtual void commit(); virtual void commit();
@ -108,7 +108,7 @@ class KviTreeTaskBarFeaturesOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent); KviTreeTaskBarFeaturesOptionsWidget(TQWidget * parent);
~KviTreeTaskBarFeaturesOptionsWidget(); ~KviTreeTaskBarFeaturesOptionsWidget();
}; };
@ -124,7 +124,7 @@ class KviClassicTaskBarOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviClassicTaskBarOptionsWidget(TQWidget * tqparent); KviClassicTaskBarOptionsWidget(TQWidget * parent);
~KviClassicTaskBarOptionsWidget(); ~KviClassicTaskBarOptionsWidget();
}; };

@ -32,8 +32,8 @@
TQString g_szPrevSettedLocale; TQString g_szPrevSettedLocale;
KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * tqparent) KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"textencoding_options_widget") : KviOptionsWidget(parent,"textencoding_options_widget")
{ {
createLayout(5,2); createLayout(5,2);

@ -38,7 +38,7 @@ class KviTextEncodingOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviTextEncodingOptionsWidget(TQWidget * tqparent); KviTextEncodingOptionsWidget(TQWidget * parent);
~KviTextEncodingOptionsWidget(); ~KviTextEncodingOptionsWidget();
protected: protected:
TQString m_szLanguage; TQString m_szLanguage;

@ -136,8 +136,8 @@ void KviTextIconTableItem::setContentFromEditor(TQWidget * w)
} }
} }
KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * tqparent) KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"texticons_options_widget") : KviOptionsWidget(parent,"texticons_options_widget")
{ {
createLayout(2,2); createLayout(2,2);

@ -90,7 +90,7 @@ class KviTextIconsOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviTextIconsOptionsWidget(TQWidget * tqparent); KviTextIconsOptionsWidget(TQWidget * parent);
~KviTextIconsOptionsWidget(); ~KviTextIconsOptionsWidget();
protected: protected:
KviTalTable * m_pTable; KviTalTable * m_pTable;

@ -30,8 +30,8 @@
#include "kvi_options.h" #include "kvi_options.h"
#include "kvi_locale.h" #include "kvi_locale.h"
KviToolsOptionsWidget::KviToolsOptionsWidget(TQWidget * tqparent) KviToolsOptionsWidget::KviToolsOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"tools_options_widget") : KviOptionsWidget(parent,"tools_options_widget")
{ {
createLayout(1,1); createLayout(1,1);

@ -40,7 +40,7 @@ class KviToolsOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviToolsOptionsWidget(TQWidget * tqparent); KviToolsOptionsWidget(TQWidget * parent);
~KviToolsOptionsWidget(); ~KviToolsOptionsWidget();
}; };

@ -32,8 +32,8 @@
//#warning "Info tips" //#warning "Info tips"
KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * tqparent) KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"tray_options_widget") : KviOptionsWidget(parent,"tray_options_widget")
{ {
createLayout(7,1); createLayout(7,1);

@ -35,7 +35,7 @@ class KviTrayOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviTrayOptionsWidget(TQWidget * tqparent); KviTrayOptionsWidget(TQWidget * parent);
~KviTrayOptionsWidget(); ~KviTrayOptionsWidget();
protected: protected:
KviBoolSelector * m_pEnable; KviBoolSelector * m_pEnable;

@ -31,8 +31,8 @@
#include <tqlabel.h> #include <tqlabel.h>
KviUParserOptionsWidget::KviUParserOptionsWidget(TQWidget * tqparent) KviUParserOptionsWidget::KviUParserOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"uparser_options_widget") : KviOptionsWidget(parent,"uparser_options_widget")
{ {
createLayout(11,1); createLayout(11,1);

@ -34,7 +34,7 @@ class KviUParserOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviUParserOptionsWidget(TQWidget * tqparent); KviUParserOptionsWidget(TQWidget * parent);
~KviUParserOptionsWidget(); ~KviUParserOptionsWidget();
}; };

@ -32,8 +32,8 @@
#include <tqlabel.h> #include <tqlabel.h>
KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * tqparent) KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"urlhandlers_options_widget") : KviOptionsWidget(parent,"urlhandlers_options_widget")
{ {
#ifdef COMPILE_ON_WINDOWS #ifdef COMPILE_ON_WINDOWS
#define START_ROW 1 #define START_ROW 1

@ -35,7 +35,7 @@ class KviUrlHandlersOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviUrlHandlersOptionsWidget(TQWidget * tqparent); KviUrlHandlersOptionsWidget(TQWidget * parent);
~KviUrlHandlersOptionsWidget(); ~KviUrlHandlersOptionsWidget();
private: private:
KviStringSelector* m_pHttpHandler; KviStringSelector* m_pHttpHandler;

@ -29,8 +29,8 @@
//#warning "Info tips" //#warning "Info tips"
KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(TQWidget * tqparent) KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"userlistlook_options_widget") : KviOptionsWidget(parent,"userlistlook_options_widget")
{ {
} }
@ -43,8 +43,8 @@ KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(TQWidget * tqparent) KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"userlistlook_foreground_options_widget") : KviOptionsWidget(parent,"userlistlook_foreground_options_widget")
{ {
createLayout(2,2); createLayout(2,2);
@ -74,8 +74,8 @@ KviUserListLookForegroundOptionsWidget::~KviUserListLookForegroundOptionsWidget(
{ {
} }
KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * tqparent) KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent) : KviOptionsWidget(parent)
{ {
createLayout(5,1); createLayout(5,1);
KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid); KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid);
@ -116,8 +116,8 @@ void KviUserListGridOptionsWidget::commit()
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(TQWidget * tqparent) KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"userlistlook_background_options_widget") : KviOptionsWidget(parent,"userlistlook_background_options_widget")
{ {
createLayout(3,2); createLayout(3,2);
@ -223,8 +223,8 @@ void KviUserListLookBackgroundOptionsWidget::commit()
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(TQWidget * tqparent) KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(TQWidget * parent)
: KviOptionsWidget(tqparent,"userlistfeatures_options_widget") : KviOptionsWidget(parent,"userlistfeatures_options_widget")
{ {
createLayout(7,1); createLayout(7,1);

@ -37,7 +37,7 @@ class KviUserListLookOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviUserListLookOptionsWidget(TQWidget * tqparent); KviUserListLookOptionsWidget(TQWidget * parent);
~KviUserListLookOptionsWidget(); ~KviUserListLookOptionsWidget();
}; };
@ -54,7 +54,7 @@ class KviUserListLookBackgroundOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviUserListLookBackgroundOptionsWidget(TQWidget * tqparent); KviUserListLookBackgroundOptionsWidget(TQWidget * parent);
~KviUserListLookBackgroundOptionsWidget(); ~KviUserListLookBackgroundOptionsWidget();
protected: protected:
TQComboBox* m_pHorizontalAlign; TQComboBox* m_pHorizontalAlign;
@ -76,7 +76,7 @@ class KviUserListLookForegroundOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviUserListLookForegroundOptionsWidget(TQWidget * tqparent); KviUserListLookForegroundOptionsWidget(TQWidget * parent);
~KviUserListLookForegroundOptionsWidget(); ~KviUserListLookForegroundOptionsWidget();
}; };
@ -93,7 +93,7 @@ class KviUserListGridOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviUserListGridOptionsWidget(TQWidget * tqparent); KviUserListGridOptionsWidget(TQWidget * parent);
~KviUserListGridOptionsWidget(); ~KviUserListGridOptionsWidget();
protected: protected:
TQComboBox * m_pGridTypeCombo; TQComboBox * m_pGridTypeCombo;
@ -112,7 +112,7 @@ class KviUserListFeaturesOptionsWidget : public KviOptionsWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviUserListFeaturesOptionsWidget(TQWidget * tqparent); KviUserListFeaturesOptionsWidget(TQWidget * parent);
~KviUserListFeaturesOptionsWidget(); ~KviUserListFeaturesOptionsWidget();
}; };

@ -62,8 +62,8 @@ KviPopupListViewItem::KviPopupListViewItem(KviTalListView * pListView,KviPopupLi
init(); init();
} }
KviPopupListViewItem::KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t) KviPopupListViewItem::KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t)
: KviTalListViewItem(tqparent,after) : KviTalListViewItem(parent,after)
{ {
m_type = t; m_type = t;
init(); init();
@ -379,7 +379,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
if(it) if(it)
{ {
parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->tqparent()); parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->parent());
bIsMenu = ((KviPopupListViewItem *)it)->m_type == KviPopupListViewItem::Menu; bIsMenu = ((KviPopupListViewItem *)it)->m_type == KviPopupListViewItem::Menu;
} }
@ -584,13 +584,13 @@ KviPopupListViewItem * KviSinglePopupEditor::newItem(KviPopupListViewItem * par,
KviPopupListViewItem * KviSinglePopupEditor::newItemBelow(KviPopupListViewItem * it,KviPopupListViewItem::Type t) KviPopupListViewItem * KviSinglePopupEditor::newItemBelow(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
{ {
if(!it)return newItem(0,0,t); if(!it)return newItem(0,0,t);
return newItem((KviPopupListViewItem *)it->tqparent(),it,t); return newItem((KviPopupListViewItem *)it->parent(),it,t);
} }
KviPopupListViewItem * KviSinglePopupEditor::newItemAbove(KviPopupListViewItem * it,KviPopupListViewItem::Type t) KviPopupListViewItem * KviSinglePopupEditor::newItemAbove(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
{ {
if(!it)return newItem(0,0,t); if(!it)return newItem(0,0,t);
return newItem((KviPopupListViewItem *)it->tqparent(),(KviPopupListViewItem *)it->itemAbove(),t); return newItem((KviPopupListViewItem *)it->parent(),(KviPopupListViewItem *)it->itemAbove(),t);
} }
KviPopupListViewItem * KviSinglePopupEditor::newItemInside(KviPopupListViewItem * it,KviPopupListViewItem::Type t) KviPopupListViewItem * KviSinglePopupEditor::newItemInside(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
@ -607,7 +607,7 @@ KviPopupListViewItem * KviSinglePopupEditor::newItemInside(KviPopupListViewItem
void KviSinglePopupEditor::contextNewPrologue() void KviSinglePopupEditor::contextNewPrologue()
{ {
KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0; KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
// if(!findPrologue(it)) // if(!findPrologue(it))
// { // {
m_pListView->setCurrentItem(newItem(it,it,KviPopupListViewItem::Prologue)); m_pListView->setCurrentItem(newItem(it,it,KviPopupListViewItem::Prologue));
@ -616,7 +616,7 @@ void KviSinglePopupEditor::contextNewPrologue()
void KviSinglePopupEditor::contextNewEpilogue() void KviSinglePopupEditor::contextNewEpilogue()
{ {
KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0; KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
// if(!findEpilogue(it)) // if(!findEpilogue(it))
// { // {
KviPopupListViewItem * after = it ? (KviPopupListViewItem *)it->firstChild() : (KviPopupListViewItem *)m_pListView->firstChild(); KviPopupListViewItem * after = it ? (KviPopupListViewItem *)it->firstChild() : (KviPopupListViewItem *)m_pListView->firstChild();
@ -653,14 +653,14 @@ void KviSinglePopupEditor::contextCut()
void KviSinglePopupEditor::contextPasteBelow() void KviSinglePopupEditor::contextPasteBelow()
{ {
if(!m_pClipboard)return; if(!m_pClipboard)return;
KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0; KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
populateMenu(m_pClipboard,par,m_pLastSelectedItem); populateMenu(m_pClipboard,par,m_pLastSelectedItem);
} }
void KviSinglePopupEditor::contextPasteAbove() void KviSinglePopupEditor::contextPasteAbove()
{ {
if(!m_pClipboard)return; if(!m_pClipboard)return;
KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0; KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
KviPopupListViewItem * above = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->itemAbove() : 0; KviPopupListViewItem * above = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->itemAbove() : 0;
populateMenu(m_pClipboard,par,above); populateMenu(m_pClipboard,par,above);

@ -42,7 +42,7 @@ public:
enum Type { Item , Menu , Separator , Label , Epilogue , Prologue , ExtMenu }; enum Type { Item , Menu , Separator , Label , Epilogue , Prologue , ExtMenu };
public: public:
KviPopupListViewItem(KviTalListView * pListView,KviPopupListViewItem * after,Type t); KviPopupListViewItem(KviTalListView * pListView,KviPopupListViewItem * after,Type t);
KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t); KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t);
public: public:
Type m_type; Type m_type;
TQString m_szText; TQString m_szText;

@ -146,7 +146,7 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col
m_pContextPopup->clear(); m_pContextPopup->clear();
if(it) if(it)
{ {
if(it->tqparent()) if(it->parent())
{ {
if(!(((KviRawHandlerListViewItem *)it)->m_bEnabled)) if(!(((KviRawHandlerListViewItem *)it)->m_bEnabled))
m_pContextPopup->insertItem( m_pContextPopup->insertItem(
@ -245,7 +245,7 @@ void KviRawEditor::addHandlerForCurrentRaw()
KviTalListViewItem * it = m_pListView->selectedItem(); KviTalListViewItem * it = m_pListView->selectedItem();
if(it) if(it)
{ {
if(it->tqparent() == 0) if(it->parent() == 0)
{ {
TQString buffer = __tr2qs("default"); TQString buffer = __tr2qs("default");
getUniqueHandlerName((KviRawListViewItem *)it,buffer); getUniqueHandlerName((KviRawListViewItem *)it,buffer);
@ -318,7 +318,7 @@ void KviRawEditor::saveLastEditedItem()
TQString buffer = m_pNameEditor->text(); TQString buffer = m_pNameEditor->text();
if(!KviTQString::equalCI(buffer,m_pLastEditedItem->m_szName)) if(!KviTQString::equalCI(buffer,m_pLastEditedItem->m_szName))
{ {
getUniqueHandlerName((KviRawListViewItem *)(m_pLastEditedItem->tqparent()),buffer); getUniqueHandlerName((KviRawListViewItem *)(m_pLastEditedItem->parent()),buffer);
} }
m_pLastEditedItem->m_szName = buffer; m_pLastEditedItem->m_szName = buffer;
@ -332,7 +332,7 @@ void KviRawEditor::selectionChanged(KviTalListViewItem * it)
{ {
__range_valid(m_bOneTimeSetupDone); __range_valid(m_bOneTimeSetupDone);
saveLastEditedItem(); saveLastEditedItem();
if(it->tqparent()) if(it->parent())
{ {
m_pLastEditedItem = (KviRawHandlerListViewItem *)it; m_pLastEditedItem = (KviRawHandlerListViewItem *)it;
m_pNameEditor->setEnabled(true); m_pNameEditor->setEnabled(true);
@ -355,14 +355,14 @@ void KviRawEditor::showEvent(TQShowEvent *e)
void KviRawEditor::getExportEventBuffer(TQString &buffer,KviRawHandlerListViewItem * it) void KviRawEditor::getExportEventBuffer(TQString &buffer,KviRawHandlerListViewItem * it)
{ {
if(!it->tqparent())return; if(!it->parent())return;
TQString szBuf = it->m_szBuffer; TQString szBuf = it->m_szBuffer;
KviCommandFormatter::blockFromBuffer(szBuf); KviCommandFormatter::blockFromBuffer(szBuf);
buffer = "event("; buffer = "event(";
buffer += ((KviRawListViewItem *)(it->tqparent()))->m_szName; buffer += ((KviRawListViewItem *)(it->parent()))->m_szName;
buffer += ","; buffer += ",";
buffer += it->m_szName; buffer += it->m_szName;
buffer += ")\n"; buffer += ")\n";
@ -373,7 +373,7 @@ void KviRawEditor::getExportEventBuffer(TQString &buffer,KviRawHandlerListViewIt
{ {
buffer += "\n"; buffer += "\n";
buffer += "eventctl -d "; buffer += "eventctl -d ";
buffer += ((KviRawListViewItem *)(it->tqparent()))->m_szName; buffer += ((KviRawListViewItem *)(it->parent()))->m_szName;
buffer += " "; buffer += " ";
buffer += it->m_szName; buffer += it->m_szName;
} }
@ -388,7 +388,7 @@ void KviRawEditor::exportCurrentHandler()
TQString szName = TQDir::homeDirPath(); TQString szName = TQDir::homeDirPath();
if(!szName.endsWith(TQString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR; if(!szName.endsWith(TQString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
szName += "raw"; szName += "raw";
szName += ((KviRawListViewItem *)(m_pLastEditedItem->tqparent()))->m_szName; szName += ((KviRawListViewItem *)(m_pLastEditedItem->parent()))->m_szName;
szName += "."; szName += ".";
szName += m_pLastEditedItem->m_szName; szName += m_pLastEditedItem->m_szName;
szName += ".kvs"; szName += ".kvs";

@ -46,10 +46,10 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
@short: @short:
Registers a channel Registers a channel
@syntax: @syntax:
regchan.add <channel:string> [nettqmask:string] regchan.add <channel:string> [netmask:string]
@description: @description:
Registers the <channel> with the specified [nettqmask]. Registers the <channel> with the specified [netmask].
[nettqmask] can be a full network name or a wildcard string [netmask] can be a full network name or a wildcard string
tht will be matched against network names. tht will be matched against network names.
For example, if you want to register #kvirc on IRCNet For example, if you want to register #kvirc on IRCNet
you can use regchan.add #kvirc IRCNet. you can use regchan.add #kvirc IRCNet.
@ -57,7 +57,7 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
you can use regchan.add #kvirc *[br] you can use regchan.add #kvirc *[br]
Obviously if you register both #kvirc/IRCNet and #kvirc/* Obviously if you register both #kvirc/IRCNet and #kvirc/*
then #kvirc/IRCNet will be looked first. then #kvirc/IRCNet will be looked first.
If nettqmask is not passed a nettqmask of * is assumed.[br] If netmask is not passed a netmask of * is assumed.[br]
@examples: @examples:
[example] [example]
regchan.add #kvirc openprojects regchan.add #kvirc openprojects
@ -67,13 +67,13 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c) static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
{ {
TQString szChan,szNettqmask; TQString szChan,szNetmask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("channel name",KVS_PT_NONEMPTYSTRING,0,szChan) KVSM_PARAMETER("channel name",KVS_PT_NONEMPTYSTRING,0,szChan)
KVSM_PARAMETER("nettqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNettqmask) KVSM_PARAMETER("netmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNetmask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
if(szNettqmask.isEmpty())szNettqmask="*"; if(szNetmask.isEmpty())szNetmask="*";
g_pRegisteredChannelDataBase->add(new KviRegisteredChannel(szChan,szNettqmask)); g_pRegisteredChannelDataBase->add(new KviRegisteredChannel(szChan,szNetmask));
return true; return true;
} }
@ -91,12 +91,12 @@ static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
regchan.remove [-q|--quiet] [-e|--exactly] <channel:string> <network:string> regchan.remove [-q|--quiet] [-e|--exactly] <channel:string> <network:string>
@description: @description:
Unregisters the channel named <channel> that best matches <network> Unregisters the channel named <channel> that best matches <network>
with its nettqmask.[br] with its netmask.[br]
If no match for <channel>/<network> is found in the database then If no match for <channel>/<network> is found in the database then
a warning is printed unless -q is used.[br] a warning is printed unless -q is used.[br]
If -e is specified then <network> is not matched against the If -e is specified then <network> is not matched against the
netmasks in the database but is compared directly. This means netmasks in the database but is compared directly. This means
that <network> must be exactly the nettqmask used to register a channel. that <network> must be exactly the netmask used to register a channel.
@examples: @examples:
[example] [example]
regchan.remove #kvirc openprojects regchan.remove #kvirc openprojects
@ -118,7 +118,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
{ {
g_pRegisteredChannelDataBase->remove(ch); g_pRegisteredChannelDataBase->remove(ch);
} else { } else {
if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No such channel/nettqmask entry in the database")); if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No such channel/netmask entry in the database"));
} }
return true; return true;
} }
@ -145,7 +145,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
!fn: -e|--exactly !fn: -e|--exactly
If -e is specified then <network> is not matched against the If -e is specified then <network> is not matched against the
netmasks in the database but is compared directly. This means netmasks in the database but is compared directly. This means
that <network> must be exactly the nettqmask used to register a channel. that <network> must be exactly the netmask used to register a channel.
@examples: @examples:
[example] [example]
regchan.setproperty #kvirc openprojects autojoin true regchan.setproperty #kvirc openprojects autojoin true
@ -175,7 +175,7 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c)
ch->removeProperty(szProperty); ch->removeProperty(szProperty);
} }
} else { } else {
if(!c->hasSwitch('q',"quiet")) c->warning(__tr2qs("No such channel/nettqmask entry in the database")); if(!c->hasSwitch('q',"quiet")) c->warning(__tr2qs("No such channel/netmask entry in the database"));
} }
return true; return true;
} }
@ -230,11 +230,11 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
@short: @short:
Get a list of registered channels Get a list of registered channels
@syntax: @syntax:
<array> $regchan.list([<channel_tqmask:string>],[<network_tqmask:string>]) <array> $regchan.list([<channel_mask:string>],[<network_mask:string>])
@description: @description:
Returns an array of the channel@nettqmask entries in the registered Returns an array of the channel@netmask entries in the registered
channels database.[br] channels database.[br]
Please note that <network_tqmask> is a wildcard string that will match Please note that <network_mask> is a wildcard string that will match
wildcard strings.[br] wildcard strings.[br]
@examples: @examples:
[example] [example]
@ -244,10 +244,10 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c) static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
{ {
TQString szChan,szNettqmask; TQString szChan,szNetmask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("channel name",KVS_PT_STRING,KVS_PF_OPTIONAL,szChan) KVSM_PARAMETER("channel name",KVS_PT_STRING,KVS_PF_OPTIONAL,szChan)
KVSM_PARAMETER("nettqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNettqmask) KVSM_PARAMETER("netmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNetmask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
KviKvsArray* pArray = new KviKvsArray(); KviKvsArray* pArray = new KviKvsArray();
@ -257,7 +257,7 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
int aid=0; int aid=0;
if(szChan.isEmpty())szChan="*"; if(szChan.isEmpty())szChan="*";
if(szNettqmask.isEmpty())szNettqmask="*"; if(szNetmask.isEmpty())szNetmask="*";
KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict(); KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d); KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d);
@ -266,9 +266,9 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
{ {
for(KviRegisteredChannel * ch = l->first();ch;ch = l->next()) for(KviRegisteredChannel * ch = l->first();ch;ch = l->next())
if(KviTQString::matchWildExpressionsCI(ch->name().ptr(),szChan) && if(KviTQString::matchWildExpressionsCI(ch->name().ptr(),szChan) &&
KviTQString::matchWildExpressionsCI(ch->netMask().ptr(),szNettqmask)) KviTQString::matchWildExpressionsCI(ch->netMask().ptr(),szNetmask))
{ {
// FIXME: WE NEED TO RETURN AN ARRAY OF 2-ELEMENT ARRAYS (chan name, nettqmask) // FIXME: WE NEED TO RETURN AN ARRAY OF 2-ELEMENT ARRAYS (chan name, netmask)
pArray->set(aid,new KviKvsVariant(TQString(ch->name()+"@"+ch->netMask()))); pArray->set(aid,new KviKvsVariant(TQString(ch->name()+"@"+ch->netMask())));
// pArray->set(aid,new KviKvsVariant(TQString(ch->name())); // pArray->set(aid,new KviKvsVariant(TQString(ch->name()));
// pArrayCN->set(0,new KviKvsVariant(TQString(ch->name()))); // pArrayCN->set(0,new KviKvsVariant(TQString(ch->name())));
@ -363,11 +363,11 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
@short: @short:
Checks if a channel is registered Checks if a channel is registered
@syntax: @syntax:
<boolean> $regchan.find(<channel_name:string>,<nettqmask:string>) <boolean> $regchan.find(<channel_name:string>,<netmask:string>)
@description: @description:
Returns 1 if the channel identified by <channel_name> and <nettqmask> Returns 1 if the channel identified by <channel_name> and <netmask>
is registered and 0 otherwise. This function is similar to $regchan.match is registered and 0 otherwise. This function is similar to $regchan.match
but for $regchan.find the second parameter is the exact nettqmask but for $regchan.find the second parameter is the exact netmask
of the registered channel entry. of the registered channel entry.
@examples: @examples:
[example] [example]
@ -380,12 +380,12 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
static bool regchan_kvs_fnc_find(KviKvsModuleFunctionCall * c) static bool regchan_kvs_fnc_find(KviKvsModuleFunctionCall * c)
{ {
TQString szChan,szNettqmask; TQString szChan,szNetmask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan) KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
KVSM_PARAMETER("nettqmask",KVS_PT_STRING,0,szNettqmask) KVSM_PARAMETER("netmask",KVS_PT_STRING,0,szNetmask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNettqmask); KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetmask);
c->returnValue()->setBoolean(ch); c->returnValue()->setBoolean(ch);
return true; return true;
} }

@ -292,7 +292,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
fillList(); fillList();
if(!tqparent()) if(!parent())
{ {
if(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).y() < 5) if(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).y() < 5)
{ {
@ -309,10 +309,10 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
KviRegisteredUsersDialog::~KviRegisteredUsersDialog() KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
{ {
#ifndef Q_OS_MACX #ifndef Q_OS_MACX
if(!tqparent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = TQRect(pos().x(),pos().y(), if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = TQRect(pos().x(),pos().y(),
size().width(),size().height()); size().width(),size().height());
#else #else
if(!tqparent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry(); if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry();
#endif #endif
g_pRegisteredUsersDialog = 0; g_pRegisteredUsersDialog = 0;
@ -724,7 +724,7 @@ void KviRegisteredUsersDialog::exportClicked()
for(KviIrcMask * m = ml->first();m;m = ml->next()) for(KviIrcMask * m = ml->first();m;m = ml->next())
{ {
TQString fullMask; TQString fullMask;
m->tqmask(fullMask,KviIrcMask::NickUserHost); m->mask(fullMask,KviIrcMask::NickUserHost);
if(!f.save(fullMask))goto write_error; if(!f.save(fullMask))goto write_error;
} }
} else { } else {

@ -216,7 +216,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
TQGridLayout * g = new TQGridLayout(this,3,2,4,4); TQGridLayout * g = new TQGridLayout(this,3,2,4,4);
TQLabel * l = new TQLabel(__tr2qs("Insert a tqmask for this user.<br>It can contain the wildcard characters '*' and '?'."),this); TQLabel * l = new TQLabel(__tr2qs("Insert a mask for this user.<br>It can contain the wildcard characters '*' and '?'."),this);
//l->tqsetAlignment(TQt::AlignCenter); //l->tqsetAlignment(TQt::AlignCenter);
g->addMultiCellWidget(l,0,0,0,1); g->addMultiCellWidget(l,0,0,0,1);
@ -606,8 +606,8 @@ void KviRegisteredUserEntryDialog::okClicked()
idx = 0; idx = 0;
while(cnt > 0) while(cnt > 0)
{ {
TQString tqmask = m_pMaskListBox->text(idx); TQString mask = m_pMaskListBox->text(idx);
KviIrcMask * mk = new KviIrcMask(tqmask); KviIrcMask * mk = new KviIrcMask(mask);
g_pLocalRegisteredUserDataBase->removeMask(*mk); g_pLocalRegisteredUserDataBase->removeMask(*mk);
g_pLocalRegisteredUserDataBase->addMask(u,mk); g_pLocalRegisteredUserDataBase->addMask(u,mk);
cnt--; cnt--;

@ -68,7 +68,7 @@ KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
The reguser module is the scripting interface to the [doc:registered_users]registered users database[/doc].[br] The reguser module is the scripting interface to the [doc:registered_users]registered users database[/doc].[br]
It provides the following set of commands:[br] It provides the following set of commands:[br]
[cmd]reguser.add[/cmd]: adds an user entry to the database[br] [cmd]reguser.add[/cmd]: adds an user entry to the database[br]
[cmd]reguser.addtqmask[/cmd]: adds an user's tqmask to the database[br] [cmd]reguser.addmask[/cmd]: adds an user's mask to the database[br]
[cmd]reguser.remove[/cmd]: removes an user entry from the database[br] [cmd]reguser.remove[/cmd]: removes an user entry from the database[br]
[fnc]$reguser.list[/fnc]: lists the entries[br] [fnc]$reguser.list[/fnc]: lists the entries[br]
[cmd]reguser.setproperty[/cmd]: sets a property associated to an entry[br] [cmd]reguser.setproperty[/cmd]: sets a property associated to an entry[br]
@ -77,7 +77,7 @@ KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
[fnc]$reguser.exactMatch[/fnc](): finds an entry by comparing masks[br] [fnc]$reguser.exactMatch[/fnc](): finds an entry by comparing masks[br]
[fnc]$reguser.property[/fnc](): finds a property associated to an entry[br] [fnc]$reguser.property[/fnc](): finds a property associated to an entry[br]
[fnc]$reguser.matchProperty[/fnc](): shortcut for [fnc]$reguser.property[/fnc]([fnc]$reguser.match[/fnc]())[br] [fnc]$reguser.matchProperty[/fnc](): shortcut for [fnc]$reguser.property[/fnc]([fnc]$reguser.match[/fnc]())[br]
[fnc]$reguser.tqmask[/fnc](): returns the registration masks for an entry [fnc]$reguser.mask[/fnc](): returns the registration masks for an entry
*/ */
/* /*
@ -105,7 +105,7 @@ KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc] [fnc]$reguser.list[/fnc]
*/ */
@ -115,12 +115,12 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
{ {
if(c->hasSwitch('t',"toplevel")) if(c->hasSwitch('t',"toplevel"))
{ {
if(g_pRegisteredUsersDialog->tqparent()) if(g_pRegisteredUsersDialog->parent())
{ {
g_pRegisteredUsersDialog->reparent(0,TQPoint(0,0),true); g_pRegisteredUsersDialog->reparent(0,TQPoint(0,0),true);
} }
} else { } else {
if(TQT_BASE_OBJECT(g_pRegisteredUsersDialog->tqparent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter())) if(TQT_BASE_OBJECT(g_pRegisteredUsersDialog->parent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter()))
{ {
g_pRegisteredUsersDialog->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true); g_pRegisteredUsersDialog->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true);
} }
@ -150,19 +150,19 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
@short: @short:
Registers an user Registers an user
@syntax: @syntax:
reguser.add [-r] [-f] [-q] [-g=group] <name> [tqmask] reguser.add [-r] [-f] [-q] [-g=group] <name> [mask]
@description: @description:
Adds a new entry with the specified <name> to the database.[br] Adds a new entry with the specified <name> to the database.[br]
If the database contains an entry with the same <name>, this command just prints If the database contains an entry with the same <name>, this command just prints
a warning and returns.[br] a warning and returns.[br]
If no [tqmask] is given the new entry has no registration masks: so it can't be "matched" yet. You have to add If no [mask] is given the new entry has no registration masks: so it can't be "matched" yet. You have to add
at least one tqmask with [cmd]reguser.addtqmask[/cmd]. at least one mask with [cmd]reguser.addmask[/cmd].
If [tqmask] is given, then it is added to the entry tqmask list.[br] If [mask] is given, then it is added to the entry mask list.[br]
The <name> parameter may contain any character: even spaces are allowed (obviously you have to The <name> parameter may contain any character: even spaces are allowed (obviously you have to
use quotes in that case).[br] use quotes in that case).[br]
If the '-r' switch is given , the new entry replaces any previous one with the same <name> (the old entry is removed).[br] If the '-r' switch is given , the new entry replaces any previous one with the same <name> (the old entry is removed).[br]
If the '-f' switch is given , and there is an existing entry with the same name , no warning is printed If the '-f' switch is given , and there is an existing entry with the same name , no warning is printed
and the old entry is treated just like it has been just added (thus the [tqmask] is eventually added to its tqmask list).[br] and the old entry is treated just like it has been just added (thus the [mask] is eventually added to its mask list).[br]
The '-q' switch causes the command to run in "quiet" mode and print no warning.[br] The '-q' switch causes the command to run in "quiet" mode and print no warning.[br]
@examples: @examples:
[example] [example]
@ -172,7 +172,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc] [fnc]$reguser.list[/fnc]
*/ */
@ -182,7 +182,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
TQString szMask; TQString szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
if(szName.isEmpty()) if(szName.isEmpty())
{ {
@ -253,7 +253,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc] [fnc]$reguser.list[/fnc]
*/ */
@ -280,51 +280,51 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
} }
/* /*
@doc: reguser.addtqmask @doc: reguser.addmask
@type: @type:
command command
@title: @title:
reguser.addtqmask reguser.addmask
@keyterms: @keyterms:
registering users registering users
@short: @short:
Adds a tqmask to a registered user Adds a mask to a registered user
@syntax: @syntax:
reguser.addtqmask [-f] <name> <tqmask> reguser.addmask [-f] <name> <mask>
@description: @description:
Adds a registration tqmask to the database entry with name <name>.[br] Adds a registration mask to the database entry with name <name>.[br]
The <tqmask> has the common [doc:irc_masks]irc tqmask[/doc] format.[br] The <mask> has the common [doc:irc_masks]irc mask[/doc] format.[br]
The only restriction on the <tqmask> is that it must be unique inside the The only restriction on the <mask> is that it must be unique inside the
regusers database: you can't match two users with the same tqmask (it would regusers database: you can't match two users with the same mask (it would
have rather undefined results).[br] have rather undefined results).[br]
If -f is used , KVIrc ensures that the tqmask is unique in the database If -f is used , KVIrc ensures that the mask is unique in the database
and associates is to THIS registered user (breaking the previous associations).<br> and associates is to THIS registered user (breaking the previous associations).<br>
Once at least one tqmask has been added, the user can be "matched" Once at least one mask has been added, the user can be "matched"
by using the [fnc]$reguser.match[/fnc]() function.[br] by using the [fnc]$reguser.match[/fnc]() function.[br]
Each database entry can have an unlimited number of masks.[br] Each database entry can have an unlimited number of masks.[br]
@examples: @examples:
[example] [example]
[cmd]reguser.add[/cmd] "Szymon Stefanek" [cmd]reguser.add[/cmd] "Szymon Stefanek"
reguser.addtqmask "Szymon Stefanek" Pragma!*@*.it reguser.addmask "Szymon Stefanek" Pragma!*@*.it
[/example] [/example]
@seealso: @seealso:
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[cmd], [cmd]reguser.add[cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.deltqmask[/cmd], [cmd]reguser.delmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.match[/fnc], [fnc]$reguser.match[/fnc],
[fnc]$reguser.exactMatch[/fnc] [fnc]$reguser.exactMatch[/fnc]
*/ */
static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c) static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c)
{ {
TQString szName; TQString szName;
TQString szMask; TQString szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
if(szName.isEmpty()) if(szName.isEmpty())
@ -335,7 +335,7 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
if(szMask.isEmpty()) if(szMask.isEmpty())
{ {
c->warning(__tr2qs("No tqmask specified")); c->warning(__tr2qs("No mask specified"));
return true; return true;
} }
@ -357,27 +357,27 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
} }
/* /*
@doc: reguser.deltqmask @doc: reguser.delmask
@type: @type:
command command
@title: @title:
reguser.deltqmask reguser.delmask
@keyterms: @keyterms:
registering users registering users
@short: @short:
Removes a tqmask from the regusers database Removes a mask from the regusers database
@syntax: @syntax:
reguser.deltqmask <tqmask> reguser.delmask <mask>
@description: @description:
Removes a tqmask from the regusers database.[br] Removes a mask from the regusers database.[br]
Since masks are unique in the database , you don't need to pass Since masks are unique in the database , you don't need to pass
an <user> parameter: if an <user> entry has the <tqmask>, removing that <tqmask> an <user> parameter: if an <user> entry has the <mask>, removing that <mask>
will surely remove it from that <user> entry. (contorsions ?)[br] will surely remove it from that <user> entry. (contorsions ?)[br]
@examples: @examples:
[example] [example]
[cmd]reguser.add[/cmd] "Szymon Stefanek" [cmd]reguser.add[/cmd] "Szymon Stefanek"
[cmd]reguser.addtqmask[/cmd] "Szymon Stefanek" Pragma!*@*.it [cmd]reguser.addmask[/cmd] "Szymon Stefanek" Pragma!*@*.it
reguser.deltqmask Pragma!*@*.it reguser.delmask Pragma!*@*.it
[fnc]$reguser.list[/fnc] [fnc]$reguser.list[/fnc]
[/example] [/example]
@seealso: @seealso:
@ -385,22 +385,22 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.match[/fnc], [fnc]$reguser.match[/fnc],
[fnc]$reguser.exactMatch[/fnc] [fnc]$reguser.exactMatch[/fnc]
*/ */
static bool reguser_kvs_cmd_deltqmask(KviKvsModuleCommandCall * c) static bool reguser_kvs_cmd_delmask(KviKvsModuleCommandCall * c)
{ {
TQString szMask; TQString szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
if(szMask.isEmpty()) if(szMask.isEmpty())
{ {
c->warning(__tr2qs("No tqmask specified")); c->warning(__tr2qs("No mask specified"));
return true; return true;
} }
@ -564,8 +564,8 @@ static bool reguser_kvs_cmd_setIgnoreFlags(KviKvsModuleCommandCall * c)
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[cmd]reguser.deltqmask[/cmd], [cmd]reguser.delmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.match[/fnc], [fnc]$reguser.match[/fnc],
[fnc]$reguser.matchProperty[/fnc] [fnc]$reguser.matchProperty[/fnc]
@ -619,8 +619,8 @@ static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c)
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[cmd]reguser.deltqmask[/cmd], [cmd]reguser.delmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.match[/fnc], [fnc]$reguser.match[/fnc],
[fnc]$reguser.matchProperty[/fnc] [fnc]$reguser.matchProperty[/fnc]
@ -685,7 +685,7 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
TQString szProperty; TQString szProperty;
TQString szValue; TQString szValue;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szName) KVSM_PARAMETER("mask",KVS_PT_STRING,0,szName)
KVSM_PARAMETER("property",KVS_PT_STRING,0,szProperty) KVSM_PARAMETER("property",KVS_PT_STRING,0,szProperty)
KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
@ -722,19 +722,19 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
@short: @short:
Get a list of registered user masks Get a list of registered user masks
@syntax: @syntax:
$reguser.list([tqmask]) $reguser.list([mask])
@description: @description:
Returns an array of the entries in the registered users database.[br] Returns an array of the entries in the registered users database.[br]
If <tqmask> is specified, only entries matching the <tqmask> If <mask> is specified, only entries matching the <mask>
and the entries with no registration masks are listed.[br] and the entries with no registration masks are listed.[br]
Please note that <tqmask> is a wildcard string that will match Please note that <mask> is a wildcard string that will match
wildcard strings... don't get messed with that :D[br] wildcard strings... don't get messed with that :D[br]
@seealso: @seealso:
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.exactMatch[/fnc] [fnc]$reguser.exactMatch[/fnc]
*/ */
@ -744,10 +744,10 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
TQString szMask; TQString szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("user_tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) KVSM_PARAMETER("user_mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
KviIrcMask tqmask(szMask); KviIrcMask mask(szMask);
KviKvsArray* pArray = new KviKvsArray(); KviKvsArray* pArray = new KviKvsArray();
int aid=0; int aid=0;
@ -759,7 +759,7 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
while(KviRegisteredUser * u = it.current()) while(KviRegisteredUser * u = it.current())
{ {
KviPointerList<KviIrcMask> * ml = u->maskList(); KviPointerList<KviIrcMask> * ml = u->maskList();
if(u->matches(tqmask) || (ml->count() == 0)) if(u->matches(mask) || (ml->count() == 0))
{ {
pArray->set(aid,new KviKvsVariant(u->name())); pArray->set(aid,new KviKvsVariant(u->name()));
aid++; aid++;
@ -781,12 +781,12 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
@short: @short:
Lists the registered users Lists the registered users
@syntax: @syntax:
reguser.showlist [tqmask] reguser.showlist [mask]
@description: @description:
Lists the entries in the registered users database.[br] Lists the entries in the registered users database.[br]
If <tqmask> is specified, only entries matching the <tqmask> If <mask> is specified, only entries matching the <mask>
and the entries with no registration masks are listed.[br] and the entries with no registration masks are listed.[br]
Please note that <tqmask> is a wildcard string that will match Please note that <mask> is a wildcard string that will match
wildcard strings... don't get messed with that :D[br] wildcard strings... don't get messed with that :D[br]
@seealso: @seealso:
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
@ -801,10 +801,10 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
{ {
TQString szMask; TQString szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
KviIrcMask tqmask(szMask); KviIrcMask mask(szMask);
c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Registered users database dump:")); c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Registered users database dump:"));
int count = 0; int count = 0;
@ -814,7 +814,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
while(KviRegisteredUser * u = it.current()) while(KviRegisteredUser * u = it.current())
{ {
KviPointerList<KviIrcMask> * ml = u->maskList(); KviPointerList<KviIrcMask> * ml = u->maskList();
if(u->matches(tqmask) || (ml->count() == 0)) if(u->matches(mask) || (ml->count() == 0))
{ {
c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" User: %c%Q"),KVI_TEXT_BOLD,&(u->name())); c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" User: %c%Q"),KVI_TEXT_BOLD,&(u->name()));
@ -859,16 +859,16 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
@short: @short:
Returns an entry in the registered user database Returns an entry in the registered user database
@syntax: @syntax:
$reguser.match(<user_tqmask>) $reguser.match(<user_mask>)
@description: @description:
Returns the name of the first entry matching <user_tqmask> in the registered user database.[br] Returns the name of the first entry matching <user_mask> in the registered user database.[br]
The <user_tqmask> has the common [doc:irc_masks]irc tqmask[/doc] format but can't contain wildcards.[br] The <user_mask> has the common [doc:irc_masks]irc mask[/doc] format but can't contain wildcards.[br]
@seealso: @seealso:
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.exactMatch[/fnc] [fnc]$reguser.exactMatch[/fnc]
*/ */
@ -878,11 +878,11 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
TQString szMask; TQString szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("user_tqmask",KVS_PT_STRING,0,szMask) KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
KviIrcMask tqmask(szMask); KviIrcMask mask(szMask);
//FIXME: it crashes kvirc KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(tqmask.nick(),tqmask.user(),tqmask.host()); //FIXME: it crashes kvirc KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(tqmask.nick(),tqmask.user(),tqmask.host()); KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
if(u) c->returnValue()->setString(u->name()); if(u) c->returnValue()->setString(u->name());
return true; return true;
} }
@ -896,16 +896,16 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
@short: @short:
Returns an entry in the registered user database Returns an entry in the registered user database
@syntax: @syntax:
$reguser.exactMatch(<user_tqmask>) $reguser.exactMatch(<user_mask>)
@description: @description:
Returns the name of the registered user database entry that has <user_tqmask> in its registration tqmask list.[br] Returns the name of the registered user database entry that has <user_mask> in its registration mask list.[br]
The <user_tqmask> has the common [doc:irc_masks]wild irc tqmask[/doc] format and can contain wildcards.[br] The <user_mask> has the common [doc:irc_masks]wild irc mask[/doc] format and can contain wildcards.[br]
@seealso: @seealso:
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.match[/fnc] [fnc]$reguser.match[/fnc]
*/ */
@ -915,10 +915,10 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
TQString szMask; TQString szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("user_tqmask",KVS_PT_STRING,0,szMask) KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
KviIrcMask tqmask(szMask); KviIrcMask mask(szMask);
KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserWithMask(tqmask); KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserWithMask(mask);
if(u) c->returnValue()->setString(u->name()); if(u) c->returnValue()->setString(u->name());
return true; return true;
} }
@ -932,24 +932,24 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
// @short: // @short:
// Returns entries in the registered user database // Returns entries in the registered user database
// @syntax: // @syntax:
// $reguser.matches(<user_tqmask>) // $reguser.matches(<user_mask>)
// @description: // @description:
// Returns a comma separated list of registered user masks that match <user_tqmask>.[br] // Returns a comma separated list of registered user masks that match <user_mask>.[br]
// User tqmask must be in the format <nick>!<user>@<host> , where <user> and // User mask must be in the format <nick>!<user>@<host> , where <user> and
// <host> may contain '*' wildcards.[br] // <host> may contain '*' wildcards.[br]
// If no registered tqmask matches the <user_tqmask> an empty string is returned.[br] // If no registered mask matches the <user_mask> an empty string is returned.[br]
// @seealso: // @seealso:
// [module:reguser]reguser module documentation[/module] // [module:reguser]reguser module documentation[/module]
//*/ //*/
//static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * tqmask,KviStr & buffer) //static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * mask,KviStr & buffer)
//{ //{
// for(KviRegisteredUser * u = l->first();u;u = l->next()) // for(KviRegisteredUser * u = l->first();u;u = l->next())
// { // {
// if(u->matches(tqmask)) // if(u->matches(mask))
// { // {
// if(buffer.hasData())buffer.append(','); // if(buffer.hasData())buffer.append(',');
// buffer.append(u->tqmask()); // buffer.append(u->mask());
// } // }
// } // }
//} //}
@ -977,17 +977,17 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
/* /*
@doc: reguser.tqmask @doc: reguser.mask
@type: @type:
function function
@title: @title:
$reguser.tqmask $reguser.mask
@short: @short:
Returns the registration masks for a db entry Returns the registration masks for a db entry
@syntax: @syntax:
$reguser.tqmask(<name>[,<N>]) $reguser.mask(<name>[,<N>])
@description: @description:
Returns the <N>th registration tqmask for the registered user database record identified Returns the <N>th registration mask for the registered user database record identified
by <name>. If <N> is not given , returns an array of registration masks for that entry.[br] by <name>. If <N> is not given , returns an array of registration masks for that entry.[br]
If <name> does not identify a valid entry an empty string is returned; If <name> does not identify a valid entry an empty string is returned;
if <N> is out of range (or there are no masks at all) , an empty string is returned.[br] if <N> is out of range (or there are no masks at all) , an empty string is returned.[br]
@ -995,22 +995,22 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
@examples: @examples:
[example] [example]
[cmd]reguser.add[/cmd] Pragma [cmd]reguser.add[/cmd] Pragma
[cmd]reguser.addtqmask[/cmd] Pragma Pragma!*@*.it [cmd]reguser.addmask[/cmd] Pragma Pragma!*@*.it
[cmd]echo[/cmd] $reguser.tqmask(Pragma,0) [cmd]echo[/cmd] $reguser.mask(Pragma,0)
[/example] [/example]
@seealso: @seealso:
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[cmd]reguser.deltqmask[/cmd], [cmd]reguser.delmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.match[/fnc], [fnc]$reguser.match[/fnc],
[fnc]$reguser.matchProperty[/fnc] [fnc]$reguser.matchProperty[/fnc]
*/ */
static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c) static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
{ {
TQString szName; TQString szName;
TQString szN; TQString szN;
@ -1058,7 +1058,7 @@ static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
@examples: @examples:
[example] [example]
[cmd]reguser.add[/cmd] Pragma [cmd]reguser.add[/cmd] Pragma
[cmd]reguser.addtqmask[/cmd] Pragma Pragma!*@*.it [cmd]reguser.addmask[/cmd] Pragma Pragma!*@*.it
[cmd]reguser.setproperty[/cmd] Pragma isDev 1 [cmd]reguser.setproperty[/cmd] Pragma isDev 1
[cmd]echo[/cmd] $reguser.property(Pragma,isDev) [cmd]echo[/cmd] $reguser.property(Pragma,isDev)
[/example] [/example]
@ -1067,7 +1067,7 @@ static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.match[/fnc], [fnc]$reguser.match[/fnc],
[fnc]$reguser.matchProperty[/fnc] [fnc]$reguser.matchProperty[/fnc]
@ -1100,19 +1100,19 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
@short: @short:
Returns a property of an entry in the registered user database Returns a property of an entry in the registered user database
@syntax: @syntax:
$reguser.matchProperty(<user_tqmask>,<property_name>) $reguser.matchProperty(<user_mask>,<property_name>)
@description: @description:
Returns the value of the property identified by <property_name> and Returns the value of the property identified by <property_name> and
bound to the first entry matched by by <user_tqmask>.[br] bound to the first entry matched by by <user_mask>.[br]
If the property is not set, an empty string is returned.[br] If the property is not set, an empty string is returned.[br]
If no entry matches <user_tqmask> this function returns an empty string If no entry matches <user_mask> this function returns an empty string
and does not print any error.[br] and does not print any error.[br]
[example] [example]
%property = $reguser.matchProperty(<user_tqmask>,<property_name>) %property = $reguser.matchProperty(<user_mask>,<property_name>)
[/example] [/example]
Is actually a shortcut for:[br] Is actually a shortcut for:[br]
[example] [example]
%tmp = [fnc]$reguser.match[/fnc](<user_tqmask>) %tmp = [fnc]$reguser.match[/fnc](<user_mask>)
if("%tmp" != "")%property = $reguser.property(%tmp,<property_name>) if("%tmp" != "")%property = $reguser.property(%tmp,<property_name>)
[/example] [/example]
@seealso: @seealso:
@ -1120,7 +1120,7 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
[cmd]reguser.add[/cmd], [cmd]reguser.add[/cmd],
[cmd]reguser.remove[/cmd], [cmd]reguser.remove[/cmd],
[cmd]reguser.addtqmask[/cmd], [cmd]reguser.addmask[/cmd],
[fnc]$reguser.list[/fnc], [fnc]$reguser.list[/fnc],
[fnc]$reguser.match[/fnc], [fnc]$reguser.match[/fnc],
[fnc]$reguser.property[/fnc] [fnc]$reguser.property[/fnc]
@ -1131,13 +1131,13 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
TQString szMask; TQString szMask;
TQString szProperty; TQString szProperty;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("user_tqmask",KVS_PT_STRING,0,szMask) KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETER("property_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szProperty) KVSM_PARAMETER("property_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szProperty)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
KviIrcMask tqmask(szMask); KviIrcMask mask(szMask);
//FIXME: it crashes kvirc KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(tqmask.nick(),tqmask.user(),tqmask.host()); //FIXME: it crashes kvirc KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(tqmask.nick(),tqmask.user(),tqmask.host()); KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
if(u) if(u)
{ {
TQString tmp; TQString tmp;
@ -1158,10 +1158,10 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
@short: @short:
Shows a registration wizard dialog Shows a registration wizard dialog
@syntax: @syntax:
reguser.wizard [tqmask] reguser.wizard [mask]
@description: @description:
Allows registering an user with an intuitive and easy to use interface. Allows registering an user with an intuitive and easy to use interface.
If [tqmask] is specified , it is used as inital tqmask in the dialog. If [mask] is specified , it is used as inital mask in the dialog.
@seealso: @seealso:
[module:reguser]Registered users database interface[/module], [module:reguser]Registered users database interface[/module],
[doc:registered_users]Registered users database[/doc], [doc:registered_users]Registered users database[/doc],
@ -1172,7 +1172,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
{ {
TQString szMask; TQString szMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
KviRegistrationWizard * w = new KviRegistrationWizard(szMask); KviRegistrationWizard * w = new KviRegistrationWizard(szMask);
@ -1188,8 +1188,8 @@ static bool reguser_module_init(KviModule * m)
KVSM_REGISTER_SIMPLE_COMMAND(m,"add",reguser_kvs_cmd_add); KVSM_REGISTER_SIMPLE_COMMAND(m,"add",reguser_kvs_cmd_add);
KVSM_REGISTER_SIMPLE_COMMAND(m,"remove",reguser_kvs_cmd_remove); KVSM_REGISTER_SIMPLE_COMMAND(m,"remove",reguser_kvs_cmd_remove);
KVSM_REGISTER_SIMPLE_COMMAND(m,"addtqmask",reguser_kvs_cmd_addtqmask); KVSM_REGISTER_SIMPLE_COMMAND(m,"addmask",reguser_kvs_cmd_addmask);
KVSM_REGISTER_SIMPLE_COMMAND(m,"deltqmask",reguser_kvs_cmd_deltqmask); KVSM_REGISTER_SIMPLE_COMMAND(m,"delmask",reguser_kvs_cmd_delmask);
KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",reguser_kvs_cmd_edit); KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",reguser_kvs_cmd_edit);
KVSM_REGISTER_SIMPLE_COMMAND(m,"showlist",reguser_kvs_cmd_showlist); KVSM_REGISTER_SIMPLE_COMMAND(m,"showlist",reguser_kvs_cmd_showlist);
KVSM_REGISTER_SIMPLE_COMMAND(m,"setproperty",reguser_kvs_cmd_setproperty); KVSM_REGISTER_SIMPLE_COMMAND(m,"setproperty",reguser_kvs_cmd_setproperty);
@ -1200,7 +1200,7 @@ static bool reguser_module_init(KviModule * m)
KVSM_REGISTER_FUNCTION(m,"match",reguser_kvs_fnc_match); KVSM_REGISTER_FUNCTION(m,"match",reguser_kvs_fnc_match);
KVSM_REGISTER_FUNCTION(m,"list",reguser_kvs_fnc_list); KVSM_REGISTER_FUNCTION(m,"list",reguser_kvs_fnc_list);
KVSM_REGISTER_FUNCTION(m,"exactMatch",reguser_kvs_fnc_exactMatch); KVSM_REGISTER_FUNCTION(m,"exactMatch",reguser_kvs_fnc_exactMatch);
KVSM_REGISTER_FUNCTION(m,"tqmask",reguser_kvs_fnc_tqmask); KVSM_REGISTER_FUNCTION(m,"mask",reguser_kvs_fnc_mask);
KVSM_REGISTER_FUNCTION(m,"property",reguser_kvs_fnc_property); KVSM_REGISTER_FUNCTION(m,"property",reguser_kvs_fnc_property);
KVSM_REGISTER_FUNCTION(m,"matchProperty",reguser_kvs_fnc_matchProperty); KVSM_REGISTER_FUNCTION(m,"matchProperty",reguser_kvs_fnc_matchProperty);
KVSM_REGISTER_FUNCTION(m,"getIgnoreFlags",reguser_kvs_fnc_getIgnoreFlags); KVSM_REGISTER_FUNCTION(m,"getIgnoreFlags",reguser_kvs_fnc_getIgnoreFlags);

@ -57,7 +57,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
m_bModal = bModal; m_bModal = bModal;
KviIrcMask tqmask(startMask ? startMask : "*!*@*"); KviIrcMask mask(startMask ? startMask : "*!*@*");
g_pRegistrationWizardList->append(this); g_pRegistrationWizardList->append(this);
@ -96,7 +96,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
m_pPage1Layout->addWidget(m_pEditRealName,1,0); m_pPage1Layout->addWidget(m_pEditRealName,1,0);
addPage( m_pPage1,__tr2qs("Step 1: Entry Name")); addPage( m_pPage1,__tr2qs("Step 1: Entry Name"));
if(tqmask.nick() != "*")m_pEditRealName->setText(tqmask.nick()); if(mask.nick() != "*")m_pEditRealName->setText(mask.nick());
connect(m_pEditRealName,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(realNameChanged(const TQString &))); connect(m_pEditRealName,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(realNameChanged(const TQString &)));
@ -109,30 +109,30 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
m_pPage2Layout->setMargin( 8 ); m_pPage2Layout->setMargin( 8 );
m_pLabel2 = new TQLabel( m_pPage2); m_pLabel2 = new TQLabel( m_pPage2);
m_pLabel2->setText(__tr2qs("<p>A registered user is identified by one or more <b>IRC masks</b>.<br>A tqmask must be in the following form:<br><b>nickname!username@hostname</b><br>and can contain wildcard characters '*' and '?'. Be careful in choosing the masks, as they are the only way to verify the identity of a registered user.<br><br>You can enter at most two masks here, if you wish to add more masks, use the \"<b>Edit</b>\" button in the Registered Users dialog. You must enter at least one tqmask.</p>")); m_pLabel2->setText(__tr2qs("<p>A registered user is identified by one or more <b>IRC masks</b>.<br>A mask must be in the following form:<br><b>nickname!username@hostname</b><br>and can contain wildcard characters '*' and '?'. Be careful in choosing the masks, as they are the only way to verify the identity of a registered user.<br><br>You can enter at most two masks here, if you wish to add more masks, use the \"<b>Edit</b>\" button in the Registered Users dialog. You must enter at least one mask.</p>"));
m_pPage2Layout->addMultiCellWidget(m_pLabel2,0,0,0,4); m_pPage2Layout->addMultiCellWidget(m_pLabel2,0,0,0,4);
//KviStr szMask; //KviStr szMask;
//tqmask.tqmask(szMask,11); //mask.mask(szMask,11);
//KviIrcMask masktempl(szMask.ptr()); //KviIrcMask masktempl(szMask.ptr());
m_pNicknameEdit1 = new TQLineEdit(m_pPage2); m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
m_pNicknameEdit1->tqsetAlignment(TQt::AlignRight); m_pNicknameEdit1->tqsetAlignment(TQt::AlignRight);
if(tqmask.nick() != "*")m_pNicknameEdit1->setText(tqmask.nick()); if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick());
connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &))); connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 ); m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
m_pUsernameEdit1 = new TQLineEdit(m_pPage2); m_pUsernameEdit1 = new TQLineEdit(m_pPage2);
m_pUsernameEdit1->tqsetAlignment(TQt::AlignHCenter); m_pUsernameEdit1->tqsetAlignment(TQt::AlignHCenter);
if(tqmask.hasUser())m_pUsernameEdit1->setText(tqmask.user()); if(mask.hasUser())m_pUsernameEdit1->setText(mask.user());
connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &))); connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2); m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
m_pHostEdit1 = new TQLineEdit(m_pPage2); m_pHostEdit1 = new TQLineEdit(m_pPage2);
if(tqmask.hasHost())m_pHostEdit1->setText(tqmask.host()); if(mask.hasHost())m_pHostEdit1->setText(mask.host());
connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &))); connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
m_pPage2Layout->addWidget(m_pHostEdit1,1,4); m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
@ -226,7 +226,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
m_pPage4Layout->addWidget(m_pNotifyNickLabel2,4,0); m_pPage4Layout->addWidget(m_pNotifyNickLabel2,4,0);
m_pNotifyNickEdit1 = new TQLineEdit(m_pPage4); m_pNotifyNickEdit1 = new TQLineEdit(m_pPage4);
if(tqmask.nick() != "*")m_pNotifyNickEdit1->setText(tqmask.nick()); if(mask.nick() != "*")m_pNotifyNickEdit1->setText(mask.nick());
connect(m_pNotifyNickEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &))); connect(m_pNotifyNickEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &)));
m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1); m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1);
@ -415,11 +415,11 @@ void KviRegistrationWizard::maskChanged(const TQString &)
return; return;
} }
KviStr tqmask(KviStr::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr()); KviStr mask(KviStr::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr());
//KviIrcMask m(tqmask.ptr()); //KviIrcMask m(mask.ptr());
setNextEnabled(m_pPage2,tqmask!="*!*@*"); setNextEnabled(m_pPage2,mask!="*!*@*");
} }
void KviRegistrationWizard::realNameChanged(const TQString &) void KviRegistrationWizard::realNameChanged(const TQString &)

@ -52,7 +52,7 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
@short: @short:
Adds a file sharedfile Adds a file sharedfile
@syntax: @syntax:
sharedfile.add [-t=<timeout:integer>] [-n=<visible name>] <filename> [user_tqmask] sharedfile.add [-t=<timeout:integer>] [-n=<visible name>] <filename> [user_mask]
@switches: @switches:
!sw: -t=<timeout> | --timeout=<timeout> !sw: -t=<timeout> | --timeout=<timeout>
Specified the timeout after that the share will be automatically removed Specified the timeout after that the share will be automatically removed
@ -61,8 +61,8 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
@description: @description:
Adds <filename> to the list of the active shared files. Adds <filename> to the list of the active shared files.
The users will be able to request the file via [cmd]dcc.get[/cmd]. The users will be able to request the file via [cmd]dcc.get[/cmd].
If [user_tqmask] is specified , the access to the file is limited If [user_mask] is specified , the access to the file is limited
to the users that match this tqmask, otherwise the tqmask will to the users that match this mask, otherwise the mask will
be automatically set to '*!*@*'.[br] be automatically set to '*!*@*'.[br]
If the 't' switch is used, the sharedfile will be removed after If the 't' switch is used, the sharedfile will be removed after
<timeout> seconds. If the 'n' switch is used, the sharedfile <timeout> seconds. If the 'n' switch is used, the sharedfile
@ -79,7 +79,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
TQString szFileName,szUserMask; TQString szFileName,szUserMask;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName) KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
KVSM_PARAMETER("user_tqmask",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szUserMask) KVSM_PARAMETER("user_mask",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szUserMask)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
if(!KviFileUtils::isReadable(szFileName)) if(!KviFileUtils::isReadable(szFileName))
@ -92,7 +92,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
KviIrcMask u(szUserMask); KviIrcMask u(szUserMask);
TQString szm; TQString szm;
u.tqmask(szm); u.mask(szm);
kvs_int_t timeout = 0; kvs_int_t timeout = 0;
@ -138,9 +138,9 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
@short: @short:
Removes a shared file Removes a shared file
@syntax: @syntax:
sharedfile.remove <visible name:string> <user tqmask:string> [filesize:integer] sharedfile.remove <visible name:string> <user mask:string> [filesize:integer]
@description: @description:
Removes the shared file that matches <visible name> and <user tqmask>. Removes the shared file that matches <visible name> and <user mask>.
If [filesize] is specified, then it must be matched by the entry If [filesize] is specified, then it must be matched by the entry
to be removed. to be removed.
@seealso: @seealso:
@ -153,12 +153,12 @@ static bool sharedfile_kvs_cmd_remove(KviKvsModuleCommandCall * c)
kvs_uint_t uSize; kvs_uint_t uSize;
KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_BEGIN(c)
KVSM_PARAMETER("visible_name",KVS_PT_NONEMPTYSTRING,0,szVisibleName) KVSM_PARAMETER("visible_name",KVS_PT_NONEMPTYSTRING,0,szVisibleName)
KVSM_PARAMETER("user_tqmask",KVS_PT_NONEMPTYSTRING,0,szUserMask) KVSM_PARAMETER("user_mask",KVS_PT_NONEMPTYSTRING,0,szUserMask)
KVSM_PARAMETER("filesize",KVS_PT_UINT,KVS_PF_OPTIONAL,uSize) KVSM_PARAMETER("filesize",KVS_PT_UINT,KVS_PF_OPTIONAL,uSize)
KVSM_PARAMETERS_END(c) KVSM_PARAMETERS_END(c)
if(!g_pSharedFilesManager->removeSharedFile(szVisibleName,szUserMask,uSize)) if(!g_pSharedFilesManager->removeSharedFile(szVisibleName,szUserMask,uSize))
c->warning(__tr2qs_ctx("No sharedfile with visible name '%Q' and user tqmask '%Q'","sharedfile"),&szVisibleName,&szUserMask); c->warning(__tr2qs_ctx("No sharedfile with visible name '%Q' and user mask '%Q'","sharedfile"),&szVisibleName,&szUserMask);
return true; return true;
} }

@ -75,7 +75,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile *
g->addWidget( m_pBrowseButton, 1, 3 ); g->addWidget( m_pBrowseButton, 1, 3 );
connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(browse())); connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(browse()));
l = new TQLabel(__tr2qs_ctx("User tqmask:","sharedfileswindow"),this); l = new TQLabel(__tr2qs_ctx("User mask:","sharedfileswindow"),this);
g->addWidget(l, 2, 0 ); g->addWidget(l, 2, 0 );
m_pUserMaskEdit = new TQLineEdit(this); m_pUserMaskEdit = new TQLineEdit(this);

@ -141,7 +141,7 @@ void KviTermWidget::konsoleDestroyed()
void KviTermWidget::autoClose() void KviTermWidget::autoClose()
{ {
if(m_bIsStandalone)delete this; if(m_bIsStandalone)delete this;
else ((KviWindow *)tqparent())->close(); else ((KviWindow *)parent())->close();
} }
void KviTermWidget::changeTitle(int i,const TQString& str) void KviTermWidget::changeTitle(int i,const TQString& str)

@ -141,8 +141,8 @@ int KviThemeListBoxItem::height(const KviTalListBox * lb) const
KviThemeManagementDialog * KviThemeManagementDialog::m_pInstance = 0; KviThemeManagementDialog * KviThemeManagementDialog::m_pInstance = 0;
KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * tqparent) KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent)
: TQDialog(tqparent,"theme_options_widget") : TQDialog(parent,"theme_options_widget")
{ {
setCaption(__tr2qs_ctx("Manage Themes - KVIrc","theme")); setCaption(__tr2qs_ctx("Manage Themes - KVIrc","theme"));
setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME))); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME)));

@ -76,7 +76,7 @@ class KviThemeManagementDialog : public TQDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KviThemeManagementDialog(TQWidget * tqparent); KviThemeManagementDialog(TQWidget * parent);
virtual ~KviThemeManagementDialog(); virtual ~KviThemeManagementDialog();
protected: protected:
static KviThemeManagementDialog * m_pInstance; static KviThemeManagementDialog * m_pInstance;

@ -4,8 +4,8 @@
#include "tc_interface.h" #include "tc_interface.h"
#include "tc_statusbarapplet.h" #include "tc_statusbarapplet.h"
KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *tqparent, KviStatusBarAppletDescriptor *desc) KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc)
: KviStatusBarApplet(tqparent, desc) : KviStatusBarApplet(parent, desc)
{ {
TQTimer *timer = new TQTimer(this); TQTimer *timer = new TQTimer(this);
connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));

@ -13,7 +13,7 @@ class KviTorrentStatusBarApplet : public KviStatusBarApplet
public: public:
KviTorrentStatusBarApplet(KviStatusBar *tqparent, KviStatusBarAppletDescriptor *desc); KviTorrentStatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc);
virtual ~KviTorrentStatusBarApplet(); virtual ~KviTorrentStatusBarApplet();
static void selfRegister(KviStatusBar *bar); static void selfRegister(KviStatusBar *bar);

@ -413,8 +413,8 @@ ConfigDialog::~ConfigDialog()
// ---------------------------- CLASS BANFRAME ------------------------begin // // ---------------------------- CLASS BANFRAME ------------------------begin //
BanFrame::BanFrame(TQWidget *tqparent, const char *name, bool banEnabled) BanFrame::BanFrame(TQWidget *parent, const char *name, bool banEnabled)
:TQFrame(tqparent,name) :TQFrame(parent,name)
{ {
setFrameStyle(TQFrame::Panel | TQFrame::Raised); setFrameStyle(TQFrame::Panel | TQFrame::Raised);

@ -96,7 +96,7 @@ class BanFrame : public TQFrame
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
BanFrame(TQWidget *tqparent=0, const char *name=0, bool banEnable = false); BanFrame(TQWidget *parent=0, const char *name=0, bool banEnable = false);
~BanFrame(); ~BanFrame();
void saveBans(); void saveBans();
private: private:

Loading…
Cancel
Save