From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- data/defscript/aliases.kvs | 30 ++++---- data/defscript/installer.kvs | 6 +- data/defscript/popups.kvs | 178 +++++++++++++++++++++---------------------- 3 files changed, 107 insertions(+), 107 deletions(-) (limited to 'data/defscript') diff --git a/data/defscript/aliases.kvs b/data/defscript/aliases.kvs index 5d8d7299..e8845ba3 100644 --- a/data/defscript/aliases.kvs +++ b/data/defscript/aliases.kvs @@ -234,9 +234,9 @@ alias(kb) { if(%nick) { - %mask = $mask(%nick,$option(uintDefaultBanType)); + %tqmask = $tqmask(%nick,$option(uintDefaultBanType)); - if(!%mask)%mask = %nick; # plain ban + if(!%tqmask)%tqmask = %nick; # plain ban %reason = $1- #if(!%reason)%reason = "You're not welcome here!" @@ -250,8 +250,8 @@ alias(kb) # kick %nick %reason - if($chan.isOp(%nick))%raw2 = "mode $target -o+b %nick %mask" - else %raw2 = "mode $target +b %mask" + if($chan.isOp(%nick))%raw2 = "mode $target -o+b %nick %tqmask" + else %raw2 = "mode $target +b %tqmask" raw -q %raw2$cr$lf%raw } @@ -484,28 +484,28 @@ alias(awayall) alias(notify) { # This one adds a registered users database entry - # For the specified nick and uses the specified mask - # If no mask is specified , a default one is constructed + # For the specified nick and uses the specified tqmask + # If no tqmask is specified , a default one is constructed # Then the "notify" property is set for the user if(!$0) { echo $tr("Usage:") - echo " /notify [mask]" + echo " /notify [tqmask]" halt } - # Get the mask + # Get the tqmask - %mask = $1 + %tqmask = $1 - # no mask specified ? build it + # no tqmask specified ? build it - if(!%mask)%mask = $0!*@* + if(!%tqmask)%tqmask = $0!*@* # Now add the user (but do not replace old entries) - reguser.add -f -q $0 %mask + reguser.add -f -q $0 %tqmask # Merge the notify property part with the old one (if any) @@ -526,8 +526,8 @@ alias(notify) alias(ignore) { # This one adds a registered users database entry - # For the specified nick and uses the specified mask - # If no mask is specified , a default one is constructed + # For the specified nick and uses the specified tqmask + # If no tqmask is specified , a default one is constructed # Then the "ignore" property is set for the user to 1 if(!$0) @@ -539,7 +539,7 @@ alias(ignore) # Now add the user (but do not replace old entries) - reguser.add $0 $mask($0,15); + reguser.add $0 $tqmask($0,15); # And finally set the property (use -n so the notify lists will be restarted) # Check if ignore or unignore the user diff --git a/data/defscript/installer.kvs b/data/defscript/installer.kvs index f974b7ed..f25aa78d 100644 --- a/data/defscript/installer.kvs +++ b/data/defscript/installer.kvs @@ -71,7 +71,7 @@ class(installer,object) @$mkdir($2) foreach(%file,%files) { - $this->%lFiles <+ $str.replace($file.fixpath("$2/%file"),"\\\\","\\") + $this->%lFiles <+ $str.tqreplace($file.fixpath("$2/%file"),"\\\\","\\") file.copy -o $file.fixpath($0/%file) $file.fixpath($2/%file) } } @@ -117,7 +117,7 @@ class(installer,object) { foreach(%file,%files) { - $this->%lSources <+ $str.replace($file.fixpath("$0/%file"),"\\\\","\\") + $this->%lSources <+ $str.tqreplace($file.fixpath("$0/%file"),"\\\\","\\") include $file.fixpath("$0/%file") } } @@ -150,7 +150,7 @@ class(installer,object) else if($str.match("toolbar.create * *",%line,e)) %c .= " toolbar.destroy -q "$str.word(1,%line)"$lf" else if($str.match("action.create* (*)",%line,e)) - %c .= " action.destroy -q "$str.replace($str.token(1,"(,)",%line),,\")"$lf" + %c .= " action.destroy -q "$str.tqreplace($str.token(1,"(,)",%line),,\")"$lf" else if($str.match("class(*)*",%line,e)) %c .= " objects.killclass -q "$str.token(1,"(,)",%line)"$lf" } diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs index 7197c923..35d39ab3 100644 --- a/data/defscript/popups.kvs +++ b/data/defscript/popups.kvs @@ -9,7 +9,7 @@ defpopup(highlight) prologue { if($0!=""){ - %:regName = $reguser.match($mask($0)) + %:regName = $reguser.match($tqmask($0)) %:beingHl = $reguser.property(%:regName,highlight) %:beingHlTmp = $tmphighlight.ishighlighted($0) } @@ -27,34 +27,34 @@ defpopup(highlight) popup($tr("Always Highlight")) (!%:beingHl && !%:regName) { - item($tr("Highlight as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "") + item($tr("Highlight as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "") { - reguser.add $0 $mask($0,11); reguser.setproperty $0 highlight 1; + reguser.add $0 $tqmask($0,11); reguser.setproperty $0 highlight 1; } - item($tr("Highlight as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "") + item($tr("Highlight as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "") { - reguser.add $0 $mask($0,12); reguser.setproperty $0 highlight 1; + reguser.add $0 $tqmask($0,12); reguser.setproperty $0 highlight 1; } - item($tr("Highlight as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "") + item($tr("Highlight as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "") { - reguser.add $0 $mask($0,13); reguser.setproperty $0 highlight 1; + reguser.add $0 $tqmask($0,13); reguser.setproperty $0 highlight 1; } - item($tr("Highlight as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "") + item($tr("Highlight as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "") { - reguser.add $0 $mask($0,3); reguser.setproperty $0 highlight 1; + reguser.add $0 $tqmask($0,3); reguser.setproperty $0 highlight 1; } - item($tr("Highlight as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "") + item($tr("Highlight as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "") { - reguser.add $0 $mask($0,4); reguser.setproperty $0 highlight 1; + reguser.add $0 $tqmask($0,4); reguser.setproperty $0 highlight 1; } - item($tr("Highlight as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "") + item($tr("Highlight as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "") { - reguser.add $0 $mask($0,5); reguser.setproperty $0 highlight 1; + reguser.add $0 $tqmask($0,5); reguser.setproperty $0 highlight 1; } } @@ -74,7 +74,7 @@ defpopup(ignore) prologue { %:inIgnoreList = 0 - %:regName = $reguser.match($mask($0)) + %:regName = $reguser.match($tqmask($0)) %:ignLabelText = "

$0 " if(%:regName) { @@ -97,191 +97,191 @@ defpopup(ignore) popup($tr("Ignore as..."),44) (!%:inIgnoreList) { - item($tr("Ignore as") $0 "("$mask($0,0)")") ("$reguser.exactMatch($mask($0,0))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,0)")") ("$reguser.exactMatch($tqmask($0,0))" == "") { - if(!%:regName) reguser.add $0 $mask($0,0); + if(!%:regName) reguser.add $0 $tqmask($0,0); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,1)")") ("$reguser.exactMatch($mask($0,1))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,1)")") ("$reguser.exactMatch($tqmask($0,1))" == "") { - if(!%:regName) reguser.add $0 $mask($0,1); + if(!%:regName) reguser.add $0 $tqmask($0,1); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,2)")") ("$reguser.exactMatch($mask($0,2))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,2)")") ("$reguser.exactMatch($tqmask($0,2))" == "") { - if(!%:regName) reguser.add $0 $mask($0,2); + if(!%:regName) reguser.add $0 $tqmask($0,2); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "") { - if(!%:regName) reguser.add $0 $mask($0,3); + if(!%:regName) reguser.add $0 $tqmask($0,3); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "") { - if(!%:regName) reguser.add $0 $mask($0,4); + if(!%:regName) reguser.add $0 $tqmask($0,4); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "") { - if(!%:regName) reguser.add $0 $mask($0,5); + if(!%:regName) reguser.add $0 $tqmask($0,5); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,6)")") ("$reguser.exactMatch($mask($0,6))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,6)")") ("$reguser.exactMatch($tqmask($0,6))" == "") { - if(!%:regName) reguser.add $0 $mask($0,6); + if(!%:regName) reguser.add $0 $tqmask($0,6); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,7)")") ("$reguser.exactMatch($mask($0,7))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,7)")") ("$reguser.exactMatch($tqmask($0,7))" == "") { - if(!%:regName) reguser.add $0 $mask($0,7); + if(!%:regName) reguser.add $0 $tqmask($0,7); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,8)")") ("$reguser.exactMatch($mask($0,8))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,8)")") ("$reguser.exactMatch($tqmask($0,8))" == "") { - if(!%:regName) reguser.add $0 $mask($0,8); + if(!%:regName) reguser.add $0 $tqmask($0,8); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,9)")") ("$reguser.exactMatch($mask($0,9))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,9)")") ("$reguser.exactMatch($tqmask($0,9))" == "") { - if(!%:regName) reguser.add $0 $mask($0,9); + if(!%:regName) reguser.add $0 $tqmask($0,9); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,10)")") ("$reguser.exactMatch($mask($0,10))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,10)")") ("$reguser.exactMatch($tqmask($0,10))" == "") { - if(!%:regName) reguser.add $0 $mask($0,10); + if(!%:regName) reguser.add $0 $tqmask($0,10); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "") { - if(!%:regName) reguser.add $0 $mask($0,11); + if(!%:regName) reguser.add $0 $tqmask($0,11); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "") { - if(!%:regName) reguser.add $0 $mask($0,12); + if(!%:regName) reguser.add $0 $tqmask($0,12); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "") { - if(!%:regName) reguser.add $0 $mask($0,13); + if(!%:regName) reguser.add $0 $tqmask($0,13); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,14)")") ("$reguser.exactMatch($mask($0,14))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,14)")") ("$reguser.exactMatch($tqmask($0,14))" == "") { - if(!%:regName) reguser.add $0 $mask($0,14); + if(!%:regName) reguser.add $0 $tqmask($0,14); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,15)")") ("$reguser.exactMatch($mask($0,15))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,15)")") ("$reguser.exactMatch($tqmask($0,15))" == "") { - if(!%:regName) reguser.add $0 $mask($0,15); + if(!%:regName) reguser.add $0 $tqmask($0,15); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,16)")") ("$reguser.exactMatch($mask($0,16))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,16)")") ("$reguser.exactMatch($tqmask($0,16))" == "") { - if(!%:regName) reguser.add $0 $mask($0,16); + if(!%:regName) reguser.add $0 $tqmask($0,16); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,17)")") ("$reguser.exactMatch($mask($0,17))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,17)")") ("$reguser.exactMatch($tqmask($0,17))" == "") { - if(!%:regName) reguser.add $0 $mask($0,17); + if(!%:regName) reguser.add $0 $tqmask($0,17); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,18)")") ("$reguser.exactMatch($mask($0,18))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,18)")") ("$reguser.exactMatch($tqmask($0,18))" == "") { - if(!%:regName) reguser.add $0 $mask($0,18); + if(!%:regName) reguser.add $0 $tqmask($0,18); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,19)")") ("$reguser.exactMatch($mask($0,19))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,19)")") ("$reguser.exactMatch($tqmask($0,19))" == "") { - if(!%:regName) reguser.add $0 $mask($0,19); + if(!%:regName) reguser.add $0 $tqmask($0,19); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,20)")") ("$reguser.exactMatch($mask($0,20))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,20)")") ("$reguser.exactMatch($tqmask($0,20))" == "") { - if(!%:regName) reguser.add $0 $mask($0,20); + if(!%:regName) reguser.add $0 $tqmask($0,20); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,21)")") ("$reguser.exactMatch($mask($0,21))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,21)")") ("$reguser.exactMatch($tqmask($0,21))" == "") { - if(!%:regName) reguser.add $0 $mask($0,21); + if(!%:regName) reguser.add $0 $tqmask($0,21); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,22)")") ("$reguser.exactMatch($mask($0,22))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,22)")") ("$reguser.exactMatch($tqmask($0,22))" == "") { - if(!%:regName) reguser.add $0 $mask($0,22); + if(!%:regName) reguser.add $0 $tqmask($0,22); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,23)")") ("$reguser.exactMatch($mask($0,23))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,23)")") ("$reguser.exactMatch($tqmask($0,23))" == "") { - if(!%:regName) reguser.add $0 $mask($0,23); + if(!%:regName) reguser.add $0 $tqmask($0,23); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,24)")") ("$reguser.exactMatch($mask($0,24))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,24)")") ("$reguser.exactMatch($tqmask($0,24))" == "") { - if(!%:regName) reguser.add $0 $mask($0,24); + if(!%:regName) reguser.add $0 $tqmask($0,24); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,25)")") ("$reguser.exactMatch($mask($0,25))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,25)")") ("$reguser.exactMatch($tqmask($0,25))" == "") { - if(!%:regName) reguser.add $0 $mask($0,25); + if(!%:regName) reguser.add $0 $tqmask($0,25); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } - item($tr("Ignore as") $0 "("$mask($0,26)")") ("$reguser.exactMatch($mask($0,26))" == "") + item($tr("Ignore as") $0 "("$tqmask($0,26)")") ("$reguser.exactMatch($tqmask($0,26))" == "") { - if(!%:regName) reguser.add $0 $mask($0,26); + if(!%:regName) reguser.add $0 $tqmask($0,26); reguser.setIgnoreEnabled $0 1; reguser.setIgnoreFlags -p -c -n -t -i -d $0; } @@ -301,12 +301,12 @@ defpopup(registration) # This is really smart...we are loading # the reguser module only if this popup is being requested (the user effectively # puts the mouse on the "Registration" item and the sub-popup is being shown) - %:regName = $reguser.match($mask($0)) + %:regName = $reguser.match($tqmask($0)) %:labelText = "

$0"; if(%:regName) { %:labelText << $tr("is registered as") ": "%:regName"" - # We want to display masks here!!! + # We want to display tqmasks here!!! %:inNotifyList = $reguser.property(%:regName,notify); if(%:inNotifyList)%:labelText << "
$0" $tr("is in the notify list") %:curAvatar = $avatar.name($0); @@ -322,39 +322,39 @@ defpopup(registration) item($tr("Register")"...") (!%:regName) { - reguser.wizard $mask($0) + reguser.wizard $tqmask($0) } popup($tr("Quick Registration")) (!%:regName) { - item($tr("Register as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "") + item($tr("Register as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "") { - reguser.add $0 $mask($0,11) + reguser.add $0 $tqmask($0,11) } - item($tr("Register as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "") + item($tr("Register as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "") { - reguser.add $0 $mask($0,12) + reguser.add $0 $tqmask($0,12) } - item($tr("Register as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "") + item($tr("Register as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "") { - reguser.add $0 $mask($0,13) + reguser.add $0 $tqmask($0,13) } - item($tr("Register as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "") + item($tr("Register as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "") { - reguser.add $0 $mask($0,3) + reguser.add $0 $tqmask($0,3) } - item($tr("Register as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "") + item($tr("Register as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "") { - reguser.add $0 $mask($0,4) + reguser.add $0 $tqmask($0,4) } - item($tr("Register as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "") + item($tr("Register as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "") { - reguser.add $0 $mask($0,5) + reguser.add $0 $tqmask($0,5) } } @@ -439,7 +439,7 @@ defpopup(channel) %:itemBanMask = "*!user@*.host.tld" %:itemBanNick = "nick" } else { - %:itemBanMask = $mask(%:visible,$option(uintDefaultBanType)) + %:itemBanMask = $tqmask(%:visible,$option(uintDefaultBanType)) if("%:itemBanMask" == "*!*@*")%:itemBanName = $tr("&Ban") %:itemBanNick = %:visible } @@ -498,7 +498,7 @@ defpopup(channel) item($tr("Mask for") %:visible,75) (!%:multiple) { - echo $mask($0,11) + echo $tqmask($0,11) } } @@ -576,7 +576,7 @@ defpopup(channel) item($tr("&Ban") %:visible "("%:itemBanMask")",67) (("%:itemBanMask" != "*!*@*") && %:bCanKB) { - ban $mask($0,$option(uintDefaultBanType)) + ban $tqmask($0,$option(uintDefaultBanType)) } item(%:itemBanName %:visible "("%:itemBanNick!*@*")",67) (%:bCanKB) @@ -601,7 +601,7 @@ defpopup(channel) } separator - item($tr("Configure ban mask..."),20) + item($tr("Configure ban tqmask..."),20) { options.edit KviChannelAdvancedOptionsWidget } @@ -1119,7 +1119,7 @@ defpopup(querytextview) item($tr("Mask for") $0,75) (!%:multiple) { - echo $mask($0,11) + echo $tqmask($0,11) } } @@ -1159,7 +1159,7 @@ defpopup(logging) # If this window is being logged actually , $log.file will be non empty # and pointing to the log file actually open. - %:logfile = $str.replace($log.file,,$file.localdir) + %:logfile = $str.tqreplace($log.file,,$file.localdir) } label($tr("Logging to"):
%:logfile) ("%:logfile" != "") -- cgit v1.2.1