TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 17 insertions, 17 deletions

diff --git a/ksirc/ksirc.pl b/ksirc/ksirc.pl
index a1768f63..5d925a59 100644
--- a/ksirc/ksirc.pl
+++ b/ksirc/ksirc.pl
@@ -13,8 +13,8 @@ is used.  Port and password are optional.");
 "\cbAdded by KSirc.pl\cb
 Usage: BAN <nickname>
 bans the specified user on the current channel. Only channel operators
-can use this command. Bans the user in the form *!*user\@hostmask.
-hostmask is xxx.xxx.xxx.* if the hostname is in dotted quad form, otherwise
+can use this command. Bans the user in the form *!*user\@hosttqmask.
+hosttqmask is xxx.xxx.xxx.* if the hostname is in dotted quad form, otherwise
 it is *.domain.com
 See Also: UNBAN, CLRBAN, BANLIST");
 
@@ -126,8 +126,8 @@ sub cmd_banlist {
 
 sub hook_banlist {
   $silent = 1;
-  my (undef, $channel, $mask, $banner, $time) = split(/ +/, $_[0]);
-  &print("~!default~*** \cb$mask\cb banned from \cb$channel\cb by \cb$banner\cb on \cb" . localtime($time). "\cb");
+  my (undef, $channel, $tqmask, $banner, $time) = split(/ +/, $_[0]);
+  &print("~!default~*** \cb$tqmask\cb banned from \cb$channel\cb by \cb$banner\cb on \cb" . localtime($time). "\cb");
 }
 
 sub hook_rmbanlist {
@@ -168,8 +168,8 @@ sub cmd_clrban {
 
 sub hook_tban {
   $silent = 1;
-  my ($shit, $channel, $mask, $banner, $time) = split(/ +/, $_[0]);
-  push @bans, $mask;
+  my ($shit, $channel, $tqmask, $banner, $time) = split(/ +/, $_[0]);
+  push @bans, $tqmask;
   if (@bans == 6) {
     &print("mode $channel -bbbbbb @bans");
     @bans = ();
@@ -193,14 +193,14 @@ sub hook_disconnectd {
 #&addhook("kick","kickd");
 
 sub cmd_fcmd {
-  ($names,$mask,$command) = split(/ /, $args,3);
-  $mask =~ s/\!/\!/;
-  $mask =~ s/\@/\@/;
-  $mask =~ s/\./\\./g;
-  $mask =~ s/\*/.*/g;
+  ($names,$tqmask,$command) = split(/ /, $args,3);
+  $tqmask =~ s/\!/\!/;
+  $tqmask =~ s/\@/\@/;
+  $tqmask =~ s/\./\\./g;
+  $tqmask =~ s/\*/.*/g;
   &addhook("353","filtercommand");
   &addhook("366","removefiltercommand");
-  &tell("\t\cb~4Matching /$mask/i on $names...");
+  &tell("\t\cb~4Matching /$tqmask/i on $names...");
   &docommand("names $names");
 }
 &addcmd("fcmd");
@@ -217,8 +217,8 @@ sub hook_filtercommand {
 
 sub dofilter {
   $s = "$who\!$user\@$host";
-  #&tell("$s =~ /$mask/");
-  if ($s =~ /$mask/i) {
+  #&tell("$s =~ /$tqmask/");
+  if ($s =~ /$tqmask/i) {
     $d = $command;
     $d =~ s/\$1/$who/;
     &docommand($d);
@@ -228,12 +228,12 @@ sub dofilter {
 sub hook_removefiltercommand {
   &remhook("353","filtercommand");
   &remhook("366","removefiltercommand");
-  &tell("*\cbI\cb* Filter on $names, /$mask/i, Done.");
+  &tell("*\cbI\cb* Filter on $names, /$tqmask/i, Done.");
 }
 
 sub cmd_fc {
-  my ($mask, $cmd) = split(/ /, $args, 2);
-  &docommand("fcmd $talkchannel $mask $cmd");
+  my ($tqmask, $cmd) = split(/ /, $args, 2);
+  &docommand("fcmd $talkchannel $tqmask $cmd");
 }
 &addcmd("fc");