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

3 files changed, 145 insertions, 145 deletions

diff --git a/data/defscript/aliases.kvs b/data/defscript/aliases.kvs
index e8845ba..5d8d729 100644
--- a/data/defscript/aliases.kvs
+++ b/data/defscript/aliases.kvs
@@ -234,9 +234,9 @@ alias(kb)
 	{
 		if(%nick)
 		{
-			%tqmask = $tqmask(%nick,$option(uintDefaultBanType));
+			%mask = $mask(%nick,$option(uintDefaultBanType));
 
-			if(!%tqmask)%tqmask = %nick; # plain ban
+			if(!%mask)%mask = %nick; # plain ban
 
 			%reason = $1-
 			#if(!%reason)%reason = "You're not welcome here!"
@@ -250,8 +250,8 @@ alias(kb)
 
 			# kick %nick %reason
 
-			if($chan.isOp(%nick))%raw2 = "mode $target -o+b %nick %tqmask"
-			else %raw2 = "mode $target +b %tqmask"
+			if($chan.isOp(%nick))%raw2 = "mode $target -o+b %nick %mask"
+			else %raw2 = "mode $target +b %mask"
 
 			raw -q %raw2$cr$lf%raw
 		}
@@ -484,28 +484,28 @@ alias(awayall)
 alias(notify)
 {
 	# This one adds a registered users database entry
-	# For the specified nick and uses the specified tqmask
-	# If no tqmask is specified , a default one is constructed
+	# For the specified nick and uses the specified mask
+	# If no mask is specified , a default one is constructed
 	# Then the "notify" property is set for the user
 
 	if(!$0)
 	{
 		echo $tr("Usage:")
-		echo "	  /notify <nick> [tqmask]"
+		echo "	  /notify <nick> [mask]"
 		halt
 	}
 
-	# Get the tqmask
+	# Get the mask
 
-	%tqmask = $1
+	%mask = $1
 
-	# no tqmask specified ? build it
+	# no mask specified ? build it
 
-	if(!%tqmask)%tqmask = $0!*@*
+	if(!%mask)%mask = $0!*@*
 
 	# Now add the user (but do not replace old entries)
 
-	reguser.add -f -q $0 %tqmask
+	reguser.add -f -q $0 %mask
 
 	# Merge the notify property part with the old one (if any)
 
@@ -526,8 +526,8 @@ alias(notify)
 alias(ignore)
 {
 	# This one adds a registered users database entry
-	# For the specified nick and uses the specified tqmask
-	# If no tqmask is specified , a default one is constructed
+	# For the specified nick and uses the specified mask
+	# If no mask is specified , a default one is constructed
 	# Then the "ignore" property is set for the user to 1
 
 	if(!$0)
@@ -539,7 +539,7 @@ alias(ignore)
 
 	# Now add the user (but do not replace old entries)
 
-	reguser.add $0 $tqmask($0,15);
+	reguser.add $0 $mask($0,15);
 
 	# And finally set the property (use -n so the notify lists will be restarted)
 	# Check if ignore or unignore the user
diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs
index 7c5e1f6..7197c92 100644
--- a/data/defscript/popups.kvs
+++ b/data/defscript/popups.kvs
@@ -9,7 +9,7 @@ defpopup(highlight)
 	prologue
 	{
 		if($0!=""){
-			%:regName = $reguser.match($tqmask($0))
+			%:regName = $reguser.match($mask($0))
 		        %:beingHl = $reguser.property(%:regName,highlight)
 			%:beingHlTmp = $tmphighlight.ishighlighted($0)
 		}
@@ -27,34 +27,34 @@ defpopup(highlight)
 
 	popup($tr("Always Highlight")) (!%:beingHl && !%:regName)
 	{
-		item($tr("Highlight as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
+		item($tr("Highlight as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
 		{
-			reguser.add $0 $tqmask($0,11); reguser.setproperty $0 highlight 1;
+			reguser.add $0 $mask($0,11); reguser.setproperty $0 highlight 1;
 		}
 
-		item($tr("Highlight as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
+		item($tr("Highlight as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
 		{
-			reguser.add $0 $tqmask($0,12); reguser.setproperty $0 highlight 1;
+			reguser.add $0 $mask($0,12); reguser.setproperty $0 highlight 1;
 		}
 
-		item($tr("Highlight as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
+		item($tr("Highlight as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
 		{
-			reguser.add $0 $tqmask($0,13); reguser.setproperty $0 highlight 1;
+			reguser.add $0 $mask($0,13); reguser.setproperty $0 highlight 1;
 		}
 
-		item($tr("Highlight as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
+		item($tr("Highlight as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
 		{
-			reguser.add $0 $tqmask($0,3); reguser.setproperty $0 highlight 1;
+			reguser.add $0 $mask($0,3); reguser.setproperty $0 highlight 1;
 		}
 
-		item($tr("Highlight as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
+		item($tr("Highlight as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
 		{
-			reguser.add $0 $tqmask($0,4); reguser.setproperty $0 highlight 1;
+			reguser.add $0 $mask($0,4); reguser.setproperty $0 highlight 1;
 		}
 
-		item($tr("Highlight as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
+		item($tr("Highlight as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
 		{
-			reguser.add $0 $tqmask($0,5); reguser.setproperty $0 highlight 1;
+			reguser.add $0 $mask($0,5); reguser.setproperty $0 highlight 1;
 		}
 	}
 
@@ -74,7 +74,7 @@ defpopup(ignore)
 	prologue
 	{
 		%:inIgnoreList = 0
-		%:regName = $reguser.match($tqmask($0))
+		%:regName = $reguser.match($mask($0))
 		%:ignLabelText = "<p><b>$0</b> "
 		if(%:regName)
 		{
@@ -97,191 +97,191 @@ defpopup(ignore)
 
 	popup($tr("Ignore as..."),44) (!%:inIgnoreList)
 	{
-		item($tr("Ignore as") $0 "("$tqmask($0,0)")") ("$reguser.exactMatch($tqmask($0,0))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,0)")") ("$reguser.exactMatch($mask($0,0))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,0);
+			if(!%:regName) reguser.add $0 $mask($0,0);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,1)")") ("$reguser.exactMatch($tqmask($0,1))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,1)")") ("$reguser.exactMatch($mask($0,1))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,1);
+			if(!%:regName) reguser.add $0 $mask($0,1);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,2)")") ("$reguser.exactMatch($tqmask($0,2))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,2)")") ("$reguser.exactMatch($mask($0,2))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,2);
+			if(!%:regName) reguser.add $0 $mask($0,2);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,3);
+			if(!%:regName) reguser.add $0 $mask($0,3);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,4);
+			if(!%:regName) reguser.add $0 $mask($0,4);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,5);
+			if(!%:regName) reguser.add $0 $mask($0,5);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,6)")") ("$reguser.exactMatch($tqmask($0,6))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,6)")") ("$reguser.exactMatch($mask($0,6))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,6);
+			if(!%:regName) reguser.add $0 $mask($0,6);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,7)")") ("$reguser.exactMatch($tqmask($0,7))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,7)")") ("$reguser.exactMatch($mask($0,7))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,7);
+			if(!%:regName) reguser.add $0 $mask($0,7);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,8)")") ("$reguser.exactMatch($tqmask($0,8))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,8)")") ("$reguser.exactMatch($mask($0,8))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,8);
+			if(!%:regName) reguser.add $0 $mask($0,8);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,9)")") ("$reguser.exactMatch($tqmask($0,9))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,9)")") ("$reguser.exactMatch($mask($0,9))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,9);
+			if(!%:regName) reguser.add $0 $mask($0,9);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,10)")") ("$reguser.exactMatch($tqmask($0,10))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,10)")") ("$reguser.exactMatch($mask($0,10))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,10);
+			if(!%:regName) reguser.add $0 $mask($0,10);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,11);
+			if(!%:regName) reguser.add $0 $mask($0,11);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,12);
+			if(!%:regName) reguser.add $0 $mask($0,12);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,13);
+			if(!%:regName) reguser.add $0 $mask($0,13);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,14)")") ("$reguser.exactMatch($tqmask($0,14))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,14)")") ("$reguser.exactMatch($mask($0,14))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,14);
+			if(!%:regName) reguser.add $0 $mask($0,14);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,15)")") ("$reguser.exactMatch($tqmask($0,15))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,15)")") ("$reguser.exactMatch($mask($0,15))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,15);
+			if(!%:regName) reguser.add $0 $mask($0,15);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,16)")") ("$reguser.exactMatch($tqmask($0,16))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,16)")") ("$reguser.exactMatch($mask($0,16))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,16);
+			if(!%:regName) reguser.add $0 $mask($0,16);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,17)")") ("$reguser.exactMatch($tqmask($0,17))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,17)")") ("$reguser.exactMatch($mask($0,17))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,17);
+			if(!%:regName) reguser.add $0 $mask($0,17);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,18)")") ("$reguser.exactMatch($tqmask($0,18))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,18)")") ("$reguser.exactMatch($mask($0,18))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,18);
+			if(!%:regName) reguser.add $0 $mask($0,18);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,19)")") ("$reguser.exactMatch($tqmask($0,19))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,19)")") ("$reguser.exactMatch($mask($0,19))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,19);
+			if(!%:regName) reguser.add $0 $mask($0,19);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,20)")") ("$reguser.exactMatch($tqmask($0,20))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,20)")") ("$reguser.exactMatch($mask($0,20))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,20);
+			if(!%:regName) reguser.add $0 $mask($0,20);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,21)")") ("$reguser.exactMatch($tqmask($0,21))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,21)")") ("$reguser.exactMatch($mask($0,21))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,21);
+			if(!%:regName) reguser.add $0 $mask($0,21);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,22)")") ("$reguser.exactMatch($tqmask($0,22))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,22)")") ("$reguser.exactMatch($mask($0,22))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,22);
+			if(!%:regName) reguser.add $0 $mask($0,22);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,23)")") ("$reguser.exactMatch($tqmask($0,23))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,23)")") ("$reguser.exactMatch($mask($0,23))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,23);
+			if(!%:regName) reguser.add $0 $mask($0,23);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,24)")") ("$reguser.exactMatch($tqmask($0,24))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,24)")") ("$reguser.exactMatch($mask($0,24))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,24);
+			if(!%:regName) reguser.add $0 $mask($0,24);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,25)")") ("$reguser.exactMatch($tqmask($0,25))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,25)")") ("$reguser.exactMatch($mask($0,25))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,25);
+			if(!%:regName) reguser.add $0 $mask($0,25);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
 
-		item($tr("Ignore as") $0 "("$tqmask($0,26)")") ("$reguser.exactMatch($tqmask($0,26))" == "")
+		item($tr("Ignore as") $0 "("$mask($0,26)")") ("$reguser.exactMatch($mask($0,26))" == "")
 		{
-			if(!%:regName) reguser.add $0 $tqmask($0,26);
+			if(!%:regName) reguser.add $0 $mask($0,26);
 			reguser.setIgnoreEnabled $0 1;
 			reguser.setIgnoreFlags -p -c -n -t -i -d $0;
 		}
@@ -301,7 +301,7 @@ defpopup(registration)
 		# This is really smart...we are loading
 		# the reguser module only if this popup is being requested (the user effectively
 		# puts the mouse on the "Registration" item and the sub-popup is being shown)
-		%:regName = $reguser.match($tqmask($0))
+		%:regName = $reguser.match($mask($0))
 		%:labelText = "<p><b>$0</b>";
 		if(%:regName)
 		{
@@ -322,39 +322,39 @@ defpopup(registration)
 
 	item($tr("Register")"...") (!%:regName)
 	{
-		reguser.wizard $tqmask($0)
+		reguser.wizard $mask($0)
 	}
 
 	popup($tr("Quick Registration")) (!%:regName)
 	{
-		item($tr("Register as") $0 "("$tqmask($0,11)")") ("$reguser.exactMatch($tqmask($0,11))" == "")
+		item($tr("Register as") $0 "("$mask($0,11)")") ("$reguser.exactMatch($mask($0,11))" == "")
 		{
-			reguser.add $0 $tqmask($0,11)
+			reguser.add $0 $mask($0,11)
 		}
 
-		item($tr("Register as") $0 "("$tqmask($0,12)")") ("$reguser.exactMatch($tqmask($0,12))" == "")
+		item($tr("Register as") $0 "("$mask($0,12)")") ("$reguser.exactMatch($mask($0,12))" == "")
 		{
-			reguser.add $0 $tqmask($0,12)
+			reguser.add $0 $mask($0,12)
 		}
 
-		item($tr("Register as") $0 "("$tqmask($0,13)")") ("$reguser.exactMatch($tqmask($0,13))" == "")
+		item($tr("Register as") $0 "("$mask($0,13)")") ("$reguser.exactMatch($mask($0,13))" == "")
 		{
-			reguser.add $0 $tqmask($0,13)
+			reguser.add $0 $mask($0,13)
 		}
 
-		item($tr("Register as") $0 "("$tqmask($0,3)")") ("$reguser.exactMatch($tqmask($0,3))" == "")
+		item($tr("Register as") $0 "("$mask($0,3)")") ("$reguser.exactMatch($mask($0,3))" == "")
 		{
-			reguser.add $0 $tqmask($0,3)
+			reguser.add $0 $mask($0,3)
 		}
 
-		item($tr("Register as") $0 "("$tqmask($0,4)")") ("$reguser.exactMatch($tqmask($0,4))" == "")
+		item($tr("Register as") $0 "("$mask($0,4)")") ("$reguser.exactMatch($mask($0,4))" == "")
 		{
-			reguser.add $0 $tqmask($0,4)
+			reguser.add $0 $mask($0,4)
 		}
 
-		item($tr("Register as") $0 "("$tqmask($0,5)")") ("$reguser.exactMatch($tqmask($0,5))" == "")
+		item($tr("Register as") $0 "("$mask($0,5)")") ("$reguser.exactMatch($mask($0,5))" == "")
 		{
-			reguser.add $0 $tqmask($0,5)
+			reguser.add $0 $mask($0,5)
 		}
 	}
 
@@ -439,7 +439,7 @@ defpopup(channel)
 			%:itemBanMask = "*!user@*.host.tld"
 			%:itemBanNick = "nick"
 		} else {
-			%:itemBanMask = $tqmask(%:visible,$option(uintDefaultBanType))
+			%:itemBanMask = $mask(%:visible,$option(uintDefaultBanType))
 			if("%:itemBanMask" == "*!*@*")%:itemBanName = $tr("&Ban")
 			%:itemBanNick = %:visible
 		}
@@ -498,7 +498,7 @@ defpopup(channel)
 
 		item($tr("Mask for") %:visible,75) (!%:multiple)
 		{
-			echo $tqmask($0,11)
+			echo $mask($0,11)
 		}
 	}
 
@@ -576,7 +576,7 @@ defpopup(channel)
 
 		item($tr("&Ban") %:visible "("%:itemBanMask")",67) (("%:itemBanMask" != "*!*@*") && %:bCanKB)
 		{
-			ban $tqmask($0,$option(uintDefaultBanType))
+			ban $mask($0,$option(uintDefaultBanType))
 		}
 
 		item(%:itemBanName %:visible "("%:itemBanNick!*@*")",67) (%:bCanKB)
@@ -601,7 +601,7 @@ defpopup(channel)
 		}
 		separator
 		
-		item($tr("Configure ban tqmask..."),20)
+		item($tr("Configure ban mask..."),20)
 		{
 			options.edit KviChannelAdvancedOptionsWidget
 		}
@@ -1119,7 +1119,7 @@ defpopup(querytextview)
 
 		item($tr("Mask for") $0,75) (!%:multiple)
 		{
-			echo $tqmask($0,11)
+			echo $mask($0,11)
 		}
 	}
 
diff --git a/data/doctemplates/rfc2812.template b/data/doctemplates/rfc2812.template
index 596f58b..6672b51 100644
--- a/data/doctemplates/rfc2812.template
+++ b/data/doctemplates/rfc2812.template
@@ -281,7 +281,7 @@ the only restriction on a channel name is that it SHALL NOT contain
 any spaces (' '), a control G (^G or ASCII 7), a comma (',').  Space
 is used as parameter separator and command is used as a list item
 separator by the protocol).  A colon (':') can also be used as a
-delimiter for the channel tqmask.  Channel names are case insensitive.
+delimiter for the channel mask.  Channel names are case insensitive.
 See the protocol grammar rules (section 2.3.1) for the exact syntax
 of a channel name.[br]
 [p]
@@ -414,7 +414,7 @@ The extracted message is parsed into the components <prefix>,
   target     =  nickname / server
   msgtarget  =  msgto *( "," msgto )
   msgto      =  channel / ( user [ "%" host ] "@" servername )
-  msgto      =/ ( user "%" host ) / targettqmask
+  msgto      =/ ( user "%" host ) / targetmask
   msgto      =/ nickname / ( nickname "!" user "@" host )
   channel    =  ( "#" / "+" / ( "!" channelid ) / "&" ) chanstring
                 [ ":" chanstring ]
@@ -429,7 +429,7 @@ The extracted message is parsed into the components <prefix>,
   ip6addr    =  1*hexdigit 7( ":" 1*hexdigit )
   ip6addr    =/ "0:0:0:0:0:" ( "0" / "FFFF" ) ":" ip4addr
   nickname   =  ( letter / special ) *8( letter / digit / special / "-" )
-  targettqmask =  ( "$" / "#" ) tqmask
+  targetmask =  ( "$" / "#" ) mask
                   ; see details on allowed masks in section 3.3.1
   chanstring =  %x01-07 / %x08-09 / %x0B-0C / %x0E-1F / %x21-2B
   chanstring =/ %x2D-39 / %x3B-FF
@@ -493,7 +493,7 @@ is supplied in section 5 (Replies).
 [/td][/tr]
 
 [tr][td]
-When wildcards are allowed in a string, it is referred as a "tqmask".
+When wildcards are allowed in a string, it is referred as a "mask".
 [p]
 For string matching purposes, the protocol allows the use of two
 special characters: '?' (%x3F) to match one and only one character,
@@ -503,7 +503,7 @@ characters can be escaped using the character '\' (%x5C).
 [pre]
    The Augmented BNF syntax for this is:
 
-    tqmask       =  *( nowild / noesc wildone / noesc wildmany )
+    mask       =  *( nowild / noesc wildone / noesc wildmany )
     wildone    =  %x3F
     wildmany   =  %x2A
     nowild     =  %x01-29 / %x2B-3E / %x40-FF
@@ -638,7 +638,7 @@ the username, hostname and realname of a new user.
 
 The <mode> parameter should be a numeric, and can be used to
 automatically set user modes when registering with the server.  This
-parameter is a bittqmask, with only 2 bits having any signification: if
+parameter is a bitmask, with only 2 bits having any signification: if
 the bit 2 is set, the user mode 'w' will be set and if the bit 3 is
 set, the user mode 'i' will be set.  (See Section 3.1.5 "User
 Modes").
@@ -769,7 +769,7 @@ service.  The service may only be known to servers which have a name
 matching the distribution.  For a matching server to have knowledge
 of the service, the network path between that server and the server
 on which the service is connected MUST be composed of servers which
-names all match the tqmask.
+names all match the mask.
 
 The <type> parameter is currently reserved for future usage.
 
@@ -1266,9 +1266,9 @@ PRIVMSG is used to send private messages between users, as well as to
 send messages to channels.  <msgtarget> is usually the nickname of
 the recipient of the message, or a channel name.
 
-The <msgtarget> parameter may also be a host tqmask (#<tqmask>) or server
-tqmask ($<tqmask>).  In both cases the server will only send the PRIVMSG
-to those who have a server or host matching the tqmask.  The tqmask MUST
+The <msgtarget> parameter may also be a host mask (#<mask>) or server
+mask ($<mask>).  In both cases the server will only send the PRIVMSG
+to those who have a server or host matching the mask.  The mask MUST
 have at least 1 (one) "." in it and no wildcards following the last
 ".".  This requirement exists to prevent people sending messages to
 "#*" or "$*", which would broadcast to all users.  Wildcards are the
@@ -1389,13 +1389,13 @@ Wildcards are allowed in the <target> parameter.
 
 [tr][td][pre]
 Command: LUSERS
-Parameters: [ <tqmask> [ <target> ] ]
+Parameters: [ <mask> [ <target> ] ]
 
 The LUSERS command is used to get statistics about the size of the
 IRC network.  If no parameter is given, the reply will be about the
-whole net.  If a <tqmask> is specified, then the reply will only
+whole net.  If a <mask> is specified, then the reply will only
 concern the part of the network formed by the servers matching the
-tqmask.  Finally, if the <target> parameter is specified, the request
+mask.  Finally, if the <target> parameter is specified, the request
 is forwarded to that server which will generate the reply.
 
 Wildcards are allowed in the <target> parameter.
@@ -1486,13 +1486,13 @@ published this way.
 
 [tr][td][pre]
 Command: LINKS
-Parameters: [ [ <remote server> ] <server tqmask> ]
+Parameters: [ [ <remote server> ] <server mask> ]
 
 With LINKS, a user can list all servernames, which are known by the
 server answering the query.  The returned list of servers MUST match
-the tqmask, or if no tqmask is given, the full list is returned.
+the mask, or if no mask is given, the full list is returned.
 
-If <remote server> is given in addition to <server tqmask>, the LINKS
+If <remote server> is given in addition to <server mask>, the LINKS
 command is forwarded to the first server found that matches that name
 (if any), and that server is then required to answer the query.
 
@@ -1545,7 +1545,7 @@ Parameters: <target server> <port> [ <remote server> ]
 The CONNECT command can be used to request a server to try to
 establish a new connection to another server immediately.  CONNECT is
 a privileged command and SHOULD be available only to IRC Operators.
-If a <remote server> is given and its tqmask doesn't match name of the
+If a <remote server> is given and its mask doesn't match name of the
 parsing server, the CONNECT attempt is sent to the first match of
 remote server. Otherwise the CONNECT attempt is made by the server
 processing the request.
@@ -1698,7 +1698,7 @@ information about any service which is connected to the network.
 
 [tr][td][pre]
 Command: SERVLIST
-Parameters: [ <tqmask> [ <type> ] ]
+Parameters: [ <mask> [ <type> ] ]
 
 The SERVLIST command is used to list services currently connected to
 the network and visible to the user issuing the command.  The
@@ -1756,20 +1756,20 @@ allowed to.
 
 [tr][td][pre]
 Command: WHO
-Parameters: [ <tqmask> [ "o" ] ]
+Parameters: [ <mask> [ "o" ] ]
 
 The WHO command is used by a client to generate a query which returns
-a list of information which 'matches' the <tqmask> parameter given by
-the client.  In the absence of the <tqmask> parameter, all visible
+a list of information which 'matches' the <mask> parameter given by
+the client.  In the absence of the <mask> parameter, all visible
 (users who aren't invisible (user mode +i) and who don't have a
 common channel with the requesting client) are listed.  The same
-result can be achieved by using a <tqmask> of "0" or any wildcard which
+result can be achieved by using a <mask> of "0" or any wildcard which
 will end up matching every visible user.
 
-The <tqmask> passed to WHO is matched against users' host, server, real
-name and nickname if the channel <tqmask> cannot be found.
+The <mask> passed to WHO is matched against users' host, server, real
+name and nickname if the channel <mask> cannot be found.
 If the "o" parameter is passed only operators are returned according
-to the <tqmask> supplied.
+to the <mask> supplied.
 
    Numeric Replies:
 
@@ -1792,13 +1792,13 @@ to the <tqmask> supplied.
 
 [tr][td][pre]
 Command: WHOIS
-Parameters: [ <target> ] <tqmask> *( "," <tqmask> )
+Parameters: [ <target> ] <mask> *( "," <mask> )
 
 This command is used to query information about particular user.
 The server will answer this command with several numeric messages
-indicating different statuses of each user which matches the tqmask (if
+indicating different statuses of each user which matches the mask (if
 you are entitled to see them).  If no wildcard is present in the
-<tqmask>, any information about that nick which you are allowed to see
+<mask>, any information about that nick which you are allowed to see
 is presented.
 
 If the <target> parameter is specified, it sends the query to a
@@ -2477,26 +2477,26 @@ to 399.
            indicate that it is summoning that user.
 
        346    RPL_INVITELIST
-              "<channel> <invitetqmask>"
+              "<channel> <invitemask>"
        347    RPL_ENDOFINVITELIST
               "<channel> :End of channel invite list"
 
          - When listing the 'invitations masks' for a given channel,
            a server is required to send the list back using the
            RPL_INVITELIST and RPL_ENDOFINVITELIST messages.  A
-           separate RPL_INVITELIST is sent for each active tqmask.
+           separate RPL_INVITELIST is sent for each active mask.
            After the masks have been listed (or if none present) a
            RPL_ENDOFINVITELIST MUST be sent.
 
        348    RPL_EXCEPTLIST
-              "<channel> <exceptiontqmask>"
+              "<channel> <exceptionmask>"
        349    RPL_ENDOFEXCEPTLIST
               "<channel> :End of channel exception list"
 
          - When listing the 'exception masks' for a given channel,
            a server is required to send the list back using the
            RPL_EXCEPTLIST and RPL_ENDOFEXCEPTLIST messages.  A
-           separate RPL_EXCEPTLIST is sent for each active tqmask.
+           separate RPL_EXCEPTLIST is sent for each active mask.
            After the masks have been listed (or if none present)
            a RPL_ENDOFEXCEPTLIST MUST be sent.
 
@@ -2548,23 +2548,23 @@ to 399.
            the end.
 
        364    RPL_LINKS
-              "<tqmask> <server> :<hopcount> <server info>"
+              "<mask> <server> :<hopcount> <server info>"
        365    RPL_ENDOFLINKS
-              "<tqmask> :End of LINKS list"
+              "<mask> :End of LINKS list"
 
          - In replying to the LINKS message, a server MUST send
            replies back using the RPL_LINKS numeric and mark the
            end of the list using an RPL_ENDOFLINKS reply.
 
        367    RPL_BANLIST
-              "<channel> <bantqmask>"
+              "<channel> <banmask>"
        368    RPL_ENDOFBANLIST
               "<channel> :End of channel ban list"
 
          - When listing the active 'bans' for a given channel,
            a server is required to send the list back using the
            RPL_BANLIST and RPL_ENDOFBANLIST messages.  A separate
-           RPL_BANLIST is sent for each active bantqmask.  After the
+           RPL_BANLIST is sent for each active banmask.  After the
            banmasks have been listed (or if none present) a
            RPL_ENDOFBANLIST MUST be sent.
 
@@ -2719,7 +2719,7 @@ to 399.
          - reports the server uptime.
 
        243    RPL_STATSOLINE
-              "O <hosttqmask> * <name>"
+              "O <hostmask> * <name>"
 
          - reports the allowed hosts from where user may become IRC
            operators.
@@ -2731,10 +2731,10 @@ to 399.
            RPL_UMODEIS is sent back.
 
        234    RPL_SERVLIST
-              "<name> <server> <tqmask> <type> <hopcount> <info>"
+              "<name> <server> <mask> <type> <hopcount> <info>"
 
        235    RPL_SERVLISTEND
-              "<tqmask> <type> :End of service listing"
+              "<mask> <type> :End of service listing"
 
          - When listing services in reply to a SERVLIST message,
            a server is required to send the list back using the
@@ -2869,11 +2869,11 @@ to 399.
        412    ERR_NOTEXTTOSEND
               ":No text to send"
        413    ERR_NOTOPLEVEL
-              "<tqmask> :No toplevel domain specified"
+              "<mask> :No toplevel domain specified"
        414    ERR_WILDTOPLEVEL
-              "<tqmask> :Wildcard in toplevel domain"
+              "<mask> :Wildcard in toplevel domain"
        415    ERR_BADMASK
-              "<tqmask> :Bad Server/host tqmask"
+              "<mask> :Bad Server/host mask"
 
          - 412 - 415 are returned by PRIVMSG to indicate that
            the message wasn't delivered for some reason.
@@ -3180,7 +3180,7 @@ both will removed by use of a server KILL (See Section 3.7.1).
 
 [tr][td]
 There is no way to escape the escape character "\" (%x5C).  While
-this isn't usually a problem, it makes it impossible to form a tqmask
+this isn't usually a problem, it makes it impossible to form a mask
 with a backslash character ("\") preceding a wildcard.
 [/td][/tr]