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]
 
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index f16ad0a..3b564c1 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -765,8 +765,8 @@ namespace KviTQString
 	
 		//          s1
 		//          m1
-		// tqmask1 : *xor
-		// tqmask2 : xorand*xor
+		// mask1 : *xor
+		// mask2 : xorand*xor
 		//         m2
 		//          s2
 	
@@ -794,7 +794,7 @@ namespace KviTQString
 		const TQChar * savePos2 = m2;
 		while(m1->tqunicode())
 		{
-			//loop managed by m1 (initially first tqmask)
+			//loop managed by m1 (initially first mask)
 			if(m1->tqunicode()=='*')
 			{
 				//Found a wildcard in m1
@@ -825,8 +825,8 @@ namespace KviTQString
 				if(m2->tqunicode() == '*')
 				{
 					//A wlidcard in the second string
-					//Invert the game : tqmask1 <-> tqmask2
-					//tqmask2 now leads the game...
+					//Invert the game : mask1 <-> mask2
+					//mask2 now leads the game...
 					savePos1 = m1;          //aux
 					m1 = m2;                //...swap
 					m2 = savePos1;          //...swap
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 3eb7fa6..525ad71 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -402,8 +402,8 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
 
 	//          s1
 	//          m1
-	// tqmask1 : *xor
-	// tqmask2 : xorand*xor
+	// mask1 : *xor
+	// mask2 : xorand*xor
 	//         m2
 	//          s2
 
@@ -423,7 +423,7 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
 	const char * savePos2 = m2;
 	while(*m1)
 	{
-		//loop managed by m1 (initially first tqmask)
+		//loop managed by m1 (initially first mask)
 		if(*m1=='*')
 		{
 			//Found a wildcard in m1
@@ -450,8 +450,8 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
 			if(*m2 == '*')
 			{
 				//A wlidcard in the second string
-				//Invert the game : tqmask1 <-> tqmask2
-				//tqmask2 now leads the game...
+				//Invert the game : mask1 <-> mask2
+				//mask2 now leads the game...
 				savePos1 = m1;          //aux
 				m1 = m2;                //...swap
 				m2 = savePos1;          //...swap
@@ -497,7 +497,7 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2)
 	if(!(m1 && m2 && (*m1)))return false;
 	const char * savePos1 = 0;
 	const char * savePos2 = m2;
-	while(*m1){ //loop managed by m1 (initially first tqmask)
+	while(*m1){ //loop managed by m1 (initially first mask)
 		if(*m1=='*'){
 			//Found a wildcard in m1
 			savePos1 = ++m1;            //move to the next char and save the position...this is our jolly
@@ -520,8 +520,8 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2)
 		} else {
 			if(*m2 == '*'){
 				//A wlidcard in the second string
-				//Invert the game : tqmask1 <-> tqmask2
-				//tqmask2 now leads the game...
+				//Invert the game : mask1 <-> mask2
+				//mask2 now leads the game...
 				savePos1 = m1;          //aux
 				m1 = m2;                //...swap
 				m2 = savePos1;          //...swap
@@ -554,7 +554,7 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char
 	const char * savePos2 = m2;
 	while(NOT_AT_END(m1))
 	{
-		//loop managed by m1 (initially first tqmask)
+		//loop managed by m1 (initially first mask)
 		if(*m1=='*')
 		{
 			//Found a wildcard in m1
@@ -588,8 +588,8 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char
 			if(*m2 == '*')
 			{
 				//A wlidcard in the second string
-				//Invert the game : tqmask1 <-> tqmask2
-				//tqmask2 now leads the game...
+				//Invert the game : mask1 <-> mask2
+				//mask2 now leads the game...
 				bSwapped = !bSwapped;
 				savePos1 = m1;          //aux
 				m1 = m2;                //...swap
diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index d7adeb2..e961359 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -98,13 +98,13 @@ KviMediaType * KviMediaManager::findMediaTypeByIanaType(const char * ianaType)
 	return 0;
 }
 
-KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filetqmask)
+KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filemask)
 {
 	__range_valid(locked());
 	for(KviMediaType * mt = m_pMediaTypeList->first();mt;mt = m_pMediaTypeList->next())
 	{
 // FIXME: #warning "Should this be case sensitive ?"
-		if(kvi_strEqualCI(mt->szFileMask.ptr(),filetqmask))return mt;
+		if(kvi_strEqualCI(mt->szFileMask.ptr(),filemask))return mt;
 	}
 
 	return 0;
@@ -137,7 +137,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 	{
 		if(iWildCount)
 		{
-			// the new tqmask has wildcards... if the current one has none, skip it
+			// the new mask has wildcards... if the current one has none, skip it
 			int iWildCountExisting = mt->szFileMask.occurences('*');
 			if(iWildCountExisting)
 			{
@@ -164,7 +164,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 				}
 			} // else the current has no wildcards...skip
 		} else {
-			// the new tqmask has no wildcards....
+			// the new mask has no wildcards....
 			if(mt->szFileMask.contains('*'))
 			{
 				// current one has wildcards...insert
@@ -433,7 +433,7 @@ KviMediaType * KviMediaManager::findMediaTypeForRegularFile(const char * szFullP
 
 typedef struct _KviDefaultMediaType
 {
-	const char * filetqmask;
+	const char * filemask;
 	const char * magicbytes;
 	const char * ianatype;
 	const char * description;
@@ -489,12 +489,12 @@ void KviMediaManager::load(const char * filename)
 		insertMediaType(m);
 	}
 
-	for(int u = 0;g_defMediaTypes[u].filetqmask;u++)
+	for(int u = 0;g_defMediaTypes[u].filemask;u++)
 	{
-		if(!findMediaTypeByFileMask(g_defMediaTypes[u].filetqmask))
+		if(!findMediaTypeByFileMask(g_defMediaTypes[u].filemask))
 		{
 			KviMediaType * m = new KviMediaType;
-			m->szFileMask = g_defMediaTypes[u].filetqmask;
+			m->szFileMask = g_defMediaTypes[u].filemask;
 			m->szMagicBytes = g_defMediaTypes[u].magicbytes;
 			m->szIanaType = g_defMediaTypes[u].ianatype;
 			m->szDescription = g_defMediaTypes[u].description;
diff --git a/src/kvilib/ext/kvi_mediatype.h b/src/kvilib/ext/kvi_mediatype.h
index 99b427f..77e9659 100644
--- a/src/kvilib/ext/kvi_mediatype.h
+++ b/src/kvilib/ext/kvi_mediatype.h
@@ -67,7 +67,7 @@ private:
 	KviMediaType * findMediaTypeForRegularFile(const char * szFullPath,const char * szFileName,bool bCheckMagic);
 public:
 	KviPointerList<KviMediaType> * mediaTypeList(){ return m_pMediaTypeList; };
-	KviMediaType * findMediaTypeByFileMask(const char * filetqmask);
+	KviMediaType * findMediaTypeByFileMask(const char * filemask);
 	KviMediaType * findMediaTypeByIanaType(const char * ianaType);
 	bool removeMediaType(KviMediaType * t){ return m_pMediaTypeList->removeRef(t); };
 	void clear(){ m_pMediaTypeList->clear(); };
diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/kvi_regchan.cpp
index 434ebd9..9cddac5 100644
--- a/src/kvilib/ext/kvi_regchan.cpp
+++ b/src/kvilib/ext/kvi_regchan.cpp
@@ -28,10 +28,10 @@
 #include "kvi_config.h"
 #include "kvi_qstring.h"
 
-KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &nettqmask)
+KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &netmask)
 {
 	m_szName = name;
-	m_szNetMask = nettqmask;
+	m_szNetMask = netmask;
 	m_pPropertyDict = new KviPointerHashTable<const char *,KviStr>(7,false,true);
 	m_pPropertyDict->setAutoDelete(true);
 }
@@ -111,13 +111,13 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::find(const char * name,cons
 	return 0;
 }
 
-KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * nettqmask)
+KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * netmask)
 {
 	KviRegisteredChannelList * l = m_pChannelDict->find(name);
 	if(!l)return 0;
 	for(KviRegisteredChannel * c = l->first();c;c = l->next())
 	{
-		if(kvi_strEqualCI(c->netMask().ptr(),nettqmask))return c;
+		if(kvi_strEqualCI(c->netMask().ptr(),netmask))return c;
 	}
 	return 0;
 }
diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/kvi_regchan.h
index 5cdad19..f447c31 100644
--- a/src/kvilib/ext/kvi_regchan.h
+++ b/src/kvilib/ext/kvi_regchan.h
@@ -35,7 +35,7 @@ class KVILIB_API KviRegisteredChannel : public KviHeapObject
 {
 	friend class KviRegisteredChannelDataBase;
 public:
-	KviRegisteredChannel(const KviStr &name,const KviStr &nettqmask);
+	KviRegisteredChannel(const KviStr &name,const KviStr &netmask);
 	~KviRegisteredChannel();
 protected:
 	KviStr               m_szName;
@@ -63,7 +63,7 @@ protected:
 public:
 	KviPointerHashTable<const char *,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; };
 	KviRegisteredChannel * find(const char * name,const char * net);
-	KviRegisteredChannel * findExact(const char * name,const char * nettqmask);
+	KviRegisteredChannel * findExact(const char * name,const char * netmask);
 	void remove(KviRegisteredChannel * c);
 	void add(KviRegisteredChannel * c);
 	void load(const char * filename);
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index 6145d0b..1edd2d7 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -42,7 +42,7 @@
 	@short:
 		Registration of users in KVIrc
 	@keyterms:
-		registered users, registration tqmask, registered user properties,
+		registered users, registration mask, registered user properties,
 		user properties, notify property, avatar property
 	@body:
 		[big]Introduction[/big][br]
@@ -59,7 +59,7 @@
 		are used to recognize the user on irc.[br]
 		[br]
 		[big]Registration masks[/big][br]
-		The masks have the common IRC tqmask format: [b]<nick>!<user>@<host>[/b][br]
+		The masks have the common IRC mask format: [b]<nick>!<user>@<host>[/b][br]
 		The masks may contain '*' and '?' wildcards that match any portion of text.[br]
 		[b]*!*@*[/b][br]
 		[b]Pragma!*@*[/b][br]
@@ -69,33 +69,33 @@
 		[b]Pragma!~daemon@some.host.it[/b][br]
 		Are examples of valid registration masks.[br]
 		The masks with wildcards can actually match more than a single user.[br]
-		For example the tqmask *!root@*.host.com will match all the users
+		For example the mask *!root@*.host.com will match all the users
 		having root as username and coming from the host.com domain.[br]
 		For this reason putting wildcards in nicknames could become a problem
 		if not used carefully (but may also be used to achieve interesting tricks).[br]
 		If you don't use wildcards in nicknames you are sure that
-		in a single irc connection , a tqmask will always refer to a single user.[br]
+		in a single irc connection , a mask will always refer to a single user.[br]
 		You will commonly use the following format:[br]
 		<nick>!*<username>@*.<host>.<top>[br]
 		or[br]
 		<nick>!*<username>@<number>.<number>.<number>.*[br]
-		In this way you can be 95% sure that the tqmask will really match the correct user.[br]
+		In this way you can be 95% sure that the mask will really match the correct user.[br]
 		[br]
 		[big]Example of registration and lookups[/big]
 		Assume that you want to registere a friend of yours: Derek Riggs.[br]
 		Derek often uses "Eddie" as his nickname
 		"stranger" as username and has a dial-up connection that makes his IP address appear as
 		<variable-number>.somewhere.in.time.org.[br]
-		You will add an entry with name "Derek Riggs" and a registration tqmask like the following:
+		You will add an entry with name "Derek Riggs" and a registration mask like the following:
 		Eddie!stranger@*.somewhere.in.time.org.[br]
 		If the IRC servers keep adding strange characters ([doc:irc_masks]prefixes[/doc]) at the beginning of his username you may use
 		Eddie!*stranger@*.somewhere.in.time.org.[br]
-		If Eddie also often connects from the wasted.years.org domain and gets 'eddie' as username there, you might add a second registration tqmask as follows:
+		If Eddie also often connects from the wasted.years.org domain and gets 'eddie' as username there, you might add a second registration mask as follows:
 		Eddie!*eddie@*.wasted.years.org.[br]
-		An alternative could be use only one tqmask with *.org as domain and allow any username (Eddie!*@*.org) but this
+		An alternative could be use only one mask with *.org as domain and allow any username (Eddie!*@*.org) but this
 		could become dangerous since it could match the users that you don't want to.[br]
 		On the other hand, if you dislike the users with the nickname Eddie that come from .org
-		and you're implementing an auto-kick system, the correct tqmask to register is "Eddie!*@*.org".[br]
+		and you're implementing an auto-kick system, the correct mask to register is "Eddie!*@*.org".[br]
 		[br]
 		KVirc ties to be smart , and always find the most correct match for an user:
 		If you have two masks registered: Pragma!*xor@*.myisp.it and *!*@*.myisp.it,
@@ -162,47 +162,47 @@ bool KviRegisteredUser::isIgnoreEnabledFor(IgnoreFlags flag)
 	return m_iIgnoreFlags & flag;
 }
 
-KviIrcMask * KviRegisteredUser::findMask(const KviIrcMask &tqmask)
+KviIrcMask * KviRegisteredUser::findMask(const KviIrcMask &mask)
 {
 	for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
 	{
-		if(*m == tqmask)return m;
+		if(*m == mask)return m;
 	}
 	return 0;
 }
 
-bool KviRegisteredUser::addMask(KviIrcMask * tqmask)
+bool KviRegisteredUser::addMask(KviIrcMask * mask)
 {
-	if(findMask(*tqmask))
+	if(findMask(*mask))
 	{
-		delete tqmask;
-        tqmask = 0;
+		delete mask;
+        mask = 0;
 		return false;
 	}
-	m_pMaskList->append(tqmask);
+	m_pMaskList->append(mask);
 	return true;
 }
 
-bool KviRegisteredUser::removeMask(KviIrcMask * tqmask)
+bool KviRegisteredUser::removeMask(KviIrcMask * mask)
 {
-	if(!tqmask)return false;
-	return m_pMaskList->removeRef(tqmask);
+	if(!mask)return false;
+	return m_pMaskList->removeRef(mask);
 }
 
-bool KviRegisteredUser::matches(const KviIrcMask &tqmask)
+bool KviRegisteredUser::matches(const KviIrcMask &mask)
 {
 	for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
 	{
-		if(m->matches(tqmask))return true;
+		if(m->matches(mask))return true;
 	}
 	return false;
 }
 
-bool KviRegisteredUser::matchesFixed(const KviIrcMask &tqmask)
+bool KviRegisteredUser::matchesFixed(const KviIrcMask &mask)
 {
 	for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
 	{
-		if(m->matchesFixed(tqmask))return true;
+		if(m->matchesFixed(mask))return true;
 	}
 	return false;
 }
@@ -359,9 +359,9 @@ KviRegisteredUser * KviRegisteredUserDataBase::getUser(const TQString & name)
 	return u;
 }
 
-static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,KviIrcMask *tqmask)
+static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,KviIrcMask *mask)
 {
-	KviRegisteredMask * newMask = new KviRegisteredMask(u,tqmask);
+	KviRegisteredMask * newMask = new KviRegisteredMask(u,mask);
 	int idx = 0;
 	for(KviRegisteredMask * m = l->first();m;m = l->next())
 	{
@@ -375,20 +375,20 @@ static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,Kv
 	l->append(newMask);
 }
 
-KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,KviIrcMask * tqmask)
+KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,KviIrcMask * mask)
 {
-	if(!u || !tqmask) return 0;
+	if(!u || !mask) return 0;
 	__range_valid(u == m_pUserDict->find(u->name()));
 
 	KviRegisteredMaskList * l;
-	if(tqmask->hasWildNick())
+	if(mask->hasWildNick())
 	{
 		for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 		{
-			if(*(m->tqmask()) == *tqmask)
+			if(*(m->mask()) == *mask)
 			{
-				delete tqmask;
-                tqmask = 0;
+				delete mask;
+                mask = 0;
 				return m->user();
 			}
 		}
@@ -396,44 +396,44 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
 		// masks with more info go first in the list
 		l = m_pWildMaskList;
 	} else {
-		l = m_pMaskDict->find(tqmask->nick());
+		l = m_pMaskDict->find(mask->nick());
 		if(l)
 		{
 			// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
 			for(KviRegisteredMask * m = l->first();m;m = l->next())
 			{
-				if(*(m->tqmask()) == *tqmask)
+				if(*(m->mask()) == *mask)
 				{
-					delete tqmask;
-                    tqmask = 0;
+					delete mask;
+                    mask = 0;
 					return m->user();
 				}
 			}
 			// not found ...ok... add it
 		} else {
 			// not found ...ok... add it
-			// this is the first tqmask in the list
+			// this is the first mask in the list
 			l = new KviRegisteredMaskList;
 			l->setAutoDelete(true);
-			if(!u->addMask(tqmask))
+			if(!u->addMask(mask))
 			{
 				debug(" Ops...got an incoherent regusers action...recovered ?");
 				delete l;
                 l = 0;
 			} else {
-				append_mask_to_list(l,u,tqmask);
-				m_pMaskDict->insert(tqmask->nick(),l);
+				append_mask_to_list(l,u,mask);
+				m_pMaskDict->insert(mask->nick(),l);
 			}
 			return 0;
 		}
 	}
 	// Ok...add it
-	if(!u->addMask(tqmask))
+	if(!u->addMask(mask))
 	{
 		debug("ops...got an incoherent regusers action...recovered ?");
 		return 0; // ops...already there ?
 	}
-	append_mask_to_list(l,u,tqmask);
+	append_mask_to_list(l,u,mask);
 	return 0;
 }
 
@@ -488,9 +488,9 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name)
 	if(name.isEmpty()) return false;
 	KviRegisteredUser * u = m_pUserDict->find(name);
 	if(!u)return false;
-	while(KviIrcMask * tqmask = u->maskList()->first())
+	while(KviIrcMask * mask = u->maskList()->first())
 	{
-		if(!removeMaskByPointer(tqmask))
+		if(!removeMaskByPointer(mask))
 			debug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data());
 	}
 	emit(userRemoved(name));
@@ -504,13 +504,13 @@ bool KviRegisteredUserDataBase::removeGroup(const TQString & name)
 	return true;
 }
 
-bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &tqmask)
+bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &mask)
 {
-	// find the tqmask pointer
-	KviRegisteredMask * m = findExactMask(tqmask);
+	// find the mask pointer
+	KviRegisteredMask * m = findExactMask(mask);
 	// and remove it
 	if(m){
-		if(removeMaskByPointer(m->tqmask()))
+		if(removeMaskByPointer(m->mask()))
 		{
 			return true;
 		}
@@ -518,36 +518,36 @@ bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &tqmask)
 	return 0;
 }
 
-bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
+bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * mask)
 {
-	if(!tqmask) return 0;
-	if(tqmask->hasWildNick())
+	if(!mask) return 0;
+	if(mask->hasWildNick())
 	{
 		// remove from the wild list
 		for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 		{
-			if(m->tqmask() == tqmask)
+			if(m->mask() == mask)
 			{
 				// ok..got it, remove from the list and from the user struct (user struct deletes it!)
-				emit(userChanged(tqmask->nick()));
-				m->user()->removeMask(tqmask);    // this one deletes m->tqmask()
+				emit(userChanged(mask->nick()));
+				m->user()->removeMask(mask);    // this one deletes m->mask()
 				m_pWildMaskList->removeRef(m);  // this one deletes m
 				return true;
 			}
 		}
 		// not found ...opz :)
 	} else {
-		KviRegisteredMaskList * l = m_pMaskDict->find(tqmask->nick());
+		KviRegisteredMaskList * l = m_pMaskDict->find(mask->nick());
 		if(l)
 		{
 			// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
 			for(KviRegisteredMask * m = l->first();m;m = l->next())
 			{
-				if(m->tqmask() == tqmask)
+				if(m->mask() == mask)
 				{
-					TQString nick = tqmask->nick();
+					TQString nick = mask->nick();
 					emit(userChanged(nick));
-					m->user()->removeMask(tqmask); // this one deletes m->tqmask() (or tqmask)
+					m->user()->removeMask(mask); // this one deletes m->mask() (or mask)
 					l->removeRef(m);             // this one deletes m
 					if(l->count() == 0)m_pMaskDict->remove(nick);
 					return true;
@@ -563,21 +563,21 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
 
 
 /*
-KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &tqmask)
+KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &mask)
 {
 	// first lookup the nickname in the maskDict
-	KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
+	KviRegisteredMaskList * l = m_pMaskDict->find(mask.nick());
 	if(l)
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
 		{
-			if(m->tqmask()->matchesFixed(0,tqmask.user(),tqmask.host()))return m->user();
+			if(m->mask()->matchesFixed(0,mask.user(),mask.host()))return m->user();
 		}
 	}
 	// not found....lookup the wild ones
 	for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 	{
-		if(m->tqmask()->matchesFixed(tqmask))return m->user();
+		if(m->mask()->matchesFixed(mask))return m->user();
 	}
 	return 0; // no match at all
 }
@@ -598,40 +598,40 @@ KviRegisteredMask * KviRegisteredUserDataBase::findMatchingMask(const TQString &
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
 		{
-			if(m->tqmask()->matchesFixed(nick,user,host))return m;
+			if(m->mask()->matchesFixed(nick,user,host))return m;
 		}
 	}
 	// not found....lookup the wild ones
 	for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 	{
-		if(m->tqmask()->matchesFixed(nick,user,host))return m;
+		if(m->mask()->matchesFixed(nick,user,host))return m;
 	}
 	return 0; // no match at all
 }
 
-KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask &tqmask)
+KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask &mask)
 {
-	KviRegisteredMask * m = findExactMask(tqmask);
+	KviRegisteredMask * m = findExactMask(mask);
 	if(m)return m->user();
 	return 0;
 }
 
-KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &tqmask)
+KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &mask)
 {
 	// first lookup the nickname in the maskDict
-	if(tqmask.nick()=="") return 0;
-	KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
+	if(mask.nick()=="") return 0;
+	KviRegisteredMaskList * l = m_pMaskDict->find(mask.nick());
 	if(l)
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
 		{
-			if(*(m->tqmask()) == tqmask)return m;
+			if(*(m->mask()) == mask)return m;
 		}
 	}
 	// not found....lookup the wild ones
 	for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 	{
-		if(*(m->tqmask()) == tqmask)return m;
+		if(*(m->mask()) == mask)return m;
 	}
 	return 0; // no match at all
 }
@@ -674,8 +674,8 @@ void KviRegisteredUserDataBase::load(const TQString & filename)
 						u->setProperty(tmp,*(sdi.current()));
 					} else if(KviTQString::equalCSN("mask_",tmp,5))
 					{
-						KviIrcMask * tqmask = new KviIrcMask(*(sdi.current()));
-						addMask(u,tqmask);
+						KviIrcMask * mask = new KviIrcMask(*(sdi.current()));
+						addMask(u,mask);
 					} else if(KviTQString::equalCI(tmp,"Group"))
 					{
 						u->setGroup(*(sdi.current()));
@@ -722,9 +722,9 @@ void KviRegisteredUserDataBase::save(const TQString & filename)
 		{
 			TQString tmp;
 			KviTQString::sprintf(tmp,"mask_%d",idx);
-			TQString tqmask;
-			m->tqmask(tqmask,KviIrcMask::NickUserHost);
-			cfg.writeEntry(tmp,tqmask);
+			TQString mask;
+			m->mask(mask,KviIrcMask::NickUserHost);
+			cfg.writeEntry(tmp,mask);
 			++idx;
 		}
 		cfg.writeEntry("Group",it.current()->group());
diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/kvi_regusersdb.h
index 797ae10..6f20422 100644
--- a/src/kvilib/ext/kvi_regusersdb.h
+++ b/src/kvilib/ext/kvi_regusersdb.h
@@ -27,7 +27,7 @@
 //
 // REGISTERED USERS
 //     
-//     Here we manage users resigered by tqmask and their (generic!) properties
+//     Here we manage users resigered by mask and their (generic!) properties
 //
 
 #include "kvi_settings.h"
@@ -74,10 +74,10 @@ private:
 	KviPointerHashTable<TQString,TQString>           * m_pPropertyDict;   // owned properties
 	KviPointerList<KviIrcMask>     * m_pMaskList;       // owned masks
 protected:
-	// tqmask ownership is transferred! (always!) returns false if the tqmask was already there
-	bool addMask(KviIrcMask * tqmask);
-	bool removeMask(KviIrcMask * tqmask);
-	KviIrcMask * findMask(const KviIrcMask &tqmask);
+	// mask ownership is transferred! (always!) returns false if the mask was already there
+	bool addMask(KviIrcMask * mask);
+	bool removeMask(KviIrcMask * mask);
+	KviIrcMask * findMask(const KviIrcMask &mask);
 public:
 	int  ignoreFlags()                  { return m_iIgnoreFlags; };
 	void setIgnoreFlags(int flags)      {m_iIgnoreFlags=flags; };
@@ -86,8 +86,8 @@ public:
 	bool isIgnoreEnabledFor(IgnoreFlags flag);
 
 	const TQString &name(){ return m_szName; };
-	bool matches(const KviIrcMask &tqmask);
-	bool matchesFixed(const KviIrcMask &tqmask);
+	bool matches(const KviIrcMask &mask);
+	bool matchesFixed(const KviIrcMask &mask);
 	bool matchesFixed(const TQString &nick,const TQString &user,const TQString &host);
 
 	void setProperty(const TQString &name,const TQString &value);
@@ -139,7 +139,7 @@ public:
 public:
 	int                 nonWildChars(){ return m_iMaskNonWildChars; };
 	KviRegisteredUser * user(){ return m_pUser; };
-	KviIrcMask        * tqmask(){ return m_pMask; };
+	KviIrcMask        * mask(){ return m_pMask; };
 };
 
 typedef KviPointerList<KviRegisteredMask> KviRegisteredMaskList;
@@ -173,14 +173,14 @@ public:
 	bool removeUser(const TQString &name);
 	bool removeGroup(const TQString &name);
 	KviRegisteredUser * findUserByName(const TQString &name){ return m_pUserDict->find(name); };
-	// tqmask must be allocated on the heap and the ownership is transferred!
-	// returns non zero if there is already an user with this tqmask (returns the pointer to it!)
-	KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * tqmask);
-	bool removeMaskByPointer(KviIrcMask * tqmask);
-	bool removeMask(const KviIrcMask &tqmask);
+	// mask must be allocated on the heap and the ownership is transferred!
+	// returns non zero if there is already an user with this mask (returns the pointer to it!)
+	KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * mask);
+	bool removeMaskByPointer(KviIrcMask * mask);
+	bool removeMask(const KviIrcMask &mask);
 	KviRegisteredUser * findMatchingUser(const TQString &nick,const TQString &user,const TQString &host);
-	KviRegisteredUser * findUserWithMask(const KviIrcMask &tqmask);
-	KviRegisteredMask * findExactMask(const KviIrcMask &tqmask);
+	KviRegisteredUser * findUserWithMask(const KviIrcMask &mask);
+	KviRegisteredMask * findExactMask(const KviIrcMask &mask);
 	KviRegisteredMask * findMatchingMask(const TQString &nick,const TQString &user,const TQString &host);
 	//Only used in few places (actually one) of the code, but lot of times;perfect for inlining...
 	//bool isIgnoredUser(const char * nick,const char * user,const char * host);
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index 0e793a3..a0d52a7 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -60,7 +60,7 @@
 		with /usr/arch/mp3/SonataArctica_SingInSilence_Live.mp3 as real file path , something like
 		"SonataArctica_SingInSilence.mp3". A remote user will then request you a DCC GET SonataArctica_SingInSilence.mp3
 		and KVIrc will automatically send the file.[br]
-		Each file offer has an "user tqmask" that the requesting remote users must match to
+		Each file offer has an "user mask" that the requesting remote users must match to
 		obtain the file: *!*@* matches any user, Pragma!*@* matches any user with nickname pragma,
 		*!*@*.omnikron.net matches any user coming from the omnikron.net domain.[br]
 		Each offer can have an expire time: the offer will be automatically removed after
@@ -69,8 +69,8 @@
 		use an additional "size" parameter in the DCC GET request.[br]
 		[big]Security issues[/big]
 		This is a nice but unsecure method of sharing files.[br]
-		The user tqmask is a good protection but you have to use it properly!.[br]
-		Setting the user tqmask to Nick!*@* can be easily exploited (just by making an user disconnect
+		The user mask is a good protection but you have to use it properly!.[br]
+		Setting the user mask to Nick!*@* can be easily exploited (just by making an user disconnect
 		in one of the well known ways and then by using his nickname).[br]
 		On the other side, the remote end must know exactly the visible name of the offer to request
 		and noone but you will tell him that name.[br]
@@ -175,7 +175,7 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
 	{
 		if(o->wildcardCount() > 0)
 		{
-			// the new tqmask has wildcards... if the current one has none, skip it
+			// the new mask has wildcards... if the current one has none, skip it
 			if(fo->wildcardCount() > 0)
 			{
 				// the one in the list has wildcards too...
@@ -200,7 +200,7 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
 				}
 			} // else the current has no wildcards...skip
 		} else {
-			// the new tqmask has no wildcards....
+			// the new mask has no wildcards....
 			if(fo->wildcardCount() > 0)
 			{
 				// current one has wildcards...insert
@@ -275,7 +275,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
 	}
 }
 
-KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,KviIrcMask * tqmask,unsigned int uFileSize)
+KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,KviIrcMask * mask,unsigned int uFileSize)
 {
 	KviSharedFileList * l = m_pSharedListDict->find(szName);
 	if(!l)return 0;
@@ -283,10 +283,10 @@ KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,K
 	for(KviSharedFile * o = l->first();o;o = l->next())
 	{
 		bool bMatch;
-		if(tqmask)
+		if(mask)
 		{
 			KviIrcMask umask(o->userMask());
-			bMatch = tqmask->matchedBy(umask);
+			bMatch = mask->matchedBy(umask);
 		} else bMatch = KviTQString::equalCS(o->userMask(),"*!*@*");
 		if(bMatch)
 		{
diff --git a/src/kvilib/ext/kvi_sharedfiles.h b/src/kvilib/ext/kvi_sharedfiles.h
index 385682a..64b2263 100644
--- a/src/kvilib/ext/kvi_sharedfiles.h
+++ b/src/kvilib/ext/kvi_sharedfiles.h
@@ -84,7 +84,7 @@ private:
 public:
 	void addSharedFile(KviSharedFile * f);
 	KviSharedFile * addSharedFile(const TQString &szName,const TQString &szAbsPath,const TQString &szMask,int timeoutInSecs);
-	KviSharedFile * lookupSharedFile(const TQString &szName,KviIrcMask * tqmask,unsigned int uFileSize = 0);
+	KviSharedFile * lookupSharedFile(const TQString &szName,KviIrcMask * mask,unsigned int uFileSize = 0);
 	bool removeSharedFile(const TQString &szName,const TQString &szMask,unsigned int uFileSize);
 	bool removeSharedFile(const TQString &szName,KviSharedFile * off);
 	void load(const TQString &filename);
diff --git a/src/kvilib/file/kvi_packagefile.cpp b/src/kvilib/file/kvi_packagefile.cpp
index fa3a91d..1a0d508 100644
--- a/src/kvilib/file/kvi_packagefile.cpp
+++ b/src/kvilib/file/kvi_packagefile.cpp
@@ -98,7 +98,7 @@
 //   FieldData         Variable   FieldLen        The data of the field, see below for defined values
 
 // FieldData for FieldType 1 (file field)
-//   Flags             uint32     4               Bittqmask. Bits: 1=FileIsDeflated
+//   Flags             uint32     4               Bitmask. Bits: 1=FileIsDeflated
 //   Path              UniString  Variable        A relative path expressed as utf8 string. \ AND / are considered to be separators
 //   Size              uint32     4               Size of the following file data
 //   FilePayload       Bytes      Variable
diff --git a/src/kvilib/irc/kvi_avatarcache.cpp b/src/kvilib/irc/kvi_avatarcache.cpp
index 57ab53f..77578b1 100644
--- a/src/kvilib/irc/kvi_avatarcache.cpp
+++ b/src/kvilib/irc/kvi_avatarcache.cpp
@@ -76,11 +76,11 @@ KviAvatarCache::~KviAvatarCache()
 }
 
 
-void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork)
+void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 	
@@ -96,11 +96,11 @@ void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask
 	}
 }
 
-void KviAvatarCache::remove(const KviIrcMask &tqmask,const TQString &szNetwork)
+void KviAvatarCache::remove(const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 	
@@ -109,11 +109,11 @@ void KviAvatarCache::remove(const KviIrcMask &tqmask,const TQString &szNetwork)
 
 
 
-const TQString & KviAvatarCache::lookup(const KviIrcMask &tqmask,const TQString &szNetwork)
+const TQString & KviAvatarCache::lookup(const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 
diff --git a/src/kvilib/irc/kvi_avatarcache.h b/src/kvilib/irc/kvi_avatarcache.h
index c245c3b..92f6a79 100644
--- a/src/kvilib/irc/kvi_avatarcache.h
+++ b/src/kvilib/irc/kvi_avatarcache.h
@@ -55,9 +55,9 @@ public:
 	
 	static KviAvatarCache * instance(){ return m_pAvatarCacheInstance; };
 
-	void replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork);
-	void remove(const KviIrcMask &tqmask,const TQString &szNetwork);
-	const TQString & lookup(const KviIrcMask &tqmask,const TQString &szNetwork);
+	void replace(const TQString &szIdString,const KviIrcMask &mask,const TQString &szNetwork);
+	void remove(const KviIrcMask &mask,const TQString &szNetwork);
+	const TQString & lookup(const KviIrcMask &mask,const TQString &szNetwork);
 	
 	void cleanup();
 	
diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp
index d18e398..4552cc9 100644
--- a/src/kvilib/irc/kvi_ircmask.cpp
+++ b/src/kvilib/irc/kvi_ircmask.cpp
@@ -40,7 +40,7 @@
 		irc masks , nickname , username , hostname , wildcard
 	@body:
 		[big]Simple masks[/big][br]
-		An irc tqmask is a string in a special format that identifies an user on irc.[br]
+		An irc mask is a string in a special format that identifies an user on irc.[br]
 		The standard basic format is:[br]
 		[b]<nick>!<username>@<host>[/b][br]
 		The <nick> part contains the nickname with that the user is widely known across the network.[br]
@@ -81,7 +81,7 @@
 		The wild masks are used to "match" an user within a set of them.[br]
 		'*' matches any sequence (eventually empty) of characters and '?' matches a single character.[br]
 		Wildcards are allowed only in the <nick> , <user> and <host> part: so the
-		"wildest" tqmask possible is:[br]
+		"wildest" mask possible is:[br]
 		[b]*!*@*[/b][br]
 		that designates "any nickname, any username on any host".[br]
 		Here are some examples of wild masks:[br]
@@ -315,8 +315,8 @@ bool KviIrcMask::hasNumericHost() const
 
 
 /**
-* Retuns in szMask the specified (if possible) tqmask of this user.<br>
-* If the host or username are not known , the tqmask may contain less information
+* Retuns in szMask the specified (if possible) mask of this user.<br>
+* If the host or username are not known , the mask may contain less information
 * than requested.<br>
 * Mask types:<br>
 * 0 : nick!user@machine.host.top  (nick!user@XXX.XXX.XXX.XXX) (default)<br>
@@ -349,7 +349,7 @@ bool KviIrcMask::hasNumericHost() const
 * 25: nick!*user@*.host.top          (nick!*user@XXX.XXX.*)
 * 26: *!*user@*.host.top          (*!user@*XXX.XXX.*)
 * If some data is missing , these types may change:<br>
-* For example , if hostname is missing , the tqmask type 3 or 4 may be reduced to type 5
+* For example , if hostname is missing , the mask type 3 or 4 may be reduced to type 5
 */
 
 /*
@@ -365,10 +365,10 @@ bool KviIrcMask::hasNumericHost() const
 
 static unsigned char maskTable[27][3] = {
 	{ 0 , 0 , 0 }, //0 means normal block
-	{ 0 , 0 , 2 }, //2 in the third field means type *.abc.host.top (or XXX.XXX.XXX.*) host tqmask
+	{ 0 , 0 , 2 }, //2 in the third field means type *.abc.host.top (or XXX.XXX.XXX.*) host mask
 	{ 0 , 0 , 1 }, //2 in the second field means *user (strip prefixes)
 	{ 0 , 1 , 0 }, //1 means *
-	{ 0 , 1 , 2 }, //3 in the third field means type *.host.top (or XXX.XXX.*) host tqmask
+	{ 0 , 1 , 2 }, //3 in the third field means type *.host.top (or XXX.XXX.*) host mask
 	{ 0 , 1 , 1 }, //4 in the third field is like 3 but tries to detect masked ip addresses too
 	{ 1 , 0 , 0 },
 	{ 1 , 0 , 2 },
@@ -393,7 +393,7 @@ static unsigned char maskTable[27][3] = {
 	{ 1 , 2 , 4 }
 };
 
-void KviIrcMask::tqmask(TQString &szMask,MaskType eMaskType) const
+void KviIrcMask::mask(TQString &szMask,MaskType eMaskType) const
 {
 	if((((int)eMaskType) > 26)||(((int)eMaskType) < 0))eMaskType = NickUserHost;
 	szMask = maskTable[((int)eMaskType)][0] ? m_szWild : m_szNick;
@@ -556,25 +556,25 @@ bool KviIrcMask::matchedBy(const TQString &szMask) const
 }
 */
 
-bool KviIrcMask::matches(const KviIrcMask &tqmask) const
+bool KviIrcMask::matches(const KviIrcMask &mask) const
 {
-	if(KviTQString::matchWildExpressionsCI(m_szNick,tqmask.m_szNick))
+	if(KviTQString::matchWildExpressionsCI(m_szNick,mask.m_szNick))
 	{
-		if(KviTQString::matchWildExpressionsCI(m_szUser,tqmask.m_szUser))
+		if(KviTQString::matchWildExpressionsCI(m_szUser,mask.m_szUser))
 		{
-			if(KviTQString::matchWildExpressionsCI(m_szHost,tqmask.m_szHost))return true;
+			if(KviTQString::matchWildExpressionsCI(m_szHost,mask.m_szHost))return true;
 		}
 	}
 	return false;
 }
 
-bool KviIrcMask::matchesFixed(const KviIrcMask &tqmask) const
+bool KviIrcMask::matchesFixed(const KviIrcMask &mask) const
 {
-	if(KviTQString::matchStringCI(m_szNick,tqmask.m_szNick,0,1))
+	if(KviTQString::matchStringCI(m_szNick,mask.m_szNick,0,1))
 	{
-		if(KviTQString::matchStringCI(m_szUser,tqmask.m_szUser,0,1))
+		if(KviTQString::matchStringCI(m_szUser,mask.m_szUser,0,1))
 		{
-			if(KviTQString::matchStringCI(m_szHost,tqmask.m_szHost,0,1))return true;
+			if(KviTQString::matchStringCI(m_szHost,mask.m_szHost,0,1))return true;
 		}
 	}
 	return false;
@@ -609,7 +609,7 @@ bool KviIrcMask::matchesFixed(const TQString &nick,const TQString &user,const TQ
 	return true;
 }
 
-//Internals for tqmask()
+//Internals for mask()
 
 int KviIrcMask::getIpDomainMaskLen() const
 {
diff --git a/src/kvilib/irc/kvi_ircmask.h b/src/kvilib/irc/kvi_ircmask.h
index 4efac62..5566a42 100644
--- a/src/kvilib/irc/kvi_ircmask.h
+++ b/src/kvilib/irc/kvi_ircmask.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_irctqmask.h
+//   File : kvi_ircmask.h
 //   Creation date : Fri Jan 8 1999 19:50:35 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -33,7 +33,7 @@
 #include "kvi_qstring.h"
 
 //=============================================================================
-// Irc user tqmask abstraction
+// Irc user mask abstraction
 //=============================================================================
 
 class KVILIB_API KviIrcMask : public KviHeapObject
@@ -56,14 +56,14 @@ public:
 	// Sets the host for this user.<br>
 	// If szHost is NULL or it points to an empty string the host is set to "*".<br>
 	void setHost(const TQString &szHost){ m_szHost = szHost.isEmpty() ? m_szWild : szHost; };
-	// Sets the host , nick and username extracting it from an irc tqmask:<br>
+	// Sets the host , nick and username extracting it from an irc mask:<br>
 	// nick!user@host<br>
-	// The tqmask is terminated by end-of string null character or a character equal to c in the string.<br>
-	// Returns the pointer to the end of the tqmask in the szMask string.(c or null-terminator)<br>
+	// The mask is terminated by end-of string null character or a character equal to c in the string.<br>
+	// Returns the pointer to the end of the mask in the szMask string.(c or null-terminator)<br>
 	//const char * setMask(const TQString &szMask,char c=' ');
-	// Sets the host , nick and username extracting it from an userhost tqmask:<br>
+	// Sets the host , nick and username extracting it from an userhost mask:<br>
 	// nick[*]=<+|->user@host<br>
-	// The tqmask is terminated by end-of string null char or a space character.<br>
+	// The mask is terminated by end-of string null char or a space character.<br>
 	// Returns the pointer to the next non-space char in the szMask string or to the null-terminator<br>
 	// If there are no more masks avaiable.
 	// WARNING : the szMask pointer can NOT be NULL
@@ -80,8 +80,8 @@ public:
 	bool hasHost() const { return !(m_szHost.isEmpty() || (m_szHost == m_szWild)); };
 
 	bool hasNumericHost() const;
-	// Retuns in szMask the specified (if possible) tqmask of this user.<br>
-	// If the host or username are not known , the tqmask may contain less information
+	// Retuns in szMask the specified (if possible) mask of this user.<br>
+	// If the host or username are not known , the mask may contain less information
 	// than requested.<br>
 
 	enum MaskType
@@ -117,7 +117,7 @@ public:
 		CleanUserSmartNet = 26      // 26 : *!*user@*.host.top          (*!user@*XXX.XXX.*)
 	};
 	
-	void tqmask(TQString &szMask,MaskType eMaskType = NickCleanUserHost) const;
+	void mask(TQString &szMask,MaskType eMaskType = NickCleanUserHost) const;
 	bool hasWildNick();
 
 	// Wild external matches (this and external are wild)
@@ -125,24 +125,24 @@ public:
 //	bool matches(const char *szMask);
 //	// passing 0 as one of params here means that it is a match by default
 //	bool matches(const char *nick,const char *user,const char *host);
-	bool matches(const KviIrcMask &tqmask) const;
+	bool matches(const KviIrcMask &mask) const;
 
 
 	// Fixed external matches  (this is wild , external is fixed)
 	bool matchesFixed(const TQString &nick,const TQString &user,const TQString &host) const;
 //	bool matchesFixed(const TQString &szMask) const;
-	bool matchesFixed(const KviIrcMask &tqmask) const;
+	bool matchesFixed(const KviIrcMask &mask) const;
 
 	// Fixed internal matches (this is fixed , external is wild)
 	//bool matchedBy(const TQString &szMask) const;
-	bool matchedBy(const KviIrcMask &tqmask) const { return tqmask.matchesFixed(*this); };
+	bool matchedBy(const KviIrcMask &mask) const { return mask.matchesFixed(*this); };
 
 	int nonWildChars();
 	bool operator==(const KviIrcMask &user);
 public:
-	// Constructs an empty tqmask (*!*@*)
+	// Constructs an empty mask (*!*@*)
 	KviIrcMask();
-	// Constructs this KviIrcMask object from a string tqmask
+	// Constructs this KviIrcMask object from a string mask
 	KviIrcMask(const TQString &szMask);
 	// Carbon copy
 	KviIrcMask(const KviIrcMask &ircUser)
diff --git a/src/kvilib/irc/kvi_nickserv.h b/src/kvilib/irc/kvi_nickserv.h
index f259f1f..5ed6bb4 100644
--- a/src/kvilib/irc/kvi_nickserv.h
+++ b/src/kvilib/irc/kvi_nickserv.h
@@ -36,10 +36,10 @@ class KVILIB_API KviNickServRule : public KviHeapObject
 {
 protected:
 	TQString m_szRegisteredNick;         // my registered nickname
-	TQString m_szNickServMask;           // the NickServ service tqmask
+	TQString m_szNickServMask;           // the NickServ service mask
 	TQString m_szMessageRegexp;          // the NickServ message regexp
 	TQString m_szIdentifyCommand;        // the IDENTIFY command to send to server
-	TQString m_szServerMask;             // the tqmask that the server must match (not used in per-network rules)
+	TQString m_szServerMask;             // the mask that the server must match (not used in per-network rules)
 public:
 	KviNickServRule() : KviHeapObject() {};
 	KviNickServRule(
diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/kvi_locale.h
index 6736a11..d29fefb 100644
--- a/src/kvilib/system/kvi_locale.h
+++ b/src/kvilib/system/kvi_locale.h
@@ -129,7 +129,7 @@ class KVILIB_API KviTranslator : public TQTranslator
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KviTranslator(TQObject * tqparent,const char * name);
+		KviTranslator(TQObject * parent,const char * name);
 		~KviTranslator();
 	public:
 #ifdef COMPILE_USE_QT4
diff --git a/src/kvilib/tal/kvi_tal_filedialog.cpp b/src/kvilib/tal/kvi_tal_filedialog.cpp
index 5760a90..f07df4c 100644
--- a/src/kvilib/tal/kvi_tal_filedialog.cpp
+++ b/src/kvilib/tal/kvi_tal_filedialog.cpp
@@ -31,8 +31,8 @@
 
 	#include <tqdir.h>
 
-	KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
-	: TQFileDialog(tqparent,"",dirName,filter)
+	KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+	: TQFileDialog(parent,"",dirName,filter)
 	{
 		setModal(modal);
 	}
@@ -78,8 +78,8 @@
 
 	#ifdef COMPILE_KDE_SUPPORT
 	
-		KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
-		: KFileDialog(dirName,filter,tqparent,name,modal)
+		KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+		: KFileDialog(dirName,filter,parent,name,modal)
 		{
 			clearWFlags(WDestructiveClose);
 		}
@@ -129,8 +129,8 @@
 	
 		#include <tqdir.h>
 	
-		KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
-		: TQFileDialog(dirName,filter,tqparent,name,modal)
+		KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+		: TQFileDialog(dirName,filter,parent,name,modal)
 		{
 			clearWFlags(WDestructiveClose);
 		}
diff --git a/src/kvilib/tal/kvi_tal_filedialog_kde.h b/src/kvilib/tal/kvi_tal_filedialog_kde.h
index 5285aa1..3597f1a 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_kde.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_kde.h
@@ -31,7 +31,7 @@ class KVILIB_API KviTalFileDialog : public KFileDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
 	~KviTalFileDialog();
 public:
 	enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -40,11 +40,11 @@ public:
 	void setDirectory(const TQString &szDirectory);
 
 
-	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
+	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
 	{ 
 		// TQFileDialog allows making new directories...kfiledialog not :/
-		return TQFileDialog::getExistingDirectory(dir,tqparent,0,caption);
-		//return getExistingDirectory(dir,tqparent,caption); 
+		return TQFileDialog::getExistingDirectory(dir,parent,0,caption);
+		//return getExistingDirectory(dir,parent,caption); 
 	};
 };
 
diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt.h b/src/kvilib/tal/kvi_tal_filedialog_qt.h
index 0eebfc6..25dff95 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_qt.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_qt.h
@@ -30,7 +30,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
 	~KviTalFileDialog();
 public:
 	enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -38,8 +38,8 @@ public:
 	void setFileMode(FileMode m);
 	void setDirectory(const TQString &szDirectory);
 
-	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
-		{ return getExistingDirectory(dir,tqparent,0 /* name */,caption); };
+	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
+		{ return getExistingDirectory(dir,parent,0 /* name */,caption); };
 };
 
 #endif // _KVI_TAL_FILEDIALOG_TQT_H_
diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt4.h b/src/kvilib/tal/kvi_tal_filedialog_qt4.h
index 18bb420..0258625 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_qt4.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_qt4.h
@@ -32,7 +32,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
 	~KviTalFileDialog();
 public:
 	enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -40,8 +40,8 @@ public:
 	void setFileMode(FileMode m);
 	void setDirectory(const TQString &szDirectory);
 
-	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
-		{ return getExistingDirectory(tqparent,caption,dir); };
+	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
+		{ return getExistingDirectory(parent,caption,dir); };
 };
 
 #endif // _KVI_TAL_FILEDIALOG_TQT_H_
diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt3.h b/src/kvilib/tal/kvi_tal_groupbox_qt3.h
index 1236920..633d04c 100644
--- a/src/kvilib/tal/kvi_tal_groupbox_qt3.h
+++ b/src/kvilib/tal/kvi_tal_groupbox_qt3.h
@@ -32,14 +32,14 @@ class KVILIB_API KviTalGroupBox : public TQGroupBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalGroupBox(TQWidget * tqparent = 0)
-	: TQGroupBox(tqparent) {};
-	KviTalGroupBox(const TQString & title,TQWidget * tqparent = 0)
-	: TQGroupBox(title,tqparent) {};
-	KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * tqparent = 0)
-	: TQGroupBox(strips,orientation,tqparent) {};
-	KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * tqparent = 0)
-	: TQGroupBox(strips,orientation,title,tqparent) {};
+	KviTalGroupBox(TQWidget * parent = 0)
+	: TQGroupBox(parent) {};
+	KviTalGroupBox(const TQString & title,TQWidget * parent = 0)
+	: TQGroupBox(title,parent) {};
+	KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0)
+	: TQGroupBox(strips,orientation,parent) {};
+	KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0)
+	: TQGroupBox(strips,orientation,title,parent) {};
 	~KviTalGroupBox() {};
 };
 
diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt4.h b/src/kvilib/tal/kvi_tal_groupbox_qt4.h
index 1b34de1..2e61356 100644
--- a/src/kvilib/tal/kvi_tal_groupbox_qt4.h
+++ b/src/kvilib/tal/kvi_tal_groupbox_qt4.h
@@ -32,14 +32,14 @@ class KVILIB_API KviTalGroupBox : public Q3GroupBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalGroupBox(TQWidget * tqparent = 0)
-	: Q3GroupBox(tqparent) {};
-	KviTalGroupBox(const TQString & title,TQWidget * tqparent = 0)
-	: Q3GroupBox(title,tqparent) {};
-	KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * tqparent = 0)
-	: Q3GroupBox(strips,orientation,tqparent) {};
-	KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * tqparent = 0)
-	: Q3GroupBox(strips,orientation,title,tqparent) {};
+	KviTalGroupBox(TQWidget * parent = 0)
+	: Q3GroupBox(parent) {};
+	KviTalGroupBox(const TQString & title,TQWidget * parent = 0)
+	: Q3GroupBox(title,parent) {};
+	KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0)
+	: Q3GroupBox(strips,orientation,parent) {};
+	KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0)
+	: Q3GroupBox(strips,orientation,title,parent) {};
 	~KviTalGroupBox() {};
 };
 
diff --git a/src/kvilib/tal/kvi_tal_iconview_qt3.h b/src/kvilib/tal/kvi_tal_iconview_qt3.h
index 73d367c..5ad9c07 100644
--- a/src/kvilib/tal/kvi_tal_iconview_qt3.h
+++ b/src/kvilib/tal/kvi_tal_iconview_qt3.h
@@ -79,18 +79,18 @@ public:
 class KVILIB_API KviTalIconViewItem : public TQIconViewItem
 {
 public:
-	KviTalIconViewItem(KviTalIconView * tqparent)
-	: TQIconViewItem(tqparent) {};
-	KviTalIconViewItem(KviTalIconView * tqparent,KviTalIconViewItem * after)
-	: TQIconViewItem(tqparent,after) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text)
-	: TQIconViewItem(tqparent,text) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text)
-	: TQIconViewItem(tqparent,after,text) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text, const TQPixmap & icon)
-	: TQIconViewItem(tqparent,text,icon) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
-	: TQIconViewItem(tqparent,after,text,icon) {};
+	KviTalIconViewItem(KviTalIconView * parent)
+	: TQIconViewItem(parent) {};
+	KviTalIconViewItem(KviTalIconView * parent,KviTalIconViewItem * after)
+	: TQIconViewItem(parent,after) {};
+	KviTalIconViewItem(KviTalIconView * parent, const TQString & text)
+	: TQIconViewItem(parent,text) {};
+	KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text)
+	: TQIconViewItem(parent,after,text) {};
+	KviTalIconViewItem(KviTalIconView * parent, const TQString & text, const TQPixmap & icon)
+	: TQIconViewItem(parent,text,icon) {};
+	KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
+	: TQIconViewItem(parent,after,text,icon) {};
 public:
 	KviTalIconView * iconView() const { return (KviTalIconView *)TQIconViewItem::iconView(); };
 	KviTalIconViewItem * prevItem() const { return (KviTalIconViewItem *)TQIconViewItem::prevItem(); };
diff --git a/src/kvilib/tal/kvi_tal_iconview_qt4.h b/src/kvilib/tal/kvi_tal_iconview_qt4.h
index 9955434..33a5bef 100644
--- a/src/kvilib/tal/kvi_tal_iconview_qt4.h
+++ b/src/kvilib/tal/kvi_tal_iconview_qt4.h
@@ -78,18 +78,18 @@ public:
 class KVILIB_API KviTalIconViewItem : public Q3IconViewItem
 {
 public:
-	KviTalIconViewItem(KviTalIconView * tqparent)
-	: Q3IconViewItem(tqparent) {};
-	KviTalIconViewItem(KviTalIconView * tqparent,KviTalIconViewItem * after)
-	: Q3IconViewItem(tqparent,after) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text)
-	: Q3IconViewItem(tqparent,text) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text)
-	: Q3IconViewItem(tqparent,after,text) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text, const TQPixmap & icon)
-	: Q3IconViewItem(tqparent,text,icon) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
-	: Q3IconViewItem(tqparent,after,text,icon) {};
+	KviTalIconViewItem(KviTalIconView * parent)
+	: Q3IconViewItem(parent) {};
+	KviTalIconViewItem(KviTalIconView * parent,KviTalIconViewItem * after)
+	: Q3IconViewItem(parent,after) {};
+	KviTalIconViewItem(KviTalIconView * parent, const TQString & text)
+	: Q3IconViewItem(parent,text) {};
+	KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text)
+	: Q3IconViewItem(parent,after,text) {};
+	KviTalIconViewItem(KviTalIconView * parent, const TQString & text, const TQPixmap & icon)
+	: Q3IconViewItem(parent,text,icon) {};
+	KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
+	: Q3IconViewItem(parent,after,text,icon) {};
 public:
 	KviTalIconView * iconView() const { return (KviTalIconView *)Q3IconViewItem::iconView(); };
 	KviTalIconViewItem * prevItem() const { return (KviTalIconViewItem *)Q3IconViewItem::prevItem(); };
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index f7c3171..2d946a2 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -69,8 +69,8 @@
 	            lvi.features |= TQStyleOptionQ3ListViewItem::MultiLine;
 	        if (item->isVisible())
 	            lvi.features |= TQStyleOptionQ3ListViewItem::Visible;
-	        if (item->tqparent() && item->tqparent()->rtti() == 1
-	            && static_cast<Q3CheckListItem *>(item->tqparent())->type() == Q3CheckListItem::Controller)
+	        if (item->parent() && item->parent()->rtti() == 1
+	            && static_cast<Q3CheckListItem *>(item->parent())->type() == Q3CheckListItem::Controller)
 	            lvi.features |= TQStyleOptionQ3ListViewItem::ParentControl;
 	        opt.items.append(lvi);
 	        if (!firstItem) {
@@ -210,39 +210,39 @@
 	    bool tristate;
 	};
 
-	KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,
 	                                Type tt)
-	    : KviTalListViewItem(tqparent, text, TQString())
+	    : KviTalListViewItem(parent, text, TQString())
 	{
 	    myType = tt;
 	    init();
 	    if (myType == RadioButton) {
-	        if (tqparent->type() != RadioButtonController)
+	        if (parent->type() != RadioButtonController)
 	            qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
 	                      "child of a controller");
 	        else
-	            d->exclusive = tqparent;
+	            d->exclusive = parent;
 	    }
 	}
 
-	KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,
 	                                const TQString &text, Type tt)
-	    : KviTalListViewItem(tqparent, after, text)
+	    : KviTalListViewItem(parent, after, text)
 	{
 	    myType = tt;
 	    init();
 	    if (myType == RadioButton) {
-	        if (tqparent->type() != RadioButtonController)
+	        if (parent->type() != RadioButtonController)
 	            qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
 	                      "child of a controller");
 	        else
-	            d->exclusive = tqparent;
+	            d->exclusive = parent;
 	    }
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
 	                                Type tt)
-	    : KviTalListViewItem(tqparent, text, TQString())
+	    : KviTalListViewItem(parent, text, TQString())
 	{
 	    myType = tt;
 	    if (myType == RadioButton) {
@@ -252,9 +252,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, KviTalListViewItem *after,
 	                                const TQString &text, Type tt)
-	    : KviTalListViewItem(tqparent, after, text)
+	    : KviTalListViewItem(parent, after, text)
 	{
 	    myType = tt;
 	    if (myType == RadioButton) {
@@ -264,9 +264,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, const TQString &text,
 	                                Type tt)
-	    : KviTalListViewItem(tqparent, text)
+	    : KviTalListViewItem(parent, text)
 	{
 	    myType = tt;
 	    if (tt == RadioButton)
@@ -275,9 +275,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, KviTalListViewItem *after,
 	                                const TQString &text, Type tt)
-	    : KviTalListViewItem(tqparent, after, text)
+	    : KviTalListViewItem(parent, after, text)
 	{
 	    myType = tt;
 	    if (tt == RadioButton)
@@ -291,18 +291,18 @@
 	    return RTTI;
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, const TQString &text,
 	                                const TQPixmap & p)
-	    : KviTalListViewItem(tqparent, text)
+	    : KviTalListViewItem(parent, text)
 	{
 	    myType = RadioButtonController;
 	    setPixmap(0, p);
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
 	                                const TQPixmap & p)
-	    : KviTalListViewItem(tqparent, text)
+	    : KviTalListViewItem(parent, text)
 	{
 	    myType = RadioButtonController;
 	    setPixmap(0, p);
@@ -373,9 +373,9 @@
 	    if (myType == CheckBox) {
 	        setCurrentState(s);
 	        stateChange(state());
-	        if (update && tqparent() && tqparent()->rtti() == 1
-	             && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
-	            ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+	        if (update && parent() && parent()->rtti() == 1
+	             && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+	            ((KviTalCheckListItem*)parent())->updateController(update, store);
 	    } else if (myType == CheckBoxController) {
 	        if (s == NoChange && childCount()) {
 	            restoreState(this);
@@ -397,18 +397,18 @@
 	                    ToggleState oldState = internalState();
 	                    updateController(false, false);
 	                    if (oldState != internalState() &&
-	                         tqparent() && tqparent()->rtti() == 1 &&
-	                         ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
-	                        ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+	                         parent() && parent()->rtti() == 1 &&
+	                         ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+	                        ((KviTalCheckListItem*)parent())->updateController(update, store);
 	
 	                        updateController(update, store);
 	                } else {
-	                    // if there are no tqchildren we simply set the CheckBoxController and update its tqparent
+	                    // if there are no tqchildren we simply set the CheckBoxController and update its parent
 	                    setCurrentState(s);
 	                    stateChange(state());
-	                    if (tqparent() && tqparent()->rtti() == 1
-	                         && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
-	                        ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+	                    if (parent() && parent()->rtti() == 1
+	                         && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+	                        ((KviTalCheckListItem*)parent())->updateController(update, store);
 	                }
 	            } else {
 	                setCurrentState(s);
@@ -482,8 +482,8 @@
 	    int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
 	    if (activatedPos(pos)) {
 	        bool parentControl = false;
-	        if (tqparent() && tqparent()->rtti() == 1  &&
-	            ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+	        if (parent() && parent()->rtti() == 1  &&
+	            ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
 	            parentControl = true;
 	
 	        int x = parentControl ? 0 : 3;
@@ -588,10 +588,10 @@
 	        return;
 	
 	    KviTalCheckListItem *controller = 0;
-	    // checks if this CheckBoxController has another CheckBoxController as tqparent
-	    if (tqparent() && tqparent()->rtti() == 1
-	         && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
-	        controller = (KviTalCheckListItem*)tqparent();
+	    // checks if this CheckBoxController has another CheckBoxController as parent
+	    if (parent() && parent()->rtti() == 1
+	         && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+	        controller = (KviTalCheckListItem*)parent();
 	
 	    ToggleState theState = Off;
 	    bool first = true;
@@ -695,8 +695,8 @@
 	    }
 	
 	    bool parentControl = false;
-	    if (tqparent() && tqparent()->rtti() == 1  &&
-	         ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+	    if (parent() && parent()->rtti() == 1  &&
+	         ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
 	        parentControl = true;
 	
 	    TQFontMetrics fm(lv->fontMetrics());
@@ -775,8 +775,8 @@
 	        intersect = r.intersects(TQRect(p, r.y(), xdepth - p + 1, r.height()));
 	    }
 	    bool parentControl = false;
-	    if (tqparent() && tqparent()->rtti() == 1  &&
-	         ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+	    if (parent() && parent()->rtti() == 1  &&
+	         ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
 	        parentControl = true;
 	    if (myType != RadioButtonController && intersect &&
 	         (lv->rootIsDecorated() || myType == RadioButton ||
@@ -935,39 +935,39 @@
 	
 	// ### obscenity is warranted.
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *parent, const TQString &text,
 					Type tt )
-	    : KviTalListViewItem( tqparent, text, TQString() )
+	    : KviTalListViewItem( parent, text, TQString() )
 	{
 	    myType = tt;
 	    init();
 	    if ( myType == RadioButton ) {
-		if ( tqparent->type() != RadioButtonController )
+		if ( parent->type() != RadioButtonController )
 		    qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
 			      "child of a controller" );
 		else
-		    d->exclusive = tqparent;
+		    d->exclusive = parent;
 	    }
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *parent, KviTalListViewItem *after,
 	 				const TQString &text, Type tt )
-	    : KviTalListViewItem( tqparent, after, text )
+	    : KviTalListViewItem( parent, after, text )
 	{
 	    myType = tt;
 	    init();
 	    if ( myType == RadioButton ) {
-	 	if ( tqparent->type() != RadioButtonController )
+	 	if ( parent->type() != RadioButtonController )
 	 	    qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
 			      "child of a controller" );
 	 	else
-	 	    d->exclusive = tqparent;
+	 	    d->exclusive = parent;
 	    }
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,
 					Type tt )
-	    : KviTalListViewItem( tqparent, text, TQString() )
+	    : KviTalListViewItem( parent, text, TQString() )
 	{
 	    myType = tt;
 	    if ( myType == RadioButton ) {
@@ -977,9 +977,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, KviTalListViewItem *after,
 	 				const TQString &text, Type tt )
-	    : KviTalListViewItem( tqparent, after, text )
+	    : KviTalListViewItem( parent, after, text )
 	{
 	    myType = tt;
 	    if ( myType == RadioButton ) {
@@ -989,9 +989,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, const TQString &text,
 					Type tt )
-	    : KviTalListViewItem( tqparent, text )
+	    : KviTalListViewItem( parent, text )
 	{
 	    myType = tt;
 	    if ( tt == RadioButton )
@@ -1000,9 +1000,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, KviTalListViewItem *after,
 	 				const TQString &text, Type tt )
-	    : KviTalListViewItem( tqparent, after, text )
+	    : KviTalListViewItem( parent, after, text )
 	{
 	    myType = tt;
 	    if ( tt == RadioButton )
@@ -1019,18 +1019,18 @@
 	    return RTTI;
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, const TQString &text,
 					const TQPixmap & p )
-	    : KviTalListViewItem( tqparent, text )
+	    : KviTalListViewItem( parent, text )
 	{
 	    myType = RadioButtonController;
 	    setPixmap( 0, p );
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,
 					const TQPixmap & p )
-	    : KviTalListViewItem( tqparent, text )
+	    : KviTalListViewItem( parent, text )
 	{
 	    myType = RadioButtonController;
 	    setPixmap( 0, p );
@@ -1107,9 +1107,9 @@
 	    if ( myType == CheckBox ) {
 		setCurrentState( s );
 		stateChange( state() );
-	  	if ( update && tqparent() && tqparent()->rtti() == 1
-	  	     && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
-	  	    ((KviTalCheckListItem*)tqparent())->updateController( update, store );
+	  	if ( update && parent() && parent()->rtti() == 1
+	  	     && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+	  	    ((KviTalCheckListItem*)parent())->updateController( update, store );
 	    } else if ( myType == CheckBoxController ) {
 		if ( s == NoChange && childCount()) {
 		    restoreState( (void*) this );
@@ -1131,18 +1131,18 @@
 			    ToggleState oldState = internalState();
 			    updateController( FALSE, FALSE );
 			    if ( oldState != internalState() &&
-				 tqparent() && tqparent()->rtti() == 1 &&
-				 ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
-				((KviTalCheckListItem*)tqparent())->updateController( update, store );
+				 parent() && parent()->rtti() == 1 &&
+				 ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+				((KviTalCheckListItem*)parent())->updateController( update, store );
 	
 				updateController( update, store );
 			} else {
-			    // if there are no tqchildren we simply set the CheckBoxController and update its tqparent
+			    // if there are no tqchildren we simply set the CheckBoxController and update its parent
 			    setCurrentState( s );
 			    stateChange( state() );
-			    if ( tqparent() && tqparent()->rtti() == 1
-				 && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
-				((KviTalCheckListItem*)tqparent())->updateController( update, store );
+			    if ( parent() && parent()->rtti() == 1
+				 && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+				((KviTalCheckListItem*)parent())->updateController( update, store );
 			}
 		    } else {
 			setCurrentState( s );
@@ -1219,8 +1219,8 @@
 	    int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
 	    if ( activatedPos( pos ) ) {
 		bool parentControl = FALSE;
-		if ( tqparent() && tqparent()->rtti() == 1  &&
-		    ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+		if ( parent() && parent()->rtti() == 1  &&
+		    ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
 		    parentControl = TRUE;
 	
 		int x = parentControl ? 0 : 3;
@@ -1324,10 +1324,10 @@
 		return;
 	
 	    KviTalCheckListItem *controller = 0;
-	    // checks if this CheckBoxController has another CheckBoxController as tqparent
-	    if ( tqparent() && tqparent()->rtti() == 1
-		 && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
-		controller = (KviTalCheckListItem*)tqparent();
+	    // checks if this CheckBoxController has another CheckBoxController as parent
+	    if ( parent() && parent()->rtti() == 1
+		 && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+		controller = (KviTalCheckListItem*)parent();
 	
 	    ToggleState theState = Off;
 	    bool first = TRUE;
@@ -1432,8 +1432,8 @@
 	    }
 	
 	    bool parentControl = FALSE;
-	    if ( tqparent() && tqparent()->rtti() == 1  &&
-		 ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+	    if ( parent() && parent()->rtti() == 1  &&
+		 ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
 		parentControl = TRUE;
 	
 	    TQFontMetrics fm( lv->fontMetrics() );
@@ -1512,8 +1512,8 @@
 		intersect = r.intersects( TQRect( p, r.y(), xdepth - p + 1, r.height() ) );
 	    }
 	    bool parentControl = FALSE;
-	    if ( tqparent() && tqparent()->rtti() == 1  &&
-		 ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+	    if ( parent() && parent()->rtti() == 1  &&
+		 ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
 		parentControl = TRUE;
 	    if ( myType != RadioButtonController && intersect &&
 		 (lv->rootIsDecorated() || myType == RadioButton ||
diff --git a/src/kvilib/tal/kvi_tal_listview_qt3.h b/src/kvilib/tal/kvi_tal_listview_qt3.h
index 75b062a..cf72e9f 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt3.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt3.h
@@ -113,7 +113,7 @@ public:
 	// Shadow the internal TQt methods
 	KviTalListViewItem * firstChild() const { return (KviTalListViewItem *)TQListViewItem::firstChild(); };
 	KviTalListViewItem * nextSibling() const { return (KviTalListViewItem *)TQListViewItem::nextSibling(); };
-	KviTalListViewItem * tqparent() const { return (KviTalListViewItem *)TQListViewItem::tqparent(); };
+	KviTalListViewItem * parent() const { return (KviTalListViewItem *)TQListViewItem::parent(); };
 	KviTalListView * listView() const { return (KviTalListView *)TQListViewItem::listView(); };
 	KviTalListViewItem * itemAbove() { return (KviTalListViewItem *)TQListViewItem::itemAbove(); };
 	KviTalListViewItem * itemBelow() { return (KviTalListViewItem *)TQListViewItem::itemBelow(); };
@@ -133,14 +133,14 @@ public:
 	};
 	enum ToggleState { Off, NoChange, On };
 
-	KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,Type = RadioButtonController);
-	KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController);
-	KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,Type = RadioButtonController );
-	KviTalCheckListItem( KviTalListViewItem *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
-	KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,Type = RadioButtonController );
-	KviTalCheckListItem( KviTalListView *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
-	KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,const TQPixmap & );
-	KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,const TQPixmap & );
+	KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,Type = RadioButtonController);
+	KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController);
+	KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,Type = RadioButtonController );
+	KviTalCheckListItem( KviTalListViewItem *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
+	KviTalCheckListItem( KviTalListView *parent, const TQString &text,Type = RadioButtonController );
+	KviTalCheckListItem( KviTalListView *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
+	KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,const TQPixmap & );
+	KviTalCheckListItem( KviTalListView *parent, const TQString &text,const TQPixmap & );
 	~KviTalCheckListItem();
 
 	void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int tqalignment );
diff --git a/src/kvilib/tal/kvi_tal_listview_qt4.h b/src/kvilib/tal/kvi_tal_listview_qt4.h
index d6f2bba..83e4686 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt4.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt4.h
@@ -114,7 +114,7 @@ public:
 	// Shadow the internal TQt methods
 	KviTalListViewItem * firstChild() const { return (KviTalListViewItem *)Q3ListViewItem::firstChild(); };
 	KviTalListViewItem * nextSibling() const { return (KviTalListViewItem *)Q3ListViewItem::nextSibling(); };
-	KviTalListViewItem * tqparent() const { return (KviTalListViewItem *)Q3ListViewItem::tqparent(); };
+	KviTalListViewItem * parent() const { return (KviTalListViewItem *)Q3ListViewItem::parent(); };
 	KviTalListView * listView() const { return (KviTalListView *)Q3ListViewItem::listView(); };
 	KviTalListViewItem * itemAbove() { return (KviTalListViewItem *)Q3ListViewItem::itemAbove(); };
 	KviTalListViewItem * itemBelow() { return (KviTalListViewItem *)Q3ListViewItem::itemBelow(); };
@@ -133,21 +133,21 @@ public:
 
     enum ToggleState { Off, NoChange, On };
 
-    KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,
                     Type = RadioButtonController);
-    KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+    KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,
                     const TQString &text, Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
                     Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListViewItem *tqparent, KviTalListViewItem *after,
+    KviTalCheckListItem(KviTalListViewItem *parent, KviTalListViewItem *after,
                     const TQString &text, Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalListView *parent, const TQString &text,
                     Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListView *tqparent, KviTalListViewItem *after,
+    KviTalCheckListItem(KviTalListView *parent, KviTalListViewItem *after,
                     const TQString &text, Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
                     const TQPixmap &);
-    KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalListView *parent, const TQString &text,
                     const TQPixmap &);
     ~KviTalCheckListItem();
 
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index b548afd..4051d21 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -72,7 +72,7 @@
 
 void register_core_actions(KviActionManager * m)
 {
-	m->registerAction(new KviConnectAction(m)); // this as tqparent will destroy it on exit!
+	m->registerAction(new KviConnectAction(m)); // this as parent will destroy it on exit!
 	m->registerAction(new KviSeparatorAction(m));
 	m->registerAction(new KviIrcContextDisplayAction(m));
 	m->registerAction(new KviJoinChannelAction(m));
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
index 376ce7a..da6246a 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/kvi_ipc.cpp
@@ -107,11 +107,11 @@
 				}
 			}
 	
-			Window root,tqparent;
+			Window root,parent;
 			Window * tqchildren;
 			unsigned int nChildren;
 	
-			if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&tqparent,&tqchildren,&nChildren))
+			if(!XQueryTree(kvi_ipc_get_xdisplay(),win,&root,&parent,&tqchildren,&nChildren))
 			{
 				if(tqchildren)XFree((char *)tqchildren);
 				return 0;
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index 029a962..2903a95 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -70,7 +70,7 @@
 		So for example, assume to register a frend of yours like Szymon:[br]
 		[example]
 			[cmd:reguser.add]reguser.add[/cmd] Szymon
-			[cmd:reguser.addtqmask]reguser.addtqmask[/cmd] Szymon Pragma!*@*.it
+			[cmd:reguser.addmask]reguser.addmask[/cmd] Szymon Pragma!*@*.it
 		[/example]
 		And then want it in the notify list; nothing easier, just set
 		hist "notify" property to the nickname that you want him to be "looked for":[br]
@@ -82,7 +82,7 @@
 		"Pragma [someuser@somehost.it] is on IRC".[br]
 		If Szymon uses often "[Pragma]" as his secondary nickname , you can do the following:[br]
 		[example]
-			[cmd:reguser.addtqmask]reguser.addtqmask[/cmd] Szymon [Pragma]*@*.it
+			[cmd:reguser.addmask]reguser.addmask[/cmd] Szymon [Pragma]*@*.it
 			[cmd:reguser.setproperty]reguser.setproperty[/cmd] Szymon notify "Pragma [Pragma]"
 		[/example]
 		KVIrc will then look for both nicknames getting online.[br]
@@ -592,7 +592,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 		if(KviUserListEntry * ent = m_pConsole->notifyListView()->findEntry(*s))
 		{
 			// the user was online from a previous notify session
-			// might the tqmask have been changed ? (heh...this is tricky, maybe too much even)
+			// might the mask have been changed ? (heh...this is tricky, maybe too much even)
 			if(KVI_OPTION_BOOL(KviOption_boolNotifyListSendUserhostForOnlineUsers))
 			{
 				// user wants to be sure about online users....
@@ -621,15 +621,15 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 			//l.append(s); // we will remove him from the list
 		} else {
 			// the user was not online!
-			// check if we have a cached tqmask
+			// check if we have a cached mask
 			if(db)
 			{
 				if(KviIrcUserEntry * ue = db->find(*s))
 				{
-					// already in the db... do we have a tqmask ?
+					// already in the db... do we have a mask ?
 					if(ue->hasUser() && ue->hasHost())
 					{
-						// yup! we have a complete tqmask to match on
+						// yup! we have a complete mask to match on
 						KviIrcMask mk(*s,ue->user(),ue->host());
 						// lookup the user's name in the m_pRegUserDict
 						if(!doMatchUser(*s,mk))return true; // critical problems = have to restart!!!
@@ -656,7 +656,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 
 // FIXME: #warning "Nickname escapes (links) in the notifylist messages!"
 
-bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const KviIrcMask & tqmask)
+bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const KviIrcMask & mask)
 {
 	TQString * nam = m_pRegUserDict->find(notifyString);
 	if(nam)
@@ -665,25 +665,25 @@ bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const Kv
 		if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam))
 		{
 			// ok ... match the user
-			if(u->matchesFixed(tqmask))
+			if(u->matchesFixed(mask))
 			{
 				// new user online
-				if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick())))
+				if(!(m_pConsole->notifyListView()->findEntry(mask.nick())))
 				{
-					notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host());
+					notifyOnLine(mask.nick(),mask.user(),mask.host());
 				} // else already online , and matching...all ok
 			} else {
 				// not matched.... has he been online before ?
-				if(m_pConsole->notifyListView()->findEntry(tqmask.nick()))
+				if(m_pConsole->notifyListView()->findEntry(mask.nick()))
 				{
-					// has been online just a sec ago , but now the tqmask does not match
+					// has been online just a sec ago , but now the mask does not match
 					// either reguserdb has changed , or the user went offline and another one got his nick
 					// in the meantime... (ugly situation anyway)
-					notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(),__tr2qs("registration tqmask changed, or nickname is being used by someone else"));
+					notifyOffLine(mask.nick(),mask.user(),mask.host(),__tr2qs("registration mask changed, or nickname is being used by someone else"));
 				} else {
 					// has never been online
 					if(_OUTPUT_VERBOSE)
-						m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the tqmask [%Q@\r!h\r%Q\r] does not match (registration tqmask does not match, or nickname is being used by someone else)"),&(tqmask.nick()),&(tqmask.user()),&(tqmask.host()));
+						m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (registration mask does not match, or nickname is being used by someone else)"),&(mask.nick()),&(mask.user()),&(mask.host()));
 				}
 			}
 		} else {
@@ -784,7 +784,7 @@ bool KviIsOnNotifyListManager::handleUserhost(KviIrcMessage *msg)
 		aux = kvi_extractToken(nk,aux,' ');
 		if(nk.hasData())
 		{
-			// split it in a tqmask
+			// split it in a mask
 			KviStr nick;
 			KviStr user;
 			KviStr host;
@@ -1146,7 +1146,7 @@ void KviWatchNotifyListManager::stop()
 	m_pRegUserDict->clear();
 }
 
-bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &notifyString,const KviIrcMask & tqmask)
+bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &notifyString,const KviIrcMask & mask)
 {
 	TQString * nam = m_pRegUserDict->find(notifyString);
 
@@ -1156,39 +1156,39 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &
 		if(KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(*nam))
 		{
 			// ok ... match the user
-			if(u->matchesFixed(tqmask))
+			if(u->matchesFixed(mask))
 			{
 				// new user online
-				if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick())))
+				if(!(m_pConsole->notifyListView()->findEntry(mask.nick())))
 				{
-					notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),"watch");
+					notifyOnLine(mask.nick(),mask.user(),mask.host(),"watch");
 				} else {
 					// else already online , and matching...all ok
 					if(msg->numeric() == RPL_NOWON)
 					{
 						// This is a reply to a /watch +something (should not happen, unless the user is messing) or to /watch l (user requested)
-						notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),
+						notifyOnLine(mask.nick(),mask.user(),mask.host(),
 								__tr2qs("watch entry listing requested by user"),false);
 					} else {
 						// This is a RPL_LOGON....we're desynched ?
-						notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),
+						notifyOnLine(mask.nick(),mask.user(),mask.host(),
 								__tr2qs("possible watch list desync"),false);
 					}
 				}
 			} else {
 				// not matched.... has he been online before ?
-				if(m_pConsole->notifyListView()->findEntry(tqmask.nick()))
+				if(m_pConsole->notifyListView()->findEntry(mask.nick()))
 				{
-					// has been online just a sec ago , but now the tqmask does not match
+					// has been online just a sec ago , but now the mask does not match
 					// prolly the reguserdb has been changed
-					notifyOffLine(tqmask.nick(),tqmask.user(),tqmask.host(),
-						__tr2qs("registration tqmask changed or desync with the watch service"));
+					notifyOffLine(mask.nick(),mask.user(),mask.host(),
+						__tr2qs("registration mask changed or desync with the watch service"));
 				} else {
 					// has never been online
 					if(_OUTPUT_VERBOSE)
 						m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,
-							__tr("Notify list: \r!n\r%Q\r appears to be online, but the tqmask [%Q@\r!h\r%Q\r] does not match (watch: registration tqmask does not match, or nickname is being used by someone else)"),
-							&(tqmask.nick()),&(tqmask.user()),&(tqmask.host()));
+							__tr("Notify list: \r!n\r%Q\r appears to be online, but the mask [%Q@\r!h\r%Q\r] does not match (watch: registration mask does not match, or nickname is being used by someone else)"),
+							&(mask.nick()),&(mask.user()),&(mask.host()));
 				}
 			}
 		} else {
@@ -1202,9 +1202,9 @@ bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &
 	} else {
 		// not in our dictionary
 		// prolly someone used /WATCH behind our back... bad boy!
-		if(!(m_pConsole->notifyListView()->findEntry(tqmask.nick())))
+		if(!(m_pConsole->notifyListView()->findEntry(mask.nick())))
 		{
-			notifyOnLine(tqmask.nick(),tqmask.user(),tqmask.host(),__tr2qs("watch entry added by user"));
+			notifyOnLine(mask.nick(),mask.user(),mask.host(),__tr2qs("watch entry added by user"));
 		}
 	}
 	return true;
@@ -1263,7 +1263,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg)
 				if(_OUTPUT_VERBOSE)
 					m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: \r!n\r%Q\r is offline (watch)"),&dnk);
 			} else {
-				// This is a RPL_LOGOFF for an user that has not matched the reg-tqmask
+				// This is a RPL_LOGOFF for an user that has not matched the reg-mask
 				notifyOffLine(dnk,dus,dho,__tr2qs("unmatched watch list entry"));
 			}
 		}
diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/kvi_notifylist.h
index ebf6151..7d84ac0 100644
--- a/src/kvirc/kernel/kvi_notifylist.h
+++ b/src/kvirc/kernel/kvi_notifylist.h
@@ -110,7 +110,7 @@ private slots:
 	void buildNotifyList();
 	void sendIsOn();
 	void sendUserhost();
-	bool doMatchUser(const TQString &notifyString,const KviIrcMask & tqmask);
+	bool doMatchUser(const TQString &notifyString,const KviIrcMask & mask);
 
 };
 
@@ -158,7 +158,7 @@ protected:
 	virtual void start();
 	virtual void stop();
 	virtual bool handleWatchReply(KviIrcMessage *msg);
-	bool doMatchUser(KviIrcMessage *msg,const TQString &notifyString,const KviIrcMask & tqmask);
+	bool doMatchUser(KviIrcMessage *msg,const TQString &notifyString,const KviIrcMask & mask);
 
 };
 
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 602e778..d0d6db9 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -776,12 +776,12 @@ KviMsgTypeOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
 	MSGTYPE_OPTION("MeDeVoice",__tr_no_lookup("Am devoiced"),KVI_SMALLICON_MEDEVOICE,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeHalfOp",__tr_no_lookup("Am halfop'd"),KVI_SMALLICON_MEHALFOP,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("MeDeHalfOp",__tr_no_lookup("Am de-halfop'd"),KVI_SMALLICON_MEDEHALFOP,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my tqmask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my tqmask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my tqmask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my tqmask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my tqmask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5),
-	MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my tqmask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION("MeBan",__tr_no_lookup("Ban matching my mask"),KVI_SMALLICON_MEBAN,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION("MeUnban",__tr_no_lookup("Unban matching my mask"),KVI_SMALLICON_MEUNBAN,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION("MeBanExcept",__tr_no_lookup("Ban exception matching my mask"),KVI_SMALLICON_MEBANEXCEPT,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION("MeBanUnExcept",__tr_no_lookup("Ban unexception matching my mask"),KVI_SMALLICON_MEBANUNEXCEPT,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION("MeInviteExcept",__tr_no_lookup("Invite exception matching my mask"),KVI_SMALLICON_MEINVITEEXCEPT,KVI_MSGTYPE_LEVEL_5),
+	MSGTYPE_OPTION("MeInviteUnexcept",__tr_no_lookup("Invite unexception matching my mask"),KVI_SMALLICON_MEINVITEUNEXCEPT,KVI_MSGTYPE_LEVEL_5),
 	MSGTYPE_OPTION("Ignore",__tr_no_lookup("Ignored user message"),KVI_SMALLICON_IGNORE,KVI_MSGTYPE_LEVEL_3),
 	MSGTYPE_OPTION("Stats",__tr_no_lookup("Server statistics"),KVI_SMALLICON_STATS,KVI_MSGTYPE_LEVEL_1),
 	MSGTYPE_OPTION("SSL",__tr_no_lookup("SSL message"),KVI_SMALLICON_SSL,KVI_MSGTYPE_LEVEL_1),
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index 398fabd..2e35f75 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -618,7 +618,7 @@ namespace KviKvsCoreCallbackCommands
 				Trigger <callback command> with "ping" events every <timeout> milliseconds.
 			!sw: -w | --bind-to-window
 				Kill the process if the current window is closed. In this case the
-				termination event is NOT triggered (since the tqparent window has been lost).
+				termination event is NOT triggered (since the parent window has been lost).
 				If this switch is not used then the process is rebound to
 				the active console window and continues running.
 			!sw: -s=<interpreter command> | --shell=<interpreter command>
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
index 6af8b98..0610328 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
@@ -93,7 +93,7 @@ namespace KviKvsCoreFunctions
 		_REGFNC("length",length)
 		_REGFNC("lf",lf)
 		// m_r
-		_REGFNC("tqmask",tqmask)
+		_REGFNC("mask",mask)
 		_REGFNC("me",me)
 		_REGFNC("msgtype",msgtype)
 		_REGFNC("new",newCKEYWORDWORKAROUND)
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.h b/src/kvirc/kvs/kvi_kvs_corefunctions.h
index 16d281a..31a73b7 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.h
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.h
@@ -101,7 +101,7 @@ namespace KviKvsCoreFunctions
 	KVSCF(length);
 	KVSCF(lf);
 	// m_r
-	KVSCF(tqmask);
+	KVSCF(mask);
 	KVSCF(me);
 	KVSCF(msgtype);
 	KVSCF(newCKEYWORDWORKAROUND);
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
index 4fb92ce..00d8d2d 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
@@ -48,22 +48,22 @@ namespace KviKvsCoreFunctions
 	///////////////////////////////////////////////////////////////////////////////////////////////
 	
 	/*
-		@doc: tqmask
+		@doc: mask
 		@type:
 			function
 		@title:
-			$tqmask
+			$mask
 		@short:
-			Retrieves the host tqmask of a user
+			Retrieves the host mask of a user
 		@syntax:
-			$tqmask[(<nickname>[,<mask_type>])]
+			$mask[(<nickname>[,<mask_type>])]
 		@description:
-			Returns the specified type of tqmask for the user with <nickname>.[br]
-			If the host or username are not known, the tqmask may contain less information
+			Returns the specified type of mask for the user with <nickname>.[br]
+			If the host or username are not known, the mask may contain less information
 			than requested.[br]
 			If the <nickname> is not given it is assumed to be the current nickname.[br]
 			If <mask_type> is not given or is invalid, it is assumed to be 0.[br]
-			Available tqmask types:[br]
+			Available mask types:[br]
 			0 : nick!user@machine.host.top  (nick!user@XXX.XXX.XXX.XXX) (default)[br]
 			1 : nick!user@*.abc.host.top        (nick!user@XXX.XXX.XXX.*)[br]
 			2 : nick!user@*[br]
@@ -92,17 +92,17 @@ namespace KviKvsCoreFunctions
 			25: nick!*user@*.host.top          (nick!*user@XXX.XXX.*)[br]
 			26: *!*user@*.host.top          (*!user@*XXX.XXX.*)[br]
 			If some data is missing, these types may change:[br]
-			For example, if the hostname is missing, the tqmask type 3 or 4 may be reduced to type 5.[br]
+			For example, if the hostname is missing, the mask type 3 or 4 may be reduced to type 5.[br]
 			If the user with <nickname> is not found in the current IRC context user database,
 			an empty string is returned.[br]
 			The masks 22-26 are the smart versions of the masks 17-21 that try take care of masked ip addresses
 			in the form xxx.xxx.INVALID-TOP-MASK. If a masked ip address is found then
-			the XXX.XXX.* or XXX.* host tqmask is returned instead of the (wrong) *.INVALID-TOP-MASK
+			the XXX.XXX.* or XXX.* host mask is returned instead of the (wrong) *.INVALID-TOP-MASK
 		@examples:
 		@seealso:
 	*/
 
-	KVSCF(tqmask)
+	KVSCF(mask)
 	{
 		TQString szNick;
 		kvs_uint_t maskType;
@@ -127,7 +127,7 @@ namespace KviKvsCoreFunctions
 					u.setHost(e->host());
 			
 					TQString tmp;
-					u.tqmask(tmp,(KviIrcMask::MaskType)maskType);
+					u.mask(tmp,(KviIrcMask::MaskType)maskType);
 					KVSCF_pRetBuffer->setString(tmp);
 					return true;
 				}
@@ -260,7 +260,7 @@ namespace KviKvsCoreFunctions
 			$new(<className>,[<parentHandle> [,<name>[,<param>[,<param>[...]]]])
 		@description:
 			Creates a new instance of the object <class> with
-			the tqparent object <parent_id> and the specified <name>.[br]
+			the parent object <parent_id> and the specified <name>.[br]
 			<name> and <parent_id> are optional: if not specified, <name>
 			is assumed to be an empty string and <parent_id> default to 0 (parentless object).[br]
 			Please see the [doc:objects]objects documentation[/doc] for more information.[br]
@@ -300,7 +300,7 @@ namespace KviKvsCoreFunctions
 			pParent = KviKvsKernel::instance()->objectController()->lookupObject(hParent);
 			if(!pParent)
 			{
-				KVSCF_pContext->error(__tr2qs("The specified tqparent object does not exist"));
+				KVSCF_pContext->error(__tr2qs("The specified parent object does not exist"));
 				return false;
 			}
 		} else {
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index e46af6e..0a4aa54 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -328,19 +328,19 @@ namespace KviKvsCoreSimpleCommands
 
 		XGetKeyboardControl(get_xdisplay(),&st);
 
-		unsigned long tqmask = KBBellPercent;
+		unsigned long mask = KBBellPercent;
 		ctl.bell_percent = uVolume;
 		if(pitch >= 0)
 		{
 			ctl.bell_pitch    = pitch;
-			tqmask             |= KBBellPitch;
+			mask             |= KBBellPitch;
 		}
 		if(duration >= 0)
 		{
 			ctl.bell_duration = duration;
-			tqmask             |= KBBellDuration;
+			mask             |= KBBellDuration;
 		}
-		XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl);
+		XChangeKeyboardControl(get_xdisplay(),mask,&ctl);
 
 		XBell(get_xdisplay(),100);
 
@@ -354,7 +354,7 @@ namespace KviKvsCoreSimpleCommands
 		ctl.bell_duration = st.bell_duration;
 		ctl.bell_percent = st.bell_percent;
 
-		XChangeKeyboardControl(get_xdisplay(),tqmask,&ctl);
+		XChangeKeyboardControl(get_xdisplay(),mask,&ctl);
 
 	#endif //COMPILE_NO_X_BELL
 #endif
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index fcb2b03..e787cf2 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -94,7 +94,7 @@ namespace KviKvsCoreSimpleCommands
 			help run
 			help help
 			help index
-			help $tqmask
+			help $mask
 			help /home/pragma/myfile.html
 			[/example]
 	*/
@@ -674,15 +674,15 @@ try_again:
 		@title:
 			lusers
 		@syntax:
-			lusers [ <tqmask> [ <target> ] ]
+			lusers [ <mask> [ <target> ] ]
 		@short:
 			Requests statistics about users on IRC
 		@description:
 			The LUSERS command is used to get statistics about the size of the
 			IRC network.[br]If no parameter is given, the reply will be about the
-			whole net.[br]If a <tqmask> is specified, then the reply will only
+			whole net.[br]If a <mask> is specified, then the reply will only
 			concern the part of the network formed by the servers matching the
-			tqmask.[br]Finally, if the <target> parameter is specified, the request
+			mask.[br]Finally, if the <target> parameter is specified, the request
 			is forwarded to that server which will generate the reply.[br]
 			This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br]
 	*/
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
index 5ee31b7..acf8eec 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
@@ -445,12 +445,12 @@ namespace KviKvsCoreSimpleCommands
 		@title:
 			sockets
 		@syntax:
-			sockets [[remote server] server tqmask]
+			sockets [[remote server] server mask]
 		@short:
 			Requests the sockets info from a server
 		@description:
 			Requests the sockets information from the specified server or the current server if no [remote server] is specified.[br]
-			The reply can be filtered by <server tqmask>.[br]
+			The reply can be filtered by <server mask>.[br]
 			This command is a [doc:rfc2821wrappers]RFC2821 command wrapper[/doc]; see that document for more information.[br]
 	*/
 	// RFC2821 wrapper
@@ -875,7 +875,7 @@ namespace KviKvsCoreSimpleCommands
 		@title:
 			who
 		@syntax:
-			who {[tqmask] | [channel]}
+			who {[mask] | [channel]}
 		@short:
 			Requests WHO information
 		@description:
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
index a046dc3..55c086d 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
@@ -1035,7 +1035,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 			$0 = source nick
 			$1 = source username
 			$2 = source hostname
-			$3 = ban tqmask
+			$3 = ban mask
 		@window:
 			Channel window
 		@description:
@@ -1043,7 +1043,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 		@seealso:
 			[event:onunban]OnUnban[/event]
 	*/
-	EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"),
+	EVENT("OnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"),
 	/*
 	 	@doc: onunban
 		@type:
@@ -1056,7 +1056,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 			$0 = source nick
 			$1 = source username
 			$2 = source hostname
-			$3 = unban tqmask
+			$3 = unban mask
 		@window:
 			Channel window
 		@description:
@@ -1064,7 +1064,7 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 		@seealso:
 			[event:onban]OnBan[/event]
 	*/
-	EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"),
+	EVENT("OnUnBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"),
 	/*
 		@doc: onmeban
 		@type:
@@ -1077,15 +1077,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 			$0 = source nickname
 			$1 = source username
 			$2 = source hostname
-			$3 = ban tqmask
+			$3 = ban mask
 		@window:
 			Channel
 		@description:
-			Triggered when someone has set a +b flag that matches your tqmask (bans you) in the channel.[br]
+			Triggered when someone has set a +b flag that matches your mask (bans you) in the channel.[br]
 		@seealso:
 			[event:onmeunban]OnMeUnban[/event]
 	*/
-	EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"),
+	EVENT("OnMeBan","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"),
 	/*
 		@doc: onmeunban
 		@type:
@@ -1098,15 +1098,15 @@ KviKvsEvent KviKvsEventManager::m_appEventTable[KVI_NUM_SCRIPT_EVENTS]=
 			$0 = source nickname
 			$1 = source username
 			$2 = source hostname
-			$3 = ban tqmask
+			$3 = ban mask
 		@window:
 			Channel
 		@description:
-			Triggered when someone has set a -b flag that matches your tqmask (debans you) in the channel.[br]
+			Triggered when someone has set a -b flag that matches your mask (debans you) in the channel.[br]
 		@seealso:
 			[event:onmeban]OnMeBan[/event]
 	*/
-EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban tqmask"),
+EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban mask"),
  	/*
         @doc: onbanexception
         @type:
@@ -1119,7 +1119,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
             $0 = source nick
             $1 = source username
             $2 = source hostname
-            $3 = banexception tqmask
+            $3 = banexception mask
         @window:
             Channel window
         @description:
@@ -1128,7 +1128,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
             [event:onbanexceptionremove]OnBanExceptionRemove[/event]
     */
 
-	EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"),
+	EVENT("OnBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"),
     /*
         @doc: onbanexceptionremove
         @type:
@@ -1141,7 +1141,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
             $0 = source nick
             $1 = source username
             $2 = source hostname
-            $3 = unban tqmask
+            $3 = unban mask
         @window:
             Channel window
         @description:
@@ -1149,7 +1149,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
         @seealso:
             [event:onbanexception]OnBanException[/event]
     */
-	EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception tqmask"),
+	EVENT("OnBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = ban exception mask"),
     /*
         @doc: onmebanexception
         @type:
@@ -1162,7 +1162,7 @@ EVENT("OnMeUnban","$0 = source nick\n$1 = source username\n$2 = source hostname\
             $0 = source nick
             $1 = source username
             $2 = source hostname
-			$3 = tqmask
+			$3 = mask
         @window:
             Channel window
         @description:
@@ -1171,7 +1171,7 @@ channel
         @seealso:
             [event:onmebanexceptionremove]OnMeBanExceptionRemove[/event]
     */
-	EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"),
+	EVENT("OnMeBanException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"),
     /*
         @doc: onmebanexceptionremove
         @type:
@@ -1184,7 +1184,7 @@ channel
             $0 = source nick
             $1 = source username
             $2 = source hostname
-			$3 = tqmask
+			$3 = mask
         @window:
             Channel window
         @description:
@@ -1192,7 +1192,7 @@ channel
         @seealso:
             [event:onmebanexception]OnMeBanException[/event]
     */
-	EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"),
+	EVENT("OnMeBanExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"),
 	/*
 	 	@doc: onop
 		@type:
@@ -1622,7 +1622,7 @@ channel
         @short:
             An unhandled literal server message has been received
         @parameters:
-			$0 = source tqmask
+			$0 = source mask
 			$1 = message (literal)
 			$2- = parameters
         @window:
@@ -1636,7 +1636,7 @@ channel
 			raw numeric events to handle them.[br]
         @seealso:
     */
-	EVENT("OnUnhandledLiteral","$0 = source tqmask\n$1 = message\n$2- parameters"),
+	EVENT("OnUnhandledLiteral","$0 = source mask\n$1 = message\n$2- parameters"),
     /*
         @doc: onmehalfop
         @type:
@@ -1731,7 +1731,7 @@ channel
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = target tqmask
+			$3 = target mask
 		@window:
 			Channels window
 		@description:
@@ -1739,7 +1739,7 @@ channel
 		@seealso:
 			[event:oninviteexceptionremove]OnInviteExceptionRemove[/event]
 	*/
-	EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"),
+	EVENT("OnInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"),
 	/*
 	 	@doc: oninviteexceptionremove
 		@type:
@@ -1752,7 +1752,7 @@ channel
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = target tqmask
+			$3 = target mask
 		@window:
 			Channels window
 		@description:
@@ -1760,7 +1760,7 @@ channel
 		@seealso:
 			[event:oninviteexceptionremove]OnInviteExceptionRemove[/event]
 	*/
-	EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target tqmask"),
+	EVENT("OnInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = target mask"),
 	/*
 	 	@doc: onmeinviteexception
 		@type:
@@ -1773,16 +1773,16 @@ channel
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = tqmask
+			$3 = mask
 		@window:
 			Channels window
 		@description:
-			Someone has set mode +I on a channel with a target tqmask that matches
-			the local user tqmask
+			Someone has set mode +I on a channel with a target mask that matches
+			the local user mask
 		@seealso:
 			[event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event]
 	*/
-	EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"),
+	EVENT("OnMeInviteException","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"),
 	/*
 	 	@doc: onmeinviteexceptionremove
 		@type:
@@ -1795,16 +1795,16 @@ channel
 			$0 = source nick
 			$1 = source username
 			$2 = source host
-			$3 = tqmask
+			$3 = mask
 		@window:
 			Channels window
 		@description:
-			Someone has set mode -I on a channel with a target tqmask that matches
-			the local user tqmask
+			Someone has set mode -I on a channel with a target mask that matches
+			the local user mask
 		@seealso:
 			[event:onmeinviteexceptionremove]OnMeInviteExceptionRemove[/event]
 	*/
-	EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = tqmask"),
+	EVENT("OnMeInviteExceptionRemove","$0 = source nick\n$1 = source username\n$2 = source hostname\n$3 = mask"),
 	/*
 	 	@doc: onaction
 		@type:
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index c6d9fcb..677095d 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -95,7 +95,7 @@
 		To create an object you must use the [fnc]$new[/fnc]()
 		function. [fnc]$new[/fnc]() requires three parameters:[br]
 		- The object class (more about object classes later in this document)[br]
-		- The ID of the tqparent object , (that can be 0 for toplevel objects).[br]
+		- The ID of the parent object , (that can be 0 for toplevel objects).[br]
 		- The object name (eventually empty)[br]
 		[example]
 			%myobject = [fnc]$new[/fnc]([class]object[/class],0,theName)
@@ -113,7 +113,7 @@
 		[example]
 			[cmd]if[/cmd](%myobject == %anotherobject)[cmd]echo[/cmd] "This is the same object!";
 		[/example]
-		The tqparent object id is optional, if not specified it is assumed to be 0.
+		The parent object id is optional, if not specified it is assumed to be 0.
 		The object name is optional , but it may help you later in finding the object.[br][br]
 
 		To destroy an object use the [cmd]delete[/cmd] command. (In previous versions
@@ -242,12 +242,12 @@
 		[/example]
 
 		In the example above four objects have been created.
-		A "tqparent" object named "myobject" , and three tqchildren objects.
+		A "parent" object named "myobject" , and three tqchildren objects.
 		The destructor has been reimplemented for each child object,
 		to make it "say" its name (Please note the usage of [fnc]$this[/fnc]).
-		In the tqparent destructor the tqchildren have been counted and listed.[br]
-		Then the tqparent object is destroyed causing to:[br]
-		- trigger the tqparent destructor.[br]
+		In the parent destructor the tqchildren have been counted and listed.[br]
+		Then the parent object is destroyed causing to:[br]
+		- trigger the parent destructor.[br]
 		- destroy all the tqchildren (and conseguently trigger all the "individual" destructors).[br][br]
 
 		Not all the object functions must return a value:
@@ -499,8 +499,8 @@
 		The default implementation emits the signal "[classsignal]destroyed[/classsignal]".
 		!fn: $name()
 		Returns the name of this object.
-		!fn: $tqparent()
-		Returns the tqparent object of this object or 0 if this object has no tqparent.
+		!fn: $parent()
+		Returns the parent object of this object or 0 if this object has no parent.
 		!fn: $timerEvent(<timerId>)
 		Handler for the timer events.
 		The default implementation does nothing.
diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h
index 5d16c74..a19bd5f 100644
--- a/src/kvirc/kvs/kvi_kvs_object.h
+++ b/src/kvirc/kvs/kvi_kvs_object.h
@@ -92,7 +92,7 @@ public:
 
 	const TQString & getName(){ return m_szName; };
 
-	KviKvsObject * parentObject(){ return (KviKvsObject *)tqparent(); };
+	KviKvsObject * parentObject(){ return (KviKvsObject *)parent(); };
 	TQWidget * parentScriptWidget();
 
 	bool connectSignal(const TQString &sigName,KviKvsObject * target,const TQString &slotName);
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp
index f995238..c0dcc49 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp
@@ -79,7 +79,7 @@ KviKvsObjectClass::~KviKvsObjectClass()
 	// then kill all objects that belong to our class
 	KviKvsKernel::instance()->objectController()->killAllObjectsWithClass(this);
 	// now we're quite clean: should have no object depending on us alive
-	// unregister from the tqparent, if any
+	// unregister from the parent, if any
 	if(m_pParentClass)m_pParentClass->unregisterChildClass(this);
 	// unregister from the object controller
 	KviKvsKernel::instance()->objectController()->unregisterClass(this);
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h
index 5815743..0aa4f83 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.h
+++ b/src/kvirc/kvs/kvi_kvs_object_class.h
@@ -38,7 +38,7 @@ class KviKvsRunTimeContext;
 class KviKvsVariantList;
 
 // Object allocation function
-// parameters are: the class, the tqparent object (eventually 0), the object name (eventually empty)
+// parameters are: the class, the parent object (eventually 0), the object name (eventually empty)
 typedef KviKvsObject * (*KviKvsObjectAllocateInstanceProc)(KviKvsObjectClass *,KviKvsObject *,const TQString &);
 
 // An object function callback
@@ -53,14 +53,14 @@ class KVIRC_API KviKvsObjectClass
 	friend class KviKvsObjectController;
 public:
 	KviKvsObjectClass(
-			KviKvsObjectClass * pParent,            // tqparent class
+			KviKvsObjectClass * pParent,            // parent class
 			const TQString & szName,                 // class name
 			KviKvsObjectAllocateInstanceProc proc,  // intance allocation proc
 			bool bBuiltin = true                    // this is a builtin or script based class ?
 		);
 	~KviKvsObjectClass();
 protected:
-	KviKvsObjectClass                           * m_pParentClass;      // the tqparent (base) class
+	KviKvsObjectClass                           * m_pParentClass;      // the parent (base) class
 	TQString                                       m_szName;            // the class name
 	bool                                          m_bBuiltin;          // is this a builtin or script based class ?
 	KviPointerHashTable<TQString,KviKvsObjectFunctionHandler>          * m_pFunctionHandlers; // all our function handlers
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 3ec6ea7..b2c1c8b 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -77,7 +77,7 @@ void KviKvsObjectController::init()
 	m_pObjectClass->registerFunctionHandler("signalSender",KVI_PTR2MEMBER(KviKvsObject::function_signalSender));
 	m_pObjectClass->registerFunctionHandler("signalName",KVI_PTR2MEMBER(KviKvsObject::function_signalName));
 	m_pObjectClass->registerFunctionHandler("destructor",KVI_PTR2MEMBER(KviKvsObject::function_destructor));
-	m_pObjectClass->registerFunctionHandler("tqparent",KVI_PTR2MEMBER(KviKvsObject::function_parent));
+	m_pObjectClass->registerFunctionHandler("parent",KVI_PTR2MEMBER(KviKvsObject::function_parent));
 	m_pObjectClass->registerFunctionHandler("property",KVI_PTR2MEMBER(KviKvsObject::function_property));
 	m_pObjectClass->registerFunctionHandler("setProperty",KVI_PTR2MEMBER(KviKvsObject::function_setProperty));
 	m_pObjectClass->registerFunctionHandler("listProperties",KVI_PTR2MEMBER(KviKvsObject::function_listProperties));
@@ -145,13 +145,13 @@ void KviKvsObjectController::unregisterClass(KviKvsObjectClass *pClass)
 void KviKvsObjectController::registerObject(KviKvsObject *pObject)
 {
 	m_pObjectDict->insert(pObject->handle(),pObject);
-	if(pObject->tqparent() == 0)m_pTopLevelObjectList->append(pObject);
+	if(pObject->parent() == 0)m_pTopLevelObjectList->append(pObject);
 }
 
 void KviKvsObjectController::unregisterObject(KviKvsObject *pObject)
 {
 	m_pObjectDict->remove(pObject->handle());
-	if(pObject->tqparent() == 0)m_pTopLevelObjectList->removeRef(pObject);
+	if(pObject->parent() == 0)m_pTopLevelObjectList->removeRef(pObject);
 }
 
 void KviKvsObjectController::flushUserClasses()
diff --git a/src/kvirc/kvs/kvi_kvs_parser.h b/src/kvirc/kvs/kvi_kvs_parser.h
index 70e353a..43105e8 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.h
+++ b/src/kvirc/kvs/kvi_kvs_parser.h
@@ -68,7 +68,7 @@ private:
 	int                        m_iFlags;         // the current parsing flags
 	bool                       m_bError;         // error(..) was called ?
 	// this stuff is used only for reporting errors and warnings
-	KviKvsScript             * m_pScript;        // tqparent script
+	KviKvsScript             * m_pScript;        // parent script
 	KviWindow                * m_pWindow;        // output window
 public: // public interface
 	enum Flags { AssumeLocals = 1, Pedantic = 2 };
diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
index a1f4c56..a2d6516 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
@@ -302,7 +302,7 @@ KviKvsTreeNodeData * KviKvsParser::parseDollar(bool bInObjScope)
 		
 		if(bInObjScope)
 		{
-			// object function call (our tqparent will be a scope operator)
+			// object function call (our parent will be a scope operator)
 			if(pId2)
 			{
 				// base class object function call
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index 6f78ad1..95eca6a 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -332,7 +332,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 			of an expression, so it is terminated by a closed parenthesis.
 			It's rather dangerous to use this command inside an object
 			function handler: if the class definition <class> was already 
-			existing and it is a tqparent of the object's class, you might
+			existing and it is a parent of the object's class, you might
 			end up executing "inexisting" code.[br]
 			As a thumb rule, use this command only outside object function handlers.[br]
 			[br][br]
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
index 5442aa2..664403f 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
+++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
@@ -132,7 +132,7 @@ void KviKvsRunTimeContext::report(bool bError,KviKvsTreeNode * pNode,const TQStr
 			}
 			pCallStack->append(pString);
 			iFrame++;
-			pNode = pNode->tqparent();
+			pNode = pNode->parent();
 		}
 		if(pNode)
 			pCallStack->append(new TQString("#12 ..."));
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.h b/src/kvirc/kvs/kvi_kvs_runtimecontext.h
index 50ee147..373eb39 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecontext.h
+++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.h
@@ -153,7 +153,7 @@ public:
 	KviKvsVariantList * parameterList()
 		{ return m_pParameterList; };
 
-	// tqparent script, may be 0!
+	// parent script, may be 0!
 	KviKvsScript * script()
 		{ return m_pScript; };
 
diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h
index 8eabc15..6934692 100644
--- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h
+++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.h
@@ -30,7 +30,7 @@
 class KVIRC_API KviKvsRWEvaluationResult
 {
 public:
-	// this result becomes the owner of the tqparent result!!!!
+	// this result becomes the owner of the parent result!!!!
 	KviKvsRWEvaluationResult(KviKvsRWEvaluationResult *pParent,KviKvsVariant *pVariant);
 	// the destructor must do (in order):
 	//    check if variant is empty and if it is then remove it from the container (destroy it)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.h b/src/kvirc/kvs/kvi_kvs_treenode_base.h
index 2057e38..62f5314 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_base.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_base.h
@@ -42,7 +42,7 @@ protected:
 	// this is called only by KviKvsParser
 	void setLocation(const TQChar * pLocation){ m_pLocation = pLocation; };
 public:
-	KviKvsTreeNode * tqparent(){ return m_pParent; };
+	KviKvsTreeNode * parent(){ return m_pParent; };
 	const TQChar * location(){ return m_pLocation; };
 	virtual void dump(const char * prefix) = 0;
 	virtual void contextDescription(TQString &szBuffer) = 0;
diff --git a/src/kvirc/sparser/kvi_ircmessage.h b/src/kvirc/sparser/kvi_ircmessage.h
index e2bf17d..b040f86 100644
--- a/src/kvirc/sparser/kvi_ircmessage.h
+++ b/src/kvirc/sparser/kvi_ircmessage.h
@@ -100,7 +100,7 @@ public:
 	bool               unrecognized(){ return (m_iFlags & KVI_IRCMSG_FLAG_UNRECOGNIZED); };
 	
 	void decodeAndSplitPrefix(TQString &szNick,TQString &szUser,TQString &szHost);
-	void decodeAndSplitMask(char * tqmask,TQString &szNick,TQString &szUser,TQString &szHost);
+	void decodeAndSplitMask(char * mask,TQString &szNick,TQString &szUser,TQString &szHost);
 };
 
 #endif //_KVI_IRCMESSAGE_H_
diff --git a/src/kvirc/sparser/kvi_numeric.h b/src/kvirc/sparser/kvi_numeric.h
index 41d246f..0c72407 100644
--- a/src/kvirc/sparser/kvi_numeric.h
+++ b/src/kvirc/sparser/kvi_numeric.h
@@ -61,7 +61,7 @@
 #define RPL_MAPEND           7  /* :End of /MAP                                          [U]       # */
 //[03:45:18] [dune.webchat.org][007] newbie dune.webchat.org 1037760291 :Tue, 19 Nov 2002 18:44:51 -0800
 
-#define RPL_SNOMASK          8  /* %d :: Server notice tqmask (%#x)                        [U]       # */
+#define RPL_SNOMASK          8  /* %d :: Server notice mask (%#x)                        [U]       # */
 //[03:45:18] [dune.webchat.org][008] newbie -/NAJgAxq7HTQPwnkK^ 124963541 :This is your Session ID and Session Key.
 
 #define RPL_STATMEMTOT       9  /* %u %u :Bytes Blocks                                   [U]       # */
@@ -216,9 +216,9 @@
 #define RPL_INVITING         341 /* [I,E,U,D] */
 #define RPL_SUMMONING        342 /* [I,E,D] */
 //      RPL_?????????    343-345
-#define RPL_INVITELIST       346 /* "<channel> <exceptiontqmask>"                                [I] # */
+#define RPL_INVITELIST       346 /* "<channel> <exceptionmask>"                                [I] # */
 #define RPL_ENDOFINVITELIST  347 /* "<channel> :End of Channel Invite List"                    [I] # */
-#define RPL_EXCEPTLIST       348 /* "<channel> <exceptiontqmask>"                                [I] # */
+#define RPL_EXCEPTLIST       348 /* "<channel> <exceptionmask>"                                [I] # */
 #define RPL_ENDOFEXCEPTLIST  349 /* "<channel> :End of Channel Exception List"                 [I] # */
 //      RPL_??????????       350
 #define RPL_VERSION          351 /* "%s.%s %s :%s"                                       [I,E,U,D] # */
@@ -229,10 +229,10 @@
 #define RPL_KILLDONE         361 /* [I,E,U,D] */
 #define RPL_CLOSING          362 /* [I,E,U,D] */
 #define RPL_CLOSEEND         363 /* [I,E,U,D] */
-#define RPL_LINKS            364 /* "<host> <tqparent> :<hops> <description>"              [I,E,U,D] # */
+#define RPL_LINKS            364 /* "<host> <parent> :<hops> <description>"              [I,E,U,D] # */
 #define RPL_ENDOFLINKS       365 /* %s :End of /LINKS"                                   [I,E,U,D] # */
 #define RPL_ENDOFNAMES       366 /* "%s :End of /NAMES list."                            [I,E,U,D] # */
-#define RPL_BANLIST          367 /* "<channel> <bantqmask>"                                [I,E,U,D] # */
+#define RPL_BANLIST          367 /* "<channel> <banmask>"                                [I,E,U,D] # */
 #define RPL_ENDOFBANLIST     368 /* "<channel> :End of channel Ban List"                 [I,E,U,D] # */
 #define RPL_ENDOFWHOWAS      369 /* "%s :END of /WHOWAS"                                 [I,E,U,D] # */
 #define RPL_INFO             371 /* ":%s"                                                [I,E,U,D] # */
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index 10c5ac1..b92afd9 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -97,8 +97,8 @@ extern KVIRC_API KviCtcpPageDialog * g_pCtcpPageDialog;
 		use the symbol <0x01> for this delimiter.
 		You may receive a CTCP message from server in one of the
 		following two ways:[br]
-		[b]:<source_tqmask> PRIVMSG <target> :<0x01><ctcp message><0x01>[/b][br]
-		[b]:<source_tqmask> NOTICE <target>:<0x01><ctcp message><0x01>[/b][br]
+		[b]:<source_mask> PRIVMSG <target> :<0x01><ctcp message><0x01>[/b][br]
+		[b]:<source_mask> NOTICE <target>:<0x01><ctcp message><0x01>[/b][br]
 		The PRIVMSG is used for CTCP REQUESTS, the NOTICE for CTCP REPLIES.
 		The NOTICE form should never generate an automatic reply.[br]
 		The two delimiters were used to begin and terminate the
@@ -1506,7 +1506,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg)
 			{
 				// FIXME: #warning "OPTION FOR SETTING A FIXED BIND ADDRESS FOR OUTGOING DCC OFFERS"
 				TQString szUserMask;
-				msg->pSource->tqmask(szUserMask);
+				msg->pSource->mask(szUserMask);
 
 				TQString szReply,szFileName;
 				szFileName=a->name();
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index 34989db..155a734 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -167,7 +167,7 @@ void KviServerParser::parseLiteralError(KviIrcMessage *msg)
 void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
 {
 	// JOIN
-	// :<joiner_tqmask> JOIN :<channel>
+	// :<joiner_mask> JOIN :<channel>
 	TQString szNick,szUser,szHost;
 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
 
@@ -345,7 +345,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
 void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
 {
 	// PART
-	// :<source_tqmask> PART <channel> :<part message>
+	// :<source_mask> PART <channel> :<part message>
 	TQString szNick,szUser,szHost;
 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
 
@@ -444,7 +444,7 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
 void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
 {
 	// TQUIT
-	// :<source_tqmask> TQUIT :<quit message>
+	// :<source_mask> TQUIT :<quit message>
 	TQString szNick,szUser,szHost;
 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
 
@@ -580,7 +580,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
 void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 {
 	// KICK
-	// :<source_tqmask> KICK <channel> <nick> :<kick message>
+	// :<source_mask> KICK <channel> <nick> :<kick message>
 	TQString szNick,szUser,szHost;
 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
 
@@ -1381,7 +1381,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 void KviServerParser::parseLiteralTopic(KviIrcMessage *msg)
 {
 	// TOPIC
-	// :<source_tqmask> TOPIC <channel> :<topic>
+	// :<source_mask> TOPIC <channel> :<topic>
 	TQString szNick,szUser,szHost;
 	msg->decodeAndSplitPrefix(szNick,szUser,szHost);
 	TQString szTarget = msg->connection()->decodeText(msg->safeParam(0));
@@ -1666,9 +1666,9 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
 	// FIXME: freenode has two ugly incompatible extensions:
 	// mode e: that is NOT viewable (???)
 	// mode q that stands for "quiet-ban"
-	//    mode #chan +q tqmask
-	// adds tqmask to the banlist with the prefix %
-	// and doesn't allow the users matching the tqmask to talk to the channel
+	//    mode #chan +q mask
+	// adds mask to the banlist with the prefix %
+	// and doesn't allow the users matching the mask to talk to the channel
 
 	bool bSet = true;
 	const char * aux = modefl.ptr();
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 802cc60..265432f 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -72,7 +72,7 @@
 void KviServerParser::parseNumeric001(KviIrcMessage *msg)
 {
 	// 001: RPL_WELCOME
-	// :prefix 001 target :Welcome to the Internet Relay Network <usertqmask>
+	// :prefix 001 target :Welcome to the Internet Relay Network <usermask>
 	// FIXME: #warning "SET THE USERMASK FROM SERVER"
 	TQString szText = msg->connection()->decodeText(msg->safeTrailing());
 	TQRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" );
@@ -442,11 +442,11 @@ void KviServerParser::parseNumericNames(KviIrcMessage *msg)
 			char save = *aux;
 			*aux = 0;
 			// NAMESX + UHNAMES support
-			KviIrcMask tqmask(msg->connection()->decodeText(begin));
+			KviIrcMask mask(msg->connection()->decodeText(begin));
 			// and make it join
-			if(!tqmask.nick().isEmpty())chan->join(tqmask.nick(),
-				tqmask.hasUser() ? tqmask.user() : TQString(),
-				tqmask.hasHost() ? tqmask.host() : TQString(),
+			if(!mask.nick().isEmpty())chan->join(mask.nick(),
+				mask.hasUser() ? mask.user() : TQString(),
+				mask.hasHost() ? mask.host() : TQString(),
 					iFlags);
 			*aux = ' ';
 			*aux = save;
@@ -640,7 +640,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
 	void KviServerParser::__funcname(KviIrcMessage *msg) \
 	{ \
 		TQString szChan   = msg->connection()->decodeText(msg->safeParam(1)); \
-		TQString bantqmask  = msg->connection()->decodeText(msg->safeParam(2)); \
+		TQString banmask  = msg->connection()->decodeText(msg->safeParam(2)); \
 		TQString bansetby = msg->connection()->decodeText(msg->safeParam(3)); \
 		TQString bansetat; \
 		getDateTimeStringFromCharTimeT(bansetat,msg->safeParam(4)); \
@@ -648,7 +648,7 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
 		KviChannel * chan = msg->connection()->findChannel(szChan); \
 		if(chan) \
 		{ \
-			chan->setMask(__modechar,bantqmask,true,bansetby,TQString(msg->safeParam(4)).toUInt()); \
+			chan->setMask(__modechar,banmask,true,bansetby,TQString(msg->safeParam(4)).toUInt()); \
 			if(chan->__sentRequest())return; \
 		} \
 		if(!msg->haltOutput()) \
@@ -656,18 +656,18 @@ PARSE_NUMERIC_ENDOFLIST(parseNumericEndOfExceptList,setHasBanExceptionList,sentB
 			KviWindow * pOut = chan ? chan : KVI_OPTION_BOOL(KviOption_boolServerRepliesToActiveWindow) ? \
 				msg->console()->activeWindow() : (KviWindow *)(msg->console()); \
 			pOut->output(__ico,__tr2qs("%Q for \r!c\r%Q\r: \r!m-%c\r%Q\r (set by %Q on %Q)"), \
-				&(__szWhatTQString),&szChan,__modechar,&bantqmask,&bansetby,&bansetat); \
+				&(__szWhatTQString),&szChan,__modechar,&banmask,&bansetby,&bansetat); \
 		} \
 	}
 
 // 367: RPL_BANLIST [I,E,U,D]
-// :prefix 367 target <channel> <bantqmask> [bansetby] [bansetat]
+// :prefix 367 target <channel> <banmask> [bansetby] [bansetat]
 PARSE_NUMERIC_LIST(parseNumericBanList,'b',sentBanListRequest,KVI_OUT_BAN,__tr2qs("Ban listing"))
 // 346: RPL_INVITELIST [I,E,U,D]
-// :prefix 346 target <channel> <invitetqmask> [invitesetby] [invitesetat]
+// :prefix 346 target <channel> <invitemask> [invitesetby] [invitesetat]
 PARSE_NUMERIC_LIST(parseNumericInviteList,'I',sentInviteListRequest,KVI_OUT_INVITEEXCEPT,__tr2qs("Invite listing"))
 // 346: RPL_EXCEPTLIST [I,E,U,D]
-// :prefix 346 target <channel> <bantqmask> [bansetby] [bansetat]
+// :prefix 346 target <channel> <banmask> [bansetby] [bansetat]
 PARSE_NUMERIC_LIST(parseNumericExceptList,'e',sentBanExceptionListRequest,KVI_OUT_BANEXCEPT,__tr2qs("Ban exception listing"));
 
 
@@ -1578,7 +1578,7 @@ void KviServerParser::parseNumericListEnd(KviIrcMessage *msg)
 void KviServerParser::parseNumericLinks(KviIrcMessage *msg)
 {
 	// 364: RPL_LINKS [I,E,U,D]
-	// :prefix 364 <target> <host> <tqparent> :<hops> <description>
+	// :prefix 364 <target> <host> <parent> :<hops> <description>
 	if(!(msg->console()->ircContext()->linksWindow()))
 	{
 		// attempt to load the module...
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 1c01b23..b9e2f2b 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -209,7 +209,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
 //	m_pEditorsContainer->raiseWidget(m_pUserListView);
 	// And finally the input line on the bottom
 	m_pInput   = new KviInput(this,m_pUserListView);
-	// no tqmask editors yet
+	// no mask editors yet
 	m_pBanEditor = 0;
 	m_pBanExceptionEditor = 0;
 	m_pInviteEditor = 0;
@@ -1424,7 +1424,7 @@ int KviChannel::myFlags()
 }
 
 
-void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt)
+void KviChannel::setMask(char flag, const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt)
 {
 	if(!connection())return;
 	KviPointerList<KviMaskEntry> * list = m_pBanList;
@@ -1446,21 +1446,21 @@ void KviChannel::setMask(char flag, const TQString &tqmask,bool bAdd,const TQStr
 		break;
 	}
 			
-	internalMask(tqmask,bAdd,setBy,setAt,list,&editor);
+	internalMask(mask,bAdd,setBy,setAt,list,&editor);
 	m_pUserListView->setMaskEntries(flag,(int)list->count());
 }
 
-void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd)
+void KviChannel::internalMask(const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd)
 {
 	KviMaskEntry * e = 0;
 	if(bAdd)
 	{
 		for(e = l->first();e;e = l->next())
 		{
-			if(KviTQString::equalCI(e->szMask,tqmask))return; //already there
+			if(KviTQString::equalCI(e->szMask,mask))return; //already there
 		}
 		e = new KviMaskEntry;
-		e->szMask = tqmask;
+		e->szMask = mask;
 		e->szSetBy = (!setBy.isEmpty()) ? setBy : __tr2qs("(Unknown)");
 		e->uSetAt = setAt;
 		l->append(e);
@@ -1468,7 +1468,7 @@ void KviChannel::internalMask(const TQString &tqmask,bool bAdd,const TQString &s
 	} else {
 		for(e = l->first();e;e = l->next())
 		{
-			if(KviTQString::equalCI(e->szMask,tqmask))break;
+			if(KviTQString::equalCI(e->szMask,mask))break;
 		}
 		if(e)
 		{
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index f1d1732..45a4801 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -160,7 +160,7 @@ protected:
 	virtual void getBaseLogFileName(TQString &buffer);
 	virtual void triggerCreationEvents();
 	void toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** ppBtn,KviPointerList<KviMaskEntry> *l,char flag,const char *edName);
-	void internalMask(const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd);
+	void internalMask(const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt,KviPointerList<KviMaskEntry> *l,KviMaskEditor **ppEd);
 	void checkChannelSync();
 	void showDoubleView(bool bShow);
 	void fixActionHistory();
@@ -192,7 +192,7 @@ public:
 	const TQString & nameWithUserFlag(){ return m_szNameWithUserFlag; };
 	virtual const TQString & target(){ return windowName(); };
 //	void appendSelectedNicknames(KviStr &buffer);
-	void setMask(char flag, const TQString &tqmask,bool bAdd,const TQString &setBy,unsigned int setAt);
+	void setMask(char flag, const TQString &mask,bool bAdd,const TQString &setBy,unsigned int setAt);
 
 	kvi_time_t lastReceivedWhoReply(){ return m_tLastReceivedWhoReply; };
 	void setLastReceivedWhoReply(kvi_time_t tTime){ m_tLastReceivedWhoReply = tTime; };
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 0b08447..fdce502 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -374,8 +374,8 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString
 
 	if(u)
 	{
-		TQString tqmask;
-		u->tqmask()->tqmask(tqmask);
+		TQString mask;
+		u->mask()->mask(mask);
 		buffer += "<tr bgcolor=\"#F0F0F0\"><td>";
 		buffer += __tr2qs("Registered as");
 		buffer += " <b>";
@@ -385,7 +385,7 @@ void KviConsole::getUserTipText(const TQString &nick,KviIrcUserEntry *e,TQString
 		buffer += "</td></tr><tr bgcolor=\"#F0F0F0\"><td><font size=\"-1\">";
 		buffer += __tr2qs("(Matched by");
 		buffer += " ";
-		buffer += tqmask;
+		buffer += mask;
 		buffer += ")</td></tr>";
 	}
 
diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h
index 17e26a4..0be14a2 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.h
+++ b/src/kvirc/ui/kvi_cryptcontroller.h
@@ -76,7 +76,7 @@
 		Q_OBJECT
 		TQ_OBJECT
 	public:
-		KviCryptController(TQWidget * tqparent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur);
+		KviCryptController(TQWidget * parent,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur);
 		~KviCryptController();
 	protected:
 		KviWindow            * m_pWindow;
diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp
index fe67619..2e1dad1 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.cpp
+++ b/src/kvirc/ui/kvi_dynamictooltip.cpp
@@ -22,8 +22,8 @@
 #define __KVIRC__
 #include "kvi_dynamictooltip.h"
 
-KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip)
-: KviTalToolTip(tqparent)
+KviDynamicToolTipHelper::KviDynamicToolTipHelper(TQWidget * parent,KviDynamicToolTip * parToolTip)
+: KviTalToolTip(parent)
 {
 	m_pParentToolTip = parToolTip;
 }
@@ -37,10 +37,10 @@ void KviDynamicToolTipHelper::maybeTip(const TQPoint & pnt)
 	m_pParentToolTip->maybeTip(pnt);
 }
 
-KviDynamicToolTip::KviDynamicToolTip(TQWidget * tqparent,const char * name)
-: TQObject(tqparent,name)
+KviDynamicToolTip::KviDynamicToolTip(TQWidget * parent,const char * name)
+: TQObject(parent,name)
 {
-	m_pHelper = new KviDynamicToolTipHelper(tqparent,this);
+	m_pHelper = new KviDynamicToolTipHelper(parent,this);
 }
 
 KviDynamicToolTip::~KviDynamicToolTip()
diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h
index d6a6adf..d57902c 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.h
+++ b/src/kvirc/ui/kvi_dynamictooltip.h
@@ -33,7 +33,7 @@ class KVIRC_API KviDynamicToolTipHelper : public KviTalToolTip
 {
 	friend class KviDynamicToolTip;
 protected:
-	KviDynamicToolTipHelper(TQWidget * tqparent,KviDynamicToolTip * parToolTip);
+	KviDynamicToolTipHelper(TQWidget * parent,KviDynamicToolTip * parToolTip);
 	virtual ~KviDynamicToolTipHelper();
 protected:
 	KviDynamicToolTip * m_pParentToolTip;
@@ -47,7 +47,7 @@ class KVIRC_API KviDynamicToolTip : public TQObject
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDynamicToolTip(TQWidget * tqparent,const char * name = 0);
+	KviDynamicToolTip(TQWidget * parent,const char * name = 0);
 	virtual ~KviDynamicToolTip();
 protected:
 	KviDynamicToolTipHelper * m_pHelper;
diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp
index 2dfba50..2660a52 100644
--- a/src/kvirc/ui/kvi_filedialog.cpp
+++ b/src/kvirc/ui/kvi_filedialog.cpp
@@ -37,8 +37,8 @@ extern KviMediaManager * g_pMediaManager;
 
 
 KviFileDialog::KviFileDialog(const TQString &dirName, const TQString &filter,
-					TQWidget *tqparent, const char *name, bool modal)
-: KviTalFileDialog(dirName,filter,tqparent,name,modal)
+					TQWidget *parent, const char *name, bool modal)
+: KviTalFileDialog(dirName,filter,parent,name,modal)
 {
 
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)));
@@ -70,17 +70,17 @@ void KviFileDialog::goHome()
 
 
 
-bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* tqparent)
+bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,const TQString &initial,const TQString &filter,bool showHidden, bool showNative,TQWidget* parent)
 {
 #ifdef COMPILE_ON_WINDOWS
 	if(showNative)
 	{
-		buffer=TQFileDialog::getOpenFileName(initial,filter,tqparent,"open_file_name_dialog",caption);
+		buffer=TQFileDialog::getOpenFileName(initial,filter,parent,"open_file_name_dialog",caption);
 		KviFileUtils::adjustFilePath(buffer);
 		return !buffer.isEmpty();
 	}
 #endif
-	KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"open_file_name_dialog",true);
+	KviFileDialog * d = new KviFileDialog(initial,filter,parent,"open_file_name_dialog",true);
 	d->setCaption(caption);
 	d->setMode(TQFileDialog::ExistingFile);
 	//d->setShowHiddenFiles(showHidden);
@@ -96,14 +96,14 @@ bool KviFileDialog::askForOpenFileName(TQString &buffer,const TQString &caption,
 }
 
 
-bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* tqparent)
+bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial,const TQString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,TQWidget* parent)
 {
 	#ifdef COMPILE_ON_WINDOWS
 	if (showNative)
 	{
 		while (1)
 		{
-			buffer=TQFileDialog::getSaveFileName(initial,filter,tqparent,"save_file_name_dialog",caption);
+			buffer=TQFileDialog::getSaveFileName(initial,filter,parent,"save_file_name_dialog",caption);
 			KviFileUtils::adjustFilePath(buffer);
 			//return !buffer.isEmpty();
 			if(buffer.isEmpty()) return false;
@@ -112,7 +112,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption
 			if(!KviFileUtils::fileExists(buffer)) return true;
 			TQString tmp;
 			KviTQString::sprintf(tmp,__tr2qs("The file %s already exists.<br>Do you wish to overwrite it?"),buffer.utf8().data());
-			switch(TQMessageBox::information(tqparent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape))
+			switch(TQMessageBox::information(parent,__tr2qs("File Exists - KVIrc"),tmp,TQMessageBox::Yes,TQMessageBox::No | TQMessageBox::Default,TQMessageBox::Cancel | TQMessageBox::Escape))
 			{
 					case TQMessageBox::Cancel: return false; break;
 					case TQMessageBox::Yes:    return true;  break;
@@ -125,7 +125,7 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption
 	#endif
 
 	
-	KviFileDialog * d = new KviFileDialog(initial,filter,tqparent,"save_file_name_dialog",true);
+	KviFileDialog * d = new KviFileDialog(initial,filter,parent,"save_file_name_dialog",true);
 	d->setCaption(caption);
 	d->setMode(TQFileDialog::AnyFile);
 	//d->setShowHiddenFiles(showHidden);
@@ -167,24 +167,24 @@ bool KviFileDialog::askForSaveFileName(TQString &buffer,const TQString & caption
 	
 }
 
-bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent)
+bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* parent)
 {
 #ifdef COMPILE_ON_WINDOWS
 	if(showNative)
 	{
-		buffer = TQFileDialog::getExistingDirectory(initial,tqparent,"open_file_name_dialog",caption);
+		buffer = TQFileDialog::getExistingDirectory(initial,parent,"open_file_name_dialog",caption);
 		return !buffer.isEmpty();
 	}
 #else
 	#ifdef COMPILE_KDE_SUPPORT
 		// the KDE based dir selection dialog is now quite nice
-		buffer = KFileDialog::getExistingDirectory(initial,tqparent,caption);
+		buffer = KFileDialog::getExistingDirectory(initial,parent,caption);
 		return !buffer.isEmpty();
 	#endif
 #endif
 
 	KviFileDialog * d = new KviFileDialog(initial,
-		filter,tqparent,"directory_name_dialog",true);
+		filter,parent,"directory_name_dialog",true);
 	d->setCaption(caption);
 	d->setMode(TQFileDialog::Directory);
 	//d->setShowHiddenFiles(showHidden);
@@ -201,17 +201,17 @@ bool KviFileDialog::askForDirectoryName(TQString &buffer,const TQString & captio
 }
 
 
-bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* tqparent)
+bool KviFileDialog::askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter,bool showHidden,bool showNative,TQWidget* parent)
 {
 	#ifdef COMPILE_ON_WINDOWS
 	if (showNative)
 	{
-		buffer=TQFileDialog::getOpenFileNames(filter,initial,tqparent,"open_file_name_dialog",caption);
+		buffer=TQFileDialog::getOpenFileNames(filter,initial,parent,"open_file_name_dialog",caption);
 		return (buffer.count()>0);
 	}
 	
 	#endif
-	KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),tqparent,"open_file_names_dialog",true);
+	KviFileDialog * d = new KviFileDialog(initial,filter ? TQString(filter) : TQString(),parent,"open_file_names_dialog",true);
 	d->setCaption(caption);
 	d->setMode(TQFileDialog::ExistingFiles);
 	//d->setShowHiddenFiles(showHidden);	
diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h
index 0bb03f6..03fea70 100644
--- a/src/kvirc/ui/kvi_filedialog.h
+++ b/src/kvirc/ui/kvi_filedialog.h
@@ -41,14 +41,14 @@ class KVIRC_API KviFileDialog : public KviTalFileDialog
   TQ_OBJECT
 public:
 	KviFileDialog(const TQString &dirName, const TQString &filter=TQString(),
-					TQWidget *tqparent=0, const char *name=0, bool modal=false);
+					TQWidget *parent=0, const char *name=0, bool modal=false);
 	~KviFileDialog();
 public:
-	static bool askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* tqparent=0);
-	static bool askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,TQWidget* tqparent=0);
+	static bool askForOpenFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool showNative = true,TQWidget* parent=0);
+	static bool askForSaveFileName(TQString &buffer,const TQString & caption,const TQString &initial = TQString(),const TQString &filter = TQString(),bool showHidden = false,bool bConfirmOverwrite = false,bool showNative = true,TQWidget* parent=0);
 
-	static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0);
-	static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* tqparent=0);
+	static bool askForDirectoryName(TQString &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* parent=0);
+	static bool askForOpenFileNames(TQStringList &buffer,const TQString & caption,const TQString & initial,const char * filter = 0,bool showHidden = false,bool showNative=true,TQWidget* parent=0);
 
 };
 
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index dfae586..db5efa8 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -1176,9 +1176,9 @@ bool KviFrame::focusNextPrevChild(bool next)
 		//TQVariant v = w->property("KviProperty_FocusOwner");
 		//if(v.isValid())return false; // Do NOT change the focus widget!
 		
-		if(w->tqparent())
+		if(w->parent())
 		{
-			TQVariant v = w->tqparent()->property("KviProperty_ChildFocusOwner");
+			TQVariant v = w->parent()->property("KviProperty_ChildFocusOwner");
 			if(v.isValid())return false; // Do NOT change the focus widget!
 		}
 	}
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 1a255fc..5258577 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -2274,7 +2274,7 @@ int KviInputEditor::xPositionFromCharIndex(int chIdx,bool bContentsCoords)
 		Ctrl+Shift+CursorLeft: Moves the selection one word left<br>
 		Ctrl+Shift+CursorRight: Moves the selection one word right<br>
 		Tab: Nickname, function/command, or filename completion (see below)<br>
-		Shift+Tab: Hosttqmask or function/command completion (see below)<br>
+		Shift+Tab: Hostmask or function/command completion (see below)<br>
 		Alt+&lt;numeric_sequence&gt;: Inserts the character by ASCII/Unicode code<br>
 		<example>
 		Alt+32: Inserts ASCII/Unicode character 32: ' ' (a space)
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index 9d1b363..0e12d2d 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -33,8 +33,8 @@
 
 // FIXME: #warning "THIS COULD GO INTO libkvioptions ?"
 
-KviIpEditor::KviIpEditor(TQWidget * tqparent,AddressType addrType,const TQString &ipAddr,const char *name)
-:TQFrame(tqparent,name)
+KviIpEditor::KviIpEditor(TQWidget * parent,AddressType addrType,const TQString &ipAddr,const char *name)
+:TQFrame(parent,name)
 {
 
 	for(int i=0;i<7;i++)
diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h
index 3a39841..19e2a3c 100644
--- a/src/kvirc/ui/kvi_ipeditor.h
+++ b/src/kvirc/ui/kvi_ipeditor.h
@@ -38,7 +38,7 @@ class KVIRC_API KviIpEditor : public TQFrame
   TQ_OBJECT
 public:
 	enum AddressType { IpV4 , IpV6 };
-	KviIpEditor(TQWidget * tqparent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0);
+	KviIpEditor(TQWidget * parent,AddressType = IpV4,const TQString &ipAddr = TQString(),const char *name = 0);
 	~KviIpEditor();
 private:
 	TQLabel      * m_pLabel[7];
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 25be1cc..a500c46 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -281,8 +281,8 @@ void kvi_appendWCharToTQStringWithLength(TQString * qstrptr,const kvi_wchar_t *
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcView::KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd)
-: TQWidget(tqparent,"irc_view") 
+KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
+: TQWidget(parent,"irc_view") 
 {
 	// Ok...here we go
 	// initialize the initializable
@@ -2920,7 +2920,7 @@ void KviIrcView::paintEvent(TQPaintEvent *p)
 			//Calculate the position of the image
 			//imageYPos = curBottomCoord - (pixmapHeight(16) + ((m_iFontLineSpacing - 16)/2) );
 			int imageYPos = curBottomCoord - m_iRelativePixmapY;
-			//Set the tqmask if needed
+			//Set the mask if needed
 			int iPixId = KVI_OPTION_MSGTYPE(pCurTextLine->iMsgType).pixId();
 			if(iPixId > 0)
 				pa.drawPixmap(KVI_IRCVIEW_HORIZONTAL_BORDER,imageYPos,*(g_pIconManager->getSmallIcon(iPixId)));
@@ -3263,7 +3263,7 @@ no_selection_paint:
 					int wdth = block->block_width;
 					if(wdth < 0)wdth = widgetWidth - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER);
 					int imageYPos = curBottomCoord - m_iRelativePixmapY;
-					//Set the tqmask if needed
+					//Set the mask if needed
 					if(curBack != KVI_TRANSPARENT && curBack < 16)
 					{
 						pa.fillRect(curLeftCoord,curBottomCoord - m_iFontLineSpacing + m_iFontDescent,wdth,m_iFontLineSpacing,KVI_OPTION_MIRCCOLOR((unsigned char)curBack));
@@ -4429,7 +4429,7 @@ KviIrcViewWrappedBlock * KviIrcView::getLinkUnderMouse(int xPos,int yPos,TQRect
 		These links are used internally in KVIrc , but you can use them too.[br]
 		The <escape_command> is a single letter this time: it defines the type of the link.[br]
 		Currently KVIrc uses six types of builtin links : 'n' for nickname links, 'u' for url links,
-		'c' for channel links, 'h' for hostname links, 'm' for tqmask links and 's' for server links.[br]
+		'c' for channel links, 'h' for hostname links, 'm' for mask links and 's' for server links.[br]
 		Theoretically you can also use your own link types: just use any other letter or digit (you can't use ']' and <cr>),
 		but probably you will prefer a completely user defined link in that case anyway.[br]
 		Once the user interacts with the link , kvirc executes the predefined events:[br]
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index 26912ef..092d5ed 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -62,7 +62,7 @@ public:
 	friend class KviIrcViewToolTip;
 	friend class KviIrcViewToolWidget;
 public:
-	KviIrcView(TQWidget *tqparent,KviFrame *pFrm,KviWindow *pWnd);
+	KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd);
 	~KviIrcView();
 public:
 	int dummyRead() const { return 0; };
diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp
index d1605e9..c0dd4ba 100644
--- a/src/kvirc/ui/kvi_listview.cpp
+++ b/src/kvirc/ui/kvi_listview.cpp
@@ -32,8 +32,8 @@
 
 #include "kvi_doublebuffer.h"
 
-KviListView::KviListView( TQWidget * tqparent, const char * name)
-:KviTalListView(tqparent)
+KviListView::KviListView( TQWidget * parent, const char * name)
+:KviTalListView(parent)
 {
 	m_pBackgroundOverlayPixmap=0;
 	m_iBackgroundOverlayAlignment=TQt::AlignAuto;
diff --git a/src/kvirc/ui/kvi_listview.h b/src/kvirc/ui/kvi_listview.h
index 6f86d80..c4f0888 100644
--- a/src/kvirc/ui/kvi_listview.h
+++ b/src/kvirc/ui/kvi_listview.h
@@ -37,7 +37,7 @@ class KVIRC_API KviListView : public KviTalListView
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviListView( TQWidget * tqparent = 0, const char * name = 0);
+	KviListView( TQWidget * parent = 0, const char * name = 0);
 	~KviListView();
 protected:
 	TQPixmap      * m_pBackgroundOverlayPixmap;
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index f0040a1..21921b5 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -36,13 +36,13 @@
 #include <tqlabel.h>
 #include <tqvalidator.h> 
 
-KviMaskItem::KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry)
-:KviTalListViewItem(tqparent), m_Mask(*entry)
+KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry)
+:KviTalListViewItem(parent), m_Mask(*entry)
 {
 	TQDateTime date;
-	date.setTime_t(tqmask()->uSetAt);
-	setText(0,tqmask()->szMask);
-	setText(1,tqmask()->szSetBy);
+	date.setTime_t(mask()->uSetAt);
+	setText(0,mask()->szMask);
+	setText(1,mask()->szSetBy);
 	setText(2,date.toString());
 }
 
@@ -57,9 +57,9 @@ int KviMaskItem::compare ( TQListViewItem * i, int col, bool ascending ) const
 {
 	if(col==2)
 	{
-		if( ((KviMaskItem*)i)->tqmask()->uSetAt > m_Mask.uSetAt )  return -1;
-		if( ((KviMaskItem*)i)->tqmask()->uSetAt == m_Mask.uSetAt ) return  0;
-		if( ((KviMaskItem*)i)->tqmask()->uSetAt < m_Mask.uSetAt )  return  1;
+		if( ((KviMaskItem*)i)->mask()->uSetAt > m_Mask.uSetAt )  return -1;
+		if( ((KviMaskItem*)i)->mask()->uSetAt == m_Mask.uSetAt ) return  0;
+		if( ((KviMaskItem*)i)->mask()->uSetAt < m_Mask.uSetAt )  return  1;
 	}
 	return KviTalListViewItem::compare(i,col,ascending);
 }
@@ -76,7 +76,7 @@ KviMaskInputDialog::KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEd
 	
 	TQGridLayout * g = new TQGridLayout(this,2,3,5,5);
 	
-	TQLabel * tl = new TQLabel(__tr2qs("New tqmask must match an *!*@* expression"),this);
+	TQLabel * tl = new TQLabel(__tr2qs("New mask must match an *!*@* expression"),this);
 	g->addMultiCellWidget(tl,0,0,0,3);
 	
 	m_pEdit=new TQLineEdit(szMask,this);
@@ -128,7 +128,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
 {
 	bool isEnabled=1;
 	
-	TQObject * w = tqparent();
+	TQObject * w = parent();
 	while(w)
 	{
 		if(w->inherits("KviChannel"))
@@ -137,7 +137,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
 			if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) )  isEnabled=0;
 			break;
 		}
-	w = w->tqparent();
+	w = w->parent();
 	}
 
 #ifdef COMPILE_USE_QT4
@@ -254,7 +254,7 @@ void KviMaskEditor::searchTextChanged ( const TQString & text)
 		{
 			pMaskItem->setVisible(true);
 		} else {
-			if(pMaskItem->tqmask()->szMask.contains(text))
+			if(pMaskItem->mask()->szMask.contains(text))
 				pMaskItem->setVisible(true);
 			else 
 				pMaskItem->setVisible(false);
@@ -273,9 +273,9 @@ void KviMaskEditor::removeClicked()
 		if(it->isSelected())
 		{
 			KviMaskEntry * e = new KviMaskEntry;
-			e->szMask  = it->tqmask()->szMask;
-			e->szSetBy = it->tqmask()->szSetBy;
-			e->uSetAt =  it->tqmask()->uSetAt;
+			e->szMask  = it->mask()->szMask;
+			e->szSetBy = it->mask()->szSetBy;
+			e->uSetAt =  it->mask()->uSetAt;
 			l->append(e);
 		}
 		it = (KviMaskItem *)(it->nextSibling());
@@ -286,7 +286,7 @@ void KviMaskEditor::removeClicked()
 
 void KviMaskEditor::addClicked()
 {
-	TQObject * w = tqparent();
+	TQObject * w = parent();
 	while(w)
 	{
 		if(w->inherits("KviChannel"))
@@ -299,7 +299,7 @@ void KviMaskEditor::addClicked()
 			}
 			break;
 		}
-	w = w->tqparent();
+	w = w->parent();
 	}
 }
 
@@ -316,7 +316,7 @@ void KviMaskEditor::removeMask(KviMaskEntry *e)
 	KviMaskItem * it =(KviMaskItem *)(m_pMaskBox->firstChild());
 	while(it)
 	{
-		if(KviTQString::equalCI(it->tqmask()->szMask,e->szMask))
+		if(KviTQString::equalCI(it->mask()->szMask,e->szMask))
 		{
 			delete it;
 			return;
@@ -329,7 +329,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem)
 {
 	if(pItem)
 	{
-		TQObject * w = tqparent();
+		TQObject * w = parent();
 		while(w)
 		{
 			if(w->inherits("KviChannel"))
@@ -342,7 +342,7 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem)
 				}
 				break;
 			}
-		w = w->tqparent();
+		w = w->parent();
 		}
 	}
 }
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h
index 47a53e8..71baadf 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/kvi_maskeditor.h
@@ -47,10 +47,10 @@ typedef struct _KviMaskEntry
 class KviMaskItem: public KviTalListViewItem
 {
 public:
-	KviMaskItem(KviTalListView* tqparent,KviMaskEntry* entry);
+	KviMaskItem(KviTalListView* parent,KviMaskEntry* entry);
 	~KviMaskItem();
 	
-	KviMaskEntry* tqmask() { return &m_Mask; };
+	KviMaskEntry* mask() { return &m_Mask; };
 #ifdef COMPILE_USE_QT4
 	virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const;
 #else
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index 80d0cac..f1d47c9 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -55,8 +55,8 @@
 #include <tqdrawutil.h>
 #include <tqevent.h>
 
-KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name)
-: TQToolButton(tqparent,name)
+KviMdiCaptionButton::KviMdiCaptionButton(const TQPixmap &pix,TQWidget * parent,const char * name)
+: TQToolButton(parent,name)
 {
 	setPixmap(pix);
 	//setAutoRaise(true);
@@ -104,17 +104,17 @@ void KviMdiCaptionButton::drawButton(TQPainter *p)
 
 
 
-KviMdiCaption::KviMdiCaption(KviMdiChild * tqparent,const char * name)
-: TQWidget(tqparent,name)
+KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name)
+: TQWidget(parent,name)
 {
 	m_pMaximizeButton    = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),this,"maximize_button");
-	connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(maximize()));
+	connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(maximize()));
 	m_pMinimizeButton    = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),this,"minimize_button");
-	connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(minimize()));
+	connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(minimize()));
 	m_pCloseButton       = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),this,"close_button");
-	connect(m_pCloseButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(closeRequest()));
+	connect(m_pCloseButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(closeRequest()));
 	m_pSystemButton        = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON)),this,"icon_button");
-	connect(m_pSystemButton,TQT_SIGNAL(clicked()),tqparent,TQT_SLOT(systemPopupSlot()));
+	connect(m_pSystemButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(systemPopupSlot()));
 
 	m_lastMousePos = TQPoint(-1,-1);
 	m_bMouseGrabbed = true;
@@ -165,7 +165,7 @@ void KviMdiCaption::fontChange(const TQFont &old)
 {
 	calcLineSpacing();
 	TQWidget::fontChange(old);
-	((KviMdiChild *)tqparent())->resizeEvent(0);
+	((KviMdiChild *)parent())->resizeEvent(0);
 }
 
 void KviMdiCaption::mousePressEvent(TQMouseEvent *e)
@@ -177,7 +177,7 @@ void KviMdiCaption::mousePressEvent(TQMouseEvent *e)
 #else
 	setCursor(TQCursor::sizeAllCursor);
 #endif
-	((KviMdiChild *)tqparent())->activate(true);
+	((KviMdiChild *)parent())->activate(true);
 }
 
 void KviMdiCaption::mouseMoveEvent(TQMouseEvent *)
@@ -187,7 +187,7 @@ void KviMdiCaption::mouseMoveEvent(TQMouseEvent *)
 		TQPoint p = TQCursor::pos();
 		int dx = m_lastMousePos.x() - p.x();
 		int dy = m_lastMousePos.y() - p.y();
-		KviMdiChild * c = (KviMdiChild *)tqparent();
+		KviMdiChild * c = (KviMdiChild *)parent();
 
 		int nx = c->manager()->childX(c) - dx;
 		int ny = c->manager()->childY(c) - dy;
@@ -220,7 +220,7 @@ void KviMdiCaption::mouseMoveEvent(TQMouseEvent *)
 
 void KviMdiCaption::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-	((KviMdiChild *)tqparent())->maximize();
+	((KviMdiChild *)parent())->maximize();
 }
 
 void KviMdiCaption::paintEvent(TQPaintEvent * e)
@@ -228,7 +228,7 @@ void KviMdiCaption::paintEvent(TQPaintEvent * e)
 	TQRect r = e->rect();
 	TQPainter p(this);
 	p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive));
-	TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)tqparent())->xmlActiveCaption() : ((KviMdiChild *)tqparent())->xmlInactiveCaption(),font());
+	TQSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font());
 	rt.draw(&p,height() + 2,-1,rect(),tqcolorGroup());
 }
 
diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h
index d070e19..c46572a 100644
--- a/src/kvirc/ui/kvi_mdicaption.h
+++ b/src/kvirc/ui/kvi_mdicaption.h
@@ -39,7 +39,7 @@ class KVIRC_API KviMdiCaptionButton : public TQToolButton
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviMdiCaptionButton(const TQPixmap &pix,TQWidget * tqparent,const char * name);
+	KviMdiCaptionButton(const TQPixmap &pix,TQWidget * parent,const char * name);
 	~KviMdiCaptionButton();
 protected:
 	virtual void drawButton(TQPainter * p);
@@ -67,7 +67,7 @@ class KVIRC_API KviMdiCaption : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviMdiCaption(KviMdiChild * tqparent,const char * name);
+	KviMdiCaption(KviMdiChild * parent,const char * name);
 	~KviMdiCaption();
 protected:
 	TQPoint                m_lastMousePos;
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index b559be8..2bf0130 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -490,8 +490,8 @@ void KviMdiChild::setClient(TQWidget *w)
 	int clientYPos=m_pCaption->heightHint()+KVI_MDICHILD_SPACING+KVI_MDICHILD_BORDER;
 	resize(w->width()+(KVI_MDICHILD_BORDER << 1),w->height()+KVI_MDICHILD_BORDER+clientYPos);
 
-	//Retqparent if needed
-	if(TQT_BASE_OBJECT(w->tqparent())!=TQT_BASE_OBJECT(this)){
+	//Reparent if needed
+	if(TQT_BASE_OBJECT(w->parent())!=TQT_BASE_OBJECT(this)){
 		//reparent to this widget , no flags , point , show it
 		TQPoint pnt2(KVI_MDICHILD_BORDER,clientYPos);
 		w->reparent(this,pnt2,true);
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 7d4a9b6..9163595 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -57,8 +57,8 @@
 
 
 
-KviMdiManager::KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name)
-: KviTalScrollView(tqparent)
+KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name)
+: KviTalScrollView(parent)
 {
 	setFrameShape(NoFrame);
 	m_pZ = new KviPointerList<KviMdiChild>;
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h
index 9577ef6..e4093d6 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/kvi_mdimanager.h
@@ -61,7 +61,7 @@ class KVIRC_API KviMdiManager : public KviTalScrollView
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviMdiManager(TQWidget * tqparent,KviFrame * pFrm,const char * name);
+	KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name);
 	~KviMdiManager();
 public:
 	KviMdiChild * topChild(){ return m_pZ->last(); };
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
index 9407131..18ce661 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -54,7 +54,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
 	m_szLimit = limit;
 	bool isEnabled=1;
 	
-	TQObject * w = tqparent();
+	TQObject * w = parent();
 	while(w)
 	{
 		if(w->inherits("KviChannel"))
@@ -63,7 +63,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
 			if(!( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O') ) )  isEnabled=0;
 			break;
 		}
-	w = w->tqparent();
+	w = w->parent();
 	}
 	
 	TQGridLayout *pMasterLayout = new TQGridLayout(this,2,1,2,2);
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index 28d986f..8b959a7 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -41,8 +41,8 @@
 TQString KviOptionsWidget::m_szBasicTipStart; // empty decl
 TQString KviOptionsWidget::m_szBasicTipEnd;
 
-KviOptionsWidget::KviOptionsWidget(TQWidget * tqparent,const char * name,bool bSunken)
-: TQFrame(tqparent,name), KviSelectorInterface()
+KviOptionsWidget::KviOptionsWidget(TQWidget * parent,const char * name,bool bSunken)
+: TQFrame(parent,name), KviSelectorInterface()
 {
 	if(m_szBasicTipStart.isEmpty())
 	{
diff --git a/src/kvirc/ui/kvi_optionswidget.h b/src/kvirc/ui/kvi_optionswidget.h
index 463cc82..5e397f1 100644
--- a/src/kvirc/ui/kvi_optionswidget.h
+++ b/src/kvirc/ui/kvi_optionswidget.h
@@ -41,7 +41,7 @@ class KVIRC_API KviOptionsWidget : public TQFrame, public KviSelectorInterface
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviOptionsWidget(TQWidget * tqparent,const char * name = 0,bool bSunken = true);
+	KviOptionsWidget(TQWidget * parent,const char * name = 0,bool bSunken = true);
 	~KviOptionsWidget();
 private:
 	TQGridLayout                      * m_pLayout;
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index 17a9ddf..c3e5473 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -735,9 +735,9 @@ KviChanListViewItem::KviChanListViewItem(KviTalListView* pList,TQString szChan,T
 :KviTalListViewItem(pList,szChan)
 {
 	m_szPass=szPass;
-	TQString tqmask;
-	tqmask.fill('*',szPass.length());
-	setText(1,tqmask);
+	TQString mask;
+	mask.fill('*',szPass.length());
+	setText(1,mask);
 }
 
 KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & txt,TQStringList * pOption,bool bEnabled)
diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp
index e81376e..629fae9 100644
--- a/src/kvirc/ui/kvi_styled_controls.cpp
+++ b/src/kvirc/ui/kvi_styled_controls.cpp
@@ -142,15 +142,15 @@ void KviStyledControl::leaveEvent ( TQEvent * )
 }
 
 
-KviStyledCheckBox::KviStyledCheckBox ( TQWidget * tqparent, const char * name )
-: TQCheckBox(tqparent,name), KviStyledControl(this)
+KviStyledCheckBox::KviStyledCheckBox ( TQWidget * parent, const char * name )
+: TQCheckBox(parent,name), KviStyledControl(this)
 {
 	setWFlags(WNoAutoErase);
 
 }
 
-KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name )
-: TQCheckBox(text,tqparent,name), KviStyledControl(this)
+KviStyledCheckBox::KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name )
+: TQCheckBox(text,parent,name), KviStyledControl(this)
 {
 	setWFlags(WNoAutoErase);
 }
@@ -234,15 +234,15 @@ void KviStyledCheckBox::paintEvent ( TQPaintEvent * event)
 		TQCheckBox::paintEvent(event);
 }
 
-KviStyledToolButton::KviStyledToolButton( TQWidget * tqparent, const char * name )
-: TQToolButton(tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false)
+KviStyledToolButton::KviStyledToolButton( TQWidget * parent, const char * name )
+: TQToolButton(parent,name), KviStyledControl(this), bShowSubmenuIndicator(false)
 {
 	setWFlags(WNoAutoErase);
 	resizeEvent(0);
 }
 
-KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name )
-: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,tqparent,name), KviStyledControl(this), bShowSubmenuIndicator(false)
+KviStyledToolButton::KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * parent, const char * name )
+: TQToolButton(iconSet,textLabel,grouptext,receiver,slot,parent,name), KviStyledControl(this), bShowSubmenuIndicator(false)
 {
 	setWFlags(WNoAutoErase);
 	resizeEvent(0);
diff --git a/src/kvirc/ui/kvi_styled_controls.h b/src/kvirc/ui/kvi_styled_controls.h
index f7e6641..0a7ed59 100644
--- a/src/kvirc/ui/kvi_styled_controls.h
+++ b/src/kvirc/ui/kvi_styled_controls.h
@@ -87,8 +87,8 @@ class KVIRC_API KviStyledCheckBox : public TQCheckBox, public KviStyledControl
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviStyledCheckBox ( TQWidget * tqparent, const char * name = 0 );
-	KviStyledCheckBox ( const TQString & text, TQWidget * tqparent, const char * name = 0 );
+	KviStyledCheckBox ( TQWidget * parent, const char * name = 0 );
+	KviStyledCheckBox ( const TQString & text, TQWidget * parent, const char * name = 0 );
 	~KviStyledCheckBox();
 protected:
 	virtual void paintEvent ( TQPaintEvent * );
@@ -101,8 +101,8 @@ class KVIRC_API KviStyledToolButton : public TQToolButton, public KviStyledContr
 private:
 	bool bShowSubmenuIndicator;
 public:
-	KviStyledToolButton ( TQWidget * tqparent, const char * name = 0 );
-	KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * tqparent, const char * name = 0 );
+	KviStyledToolButton ( TQWidget * parent, const char * name = 0 );
+	KviStyledToolButton ( const TQIconSet & iconSet, const TQString & textLabel, const TQString & grouptext, TQObject * receiver, const char * slot, KviTalToolBar * parent, const char * name = 0 );
 	~KviStyledToolButton();
 	
 	void setShowSubmenuIndicator(bool bShow);
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 37bb7a8..ad47661 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -1373,9 +1373,9 @@ void KviTreeTaskBar::setActiveItem(KviTaskBarItem * it)
 		{
 			cur->setActive(false);
 		}
-		if(((KviTreeTaskBarItem *)it)->tqparent())
+		if(((KviTreeTaskBarItem *)it)->parent())
 		{
-			if(!((KviTreeTaskBarItem *)it)->tqparent()->isOpen())((KviTreeTaskBarItem *)it)->tqparent()->setOpen(true);
+			if(!((KviTreeTaskBarItem *)it)->parent()->isOpen())((KviTreeTaskBarItem *)it)->parent()->setOpen(true);
 		}
 		((KviTreeTaskBarItem *)it)->setActive(true);
 		m_pListView->setSelected(((KviTreeTaskBarItem *)it),true); // this MUST go after it->setActive()
@@ -1410,10 +1410,10 @@ KviTaskBarItem * KviTreeTaskBar::nextItem()
 		{
 			m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->nextSibling();
 		} else {
-			if(m_pCurrentItem->tqparent())
+			if(m_pCurrentItem->parent())
 			{
-				// child with not siblings : try the sibling of the tqparent
-				m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->nextSibling();
+				// child with not siblings : try the sibling of the parent
+				m_pCurrentItem = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->nextSibling();
 			} else {
 				m_pCurrentItem = 0; // toplevel with no siblings
 			}
@@ -1428,10 +1428,10 @@ KviTaskBarItem * KviTreeTaskBar::prevItem()
 
 	if(!m_pCurrentItem)return 0;
 
-	if(m_pCurrentItem->tqparent())
+	if(m_pCurrentItem->parent())
 	{
 		// a child item
-		it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent()->firstChild();
+		it = (KviTreeTaskBarItem *)m_pCurrentItem->parent()->firstChild();
 
 		while(it)
 		{
@@ -1440,7 +1440,7 @@ KviTaskBarItem * KviTreeTaskBar::prevItem()
 		}
 		if(!it)
 		{
-			it = (KviTreeTaskBarItem *)m_pCurrentItem->tqparent();
+			it = (KviTreeTaskBarItem *)m_pCurrentItem->parent();
 		}
 
 	} else {
diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp
index 4d4243c..1f57db0 100644
--- a/src/kvirc/ui/kvi_themedlabel.cpp
+++ b/src/kvirc/ui/kvi_themedlabel.cpp
@@ -59,7 +59,7 @@ void KviThemedLabel::setText(const char * text)
 	{
 		int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4;
 		setMinimumHeight(iHeight);
-		//g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize));
+		//g_pApp->postEvent(parent(),new TQEvent(TQEvent::Resize));
 	}
 	update();
 }
@@ -71,7 +71,7 @@ void KviThemedLabel::setText(const TQString& text)
 	{
 		int iHeight=fontMetrics().height()*TQStringList::split('\n',m_szText).count()+4;
 		setMinimumHeight(iHeight);
- 		//g_pApp->postEvent(tqparent(),new TQEvent(TQEvent::Resize));
+ 		//g_pApp->postEvent(parent(),new TQEvent(TQEvent::Resize));
 	}
 	update();
 }
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
index bd424fe..65c6dec 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
@@ -13,10 +13,10 @@
 #include "kvi_iconmanager.h"
 
 
-KviWindowToolWidget::KviWindowToolWidget(TQWidget * tqparent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ )
-:TQWidget(tqparent/*,name,f*/)
+KviWindowToolWidget::KviWindowToolWidget(TQWidget * parent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ )
+:TQWidget(parent/*,name,f*/)
 {
-//	m_pContainer=tqparent;
+//	m_pContainer=parent;
 	m_pButton=button;
 	m_bAutoDelete=1;
 	m_bHidden=0;
@@ -77,8 +77,8 @@ void KviWindowToolWidget::unregisterSelf()
 	m_bHidden=0;
 }*/
 
-KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn, const char * name )
-:TOOL_PAGE_PARENT(tqparent)
+KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * parent,bool bOn, const char * name )
+:TOOL_PAGE_PARENT(parent)
 {
 #ifdef COMPILE_USE_QT4
 	setFlat(true);
diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h
index 7b43af3..456418e 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.h
+++ b/src/kvirc/ui/kvi_toolwindows_container.h
@@ -26,7 +26,7 @@ class KVIRC_API KviWindowToolWidget : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviWindowToolWidget( TQWidget * tqparent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */);
+	KviWindowToolWidget( TQWidget * parent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */);
 	~KviWindowToolWidget();
 	
 	void setAutoDelete(bool b) { m_bAutoDelete=b; };
@@ -58,7 +58,7 @@ class KVIRC_API KviWindowToolPageButton : public TOOL_PAGE_PARENT
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * tqparent,bool bOn=0,const char * name = 0 );
+	KviWindowToolPageButton ( int pixon,int pixoff, const TQString & text, TQWidget * parent,bool bOn=0,const char * name = 0 );
 	~KviWindowToolPageButton();
 /*protected:
 	virtual void drawButton ( TQPainter * painter);*/
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index d4a3ecd..fe9011e 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -553,7 +553,7 @@ TQSize KviTopicWidget::tqsizeHint() const
 void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *)
 {
 	int maxlen=-1;
-	TQObject * w = tqparent();
+	TQObject * w = parent();
 	TQString szModes;
 	bool bCanEdit = TRUE;
 	while(w)
@@ -568,7 +568,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *)
 				}
 			break;
 		}
-	w = w->tqparent();
+	w = w->parent();
 	}
 	if(m_pInput == 0)
 	{
@@ -728,9 +728,9 @@ void KviTopicWidget::deactivate()
 		m_pDiscard = 0;
 	}
 	
-	// try to find a KviWindow tqparent and give it the focus
+	// try to find a KviWindow parent and give it the focus
 	
-	TQObject * w = tqparent();
+	TQObject * w = parent();
 	while(w)
 	{
 		if(w->inherits("KviWindow"))
@@ -738,11 +738,11 @@ void KviTopicWidget::deactivate()
 			((KviWindow *)w)->setFocus();
 			return;
 		}
-		w = w->tqparent();
+		w = w->parent();
 	}
 
 	// no KviWindow on the path
-	w = tqparent();
+	w = parent();
 	if(w)
 	{
 		if(w->inherits(TQWIDGET_OBJECT_NAME_STRING))
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index 1b55386..d504915 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -91,10 +91,10 @@ void KviUserListToolTip::maybeTip(const TQPoint &pnt)
 
 
 
-KviUserListEntry::KviUserListEntry(KviUserListView * tqparent,const TQString &nick,
+KviUserListEntry::KviUserListEntry(KviUserListView * parent,const TQString &nick,
 	KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown)
 {
-	m_pListView      = tqparent;
+	m_pListView      = parent;
 	m_szNick         = nick;
 	m_pGlobalData    = e;
 	m_iFlags         = iFlags;
@@ -184,8 +184,8 @@ void KviUserListEntry::recalcSize()
 
 
 
-KviUserListView::KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name)
-: KviWindowToolWidget(tqparent,button)
+KviUserListView::KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const TQString & label_text,const char * name)
+: KviWindowToolWidget(parent,button)
 {
 	setAutoDelete(0);
 	m_pKviWindow  = pWnd;
@@ -1476,7 +1476,7 @@ void KviUserListViewArea::paintEvent(TQPaintEvent *ev)
 				// FIXME:
 				//
 				// this is slow... VERY slow when one has a lot of registered users.
-				//   (this is NOT a simple lookup in the user db... it is a tqmask match)
+				//   (this is NOT a simple lookup in the user db... it is a mask match)
 				// if we REALLY need to use custom colors for regged users then
 				// they should be updated ONCE and stored (cached) in the KviUserListEntry structure
 				//
diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h
index a666d33..b275126 100644
--- a/src/kvirc/ui/kvi_userlistview.h
+++ b/src/kvirc/ui/kvi_userlistview.h
@@ -74,7 +74,7 @@ class KVIRC_API KviUserListEntry
 	friend class KviUserListView;
 	friend class KviUserListViewArea;
 public:
-	KviUserListEntry(KviUserListView * tqparent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true);
+	KviUserListEntry(KviUserListView * parent,const TQString &nick,KviIrcUserEntry * e,short int iFlags,bool bJoinTimeUnknown = true);
 	~KviUserListEntry();
 protected:
 	KviUserListView  * m_pListView;
@@ -128,7 +128,7 @@ class KVIRC_API KviUserListView : public KviWindowToolWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListView(TQWidget * tqparent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0);
+	KviUserListView(TQWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize = 5,const TQString &label_text = TQString(),const char * name = 0);
 	~KviUserListView();
 protected:
 	KviPointerHashTable<TQString,KviUserListEntry>         * m_pEntryDict;
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index d7f141a..352c0cf 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -296,12 +296,12 @@ bool KviWindow::focusNextPrevChild(bool next)
 		//TQVariant v = w->property("KviProperty_FocusOwner");
 		//if(v.isValid())return false; // Do NOT change the focus widget!
 		
-		if(w->tqparent())
+		if(w->parent())
 		{
 #ifdef COMPILE_USE_QT4
-			if(w->tqparent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
+			if(w->parent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
 #else
-			if(w->tqparent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
+			if(w->parent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
 #endif
 				return false; // Do NOT change the focus widget!
 		}
@@ -936,9 +936,9 @@ void KviWindow::closeEvent(TQCloseEvent *e)
 
 void KviWindow::updateIcon()
 {
-	if(tqparent())
+	if(parent())
 	{
-		((KviMdiChild *)tqparent())->setIcon(*myIconPtr());
+		((KviMdiChild *)parent())->setIcon(*myIconPtr());
 	} else {
 		setIcon(*myIconPtr());
 	}
@@ -951,9 +951,9 @@ void KviWindow::youAreDocked()
 		delete m_pAccel;
 		m_pAccel = 0;
 	}
-	((KviMdiChild *)tqparent())->setIcon(*myIconPtr());
+	((KviMdiChild *)parent())->setIcon(*myIconPtr());
 	updateCaption();
-	connect(((KviMdiChild *)tqparent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &)));
+	connect(((KviMdiChild *)parent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &)));
 }
 
 void KviWindow::youAreUndocked()
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index 7cc410b..a044bae 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -206,7 +206,7 @@ public:
 	// The KviIrcView of this window: may be NULL if the window has no KviIrcView (and thus supports no direct output)
 	KviIrcView * view() const { return m_pIrcView; };
 	// The mdiParent widget: may be nulll if the window is undocked
-	KviMdiChild * mdiParent(){ return (KviMdiChild *)tqparent(); };
+	KviMdiChild * mdiParent(){ return (KviMdiChild *)parent(); };
 	// The console that this window belongs to: may be null for windows that aren't bound to irc contexts
 	KviConsole * console(){ return m_pConsole; };
 	// same as above
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 70fc661..e7bd5d7 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -822,7 +822,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll
 	{
 		while(it)
 		{
-			KviAliasEditorListViewItem * par = (KviAliasEditorListViewItem *)(it->tqparent());
+			KviAliasEditorListViewItem * par = (KviAliasEditorListViewItem *)(it->parent());
 			delete it;
 			if(par)
 			{
@@ -992,10 +992,10 @@ TQString KviAliasEditor::askForNamespaceName(const TQString &szAction,const TQSt
 
 void KviAliasEditor::openParentItems(KviTalListViewItem * it)
 {
-	if(it->tqparent())
+	if(it->parent())
 	{
-		it->tqparent()->setOpen(true);
-		openParentItems(it->tqparent());
+		it->parent()->setOpen(true);
+		openParentItems(it->parent());
 	}
 }
 
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 174f28b..a540e23 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1029,21 +1029,21 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns an array of channel user nicknames
 	@syntax:
-		<array> $chan.users([window_id:string],[tqmask:string],[flags:string])
+		<array> $chan.users([window_id:string],[mask:string],[flags:string])
 	@description:
 		Returns an array of nicknames on the channel specified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
-		If [tqmask] is given, each user is added to the array only
-		if it matches the [tqmask].[br]
+		If [mask] is given, each user is added to the array only
+		if it matches the [mask].[br]
 		[flags] may contain a subset of the letters "aovhnmi":[br]
 		"ovhn" are mode flags: the users are added to the array only if they are channel administrators ('a'), operators ('o'),
 		voiced users ('v'), half-operators ('h'), user-operators ('u') or unflagged ('n') users. (Unflagged means not operators, not
 		voiced and not half-operators). If none of the "ovhun" flags are used, KVIrc behaves like all five were passed.[br]
 		The flag 'm' causes the entire user masks to be added to the 
 		array entries, as known by KVIrc at the moment of this function call.[br]
-		The flag 'i' causes KVIrc to invert the match and add only the users that do NOT match [tqmask].[br]
-		Please note that on really large channels this function may be time consuming (especially if [tqmask] is used):
+		The flag 'i' causes KVIrc to invert the match and add only the users that do NOT match [mask].[br]
+		Please note that on really large channels this function may be time consuming (especially if [mask] is used):
 		use with care.[br]
 	@example:
 		[example]
@@ -1069,7 +1069,7 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 			%test[] = $chan.users(,,o)
 			echo %test[]
 			[comment]# Find all the voiced users that do NOT come from *.edu[/comment]
-			[comment]# See also their whole tqmask[/comment]
+			[comment]# See also their whole mask[/comment]
 			%test[] = $chan.users(,*!*@*.edu,vim)
 			echo %test[]
 		[/example]
@@ -1081,7 +1081,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 	TQString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
 		KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
 	KVSM_PARAMETERS_END(c)
 
@@ -1108,7 +1108,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 	if(bAddMask || bCheckFlags || bCheckMask)
 	{
 		bool bMaskMustMatch = szFlags.find('i',false) == -1;
-		KviIrcMask tqmask(szMask);
+		KviIrcMask mask(szMask);
 
 		while(e)
 		{
@@ -1116,34 +1116,34 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 			{
 				if(bChanAdmins)
 				{
-					if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_mask;
 				}
 				if(bOp)
 				{
-					if(e->flags() & KVI_USERFLAG_OP)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_OP)goto check_mask;
 				}
 				if(bVoice)
 				{
-					if(e->flags() & KVI_USERFLAG_VOICE)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_VOICE)goto check_mask;
 				}
 				if(bHalfOp)
 				{
-					if(e->flags() & KVI_USERFLAG_HALFOP)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_HALFOP)goto check_mask;
 				}
 				if(bUserOp)
 				{
-					if(e->flags() & KVI_USERFLAG_USEROP)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_USEROP)goto check_mask;
 				}
 				if(bNone)
 				{
-					if(!(e->flags() & KVI_USERFLAG_MASK))goto check_tqmask;
+					if(!(e->flags() & KVI_USERFLAG_MASK))goto check_mask;
 				}
 				goto next_item;
 			}
-check_tqmask:
+check_mask:
 			if(bCheckMask)
 			{
-				if(tqmask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item;
+				if(mask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item;
 				goto next_item;
 			}
 add_item:
@@ -1311,12 +1311,12 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchban
 	@short:
-		Matches a tqmask agains the channel ban list
+		Matches a mask agains the channel ban list
 	@syntax:
-		<string> $chan.matchban([window_id],<complete_tqmask>)
+		<string> $chan.matchban([window_id],<complete_mask>)
 	@description:
-		Returns the ban tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
-		If no ban tqmask matches <complete_tqmask> an empty string is returned.[br]
+		Returns the ban mask that matches <complete_mask> on channel identified by [window_id].[br]
+		If no ban mask matches <complete_mask> an empty string is returned.[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br]
 		This function is useful to determine if a ban set on the channel matches an user.[br]
@@ -1327,7 +1327,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@@ -1360,12 +1360,12 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchbanexception
 	@short:
-		Matches a tqmask agains the channel ban exception list
+		Matches a mask agains the channel ban exception list
 	@syntax:
-		<string> $chan.matchbanexception([window_id],<complete_tqmask>)
+		<string> $chan.matchbanexception([window_id],<complete_mask>)
 	@description:
-		Returns the ban exception tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
-		If no ban exception tqmask matches <complete_tqmask> an empty string is returned.[br]
+		Returns the ban exception mask that matches <complete_mask> on channel identified by [window_id].[br]
+		If no ban exception mask matches <complete_mask> an empty string is returned.[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br]
 		This function is useful to determine if a ban exception set on the channel matches an user.[br]
@@ -1376,7 +1376,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@@ -1409,12 +1409,12 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchinvite
 	@short:
-		Matches a tqmask agains the channel invite list
+		Matches a mask agains the channel invite list
 	@syntax:
-		<string> $chan.matchinvite([window_id:string],<complete_tqmask>)
+		<string> $chan.matchinvite([window_id:string],<complete_mask>)
 	@description:
-		Returns the invite tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
-		If no invite tqmask matches <complete_tqmask> an empty string is returned.[br]
+		Returns the invite mask that matches <complete_mask> on channel identified by [window_id].[br]
+		If no invite mask matches <complete_mask> an empty string is returned.[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty string is returned.[br]
 		This function is useful to determine if a invite set on the channel matches an user.[br]
@@ -1425,7 +1425,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index b05bb5a..fc3428b 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -200,7 +200,7 @@ void KviChannelsJoinWindow::fillListView()
 void KviChannelsJoinWindow::itemClicked(KviTalListViewItem * it) 
 {
 	if(!it)return;
-	if(!it->tqparent())return;
+	if(!it->parent())return;
 	KviStr tmp = it->text(0);
 	m_pChannelEdit->setText(tmp.ptr());
 	enableJoin();
@@ -209,7 +209,7 @@ void KviChannelsJoinWindow::itemClicked(KviTalListViewItem * it)
 void KviChannelsJoinWindow::itemDoubleClicked(KviTalListViewItem * it) 
 {
 	if(!it)return;
-	if(!it->tqparent())return;
+	if(!it->parent())return;
 	KviStr tmp = it->text(0);
 	m_pChannelEdit->setText(tmp.ptr());
 	enableJoin();
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 09778d7..7e41034 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -714,7 +714,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 				kvi_free(data->buffer);
 				data->buffer = end = aux = 0;
 			}
-			postEvent(tqparent(),e);
+			postEvent(parent(),e);
 		} else aux++;
 //		debug("PASSING CHAR %c",*aux);
 	}
@@ -732,7 +732,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 			data->iLen = 0;
 			kvi_free(data->buffer);
 			data->buffer = 0;
-			postEvent(tqparent(),e);
+			postEvent(parent(),e);
 		}
 	}
 	return true;
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 3cb5a7c..93274b4 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -862,7 +862,7 @@ static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 		The remote end may acknowledge the request by sending a DCC RECV request.
 		This command effects are similar to [cmd]dcc.send[/cmd], but will work also on machines
 		that can't accept incoming connections (firewalling or masquerading problems).[br]
-		A 120 seconds file offer is added for the specified file and tqmask "<nickname>!*@*".
+		A 120 seconds file offer is added for the specified file and mask "<nickname>!*@*".
 	@examples:
 
 */
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 4eed239..00a1d1e 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -878,7 +878,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 			// now add a file offer , so he we will accept it automatically
 			// 120 secs is a reasonable timeout
 			TQString szMask;
-			dcc->ctcpMsg->pSource->tqmask(szMask,KviIrcMask::NickUserHost);
+			dcc->ctcpMsg->pSource->mask(szMask,KviIrcMask::NickUserHost);
 
 			KviSharedFile * pOld = o;
 			o = g_pSharedFilesManager->addSharedFile(szFileName,o->absFilePath(),szMask,120);
@@ -1081,7 +1081,7 @@ static void dccModuleParseDccCanvas(KviDccRequest *dcc)
 
 static void dccModuleParseDccList(KviDccRequest *dcc)
 {
-	// DCC LIST <tqmask> <ipaddr> <port>
+	// DCC LIST <mask> <ipaddr> <port>
 	// FIXME!
 }
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 7458611..a7485ca 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -158,7 +158,7 @@ void KviDccRecvThread::postMessageEvent(const char * m)
 {
 	KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
 	e->setData(new KviStr(m));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 }
 
 // FIXME: This stuff should be somewhat related to the 1448 bytes TCP basic packet size
@@ -292,7 +292,7 @@ void KviDccRecvThread::run()
 								{
 									// Received the whole file...die
 									KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-									postEvent(tqparent(),e);
+									postEvent(parent(),e);
 									break;
 								}
 							}
@@ -327,7 +327,7 @@ void KviDccRecvThread::run()
 							{
 								// success if we got the whole file or if we don't know the file size (we trust the peer)
 								KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-								postEvent(tqparent(),e);
+								postEvent(parent(),e);
 								break;
 							}
 						}
@@ -368,7 +368,7 @@ void KviDccRecvThread::run()
 							// success if we got the whole file or if we don't know the file size (we trust the peer)
 							postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc"));
 							KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-							postEvent(tqparent(),e);
+							postEvent(parent(),e);
 							break;
 						}
 					}
@@ -572,7 +572,7 @@ void KviDccSendThread::run()
 					if(iLastAck >= pFile->size())
 					{
 						KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-						postEvent(tqparent(),e);
+						postEvent(parent(),e);
 						break;
 					}
 				} else {
@@ -589,7 +589,7 @@ void KviDccSendThread::run()
 								// done...success
 								updateStats();
 								KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-								postEvent(tqparent(),e);
+								postEvent(parent(),e);
 								break;
 							} else {
 								if(readLen < 0)
@@ -598,7 +598,7 @@ void KviDccSendThread::run()
 								} else {
 									KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
 									e->setData(new KviStr(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc")));
-									postEvent(tqparent(),e);
+									postEvent(parent(),e);
 								}
 							}
 						}
@@ -672,7 +672,7 @@ void KviDccSendThread::run()
 						// not in a tdcc: we can close the file...
 						updateStats();
 						KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-						postEvent(tqparent(),e);
+						postEvent(parent(),e);
 						break;
 					} else {
 						// upload finished but we're waiting for the last ack
diff --git a/src/modules/dcc/thread.h b/src/modules/dcc/thread.h
index b91e2a2..7687f65 100644
--- a/src/modules/dcc/thread.h
+++ b/src/modules/dcc/thread.h
@@ -66,7 +66,7 @@ protected:
 protected:
 	bool handleInvalidSocketRead(int readLen);
 public:
-	TQObject * tqparent(){ return m_pParent; };
+	TQObject * parent(){ return m_pParent; };
 	void postErrorEvent(int err);
 	// Warning!..newer call __tr() here!...use __tr_no_lookup()
 	void postMessageEvent(const char * message);
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 4bf9ad9..e9d8a2a 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -533,7 +533,7 @@ void KviDccVoiceThread::startRecording()
 //		debug("Posting event");
 		KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 		e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_RECORDING));
-		postEvent(tqparent(),e);
+		postEvent(parent(),e);
 
 		m_bRecording = true;
 		m_bRecordingRequestPending = false;
@@ -552,7 +552,7 @@ void KviDccVoiceThread::stopRecording()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_STOP_RECORDING));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 
 	m_bRecording = false;
 	if(!m_bPlaying)closeSoundcard();
@@ -569,7 +569,7 @@ void KviDccVoiceThread::startPlaying()
 	{
 		KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 		e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_PLAYING));
-		postEvent(tqparent(),e);
+		postEvent(parent(),e);
 		m_bPlaying = true;
 	}
 #endif
@@ -583,7 +583,7 @@ void KviDccVoiceThread::stopPlaying()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_STOP_PLAYING));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 
 	m_bPlaying = false;
 	if(!m_bRecording)closeSoundcard();
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 52b0e10..7e3149f 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -147,7 +147,7 @@ void KviKvsCallbackMessageBox::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.[br] 
+		it will appear above its parent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will click one of the buttons. At this point the dialog
 		is hidden and the <callback_command> is executed passing the number of the button clicked
 		as $0 and the magic parameters as positional parameters $1 , $2 , $3....[br]
@@ -417,7 +417,7 @@ void KviKvsCallbackTextInput::showEvent(TQShowEvent *e)
 		If the -d switch is used , the initial text input value is set to <default text>.[br]
 		If the -i switch is used , the dialog displays also the icon <icon> , just on the left ot the <info_text>[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.[br] 
+		it will appear above its parent widget and block its input until it's closed.[br] 
 		In that case <icon> is an [doc:image_id]image identifier[/doc] (can be a relative or absolute
 		path to an image file or a signed number (in that case it defines an internal KVIrc image).[br]
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.textinput call time and passed
@@ -573,7 +573,7 @@ void KviKvsCallbackFileDialog::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.[br] 
+		it will appear above its parent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will select an EXISTING file and click either
 		Ok or Cancel. At this point the dialog is hidden and the <callback_command> is executed passing the selected file(s) as $0
 		and the magic parameters as positional parameters $1 , $2 , $3....[br]
@@ -704,7 +704,7 @@ void KviKvsCallbackImageDialog::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.image call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.[br] 
+		it will appear above its parent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will select an EXISTING file and click either
 		Ok or Cancel. At this point the dialog is hidden and the <callback_command> is executed passing the selected file(s) as $0
 		and the magic parameters as positional parameters $1 , $2 , $3....[br]
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index f734d28..8dd177c 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -199,8 +199,8 @@ void KviDockWidget::createTaskbarIcon()
 	ICONINFO inf;
 	g_pCurrentPixmap=new TQPixmap(*g_pDock1);
 	inf.hbmColor = g_pCurrentPixmap->hbm();
-	if(!g_pCurrentPixmap->tqmask())g_pCurrentPixmap->setMask(g_pCurrentPixmap->createHeuristicMask());
-	inf.hbmMask = g_pCurrentPixmap->tqmask()->hbm();
+	if(!g_pCurrentPixmap->mask())g_pCurrentPixmap->setMask(g_pCurrentPixmap->createHeuristicMask());
+	inf.hbmMask = g_pCurrentPixmap->mask()->hbm();
 	g_pCurrentIcon=CreateIconIndirect(&inf);
 
 	NOTIFYICONDATA nid;
@@ -229,8 +229,8 @@ void KviDockWidget::updateTaskbarIcon()
 	ICONINFO inf;
 	TQPixmap* pix = m_bFlashed ? g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE) : g_pCurrentPixmap;
 	inf.hbmColor = pix->hbm();
-	if(!pix->tqmask())pix->setMask(pix->createHeuristicMask());
-	inf.hbmMask = pix->tqmask()->hbm();
+	if(!pix->mask())pix->setMask(pix->createHeuristicMask());
+	inf.hbmMask = pix->mask()->hbm();
 	HICON hIcon=CreateIconIndirect(&inf);
 
 	NOTIFYICONDATA nid;
@@ -719,7 +719,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 {
 	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)delete w;
-	// show the tqparent frame.. otherwise there will be no way to get it back
+	// show the parent frame.. otherwise there will be no way to get it back
 	if(!c->window()->frame()->isVisible())
 	{
 		c->window()->frame()->show();
diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
index 7631694..00fd009 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
@@ -550,7 +550,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 {
 	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)delete w;
-	// show the tqparent frame.. otherwise there will be no way to get it back
+	// show the parent frame.. otherwise there will be no way to get it back
 	if(!c->window()->frame()->isVisible())
 	{
 		c->window()->frame()->show();
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 1ef36b5..8d08747 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -43,7 +43,7 @@ static bool editor_module_cleanup(KviModule *m)
 {
 	while(g_pScriptEditorWindowList->first())
 	{
-		TQObject * w = g_pScriptEditorWindowList->first()->tqparent();;
+		TQObject * w = g_pScriptEditorWindowList->first()->parent();;
 		while(w)
 		{
 			//debug("%s %s %i %s",__FILE__,__FUNCTION__,__LINE__,w->className());
@@ -54,7 +54,7 @@ static bool editor_module_cleanup(KviModule *m)
 			//	debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
 				break;
 			}
-		w = w->tqparent();
+		w = w->parent();
 		}
 		delete g_pScriptEditorWindowList->first();
 	}
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 498da23..25508d6 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -74,8 +74,8 @@ static TQColor g_clrFind(0,0,0);
 
 static TQFont g_fntNormal("Courier New",8);
 
-KviCompletionBox::KviCompletionBox(TQWidget * tqparent = 0)
-: KviTalListBox(tqparent)
+KviCompletionBox::KviCompletionBox(TQWidget * parent = 0)
+: KviTalListBox(parent)
 {
 	setPaletteForegroundColor(TQColor(0,0,0));
 	setPaletteBackgroundColor(TQColor(255,255,255));
@@ -323,7 +323,7 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e)
 			case TQt::Key_Return:
 			case TQt::Key_Backspace:
 			case TQt::Key_PageUp:
-				 e->ignore(); // allow the tqparent to process it
+				 e->ignore(); // allow the parent to process it
 				 return;
 			break;
 		}
@@ -1117,10 +1117,10 @@ void KviScriptEditorImplementation::configureColors()
 		saveOptions();
 	}
 }
-KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* tqparent, const char* name)
-    : TQDialog( tqparent)
+KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, const char* name)
+    : TQDialog( parent)
 {
-	m_pParent=tqparent;
+	m_pParent=parent;
 	emit initFind();
 	setPaletteForegroundColor( TQColor( 0, 0, 0 ) );
 	setPaletteBackgroundColor( TQColor( 236, 233, 216 ) );
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 9163572..4802be3 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -47,7 +47,7 @@ class KviCompletionBox: public KviTalListBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviCompletionBox(TQWidget * tqparent);
+	KviCompletionBox(TQWidget * parent);
 	~KviCompletionBox(){};
 	
 	void updateContents(TQString word);
@@ -176,7 +176,7 @@ class KviScriptEditorReplaceDialog: public TQDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviScriptEditorReplaceDialog( TQWidget* tqparent = 0, const char* name = 0);
+	KviScriptEditorReplaceDialog( TQWidget* parent = 0, const char* name = 0);
     ~KviScriptEditorReplaceDialog();
 	TQLineEdit *m_pFindlineedit;
 	TQLineEdit *m_pReplacelineedit;
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index d967bb7..fc7a4d4 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -141,7 +141,7 @@ void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 	if(it)
 	{
 		m_pContextPopup->clear();
-		if(it->tqparent())
+		if(it->parent())
 		{
 			TQString tmp;
 			if(!(((KviEventHandlerListViewItem *)it)->m_bEnabled))
@@ -210,7 +210,7 @@ void KviEventEditor::addHandlerForCurrentEvent()
 	KviTalListViewItem * it = m_pListView->selectedItem();
 	if(it)
 	{
-		if(it->tqparent() == 0)
+		if(it->parent() == 0)
 		{
 			TQString buffer = __tr2qs("default");
 			getUniqueHandlerName((KviEventListViewItem *)it,buffer);
@@ -284,7 +284,7 @@ void KviEventEditor::saveLastEditedItem()
 	TQString buffer = m_pNameEditor->text();
 	if(!KviTQString::equalCI(buffer,m_pLastEditedItem->m_szName))
 	{
-		getUniqueHandlerName((KviEventListViewItem *)(m_pLastEditedItem->tqparent()),buffer);
+		getUniqueHandlerName((KviEventListViewItem *)(m_pLastEditedItem->parent()),buffer);
 	}
 
 	m_pLastEditedItem->m_szName = buffer;
@@ -298,7 +298,7 @@ void KviEventEditor::selectionChanged(KviTalListViewItem * it)
 {
 	__range_valid(m_bOneTimeSetupDone);
 	saveLastEditedItem();
-	if(it->tqparent())
+	if(it->parent())
 	{
 		m_pLastEditedItem = (KviEventHandlerListViewItem *)it;
 		m_pNameEditor->setEnabled(true);
@@ -330,14 +330,14 @@ void KviEventEditor::showEvent(TQShowEvent *e)
 
 void KviEventEditor::getExportEventBuffer(TQString &buffer,KviEventHandlerListViewItem * it)
 {
-	if(!it->tqparent())return;
+	if(!it->parent())return;
 
 	TQString szBuf = it->m_szBuffer;
 
 	KviCommandFormatter::blockFromBuffer(szBuf);
 	
 	buffer = "event(";
-	buffer += ((KviEventListViewItem *)(it->tqparent()))->m_szName;
+	buffer += ((KviEventListViewItem *)(it->parent()))->m_szName;
 	buffer += ",";
 	buffer += it->m_szName;
 	buffer += ")\n";
@@ -348,7 +348,7 @@ void KviEventEditor::getExportEventBuffer(TQString &buffer,KviEventHandlerListVi
 	{
 		buffer += "\n";
 		buffer += "eventctl -d ";
-		buffer += ((KviEventListViewItem *)(it->tqparent()))->m_szName;
+		buffer += ((KviEventListViewItem *)(it->parent()))->m_szName;
 		buffer += " ";
 		buffer += it->m_szName;
 	}
@@ -362,7 +362,7 @@ void KviEventEditor::exportCurrentHandler()
 
 	TQString szName = TQDir::homeDirPath();
 	if(!szName.endsWith(TQString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
-	szName += ((KviEventListViewItem *)(m_pLastEditedItem->tqparent()))->m_szName;
+	szName += ((KviEventListViewItem *)(m_pLastEditedItem->parent()))->m_szName;
 	szName += ".";
 	szName += m_pLastEditedItem->m_szName;
 	szName += ".kvs";
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 90873c3..e01b316 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -232,10 +232,10 @@ void KviLinksWindow::endOfLinks()
 			if(l->host.contains('*'))wildServers++;
 			it = insertLink(l);
 			if(!it){
-				output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing tqparent (%s) for %s (%d hops): %s (used /LINKS <tqmask> ?)"),
-					l->tqparent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
+				output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing parent (%s) for %s (%d hops): %s (used /LINKS <mask> ?)"),
+					l->parent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
 				brokenLinks++;
-				KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->tqparent.ptr());
+				KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
 				KviStr tmp2(KviStr::Format,"%d",l->hops);
 				if(root)it = new KviTalListViewItem(m_pListView,root,TQString(l->host.ptr()),TQString(tmp2.ptr()),TQString(tmp.ptr()));
 				else {
@@ -243,7 +243,7 @@ void KviLinksWindow::endOfLinks()
 					it = new KviTalListViewItem(m_pListView,TQString(l->host.ptr()),TQString(tmp2.ptr()),TQString(tmp.ptr()));
 				}
 			} else {
-				it = it->tqparent();
+				it = it->parent();
 				if(it)
 				{
 					int links = it->childCount() + 1;
@@ -307,7 +307,7 @@ void KviLinksWindow::endOfLinks()
 KviTalListViewItem * KviLinksWindow::insertLink(KviLink *l)
 {
 	__range_valid(l->hops > 0);
-	KviTalListViewItem * i = getItemByHost(l->tqparent.ptr(),0);
+	KviTalListViewItem * i = getItemByHost(l->parent.ptr(),0);
 	KviTalListViewItem * it = 0;
 	if(!i)return 0;
 	else {
@@ -405,7 +405,7 @@ void KviLinksWindow::processData(KviIrcMessage *msg)
 	KviLink * l = new KviLink;
 
 	l->host = msg->safeParam(1);
-	l->tqparent = msg->safeParam(2);
+	l->parent = msg->safeParam(2);
 
 	const char * tr = msg->safeTrailing();
 
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index d21a604..d0af9eb 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -39,7 +39,7 @@ class KviThemedLabel;
 typedef struct _KviLink
 {
 	KviStr host;
-	KviStr tqparent;
+	KviStr parent;
 	int hops;
 	KviStr description;
 } KviLink;
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index bdc4083..97d5035 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -116,13 +116,13 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	l = new TQLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);
 	tqlayout->addMultiCellWidget(l,5,5,0,1);
 
-	l = new TQLabel(__tr2qs_ctx("Log name tqmask:","logview"),m_pSearchTab);
+	l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
 	m_pFileNameMask = new TQLineEdit(m_pSearchTab);
 	connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
 	tqlayout->addWidget(l,6,0);
 	tqlayout->addWidget(m_pFileNameMask,6,1);
 
-	l = new TQLabel(__tr2qs_ctx("Log contents tqmask:","logview"),m_pSearchTab);
+	l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
 	m_pContentsMask = new TQLineEdit(m_pSearchTab);
 	connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
 	tqlayout->addWidget(l,7,0);
@@ -340,9 +340,9 @@ void KviLogViewMDIWindow::cacheFileList()
 void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
 {
 	bool bCompressed=0;
-	//A tqparent node
+	//A parent node
 	m_pIrcView->clearBuffer();
-	if(!it || !it->tqparent() || !(((KviLogListViewItem *)it)->m_pFileData) )
+	if(!it || !it->parent() || !(((KviLogListViewItem *)it)->m_pFileData) )
 	{
 		return;
 	}
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 8a2a503..96546e7 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -93,7 +93,7 @@ protected:
 	TQLineEdit          * m_pFileNameMask;
 	TQLineEdit          * m_pContentsMask;
 
-	// Date/time tqmask
+	// Date/time mask
 	TQCheckBox          * m_pEnableFromFilter;
 	TQCheckBox          * m_pEnableToFilter;
 	TQDateEdit          * m_pFromDateEdit;
diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp
index 0c75fc5..03d5c1a 100644
--- a/src/modules/mask/libkvimask.cpp
+++ b/src/modules/mask/libkvimask.cpp
@@ -28,140 +28,140 @@
 #include "kvi_ircmask.h"
 
 	/*
-		@doc: tqmask.match
+		@doc: mask.match
 		@type:
 			function
 		@title:
-			$tqmask.match
+			$mask.match
 		@short:
-			Matches a tqmask agains a wildcarded one
+			Matches a mask agains a wildcarded one
 		@syntax:
-			<boolean> $tqmask.match(<wildcard_tqmask:string>,<fixed_tqmask:string>)
+			<boolean> $mask.match(<wildcard_mask:string>,<fixed_mask:string>)
 		@description:
-			Returns 1 if the <wildcard_tqmask> matches <fixed_tqmask> and 0 otherwise.
-			<wildcard_tqmask> can obviously contain wildcards ('*' and '?').
+			Returns 1 if the <wildcard_mask> matches <fixed_mask> and 0 otherwise.
+			<wildcard_mask> can obviously contain wildcards ('*' and '?').
 		@example:
 			[example]
-			[cmd]if[/cmd]($tqmask.match(*!*@*.linux.it,$0))
-				[cmd]op[/cmd] [fnc]$tqmask.nick[/fnc]($0)
+			[cmd]if[/cmd]($mask.match(*!*@*.linux.it,$0))
+				[cmd]op[/cmd] [fnc]$mask.nick[/fnc]($0)
 			[/example]
 	*/
 
 static bool mask_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 { 
 
-	TQString wildtqmask,fixedtqmask;
+	TQString wildmask,fixedmask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("wildcard tqmask",KVS_PT_STRING,0,wildtqmask)
-		KVSM_PARAMETER("fixed tqmask",KVS_PT_STRING,0,fixedtqmask)
+		KVSM_PARAMETER("wildcard mask",KVS_PT_STRING,0,wildmask)
+		KVSM_PARAMETER("fixed mask",KVS_PT_STRING,0,fixedmask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk1(wildtqmask);
-	KviIrcMask mk2(fixedtqmask);
+	KviIrcMask mk1(wildmask);
+	KviIrcMask mk2(fixedmask);
 	c->returnValue()->setBoolean(mk1.matchesFixed(mk2.nick(),mk2.user(),mk2.host()));
 	return true;
 }
 
 	/*
-		@doc: tqmask.nick
+		@doc: mask.nick
 		@type:
 			function
 		@title:
-			$tqmask.nick
+			$mask.nick
 		@short:
-			Returns the nick part of an IRC tqmask
+			Returns the nick part of an IRC mask
 		@syntax:
-			<string> $tqmask.nick(<tqmask:string>)
+			<string> $mask.nick(<mask:string>)
 		@description:
-			Returns the nickname part of an IRC tqmask.
+			Returns the nickname part of an IRC mask.
 	*/
 
 static bool mask_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
 {
 
-	TQString tqmask;
+	TQString mask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk(tqmask);
+	KviIrcMask mk(mask);
 	c->returnValue()->setString(mk.nick());
 	return true;
 }
 
 	/*
-		@doc: tqmask.user
+		@doc: mask.user
 		@type:
 			function
 		@title:
-			$tqmask.user
+			$mask.user
 		@short:
-			Returns the username part of an IRC tqmask
+			Returns the username part of an IRC mask
 		@syntax:
-			<string> $tqmask.user(<tqmask:string>)
+			<string> $mask.user(<mask:string>)
 		@description:
-			Returns the username part of an IRC tqmask.
+			Returns the username part of an IRC mask.
 	*/
 
 static bool mask_kvs_fnc_user(KviKvsModuleFunctionCall * c)
 {
 
-	TQString tqmask;
+	TQString mask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk(tqmask);
+	KviIrcMask mk(mask);
 	c->returnValue()->setString(mk.user());
 	return true;
 }
 
 
 	/*
-		@doc: tqmask.host
+		@doc: mask.host
 		@type:
 			function
 		@title:
-			$tqmask.host
+			$mask.host
 		@short:
-			Returns the hostname part of an IRC tqmask
+			Returns the hostname part of an IRC mask
 		@syntax:
-			<string> $tqmask.host(<tqmask:string>)
+			<string> $mask.host(<mask:string>)
 		@description:
-			Returns the hostname part of an IRC tqmask.
+			Returns the hostname part of an IRC mask.
 	*/
 
 static bool mask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 {
-	TQString tqmask;
+	TQString mask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk(tqmask);
+	KviIrcMask mk(mask);
 	c->returnValue()->setString(mk.host());
 	return true;
 }
 
 
 	/*
-		@doc: tqmask.hasnumerichost
+		@doc: mask.hasnumerichost
 		@type:
 			function
 		@title:
-			$tqmask.hasNumericHost
+			$mask.hasNumericHost
 		@short:
-			Checks if a host part of a tqmask is numeric
+			Checks if a host part of a mask is numeric
 		@syntax:
-			<boolean> $tqmask.hasNumericHost(<tqmask: string>)
+			<boolean> $mask.hasNumericHost(<mask: string>)
 		@description:
-			Returns 1 if the hostname part of the tqmask is numeric (e.g : unresolved IPV4 or IPV6 address)
+			Returns 1 if the hostname part of the mask is numeric (e.g : unresolved IPV4 or IPV6 address)
 	*/
 
 
 static bool mask_kvs_fnc_hasnumerichost(KviKvsModuleFunctionCall * c)
 {
-	TQString tqmask;
+	TQString mask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk(tqmask);
+	KviIrcMask mk(mask);
 	c->returnValue()->setBoolean(mk.hasNumericHost());
 	return true;
 }
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index d0f2554..9f6e26a 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -47,7 +47,7 @@
 		[class]widget[/class]
 	@description:
 		This widget organizes buttons in a group.
-		It will be usually a tqparent for other child controls.
+		It will be usually a parent for other child controls.
 		You can either use a child tqlayout to manage the tqchildren geometries
 		or use $setColumnLayout function to manage the tqlayout automatically.
 		The class ineriths groupbox.
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index 490aabb..366cf5f 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -46,10 +46,10 @@
 	@description:
 		Rappresents a dialog object. The class is really
 		similar to the widget class, it has only a couple of minor differences.
-		A dialog is always a top-level widget, but if it has a tqparent, its default
-		location is centered on top of the tqparent. It will also share the tqparent's taskbar entry.
+		A dialog is always a top-level widget, but if it has a parent, its default
+		location is centered on top of the parent. It will also share the parent's taskbar entry.
 		If you call $setModal(1) then the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.
+		it will appear above its parent widget and block its input until it's closed.
 	@functions:
 */
 
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index aa9c8f8..40fc473 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -141,7 +141,7 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 
-	if(((TQWidget *)(pWidget->object()))->tqparent() != (TQObject *)_pDockWindow)
+	if(((TQWidget *)(pWidget->object()))->parent() != (TQObject *)_pDockWindow)
 	{
 		c->warning(__tr2qs("The added widget is not a child of this dock window"));
 	}
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index f741f70..07f73be 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -59,7 +59,7 @@ const int align_cod[] = {
 		[class]widget[/class]
 	@description:
 		This widget can be used to display a groupbox.
-		It will be usually a tqparent for other child controls.
+		It will be usually a parent for other child controls.
 		You can either use a child tqlayout to manage the tqchildren geometries
 		or use $setColumnLayout to manage the tqlayout automatically.
 	@functions:
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 1a23aa4..ce2c536 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -196,9 +196,9 @@ const int frame_cod[] = {
 		[pre]
 		Plain       - no 3D effect (draws using foreground color)[br]
 		Raised      - makes the label look like it was raised above the
-		tqparent widget[br]
+		parent widget[br]
 		Sunken      - makes the label look like it was "pushed" inside
-		the tqparent widget[br]
+		the parent widget[br]
 		[/pre]
 		!fn: $setImage(<image_id>)
 		Sets the image to be displayed on this label. 
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 3cc6a0e..b2842a8 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -55,7 +55,7 @@
 		The tqlayout is a tqgeometry management tool for child widgets.
 		You create a tqlayout , give it some widgets to manage and it will tqlayout them
 		automatically.[br]
-		The tqparent of the tqlayout must be the widget for which child widget geometries have to be managed.
+		The parent of the tqlayout must be the widget for which child widget geometries have to be managed.
 		A tqlayout is a grid of NxM cells in which you insert child widgets with [classfnc:tqlayout]$addWidget[/classfnc]().[br]
 		Widgets that must span multiple cells can be added to the tqlayout with [classfnc:tqlayout]$addMultiCellWidget[/classfnc]().[br]
 	@functions:
@@ -80,12 +80,12 @@
 		!fn: $setMargin(<margin:uint>)
 		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setResizeMode(<resize_mode:string>)
-		Sets the resize mode of the tqparent widget in relation to this tqlayout.
+		Sets the resize mode of the parent widget in relation to this tqlayout.
 		<mode> can be one of:[br]
 		-Auto: this is the default[br]
-		-Fixed: the tqparent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br]
-		-Minimum: the minimum size of the tqparent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
-		-FreeResize: the tqparent widget of this tqlayout is not constrained at all[br]
+		-Fixed: the parent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br]
+		-Minimum: the minimum size of the parent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
+		-FreeResize: the parent widget of this tqlayout is not constrained at all[br]
 */
 
 
@@ -116,7 +116,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 
 	if(!w)
 	{
-		pContext->warning(__tr2qs("The tqparent of a tqlayout must be a widget!"));
+		pContext->warning(__tr2qs("The parent of a tqlayout must be a widget!"));
 		return false;
 	}
 	setObject(TQT_TQOBJECT(new TQGridLayout(w)));
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index 8844d1b..868ce8f 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -128,8 +128,8 @@ static const int mode_cod[] =  {
 		With this property user can drag text in the lineedit.
 		!fn: $setReadOnly(<bReadonly:boolean>)
 		Sets the lineedit to read only mode.
-		!fn: $setInputMask(<tqmask:string>)
-		Sets the validation input tqmask to inputMask.[br]
+		!fn: $setInputMask(<mask:string>)
+		Sets the validation input mask to inputMask.[br]
 		Example:[br]
 		[br]
 		%esempio->$setInputMask( "+99 99 99 99 99;_" );[br]
@@ -137,7 +137,7 @@ static const int mode_cod[] =  {
 		%esempio->Ip Number Mask.[br]
 		%esempio->setInputMask( ">AAAAA-AAAAA-AAAAA-AAAAA-AAAAA;#" );[br]
 		[br]
-		The tqmask format understands these tqmask characters:[br]
+		The mask format understands these mask characters:[br]
 		Character		Meaning[br]
 		A			ASCII alphabetic character required. A-Z, a-z.[br]
 		a			ASCII alphabetic character permitted but not required.[br]
@@ -155,7 +155,7 @@ static const int mode_cod[] =  {
 		!			Switch off case conversion.[br]
 		\			Use \ to escape the special characters listed above to use them as separators.[br]
 		[br]
-		The tqmask consists of a string of tqmask characters and separators, optionally[br]
+		The mask consists of a string of mask characters and separators, optionally[br]
 		followed by a semi-colon and the character used for blanks: the blank characters [br]
 		are always removed from the text after editing. The default blank character is space. [br]
 		!fn: $returnPressedEvent()
@@ -407,7 +407,7 @@ bool KviKvsObject_lineedit::functionSetInputMask(KviKvsObjectFunctionCall *c)
 {
 	TQString szMask;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSO_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSO_PARAMETERS_END(c)
 	if (widget())
 		((TQLineEdit *)widget())->setInputMask(szMask);
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 8dd485a..1bfe95a 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -59,7 +59,7 @@
 		will add the items to the listview and simply deleting them will remove them.
 		Allocating a [class]listviewitem[/class] item2 as a child of item1 will insert it to the same listview creating
 		a subtree of items spannig from item1. The subtree can be opened or closed by a simple click either
-		on the tqparent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc]
+		on the parent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc]
 		is set to $true. The listview can be in Single, Multi, Extended or NoSelection selection mode.
 		In single selection mode there can be only one selected item at a time and the selected item is also
 		the current item (this mode is the default). In Multi and Extended selection mode there can be multiple selected items
@@ -510,10 +510,10 @@ void KviKvsObject_listview::fileDropped(TQString &szFile,KviTalListViewItem *ite
 	callFunction(this,"fileDroppedEvent",0,&params);
 }
 
-KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObject_listview *tqparent)
+KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObject_listview *parent)
 :KviTalListView(par)
 {
-	m_pParentScript=tqparent;
+	m_pParentScript=parent;
 	setAcceptDrops(true);
 	viewport()->setAcceptDrops( TRUE );
 
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index f382628..49c448e 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -46,7 +46,7 @@
 		The listviewitem class implements a list view item.
 		A list view item is a multi-column object capable of displaying itself in a [class]listview[/class].
 		To use this class you must instantiate it with another listviewitem or a [class]listview[/class]
-		as tqparent. The item will be automatically displayed.
+		as parent. The item will be automatically displayed.
 		You can set the text and a pixmap in each column and you can make it checkable
 		with [classfnc:listviewitem]$setCheckable[/classfnc]().
 		A checkable listviewitem will display a small check mark in the first column.
@@ -149,7 +149,7 @@ bool KviKvsObject_listviewitem::init(KviKvsRunTimeContext * pContext,KviKvsVaria
 		if(parentObject()->inherits("KviKvsObject_listview"))
 			m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)parentScriptWidget()));
 		else {
-			pContext->error(__tr2qs("The tqparent of the listviewitem must be either another listviewitem or a listview"));
+			pContext->error(__tr2qs("The parent of the listviewitem must be either another listviewitem or a listview"));
 			return false;
 		}
 	}
@@ -335,7 +335,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
 	if(bCheckable)
 	{
 		if(m_pListViewItem->rtti() == 1)return true; // a TQCheckListItem already
-		KviTalListViewItem * pParent = m_pListViewItem->tqparent();
+		KviTalListViewItem * pParent = m_pListViewItem->parent();
 		KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
 		// swap the items, so we don't die now
 		KviTalListViewItem * pThis = m_pListViewItem;
@@ -347,7 +347,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
 			m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pLV);
 	} else {
 		if(m_pListViewItem->rtti() != 1)return true; // not a TQCheckListItem yet
-		KviTalListViewItem * pParent = m_pListViewItem->tqparent();
+		KviTalListViewItem * pParent = m_pListViewItem->parent();
 		KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
 		// swap the items, so we don't die now
 		KviTalListViewItem * pThis = m_pListViewItem;
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index a9adda3..826d119 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -311,14 +311,14 @@
 		[br]
 		privateimpl(%Btn,mousepressevent)[br] 
 		{[br] 
-			if ($$->$tqparent->%nextanim==0) [br] 
+			if ($$->$parent->%nextanim==0) [br] 
 			{[br] 
-				$$->$tqparent->%nextanim=1[br] 
+				$$->$parent->%nextanim=1[br] 
 				$$->$settext(Prev)[br] 
 			} [br] 
 			else[br] 
 			{[br] 
-				$$->$tqparent->%nextanim=0[br] 
+				$$->$parent->%nextanim=0[br] 
 				$$->$settext(Next)[br] 
 			}[br]
 		}[br] 
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 637feff..2b58acd 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -81,7 +81,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 {
 	if (!parentObject())
 	{	
-		pContext->warning(__tr2qs("the toolbar cannot be a tqparent-widget!"));
+		pContext->warning(__tr2qs("the toolbar cannot be a parent-widget!"));
 		return true;
 	}
 	if(parentObject()->inherits("KviKvsObject_mainwindow"))
@@ -90,7 +90,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 	}
 	else
 	{
-		pContext->warning(__tr2qs("The tqparent-widget isn't a MainWindow."));
+		pContext->warning(__tr2qs("The parent-widget isn't a MainWindow."));
 	}
 	
 	return true;
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 3e6b4b6..4ff98d6 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -147,11 +147,11 @@ const int widgettypes_cod[] = {
 		If erase is TRUE, erases the widget before the $paintEvent() call.
 		!fn: $x()
 		Returns the x coordinate of the upper-left corner
-		of this widget relative to the tqparent widget,
+		of this widget relative to the parent widget,
 		or to the desktop if this widget is a toplevel one.
 		!fn: $y()
 		Returns the y coordinate of the uspper-left corner
-		of this widget relative to the tqparent widget,
+		of this widget relative to the parent widget,
 		or to the desktop if this widget is a toplevel one.
 		!fn: $width()
 		Returns the width of this widget in pixels.
@@ -162,7 +162,7 @@ const int widgettypes_cod[] = {
 		x, y, width, height.
 		!fn: $setGeometry(<x_or_array>,[<y>,<width>,<heigth>])
 		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.
 		!fn: $setMinimumWidth(<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].
 		!fn: $move(<x_or_array>[,<y>])
 		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>,
 		[classfnc]$width[/classfnc](),[classfnc]$height[/classfnc]()).
 		!fn: $resize(<w_or_array>,[height])
@@ -212,10 +212,10 @@ const int widgettypes_cod[] = {
 		See also [classfnc]$show[/classfnc]() and [classfnc]$hide[/classfnc]().
 		!fn: $raise()
 		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()
 		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()
 		Returns '1' if this widget has the keyboard focus.
 		See also [classfnc]$setFocus[/classfnc].
@@ -223,7 +223,7 @@ const int widgettypes_cod[] = {
 		Sets this widget to be the one that receives keyboard events.
 		See also [classfnc]$hasFocus[/classfnc]
 		!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.
 		!fn: $backgroundColor()
 		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();
 #ifdef COMPILE_USE_QT4
-	TQBitmap tqmask(pm->tqmask());
+	TQBitmap mask(pm->mask());
 #else
-	TQBitmap tqmask(*pm->tqmask());
+	TQBitmap mask(*pm->mask());
 #endif
-	if (tqmask.isNull()) c->warning(__tr2qs("Null tqmask"));
-	widget()->setMask(tqmask);
+	if (mask.isNull()) c->warning(__tr2qs("Null mask"));
+	widget()->setMask(mask);
 	return true;
 }
 #ifdef COMPILE_USE_QT4
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 732e6f4..393c296 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -87,9 +87,9 @@ void KviKvsScriptWindowWindow::centralWidgetDestroyed()
 		[class]widget[/class]
 	@description:
 		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
-		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.
 		This class can manage only a single central child widget that must
 		be set with $setCentralWidget().
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 3ea0c13..13c9bf8 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -340,10 +340,10 @@ void KviKvsObject_wizard::backClicked()
 	KviKvsVariantList *params=0;
 	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)
 {
-	m_pParentScript=tqparent;
+	m_pParentScript=parent;
 	connect (this->backButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotBackClicked()));
 	connect (this->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextClicked()));
 }
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index b91af10..977c8c9 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -86,7 +86,7 @@
 #include "class_dockwindow.h"
 #include "class_vbox.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)
 {
@@ -910,10 +910,10 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 	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
-	const TQObjectList list = tqparent->tqchildren();
+	const TQObjectList list = parent->tqchildren();
 	if( !list.count() ) return;
 	TQString sp(spacing);
 	sp.append(">");
@@ -942,7 +942,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *sp
 	}
 
 #else
-	const TQObjectList l = tqparent->childrenListObject();
+	const TQObjectList l = parent->childrenListObject();
 	if( l.isEmpty() ) return;
 	TQObjectListIt it(l);
 	TQString sp(spacing);
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index d86abbb..c0b7bf8 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -94,7 +94,7 @@ void KviOptionsWidgetContainer::closeEvent(TQCloseEvent *e)
 
 void KviOptionsWidgetContainer::showEvent(TQShowEvent *e)
 {
-	if(tqparent() == 0)
+	if(parent() == 0)
 	{
 		move((g_pApp->desktop()->width() - width()) / 2,
 			(g_pApp->desktop()->height() - height()) / 2);
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 4f53ad1..b00eba6 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -61,8 +61,8 @@ extern KviPointerHashTable<TQString,KviOptionsDialog> * g_pOptionsDialogDict;
 extern KVIRC_API KviApp * g_pApp;
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText)
-:KviOptionsWidget(tqparent,"general_options_front_widget")
+KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,const TQString &szText)
+:KviOptionsWidget(parent,"general_options_front_widget")
 {
 	createLayout(1,1);
 	TQLabel * l = new TQLabel(szText,this);
@@ -80,8 +80,8 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
 
 
 
-KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e)
-:KviTalListViewItem(tqparent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(parent,e->szName)
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -89,8 +89,8 @@ KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptio
 	setPixmap(0,*(g_pIconManager->getSmallIcon(e->iIcon)));
 }
 
-KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e)
-:KviTalListViewItem(tqparent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(parent,e->szName)
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -272,7 +272,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 
 	fillListView(0,g_pOptionsInstanceManager->instanceEntryTree(),szGroup);
 	
-	if(!tqparent())
+	if(!parent())
 	{
 
 		if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5)
@@ -293,7 +293,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 
 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());
 	if(g_pOptionsDialogDict)
 		g_pOptionsDialogDict->remove(m_szGroup);
@@ -378,8 +378,8 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 					font.setUnderline(bOk);
 					pWidget->setFont(font);
 
-					// if there is a TQTabWidget in the tqparent chain, signal it in the tab text
-					TQObject * pParent = pWidget->tqparent();
+					// if there is a TQTabWidget in the parent chain, signal it in the tab text
+					TQObject * pParent = pWidget->parent();
 					while(pParent)
 					{
 						if(pParent->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
@@ -387,13 +387,13 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 							pTabWidgetToMark = (TQTabWidget *)pParent;
 							break;
 						}
-						pParent = pParent->tqparent();
+						pParent = pParent->parent();
 					}
 
 					if(pTabWidgetToMark)
 					{
-						// lookup the KviOptionsWidget tqparent
-						pParent = pWidget->tqparent();
+						// lookup the KviOptionsWidget parent
+						pParent = pWidget->parent();
 						while(pParent)
 						{
 							if(pParent->inherits("KviOptionsWidget"))
@@ -408,7 +408,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 								}
 								break;
 							}
-							pParent = pParent->tqparent();
+							pParent = pParent->parent();
 						}
 					}
 				}
@@ -549,13 +549,13 @@ void KviOptionsDialog::listViewItemSelectionChanged(KviTalListViewItem *it)
 	if(it)
 	{
 		TQString str = it->text(0);
-		KviTalListViewItem * par = it->tqparent();
+		KviTalListViewItem * par = it->parent();
 
 		while(par)
 		{
 			str.prepend(" :: ");
 			str.prepend(par->text(0));
-			par = par->tqparent();
+			par = par->parent();
 		}
 		str.prepend("<b>");
 		str += "</b>";
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 267c552..1d04b0d 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -44,15 +44,15 @@ class KviGeneralOptionsFrontWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText);
+	KviGeneralOptionsFrontWidget(TQWidget *parent,const TQString &szText);
 	~KviGeneralOptionsFrontWidget();
 };
 
 class KviOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e);
-	KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e);
+	KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e);
+	KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e);
 	~KviOptionsListViewItem();
 public:
 	KviOptionsWidgetInstanceEntry * m_pInstanceEntry;
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index c338f4a..7e1e896 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -76,409 +76,409 @@
 
 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->tqparent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
-					delete e->pWidget->tqparent();
+					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
 					debug("Ops...i have deleted the options dialog ?");
@@ -3504,9 +3504,9 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		g_iOptionWidgetInstances++;
 		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));
 		delete oldPar;
 	}
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index eeb2d8a..809fd55 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -103,12 +103,12 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 	{
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			if(d->tqparent())
+			if(d->parent())
 			{
 				d->reparent(0,TQPoint(0,0),true);
 			}
 		} 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);
 			}
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index fd1d7ff..1a25a14 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -160,9 +160,9 @@ EOF
 
 for aclass in $CLASS_LIST; do
 	echo -n "KviOptionsWidget * class$aclass" >> $TARGET
-		echo "_createInstanceProc(QWidget * tqparent)" >> $TARGET
+		echo "_createInstanceProc(QWidget * parent)" >> $TARGET
 	echo "{" >> $TARGET
-	echo "	return new $aclass(tqparent);" >> $TARGET
+	echo "	return new $aclass(parent);" >> $TARGET
 	echo "}" >> $TARGET
 	echo "" >> $TARGET
 done
@@ -308,10 +308,10 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->tqparent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
-					delete e->pWidget->tqparent();
+					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
 					debug("Ops...i have deleted the options dialog ?");
@@ -352,9 +352,9 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		g_iOptionWidgetInstances++;
 		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));
 		delete oldPar;
 	}
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index b317307..43cc13e 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -31,8 +31,8 @@
 
 
 
-KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"antispam_options_widget")
+KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"antispam_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_antispam.h b/src/modules/options/optw_antispam.h
index 5e7f9be..98db48c 100644
--- a/src/modules/options/optw_antispam.h
+++ b/src/modules/options/optw_antispam.h
@@ -33,7 +33,7 @@ class KviAntispamOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAntispamOptionsWidget(TQWidget * tqparent);
+	KviAntispamOptionsWidget(TQWidget * parent);
 	~KviAntispamOptionsWidget();
 protected:
 	KviBoolSelector * m_b1;
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index 5816584..d01e456 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -30,8 +30,8 @@
 
 #include "kvi_tal_tooltip.h"
 
-KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"avatar_advanced_options_widget")
+KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"avatar_advanced_options_widget")
 {
 	createLayout(4,1);
 	// AVATAR
diff --git a/src/modules/options/optw_avatar.h b/src/modules/options/optw_avatar.h
index 003f8d8..f2f2cb6 100644
--- a/src/modules/options/optw_avatar.h
+++ b/src/modules/options/optw_avatar.h
@@ -39,7 +39,7 @@ class KviAvatarAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAvatarAdvancedOptionsWidget(TQWidget * tqparent);
+	KviAvatarAdvancedOptionsWidget(TQWidget * parent);
 	~KviAvatarAdvancedOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 3f67fa2..0faf216 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -31,8 +31,8 @@
 //#warning "Info tips"
 
 
-KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"away_options_widget")
+KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"away_options_widget")
 {
 	createLayout(4,1);
 
diff --git a/src/modules/options/optw_away.h b/src/modules/options/optw_away.h
index 53d342b..f4a0487 100644
--- a/src/modules/options/optw_away.h
+++ b/src/modules/options/optw_away.h
@@ -33,7 +33,7 @@ class KviAwayOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAwayOptionsWidget(TQWidget * tqparent);
+	KviAwayOptionsWidget(TQWidget * parent);
 	~KviAwayOptionsWidget();
 protected: 
 	KviBoolSelector		* m_pEnableAwayNick;
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 3427522..ecd026f 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -31,8 +31,8 @@
 #include <tqradiobutton.h>
 
 
-KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"connection_options_widget")
+KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"connection_options_widget")
 {
 
 	createLayout(2,1);
@@ -114,8 +114,8 @@ KviConnectionOptionsWidget::~KviConnectionOptionsWidget()
 
 
 
-KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ssl_options_widget")
+KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ssl_options_widget")
 {
 #ifdef COMPILE_SSL_SUPPORT
 	createLayout(3,1);
@@ -156,8 +156,8 @@ KviSSLOptionsWidget::~KviSSLOptionsWidget()
 
 
 
-KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"transport_options_widget")
+KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"transport_options_widget")
 {
 	createLayout(5,1);
 	KviUIntSelector * u;
@@ -202,8 +202,8 @@ KviTransportOptionsWidget::~KviTransportOptionsWidget()
 
 
 
-KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ident_options_widget")
+KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ident_options_widget")
 {
 	createLayout(6,1);
 
@@ -307,8 +307,8 @@ void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
 
 
 
-KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"connection_advanced_options_widget")
+KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"connection_advanced_options_widget")
 {
 
 }
diff --git a/src/modules/options/optw_connection.h b/src/modules/options/optw_connection.h
index fd180e4..907f57f 100644
--- a/src/modules/options/optw_connection.h
+++ b/src/modules/options/optw_connection.h
@@ -33,7 +33,7 @@ class KviConnectionOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviConnectionOptionsWidget(TQWidget * tqparent);
+	KviConnectionOptionsWidget(TQWidget * parent);
 	~KviConnectionOptionsWidget();
 };
 
@@ -48,7 +48,7 @@ class KviConnectionAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviConnectionAdvancedOptionsWidget(TQWidget * tqparent);
+	KviConnectionAdvancedOptionsWidget(TQWidget * parent);
 	~KviConnectionAdvancedOptionsWidget();
 };
 
@@ -65,7 +65,7 @@ class KviSSLOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviSSLOptionsWidget(TQWidget * tqparent);
+	KviSSLOptionsWidget(TQWidget * parent);
 	~KviSSLOptionsWidget();
 };
 
@@ -82,7 +82,7 @@ class KviTransportOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTransportOptionsWidget(TQWidget * tqparent);
+	KviTransportOptionsWidget(TQWidget * parent);
 	~KviTransportOptionsWidget();
 };
 
@@ -99,7 +99,7 @@ class KviIdentOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIdentOptionsWidget(TQWidget * tqparent);
+	KviIdentOptionsWidget(TQWidget * parent);
 	~KviIdentOptionsWidget();
 
 	virtual void commit();
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index 72a6d03..c3c7c11 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -30,8 +30,8 @@
 //	#include "kvi_tal_tooltip.h"
 //#endif
 
-KviCtcpOptionsWidget::KviCtcpOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ctcp_options_widget")
+KviCtcpOptionsWidget::KviCtcpOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ctcp_options_widget")
 {
 
 	createLayout(4,1);
diff --git a/src/modules/options/optw_ctcp.h b/src/modules/options/optw_ctcp.h
index 745f0bb..7cb1e54 100644
--- a/src/modules/options/optw_ctcp.h
+++ b/src/modules/options/optw_ctcp.h
@@ -34,7 +34,7 @@ class KviCtcpOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviCtcpOptionsWidget(TQWidget * tqparent);
+	KviCtcpOptionsWidget(TQWidget * parent);
 	~KviCtcpOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index 9d03daa..a0604d9 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -71,8 +71,8 @@
 */
 
 
-KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ctcpfloodprotection_options_widget")
+KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ctcpfloodprotection_options_widget")
 {
 	createLayout(4,2);
 
diff --git a/src/modules/options/optw_ctcpfloodprotection.h b/src/modules/options/optw_ctcpfloodprotection.h
index 0462c43..1d00d32 100644
--- a/src/modules/options/optw_ctcpfloodprotection.h
+++ b/src/modules/options/optw_ctcpfloodprotection.h
@@ -35,7 +35,7 @@ class KviCtcpFloodProtectionOptionsWidget : public KviOptionsWidget
   TQ_OBJECT
 //	TQ_CLASSINFO("help","ctcpfloodprotectionoptions")
 public:
-	KviCtcpFloodProtectionOptionsWidget(TQWidget * tqparent);
+	KviCtcpFloodProtectionOptionsWidget(TQWidget * parent);
 	~KviCtcpFloodProtectionOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index d6d66e2..8ddf15b 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -43,8 +43,8 @@ KviDccOptionsWidget::~KviDccOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccgeneral_options_widget")
+KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccgeneral_options_widget")
 {
 	createLayout(2,1);
 
@@ -65,8 +65,8 @@ KviDccGeneralOptionsWidget::~KviDccGeneralOptionsWidget()
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccgeneral_options_widget")
+KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccgeneral_options_widget")
 {
 	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>" \
 			"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>" \
-			"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
 
 	b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),
@@ -177,8 +177,8 @@ KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccSendOptionsWidget::KviDccSendOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccsend_options_widget")
+KviDccSendOptionsWidget::KviDccSendOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccsend_options_widget")
 {
 }
 
@@ -188,8 +188,8 @@ KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
 
 
 
-KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccsend_options_widget")
+KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccsend_options_widget")
 {
 	createLayout(5,1);
 
@@ -230,8 +230,8 @@ KviDccSendGeneralOptionsWidget::~KviDccSendGeneralOptionsWidget()
 }
 
 
-KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccsend_advanced_options_widget")
+KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccsend_advanced_options_widget")
 {
 	createLayout(4,1);
 
@@ -341,8 +341,8 @@ KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
 //}
 
 
-KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccchat_options_widget")
+KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccchat_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_dcc.h b/src/modules/options/optw_dcc.h
index 9058766..1021ef5 100644
--- a/src/modules/options/optw_dcc.h
+++ b/src/modules/options/optw_dcc.h
@@ -34,7 +34,7 @@ class KviDccOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccOptionsWidget(TQWidget * tqparent);
+	KviDccOptionsWidget(TQWidget * parent);
 	~KviDccOptionsWidget();
 };
 
@@ -50,7 +50,7 @@ class KviDccGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccGeneralOptionsWidget(TQWidget * tqparent);
+	KviDccGeneralOptionsWidget(TQWidget * parent);
 	~KviDccGeneralOptionsWidget();
 };
 
@@ -64,7 +64,7 @@ class KviDccAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccAdvancedOptionsWidget(TQWidget * tqparent);
+	KviDccAdvancedOptionsWidget(TQWidget * parent);
 	~KviDccAdvancedOptionsWidget();
 };
 
@@ -82,7 +82,7 @@ class KviDccSendOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccSendOptionsWidget(TQWidget * tqparent);
+	KviDccSendOptionsWidget(TQWidget * parent);
 	~KviDccSendOptionsWidget();
 };
 
@@ -96,7 +96,7 @@ class KviDccSendGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccSendGeneralOptionsWidget(TQWidget * tqparent);
+	KviDccSendGeneralOptionsWidget(TQWidget * parent);
 	~KviDccSendGeneralOptionsWidget();
 };
 
@@ -110,7 +110,7 @@ class KviDccSendAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccSendAdvancedOptionsWidget(TQWidget * tqparent);
+	KviDccSendAdvancedOptionsWidget(TQWidget * parent);
 	~KviDccSendAdvancedOptionsWidget();
 };
 
@@ -125,7 +125,7 @@ class KviDccChatOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccChatOptionsWidget(TQWidget * tqparent);
+	KviDccChatOptionsWidget(TQWidget * parent);
 	~KviDccChatOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index c411b73..76ecdf4 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -29,8 +29,8 @@
 #include "kvi_options.h"
 
 
-KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"generalopt_options_widget")
+KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"generalopt_options_widget")
 {
 
 	createLayout(1,4);
diff --git a/src/modules/options/optw_generalopt.h b/src/modules/options/optw_generalopt.h
index 7da3c28..2a1359a 100644
--- a/src/modules/options/optw_generalopt.h
+++ b/src/modules/options/optw_generalopt.h
@@ -33,7 +33,7 @@ class KviGeneralOptOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviGeneralOptOptionsWidget(TQWidget * tqparent);
+	KviGeneralOptOptionsWidget(TQWidget * parent);
 	~KviGeneralOptOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index bf12aaf..fdb8e90 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -31,8 +31,8 @@
 
 #include <tqlabel.h>
 
-KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"highlighting_options_widget")
+KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"highlighting_options_widget")
 {
 }
 
@@ -42,8 +42,8 @@ KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
 
 
 
-KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"highlighting_options_widget")
+KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"highlighting_options_widget")
 {
 	createLayout(7,1);
 
@@ -81,8 +81,8 @@ KviHighlightingOptionsWidget::~KviHighlightingOptionsWidget()
 
 
 
-KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"highlighting_options_widget")
+KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"highlighting_options_widget")
 {
 	createLayout(2,1);
 
diff --git a/src/modules/options/optw_highlighting.h b/src/modules/options/optw_highlighting.h
index 6f03a0d..e14e4e5 100644
--- a/src/modules/options/optw_highlighting.h
+++ b/src/modules/options/optw_highlighting.h
@@ -34,7 +34,7 @@ class KviAlertHighlightingOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAlertHighlightingOptionsWidget(TQWidget * tqparent);
+	KviAlertHighlightingOptionsWidget(TQWidget * parent);
 	~KviAlertHighlightingOptionsWidget();
 };
 
@@ -48,7 +48,7 @@ class KviHighlightingOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviHighlightingOptionsWidget(TQWidget * tqparent);
+	KviHighlightingOptionsWidget(TQWidget * parent);
 	~KviHighlightingOptionsWidget();
 };
 
@@ -62,7 +62,7 @@ class KviAlertOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAlertOptionsWidget(TQWidget * tqparent);
+	KviAlertOptionsWidget(TQWidget * parent);
 	~KviAlertOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 0f702ae..57b67a4 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -290,8 +290,8 @@ void KviAvatarSelectionDialog::closeEvent(TQCloseEvent * e)
 
 
 
-KviIdentityOptionsWidget::KviIdentityOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviIdentityOptionsWidget::KviIdentityOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 }
 
@@ -302,8 +302,8 @@ KviIdentityOptionsWidget::~KviIdentityOptionsWidget()
 
 
 
-KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	m_szAltNicknames[0] = KVI_OPTION_STRING(KviOption_stringNickname2);
 	m_szAltNicknames[1] = KVI_OPTION_STRING(KviOption_stringNickname3);
@@ -488,8 +488,8 @@ void KviIdentityGeneralOptionsWidget::commit()
 }
 
 
-KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(4,1);
 	tqlayout()->setMargin(10);
@@ -664,8 +664,8 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 
 
 
-KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	m_pISelector=0;
 	m_pWSelector=0;
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index 5170e4d..70edba1 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -114,7 +114,7 @@ class KviIdentityOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIdentityOptionsWidget(TQWidget * tqparent);
+	KviIdentityOptionsWidget(TQWidget * parent);
 	~KviIdentityOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index d164f64..9d6b56a 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -30,8 +30,8 @@
 //#warning "Info tips"
 
 
-KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ignore_options_widget")
+KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ignore_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_ignore.h b/src/modules/options/optw_ignore.h
index 92864f3..6969a52 100644
--- a/src/modules/options/optw_ignore.h
+++ b/src/modules/options/optw_ignore.h
@@ -35,7 +35,7 @@ class KviIgnoreOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIgnoreOptionsWidget(TQWidget * tqparent);
+	KviIgnoreOptionsWidget(TQWidget * parent);
 	~KviIgnoreOptionsWidget();
 public:
 	KviBoolSelector * m_pIgnorePrivmsg;
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index 210980e..c1ad6e8 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -28,8 +28,8 @@
 
 //#warning "Info tips"
 
-KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircviewlook_options_widget")
+KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircviewlook_options_widget")
 {
 	createLayout(10,2);
 
@@ -133,8 +133,8 @@ void KviInputLookOptionsWidget::commit()
 
 
 
-KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget")
+KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
 {
 	createLayout(6,1);
 
diff --git a/src/modules/options/optw_input.h b/src/modules/options/optw_input.h
index 0642ee7..47bda95 100644
--- a/src/modules/options/optw_input.h
+++ b/src/modules/options/optw_input.h
@@ -41,7 +41,7 @@ private:
 	TQComboBox* m_pHorizontalAlign;
 	TQComboBox* m_pVerticalAlign;
 public:
-	KviInputLookOptionsWidget(TQWidget * tqparent);
+	KviInputLookOptionsWidget(TQWidget * parent);
 	~KviInputLookOptionsWidget();
 	
 	virtual void commit();
@@ -56,7 +56,7 @@ class KviInputFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviInputFeaturesOptionsWidget(TQWidget * tqparent);
+	KviInputFeaturesOptionsWidget(TQWidget * parent);
 	~KviInputFeaturesOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index 0eb2766..780c493 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -33,8 +33,8 @@
 #include "kvi_app.h"
 #include "kvi_fileutils.h"
 
-KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"interfacefeatures_options_widget")
+KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"interfacefeatures_options_widget")
 {
 	createLayout(8,1);
 
diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/optw_interfacefeatures.h
index d302ce2..03fdb6d 100644
--- a/src/modules/options/optw_interfacefeatures.h
+++ b/src/modules/options/optw_interfacefeatures.h
@@ -38,7 +38,7 @@ class KviInterfaceFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviInterfaceFeaturesOptionsWidget(TQWidget * tqparent);
+	KviInterfaceFeaturesOptionsWidget(TQWidget * parent);
 	~KviInterfaceFeaturesOptionsWidget();
 protected:
 	TQCheckBox * m_pDisableSplash;
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 5b7dde1..1e2c998 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -31,8 +31,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(4,2);
 
@@ -53,8 +53,8 @@ KviThemeGeneralOptionsWidget::~KviThemeGeneralOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 
@@ -147,8 +147,8 @@ void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bo
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(7,1);
 
@@ -169,8 +169,8 @@ KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(2,1);
 
@@ -187,8 +187,8 @@ KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(9,1);
 	
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
index a631dbe..22651ce 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/optw_interfacelookglobal.h
@@ -39,7 +39,7 @@ class KviThemeGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeGeneralOptionsWidget(TQWidget * tqparent);
+	KviThemeGeneralOptionsWidget(TQWidget * parent);
 	~KviThemeGeneralOptionsWidget();
 };
 
@@ -55,7 +55,7 @@ class KviThemeTransparencyOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeTransparencyOptionsWidget(TQWidget * tqparent);
+	KviThemeTransparencyOptionsWidget(TQWidget * parent);
 	~KviThemeTransparencyOptionsWidget();
 protected:
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -82,7 +82,7 @@ class KviThemeMdiCaptionsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeMdiCaptionsOptionsWidget(TQWidget * tqparent);
+	KviThemeMdiCaptionsOptionsWidget(TQWidget * parent);
 	~KviThemeMdiCaptionsOptionsWidget();
 };
 
@@ -96,7 +96,7 @@ class KviThemeMdiAreaOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeMdiAreaOptionsWidget(TQWidget * tqparent);
+	KviThemeMdiAreaOptionsWidget(TQWidget * parent);
 	~KviThemeMdiAreaOptionsWidget();
 };
 
@@ -111,7 +111,7 @@ class KviThemeToolBarAppletsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeToolBarAppletsOptionsWidget(TQWidget * tqparent);
+	KviThemeToolBarAppletsOptionsWidget(TQWidget * parent);
 	~KviThemeToolBarAppletsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 56552a2..f39add0 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -31,8 +31,8 @@
 #include <tqcombobox.h>
 
 
-KviIrcOptionsWidget::KviIrcOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"irc_options_widget")
+KviIrcOptionsWidget::KviIrcOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"irc_options_widget")
 {
 }
 
@@ -42,8 +42,8 @@ KviIrcOptionsWidget::~KviIrcOptionsWidget()
 }
 
 
-KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"irc_options_widget")
+KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"irc_options_widget")
 {
 	createLayout(3,1);
 	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)
-: KviOptionsWidget(tqparent,"irc_advanced_options_widget")
+KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"irc_advanced_options_widget")
 {
 	createLayout(3,1);
 	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);
 	
-	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);
 	addWidgetToLayout(m_pBanTypeCombo,1,1,4,1);
 	
-	KviIrcMask hosttqmask("nick!user@machine.host.top");
-	KviIrcMask iptqmask("nick!user@192.168.1.2");
+	KviIrcMask hostmask("nick!user@machine.host.top");
+	KviIrcMask ipmask("nick!user@192.168.1.2");
 	TQString tmp1;
 	TQString tmp2;
 	for(int i=0;i<=26;i++)
 	{
 		
-		hosttqmask.tqmask(tmp1,(KviIrcMask::MaskType)i);
-		iptqmask.tqmask(tmp2,(KviIrcMask::MaskType)i);
+		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
+		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
 		m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2));
 	}
 	m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
diff --git a/src/modules/options/optw_irc.h b/src/modules/options/optw_irc.h
index d64c34f..37cc285 100644
--- a/src/modules/options/optw_irc.h
+++ b/src/modules/options/optw_irc.h
@@ -38,7 +38,7 @@ class KviIrcOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcOptionsWidget(TQWidget * tqparent);
+	KviIrcOptionsWidget(TQWidget * parent);
 	~KviIrcOptionsWidget();
 };
 
@@ -52,7 +52,7 @@ class KviIrcGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcGeneralOptionsWidget(TQWidget * tqparent);
+	KviIrcGeneralOptionsWidget(TQWidget * parent);
 	~KviIrcGeneralOptionsWidget();
 };
 
@@ -67,7 +67,7 @@ class KviIrcAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcAdvancedOptionsWidget(TQWidget * tqparent);
+	KviIrcAdvancedOptionsWidget(TQWidget * parent);
 	~KviIrcAdvancedOptionsWidget();
 };
 
@@ -84,7 +84,7 @@ class KviChannelOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviChannelOptionsWidget(TQWidget * tqparent);
+	KviChannelOptionsWidget(TQWidget * parent);
 	~KviChannelOptionsWidget();
 };
 
@@ -98,7 +98,7 @@ class KviChannelGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviChannelGeneralOptionsWidget(TQWidget * tqparent);
+	KviChannelGeneralOptionsWidget(TQWidget * parent);
 	~KviChannelGeneralOptionsWidget();
 };
 
@@ -111,7 +111,7 @@ class KviChannelAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviChannelAdvancedOptionsWidget(TQWidget * tqparent);
+	KviChannelAdvancedOptionsWidget(TQWidget * parent);
 	~KviChannelAdvancedOptionsWidget();
 public:
 	virtual void commit();
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index 83414f3..6446fe7 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -35,8 +35,8 @@
 	#include "kvi_tal_tooltip.h"
 #endif
 
-KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircoutput_options_widget")
+KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircoutput_options_widget")
 {
 	createLayout(7,2);
 
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/optw_ircoutput.h
index 3c82add..b48b8d0 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/optw_ircoutput.h
@@ -39,7 +39,7 @@ class KviIrcOutputOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcOutputOptionsWidget(TQWidget * tqparent);
+	KviIrcOutputOptionsWidget(TQWidget * parent);
 	~KviIrcOutputOptionsWidget();
 protected:
 	TQComboBox * m_pVerbosityCombo;
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 1c9e4a2..4bb80f5 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -38,8 +38,8 @@ KviIrcViewThemeOptionsWidget::~KviIrcViewThemeOptionsWidget()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircviewlook_options_widget")
+KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircviewlook_options_widget")
 {
 	createLayout(6,2);
 
@@ -139,8 +139,8 @@ void KviIrcViewLookOptionsWidget::commit()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget")
+KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
 {
 	createLayout(14,1);
 
diff --git a/src/modules/options/optw_ircview.h b/src/modules/options/optw_ircview.h
index 0f7fbfa..f402487 100644
--- a/src/modules/options/optw_ircview.h
+++ b/src/modules/options/optw_ircview.h
@@ -60,7 +60,7 @@ private:
 	TQComboBox* m_pHorizontalAlign;
 	TQComboBox* m_pVerticalAlign;
 public:
-	KviIrcViewLookOptionsWidget(TQWidget * tqparent);
+	KviIrcViewLookOptionsWidget(TQWidget * parent);
 	~KviIrcViewLookOptionsWidget();
 public:
 	virtual void commit();
@@ -77,7 +77,7 @@ class KviIrcViewFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent);
+	KviIrcViewFeaturesOptionsWidget(TQWidget * parent);
 	~KviIrcViewFeaturesOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 8978618..8dce861 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -32,8 +32,8 @@
 //#warning "Info tips"
 
 
-KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"lag_options_widget")
+KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"lag_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_lag.h b/src/modules/options/optw_lag.h
index 065c884..0c8e1b7 100644
--- a/src/modules/options/optw_lag.h
+++ b/src/modules/options/optw_lag.h
@@ -34,7 +34,7 @@ class KviLagOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviLagOptionsWidget(TQWidget * tqparent);
+	KviLagOptionsWidget(TQWidget * parent);
 	~KviLagOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index 87b998a..378c1dd 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -31,8 +31,8 @@
 //#warning "Info tips"
 
 
-KviLoggingOptionsWidget::KviLoggingOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"logging_options_widget")
+KviLoggingOptionsWidget::KviLoggingOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"logging_options_widget")
 {
 	createLayout(4,1);
 
diff --git a/src/modules/options/optw_logging.h b/src/modules/options/optw_logging.h
index ede7d41..bda9967 100644
--- a/src/modules/options/optw_logging.h
+++ b/src/modules/options/optw_logging.h
@@ -36,7 +36,7 @@ class KviLoggingOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviLoggingOptionsWidget(TQWidget * tqparent);
+	KviLoggingOptionsWidget(TQWidget * parent);
 	~KviLoggingOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 0b0d7c5..b93081e 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -62,8 +62,8 @@ void KviMediaTypeListViewItem::copyData(KviMediaType * t)
 	setText(2,m_data.szDescription.ptr());	
 }
 
-KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"mediatypes_options_widget")
+KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"mediatypes_options_widget")
 {
 	createLayout(11,3);
 
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index 06de7f7..04b5bf4 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -54,7 +54,7 @@ class KviMediaTypesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviMediaTypesOptionsWidget(TQWidget * tqparent);
+	KviMediaTypesOptionsWidget(TQWidget * parent);
 	~KviMediaTypesOptionsWidget();
 private:
 	KviTalListView   * m_pListView;
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 058afb6..175f119 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -68,8 +68,8 @@ KviMessageOptionsWidget::~KviMessageOptionsWidget()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"privmsg_options_widget")
+KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"privmsg_options_widget")
 {
 	createLayout(4,1);
 
@@ -162,8 +162,8 @@ void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"stdcolors")
+KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"stdcolors")
 {
 	createLayout(5,4);
 	
@@ -370,8 +370,8 @@ int KviMessageColorListBoxItem::height(const KviTalListBox *) const
 */
 
 /*
-KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"irccolors","options")
+KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"irccolors","options")
 {
 	createLayout(5,4);
 
@@ -383,8 +383,8 @@ KviIrcColorsOptionsWidget::~KviIrcColorsOptionsWidget()
 }
 */
 
-KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"messages")
+KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"messages")
 {
 	int i;
 
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index e8ecb59..cc9f26f 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -61,7 +61,7 @@ class KviPrivmsgOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviPrivmsgOptionsWidget(TQWidget * tqparent);
+	KviPrivmsgOptionsWidget(TQWidget * parent);
 	~KviPrivmsgOptionsWidget();
 };
 
@@ -77,7 +77,7 @@ class KviTimestampOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTimestampOptionsWidget(TQWidget * tqparent);
+	KviTimestampOptionsWidget(TQWidget * parent);
 	~KviTimestampOptionsWidget();
 public:
 	KviBoolSelector * m_pUseTimestampSelector;
@@ -144,7 +144,7 @@ class KviMessageColorsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviMessageColorsOptionsWidget(TQWidget * tqparent);
+	KviMessageColorsOptionsWidget(TQWidget * parent);
 	~KviMessageColorsOptionsWidget();
 public:
 	KviMessageListView         * m_pListView;
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index c4afaca..19a7683 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -67,11 +67,11 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
 	m_pNickServMaskEdit = new TQLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
 	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>" \
 			"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\", " \
-			"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
 	gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3);
 	
@@ -96,7 +96,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pIdentifyCommandEdit,
 		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>" \
 			"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);
@@ -108,13 +108,13 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
 
 	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);
 		
 		m_pServerMaskEdit = new TQLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
 		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);
 #endif
 		gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3);
@@ -180,7 +180,7 @@ bool KviNickServRuleEditor::validate()
 	
 	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;
 	}
 
@@ -231,8 +231,8 @@ bool KviNickServRuleEditor::editRule(KviNickServRule * r)
 
 
 
-KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"nickserv_options_widget")
+KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"nickserv_options_widget")
 {
 	createLayout(3,3);
 	
@@ -253,7 +253,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * tqparent)
 	m_pNickServListView->setSelectionMode(KviTalListView::Single);
 	m_pNickServListView->setAllColumnsShowFocus(true);
 	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 Request Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options"));
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index 9fb6bfc..81c4a5b 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -71,7 +71,7 @@ class KviNickServOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviNickServOptionsWidget(TQWidget * tqparent);
+	KviNickServOptionsWidget(TQWidget * parent);
 	~KviNickServOptionsWidget();
 protected:
 	KviTalListView             * m_pNickServListView;
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index c8d3f9b..8688cdc 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -31,8 +31,8 @@
 //#warning "Info tips"
 
 
-KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"notify_options_widget")
+KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"notify_options_widget")
 {
 	createLayout(5,1);
 
@@ -104,8 +104,8 @@ KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
 
 
 
-KviNotifierOptionsWidget::KviNotifierOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"notifier_options_widget")
+KviNotifierOptionsWidget::KviNotifierOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"notifier_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_notify.h b/src/modules/options/optw_notify.h
index be771b8..64a4272 100644
--- a/src/modules/options/optw_notify.h
+++ b/src/modules/options/optw_notify.h
@@ -35,7 +35,7 @@ class KviNotifyOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviNotifyOptionsWidget(TQWidget * tqparent);
+	KviNotifyOptionsWidget(TQWidget * parent);
 	~KviNotifyOptionsWidget();
 };
 
@@ -49,7 +49,7 @@ class KviNotifierOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviNotifierOptionsWidget(TQWidget * tqparent);
+	KviNotifierOptionsWidget(TQWidget * parent);
 	~KviNotifierOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index dc8fa0e..5f12510 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -30,8 +30,8 @@
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-KviProtectionOptionsWidget::KviProtectionOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"protection_options_widget")
+KviProtectionOptionsWidget::KviProtectionOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"protection_options_widget")
 {
 	
 	createLayout(1,1);
diff --git a/src/modules/options/optw_protection.h b/src/modules/options/optw_protection.h
index 1837f59..d00164a 100644
--- a/src/modules/options/optw_protection.h
+++ b/src/modules/options/optw_protection.h
@@ -42,7 +42,7 @@ class KviProtectionOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviProtectionOptionsWidget(TQWidget * tqparent);
+	KviProtectionOptionsWidget(TQWidget * parent);
 	~KviProtectionOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 98acb0a..f5db325 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -41,8 +41,8 @@
 #include <tqtoolbutton.h>
 
 
-KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx)
-: KviTalListViewItem(tqparent,prx->m_szHostname.ptr())
+KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,KviProxy * prx)
+: KviTalListViewItem(parent,prx->m_szHostname.ptr())
 {
 	setPixmap(0,pm);
 	m_pProxyData = new KviProxy(*prx);
@@ -53,8 +53,8 @@ KviProxyOptionsListViewItem::~KviProxyOptionsListViewItem()
 	delete m_pProxyData;
 }
 
-KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"proxy_options_widget")
+KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"proxy_options_widget")
 {
 	createLayout(3,2);
 
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index 73b4f78..53e035c 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -35,7 +35,7 @@ extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 class KviProxyOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx);
+	KviProxyOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,KviProxy * prx);
 	~KviProxyOptionsListViewItem();
 public:
 	KviProxy * m_pProxyData;
@@ -59,7 +59,7 @@ class KviProxyOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviProxyOptionsWidget(TQWidget * tqparent);
+	KviProxyOptionsWidget(TQWidget * parent);
 	~KviProxyOptionsWidget();
 protected:
 	KviTalListView    * m_pListView;
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index a97ce83..7e60df8 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -34,8 +34,8 @@
 	#include <kdeversion.h>
 #endif
 
-KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"query_options_widget")
+KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"query_options_widget")
 {
 	createLayout(8,1);
 
diff --git a/src/modules/options/optw_query.h b/src/modules/options/optw_query.h
index 6e6b96f..5e22ef0 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/optw_query.h
@@ -36,7 +36,7 @@ class KviQueryOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviQueryOptionsWidget(TQWidget * tqparent);
+	KviQueryOptionsWidget(TQWidget * parent);
 	~KviQueryOptionsWidget();
 protected: 
 };
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 258601f..319f5be 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -973,8 +973,8 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 // kvi_app.cpp
 extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase;
 
-KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n)
-    : KviTalListViewItem(tqparent)
+KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,const KviIrcNetwork *n)
+    : KviTalListViewItem(parent)
 {
 	setPixmap(0,pm);
 	m_pServerData = 0;
@@ -983,8 +983,8 @@ KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *tqpar
 	setText(1,n->description());
 }
 
-KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s)
-    : KviTalListViewItem(tqparent)
+KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *parent,const TQPixmap &pm,const KviIrcServer *s)
+    : KviTalListViewItem(parent)
 {
 	setPixmap(0,pm);
 	m_pServerData = new KviIrcServer(*s);
@@ -1021,8 +1021,8 @@ void KviServerOptionsListViewItem::updateVisibleStrings()
 
 
 
-KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * tqparent)
-    : KviOptionsWidget(tqparent,"server_options_widget")
+KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
+    : KviOptionsWidget(parent,"server_options_widget")
 {
 	createLayout(4,2);
 
@@ -1565,7 +1565,7 @@ void KviServerOptionsWidget::newServer()
 		KviServerOptionsListViewItem * net;
 		if(m_pLastEditedItem->m_pServerData)
 		{
-			net = (KviServerOptionsListViewItem *)m_pLastEditedItem->tqparent();
+			net = (KviServerOptionsListViewItem *)m_pLastEditedItem->parent();
 			if(!net)return;
 		}
 		else net = m_pLastEditedItem;
@@ -1607,7 +1607,7 @@ void KviServerOptionsWidget::pasteServer()
 			KviServerOptionsListViewItem * net;
 			if(m_pLastEditedItem->m_pServerData)
 			{
-				net = (KviServerOptionsListViewItem *)m_pLastEditedItem->tqparent();
+				net = (KviServerOptionsListViewItem *)m_pLastEditedItem->parent();
 				if(!net)return;
 			}
 			else net = m_pLastEditedItem;
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index d03f824..9c14abb 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -41,8 +41,8 @@ class KviMexServerImport;
 class KviServerOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n);
-	KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s);
+	KviServerOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,const KviIrcNetwork *n);
+	KviServerOptionsListViewItem(KviTalListViewItem *parent,const TQPixmap &pm,const KviIrcServer *s);
 	~KviServerOptionsListViewItem();
 public:
 	KviIrcServer * m_pServerData;
@@ -158,7 +158,7 @@ class KviServerOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviServerOptionsWidget(TQWidget * tqparent);
+	KviServerOptionsWidget(TQWidget * parent);
 	~KviServerOptionsWidget();
 protected:
 	KviTalListView                    * m_pListView;
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 569d4ae..d2d1659 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -53,8 +53,8 @@ KviSoundOptionsWidget::~KviSoundOptionsWidget()
 }
 
 
-KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"sound_system_options_widget")
+KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"sound_system_options_widget")
 {
 #ifdef COMPILE_ON_WINDOWS
 	createLayout(4,1);
@@ -283,8 +283,8 @@ void KviSoundGeneralOptionsWidget::commit()
 #endif
 }
 
-KviSoundsOptionsWidget::KviSoundsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"sound_options_widget")
+KviSoundsOptionsWidget::KviSoundsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"sound_options_widget")
 {
 	createLayout(5,2);
 	addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options"));
diff --git a/src/modules/options/optw_sound.h b/src/modules/options/optw_sound.h
index 3c2128f..645b827 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/optw_sound.h
@@ -39,7 +39,7 @@ class KviSoundOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviSoundOptionsWidget(TQWidget * tqparent);
+	KviSoundOptionsWidget(TQWidget * parent);
 	~KviSoundOptionsWidget();
 };
 
@@ -54,7 +54,7 @@ class KviSoundGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviSoundGeneralOptionsWidget(TQWidget * tqparent);
+	KviSoundGeneralOptionsWidget(TQWidget * parent);
 	~KviSoundGeneralOptionsWidget();
 protected:
 	TQComboBox * m_pSoundSystemBox;
@@ -90,7 +90,7 @@ class KviSoundsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviSoundsOptionsWidget(TQWidget * tqparent);
+	KviSoundsOptionsWidget(TQWidget * parent);
 	~KviSoundsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index dae204e..201766c 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -27,8 +27,8 @@
 #include "kvi_options.h"
 
 
-KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"taskbar_options_widget")
+KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"taskbar_options_widget")
 {
 
 	createLayout(7,1);
@@ -60,8 +60,8 @@ KviTaskBarOptionsWidget::~KviTaskBarOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
+KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 }
 
@@ -72,8 +72,8 @@ KviTreeTaskBarOptionsWidget::~KviTreeTaskBarOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
+KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 	createLayout(3,1);
 	
@@ -102,8 +102,8 @@ KviTreeTaskBarForegroundOptionsWidget::~KviTreeTaskBarForegroundOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
+KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 	createLayout(4,2);
 	
@@ -204,8 +204,8 @@ void KviTreeTaskBarBackgroundOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
+KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 	createLayout(4,1);
 
@@ -225,8 +225,8 @@ KviTreeTaskBarFeaturesOptionsWidget::~KviTreeTaskBarFeaturesOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"classictaskbar_options_widget")
+KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"classictaskbar_options_widget")
 {
 	createLayout(8,1);
 	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar);
diff --git a/src/modules/options/optw_taskbar.h b/src/modules/options/optw_taskbar.h
index 84a0633..5f15ff2 100644
--- a/src/modules/options/optw_taskbar.h
+++ b/src/modules/options/optw_taskbar.h
@@ -40,7 +40,7 @@ class KviTaskBarOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTaskBarOptionsWidget(TQWidget * tqparent);
+	KviTaskBarOptionsWidget(TQWidget * parent);
 	~KviTaskBarOptionsWidget();
 };
 
@@ -72,7 +72,7 @@ class KviTreeTaskBarForegroundOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent);
+	KviTreeTaskBarForegroundOptionsWidget(TQWidget * parent);
 	~KviTreeTaskBarForegroundOptionsWidget();
 };
 
@@ -91,7 +91,7 @@ private:
 	TQComboBox* m_pHorizontalAlign;
 	TQComboBox* m_pVerticalAlign;
 public:
-	KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent);
+	KviTreeTaskBarBackgroundOptionsWidget(TQWidget * parent);
 	~KviTreeTaskBarBackgroundOptionsWidget();
 	
 	virtual void commit();
@@ -108,7 +108,7 @@ class KviTreeTaskBarFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent);
+	KviTreeTaskBarFeaturesOptionsWidget(TQWidget * parent);
 	~KviTreeTaskBarFeaturesOptionsWidget();
 };
 
@@ -124,7 +124,7 @@ class KviClassicTaskBarOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviClassicTaskBarOptionsWidget(TQWidget * tqparent);
+	KviClassicTaskBarOptionsWidget(TQWidget * parent);
 	~KviClassicTaskBarOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index aad9f2f..495df00 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -32,8 +32,8 @@
 
 TQString g_szPrevSettedLocale;
 
-KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"textencoding_options_widget")
+KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"textencoding_options_widget")
 {
 	createLayout(5,2);
 
diff --git a/src/modules/options/optw_textencoding.h b/src/modules/options/optw_textencoding.h
index 9b0e186..5c2836e 100644
--- a/src/modules/options/optw_textencoding.h
+++ b/src/modules/options/optw_textencoding.h
@@ -38,7 +38,7 @@ class KviTextEncodingOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTextEncodingOptionsWidget(TQWidget * tqparent);
+	KviTextEncodingOptionsWidget(TQWidget * parent);
 	~KviTextEncodingOptionsWidget();
 protected:
 	TQString     m_szLanguage;
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 257689c..3d6e01b 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -136,8 +136,8 @@ void KviTextIconTableItem::setContentFromEditor(TQWidget * w)
 	}
 }
 
-KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"texticons_options_widget")
+KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"texticons_options_widget")
 {
 	createLayout(2,2);
 
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index fe4e2f1..4824397 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -90,7 +90,7 @@ class KviTextIconsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTextIconsOptionsWidget(TQWidget * tqparent);
+	KviTextIconsOptionsWidget(TQWidget * parent);
 	~KviTextIconsOptionsWidget();
 protected:
 	KviTalTable     * m_pTable;
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index bbbac04..a1f3cf0 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -30,8 +30,8 @@
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-KviToolsOptionsWidget::KviToolsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"tools_options_widget")
+KviToolsOptionsWidget::KviToolsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"tools_options_widget")
 {
 	
 	createLayout(1,1);
diff --git a/src/modules/options/optw_tools.h b/src/modules/options/optw_tools.h
index c0f9fe4..4d191a7 100644
--- a/src/modules/options/optw_tools.h
+++ b/src/modules/options/optw_tools.h
@@ -40,7 +40,7 @@ class KviToolsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviToolsOptionsWidget(TQWidget * tqparent);
+	KviToolsOptionsWidget(TQWidget * parent);
 	~KviToolsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 0e833ec..df6fd0b 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -32,8 +32,8 @@
 //#warning "Info tips"
 
 
-KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"tray_options_widget")
+KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"tray_options_widget")
 {
 	createLayout(7,1);
 	
diff --git a/src/modules/options/optw_tray.h b/src/modules/options/optw_tray.h
index 5fc4ba7..4d89c3b 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/optw_tray.h
@@ -35,7 +35,7 @@ class KviTrayOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTrayOptionsWidget(TQWidget * tqparent);
+	KviTrayOptionsWidget(TQWidget * parent);
 	~KviTrayOptionsWidget();
 protected:
 	KviBoolSelector * m_pEnable;
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp
index 6b05d46..15fe465 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/optw_uparser.cpp
@@ -31,8 +31,8 @@
 #include <tqlabel.h>
 
 
-KviUParserOptionsWidget::KviUParserOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"uparser_options_widget")
+KviUParserOptionsWidget::KviUParserOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"uparser_options_widget")
 {
 	createLayout(11,1);
 
diff --git a/src/modules/options/optw_uparser.h b/src/modules/options/optw_uparser.h
index 8b538a7..c8ba5ea 100644
--- a/src/modules/options/optw_uparser.h
+++ b/src/modules/options/optw_uparser.h
@@ -34,7 +34,7 @@ class KviUParserOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUParserOptionsWidget(TQWidget * tqparent);
+	KviUParserOptionsWidget(TQWidget * parent);
 	~KviUParserOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index 8695406..6e35677 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -32,8 +32,8 @@
 #include <tqlabel.h>
 
 
-KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"urlhandlers_options_widget")
+KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"urlhandlers_options_widget")
 {
 #ifdef COMPILE_ON_WINDOWS
 	#define START_ROW 1
diff --git a/src/modules/options/optw_urlhandlers.h b/src/modules/options/optw_urlhandlers.h
index 611ed50..f322619 100644
--- a/src/modules/options/optw_urlhandlers.h
+++ b/src/modules/options/optw_urlhandlers.h
@@ -35,7 +35,7 @@ class KviUrlHandlersOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUrlHandlersOptionsWidget(TQWidget * tqparent);
+	KviUrlHandlersOptionsWidget(TQWidget * parent);
 	~KviUrlHandlersOptionsWidget();
 private:
 	KviStringSelector*   m_pHttpHandler;
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 90695e2..9785cf2 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -29,8 +29,8 @@
 
 //#warning "Info tips"
 
-KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"userlistlook_options_widget")
+KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"userlistlook_options_widget")
 {
 }
 
@@ -43,8 +43,8 @@ KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"userlistlook_foreground_options_widget")
+KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"userlistlook_foreground_options_widget")
 {
 	createLayout(2,2);
 
@@ -74,8 +74,8 @@ KviUserListLookForegroundOptionsWidget::~KviUserListLookForegroundOptionsWidget(
 {
 }
 
-KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(5,1);
 	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)
-: KviOptionsWidget(tqparent,"userlistlook_background_options_widget")
+KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"userlistlook_background_options_widget")
 {
 	createLayout(3,2);
 
@@ -223,8 +223,8 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"userlistfeatures_options_widget")
+KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"userlistfeatures_options_widget")
 {
 	createLayout(7,1);
 
diff --git a/src/modules/options/optw_userlist.h b/src/modules/options/optw_userlist.h
index 8c4eaee..447208e 100644
--- a/src/modules/options/optw_userlist.h
+++ b/src/modules/options/optw_userlist.h
@@ -37,7 +37,7 @@ class KviUserListLookOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListLookOptionsWidget(TQWidget * tqparent);
+	KviUserListLookOptionsWidget(TQWidget * parent);
 	~KviUserListLookOptionsWidget();
 };
 
@@ -54,7 +54,7 @@ class KviUserListLookBackgroundOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListLookBackgroundOptionsWidget(TQWidget * tqparent);
+	KviUserListLookBackgroundOptionsWidget(TQWidget * parent);
 	~KviUserListLookBackgroundOptionsWidget();
 protected:
 	TQComboBox* m_pHorizontalAlign;
@@ -76,7 +76,7 @@ class KviUserListLookForegroundOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListLookForegroundOptionsWidget(TQWidget * tqparent);
+	KviUserListLookForegroundOptionsWidget(TQWidget * parent);
 	~KviUserListLookForegroundOptionsWidget();
 };
 
@@ -93,7 +93,7 @@ class KviUserListGridOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListGridOptionsWidget(TQWidget * tqparent);
+	KviUserListGridOptionsWidget(TQWidget * parent);
 	~KviUserListGridOptionsWidget();
 protected:
 	TQComboBox * m_pGridTypeCombo;
@@ -112,7 +112,7 @@ class KviUserListFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListFeaturesOptionsWidget(TQWidget * tqparent);
+	KviUserListFeaturesOptionsWidget(TQWidget * parent);
 	~KviUserListFeaturesOptionsWidget();
 };
 
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 38c5bd5..db3479e 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -62,8 +62,8 @@ KviPopupListViewItem::KviPopupListViewItem(KviTalListView * pListView,KviPopupLi
 	init();
 }
 
-KviPopupListViewItem::KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t)
-: KviTalListViewItem(tqparent,after)
+KviPopupListViewItem::KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t)
+: KviTalListViewItem(parent,after)
 {
 	m_type = t;
 	init();
@@ -379,7 +379,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 
 	if(it)
 	{
-		parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->tqparent());
+		parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->parent());
 		bIsMenu = ((KviPopupListViewItem *)it)->m_type == KviPopupListViewItem::Menu;
 	}
 
@@ -584,13 +584,13 @@ KviPopupListViewItem * KviSinglePopupEditor::newItem(KviPopupListViewItem * par,
 KviPopupListViewItem * KviSinglePopupEditor::newItemBelow(KviPopupListViewItem * it,KviPopupListViewItem::Type 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)
 {
 	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)
@@ -607,7 +607,7 @@ KviPopupListViewItem * KviSinglePopupEditor::newItemInside(KviPopupListViewItem
 
 void KviSinglePopupEditor::contextNewPrologue()
 {
-	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 //	if(!findPrologue(it))
 //	{
 		m_pListView->setCurrentItem(newItem(it,it,KviPopupListViewItem::Prologue));
@@ -616,7 +616,7 @@ void KviSinglePopupEditor::contextNewPrologue()
 
 void KviSinglePopupEditor::contextNewEpilogue()
 {
-	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 //	if(!findEpilogue(it))
 //	{
 		KviPopupListViewItem * after = it ? (KviPopupListViewItem *)it->firstChild() : (KviPopupListViewItem *)m_pListView->firstChild();
@@ -653,14 +653,14 @@ void KviSinglePopupEditor::contextCut()
 void KviSinglePopupEditor::contextPasteBelow()
 {
 	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);
 }
 
 void KviSinglePopupEditor::contextPasteAbove()
 {
 	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;
 	populateMenu(m_pClipboard,par,above);
 
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 5c4ce20..5c214ff 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -42,7 +42,7 @@ public:
 	enum Type { Item , Menu , Separator , Label , Epilogue , Prologue , ExtMenu };
 public:
 	KviPopupListViewItem(KviTalListView * pListView,KviPopupListViewItem * after,Type t);
-	KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t);
+	KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t);
 public:
 	Type                   m_type;
 	TQString                m_szText;
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 521c994..b710cb4 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -146,7 +146,7 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col
 	m_pContextPopup->clear();
 	if(it)
 	{
-		if(it->tqparent())
+		if(it->parent())
 		{
 			if(!(((KviRawHandlerListViewItem *)it)->m_bEnabled))
 				m_pContextPopup->insertItem(
@@ -245,7 +245,7 @@ void KviRawEditor::addHandlerForCurrentRaw()
 	KviTalListViewItem * it = m_pListView->selectedItem();
 	if(it)
 	{
-		if(it->tqparent() == 0)
+		if(it->parent() == 0)
 		{
 			TQString buffer = __tr2qs("default");
 			getUniqueHandlerName((KviRawListViewItem *)it,buffer);
@@ -318,7 +318,7 @@ void KviRawEditor::saveLastEditedItem()
 	TQString buffer = m_pNameEditor->text();
 	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;
@@ -332,7 +332,7 @@ void KviRawEditor::selectionChanged(KviTalListViewItem * it)
 {
 	__range_valid(m_bOneTimeSetupDone);
 	saveLastEditedItem();
-	if(it->tqparent())
+	if(it->parent())
 	{
 		m_pLastEditedItem = (KviRawHandlerListViewItem *)it;
 		m_pNameEditor->setEnabled(true);
@@ -355,14 +355,14 @@ void KviRawEditor::showEvent(TQShowEvent *e)
 
 void KviRawEditor::getExportEventBuffer(TQString &buffer,KviRawHandlerListViewItem * it)
 {
-	if(!it->tqparent())return;
+	if(!it->parent())return;
 
 	TQString szBuf = it->m_szBuffer;
 
 	KviCommandFormatter::blockFromBuffer(szBuf);
 	
 	buffer = "event(";
-	buffer += ((KviRawListViewItem *)(it->tqparent()))->m_szName;
+	buffer += ((KviRawListViewItem *)(it->parent()))->m_szName;
 	buffer += ",";
 	buffer += it->m_szName;
 	buffer += ")\n";
@@ -373,7 +373,7 @@ void KviRawEditor::getExportEventBuffer(TQString &buffer,KviRawHandlerListViewIt
 	{
 		buffer += "\n";
 		buffer += "eventctl -d ";
-		buffer += ((KviRawListViewItem *)(it->tqparent()))->m_szName;
+		buffer += ((KviRawListViewItem *)(it->parent()))->m_szName;
 		buffer += " ";
 		buffer += it->m_szName;
 	}
@@ -388,7 +388,7 @@ void KviRawEditor::exportCurrentHandler()
 	TQString szName = TQDir::homeDirPath();
 	if(!szName.endsWith(TQString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
 	szName += "raw";
-	szName += ((KviRawListViewItem *)(m_pLastEditedItem->tqparent()))->m_szName;
+	szName += ((KviRawListViewItem *)(m_pLastEditedItem->parent()))->m_szName;
 	szName += ".";
 	szName += m_pLastEditedItem->m_szName;
 	szName += ".kvs";
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index cc00fec..fe38cf3 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -46,10 +46,10 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 	@short:
 		Registers a channel
 	@syntax:
-		regchan.add <channel:string> [nettqmask:string]
+		regchan.add <channel:string> [netmask:string]
 	@description:
-		Registers the <channel> with the specified [nettqmask].
-		[nettqmask] can be a full network name or a wildcard string
+		Registers the <channel> with the specified [netmask].
+		[netmask] can be a full network name or a wildcard string
 		tht will be matched against network names.
 		For example, if you want to register #kvirc on 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]
 		Obviously if you register both #kvirc/IRCNet and #kvirc/*
 		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:
 		[example]
 			regchan.add #kvirc openprojects
@@ -67,13 +67,13 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 
 static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
 { 
-	TQString szChan,szNettqmask;
+	TQString szChan,szNetmask;
 	KVSM_PARAMETERS_BEGIN(c)
 		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)
-	if(szNettqmask.isEmpty())szNettqmask="*";
-	g_pRegisteredChannelDataBase->add(new KviRegisteredChannel(szChan,szNettqmask));
+	if(szNetmask.isEmpty())szNetmask="*";
+	g_pRegisteredChannelDataBase->add(new KviRegisteredChannel(szChan,szNetmask));
 	return true;
 }
 
@@ -91,12 +91,12 @@ static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		regchan.remove [-q|--quiet] [-e|--exactly] <channel:string> <network:string>
 	@description:
 		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
 		a warning is printed unless -q is used.[br]
 		If -e is specified then <network> is not matched against the
 		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:
 		[example]
 			regchan.remove #kvirc openprojects
@@ -118,7 +118,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 	{
 		g_pRegisteredChannelDataBase->remove(ch);
 	} 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;
 }
@@ -145,7 +145,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		!fn: -e|--exactly
 		If -e is specified then <network> is not matched against the
 		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:
 		[example]
 			regchan.setproperty #kvirc openprojects autojoin true
@@ -175,7 +175,7 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c)
 			ch->removeProperty(szProperty);
 		}
 	} 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;
 }
@@ -230,11 +230,11 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	@short:
 		Get a list of registered channels
 	@syntax:
-		<array> $regchan.list([<channel_tqmask:string>],[<network_tqmask:string>])
+		<array> $regchan.list([<channel_mask:string>],[<network_mask:string>])
 	@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]
-		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]
 	@examples:
 		[example]
@@ -244,10 +244,10 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 
 static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 { 
-	TQString szChan,szNettqmask;
+	TQString szChan,szNetmask;
 	KVSM_PARAMETERS_BEGIN(c)
 		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)
 
 	KviKvsArray* pArray = new KviKvsArray();
@@ -257,7 +257,7 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	int aid=0;
 
 	if(szChan.isEmpty())szChan="*";
-	if(szNettqmask.isEmpty())szNettqmask="*";
+	if(szNetmask.isEmpty())szNetmask="*";
 
 	KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
 	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())
 		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()));
 //			pArrayCN->set(0,new KviKvsVariant(TQString(ch->name())));
@@ -363,11 +363,11 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	@short:
 		Checks if a channel is registered
 	@syntax:
-		<boolean> $regchan.find(<channel_name:string>,<nettqmask:string>)
+		<boolean> $regchan.find(<channel_name:string>,<netmask:string>)
 	@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
-		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.
 	@examples:
 		[example]
@@ -380,12 +380,12 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 
 static bool regchan_kvs_fnc_find(KviKvsModuleFunctionCall * c)
 { 
-	TQString szChan,szNettqmask;
+	TQString szChan,szNetmask;
 	KVSM_PARAMETERS_BEGIN(c)
 		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)
-	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNettqmask);
+	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetmask);
 	c->returnValue()->setBoolean(ch);
 	return true;
 }
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index c6a5f70..648fdfb 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -292,7 +292,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 	fillList();
 
-	if(!tqparent())
+	if(!parent())
 	{
 		if(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).y() < 5)
 		{
@@ -309,10 +309,10 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
 {
 #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());
 #else
-	if(!tqparent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry();
+	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry();
 #endif
 
 	g_pRegisteredUsersDialog = 0;
@@ -724,7 +724,7 @@ void KviRegisteredUsersDialog::exportClicked()
 				for(KviIrcMask * m = ml->first();m;m = ml->next())
 				{
 					TQString fullMask;
-					m->tqmask(fullMask,KviIrcMask::NickUserHost);
+					m->mask(fullMask,KviIrcMask::NickUserHost);
 					if(!f.save(fullMask))goto write_error;
 				}
 			} else {
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 66e89d1..646261a 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -216,7 +216,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
 
 	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);
 	g->addMultiCellWidget(l,0,0,0,1);
 
@@ -606,8 +606,8 @@ void KviRegisteredUserEntryDialog::okClicked()
 	idx = 0;
 	while(cnt > 0)
 	{
-		TQString tqmask = m_pMaskListBox->text(idx);
-		KviIrcMask * mk = new KviIrcMask(tqmask);
+		TQString mask = m_pMaskListBox->text(idx);
+		KviIrcMask * mk = new KviIrcMask(mask);
 		g_pLocalRegisteredUserDataBase->removeMask(*mk);
 		g_pLocalRegisteredUserDataBase->addMask(u,mk);
 		cnt--;
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 6b8f715..d40bfab 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -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]
 		It provides the following set of commands:[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]
 		[fnc]$reguser.list[/fnc]: lists the entries[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.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.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],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc]
 */
 
@@ -115,12 +115,12 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	{
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			if(g_pRegisteredUsersDialog->tqparent())
+			if(g_pRegisteredUsersDialog->parent())
 			{
 				g_pRegisteredUsersDialog->reparent(0,TQPoint(0,0),true);
 			}
 		} 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);
 			}
@@ -150,19 +150,19 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	@short:
 		Registers an user
 	@syntax:
-		reguser.add [-r] [-f] [-q] [-g=group] <name> [tqmask]
+		reguser.add [-r] [-f] [-q] [-g=group] <name> [mask]
 	@description:
 		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
 		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
-		at least one tqmask with [cmd]reguser.addtqmask[/cmd].
-		If [tqmask] is given, then it is added to the entry tqmask list.[br]
+		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 mask with [cmd]reguser.addmask[/cmd].
+		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
 		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 '-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]
 	@examples:
 		[example]
@@ -172,7 +172,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc]
 */
 
@@ -182,7 +182,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	TQString szMask;
 	KVSM_PARAMETERS_BEGIN(c) 
 		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) 
 	if(szName.isEmpty())
 	{
@@ -253,7 +253,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc]
 */
 
@@ -280,51 +280,51 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 }
 
 /*
-	@doc: reguser.addtqmask
+	@doc: reguser.addmask
 	@type:
 		command
 	@title:
-		reguser.addtqmask
+		reguser.addmask
 	@keyterms:
 		registering users
 	@short:
-		Adds a tqmask to a registered user
+		Adds a mask to a registered user
 	@syntax:
-		reguser.addtqmask [-f] <name> <tqmask>
+		reguser.addmask [-f] <name> <mask>
 	@description:
-		Adds a registration tqmask to the database entry with name <name>.[br]
-		The <tqmask> has the common [doc:irc_masks]irc tqmask[/doc] format.[br]
-		The only restriction on the <tqmask> is that it must be unique inside the
-		regusers database: you can't match two users with the same tqmask (it would
+		Adds a registration mask to the database entry with name <name>.[br]
+		The <mask> has the common [doc:irc_masks]irc mask[/doc] format.[br]
+		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 mask (it would
 		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>
-		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]
 		Each database entry can have an unlimited number of masks.[br]
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] "Szymon Stefanek"
-			reguser.addtqmask "Szymon Stefanek" Pragma!*@*.it
+			reguser.addmask "Szymon Stefanek" Pragma!*@*.it
 		[/example]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.deltqmask[/cmd],
+		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.exactMatch[/fnc]
 */
 
-static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
+static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c)
 {
 	TQString szName; 
 	TQString szMask;
 	KVSM_PARAMETERS_BEGIN(c) 
 		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) 
 	
 	if(szName.isEmpty())
@@ -335,7 +335,7 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
 
 	if(szMask.isEmpty())
 	{
-		c->warning(__tr2qs("No tqmask specified"));
+		c->warning(__tr2qs("No mask specified"));
 		return true;
 	}
 
@@ -357,27 +357,27 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
 }
 
 /*
-	@doc: reguser.deltqmask
+	@doc: reguser.delmask
 	@type:
 		command
 	@title:
-		reguser.deltqmask
+		reguser.delmask
 	@keyterms:
 		registering users
 	@short:
-		Removes a tqmask from the regusers database
+		Removes a mask from the regusers database
 	@syntax:
-		reguser.deltqmask <tqmask>
+		reguser.delmask <mask>
 	@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
-		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]
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] "Szymon Stefanek"
-			[cmd]reguser.addtqmask[/cmd] "Szymon Stefanek" Pragma!*@*.it
-			reguser.deltqmask Pragma!*@*.it
+			[cmd]reguser.addmask[/cmd] "Szymon Stefanek" Pragma!*@*.it
+			reguser.delmask Pragma!*@*.it
 			[fnc]$reguser.list[/fnc]
 		[/example]
 	@seealso:
@@ -385,22 +385,22 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.exactMatch[/fnc]
 */
 
-static bool reguser_kvs_cmd_deltqmask(KviKvsModuleCommandCall * c)
+static bool reguser_kvs_cmd_delmask(KviKvsModuleCommandCall * c)
 {
 	TQString szMask;
 	KVSM_PARAMETERS_BEGIN(c) 
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) 
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) 
 	KVSM_PARAMETERS_END(c) 
 	
 	if(szMask.isEmpty())
 	{
-		c->warning(__tr2qs("No tqmask specified"));
+		c->warning(__tr2qs("No mask specified"));
 		return true;
 	}
 
@@ -564,8 +564,8 @@ static bool reguser_kvs_cmd_setIgnoreFlags(KviKvsModuleCommandCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
-		[cmd]reguser.deltqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
+		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
@@ -619,8 +619,8 @@ static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
-		[cmd]reguser.deltqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
+		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
@@ -685,7 +685,7 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 	TQString szProperty;
 	TQString szValue;
 	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("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) 
 	KVSM_PARAMETERS_END(c) 
@@ -722,19 +722,19 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 	@short:
 		Get a list of registered user masks
 	@syntax:
-		$reguser.list([tqmask])
+		$reguser.list([mask])
 	@description:
 		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]
-		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]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.exactMatch[/fnc]
 */
@@ -744,10 +744,10 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	TQString szMask; 
 	
 	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)
 	
-	KviIrcMask tqmask(szMask);
+	KviIrcMask mask(szMask);
 	KviKvsArray* pArray = new KviKvsArray();
 	int aid=0;
 	
@@ -759,7 +759,7 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	while(KviRegisteredUser * u = it.current())
 	{
 		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()));
 			aid++;
@@ -781,12 +781,12 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	@short:
 		Lists the registered users
 	@syntax:
-		reguser.showlist [tqmask]
+		reguser.showlist [mask]
 	@description:
 		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]
-		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]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
@@ -801,10 +801,10 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 {
 	TQString szMask;
 	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) 
 
-	KviIrcMask tqmask(szMask);
+	KviIrcMask mask(szMask);
 	c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Registered users database dump:"));
 
 	int count = 0;
@@ -814,7 +814,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	while(KviRegisteredUser * u = it.current())
 	{
 		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()));
 
@@ -859,16 +859,16 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	@short:
 		Returns an entry in the registered user database
 	@syntax:
-		$reguser.match(<user_tqmask>)
+		$reguser.match(<user_mask>)
 	@description:
-		Returns the name of the first entry matching <user_tqmask> 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]
+		Returns the name of the first entry matching <user_mask> in the registered user database.[br]
+		The <user_mask> has the common [doc:irc_masks]irc mask[/doc] format but can't contain wildcards.[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.exactMatch[/fnc]
 */
@@ -878,11 +878,11 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	TQString szMask; 
 	
 	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)
-	KviIrcMask tqmask(szMask);
-//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(tqmask.nick(),tqmask.user(),tqmask.host());
-	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(tqmask.nick(),tqmask.user(),tqmask.host());
+	KviIrcMask mask(szMask);
+//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
 	if(u) c->returnValue()->setString(u->name());
 	return true;
 }
@@ -896,16 +896,16 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns an entry in the registered user database
 	@syntax:
-		$reguser.exactMatch(<user_tqmask>)
+		$reguser.exactMatch(<user_mask>)
 	@description:
-		Returns the name of the registered user database entry that has <user_tqmask> in its registration tqmask list.[br]
-		The <user_tqmask> has the common [doc:irc_masks]wild irc tqmask[/doc] format and can contain wildcards.[br]
+		Returns the name of the registered user database entry that has <user_mask> in its registration mask list.[br]
+		The <user_mask> has the common [doc:irc_masks]wild irc mask[/doc] format and can contain wildcards.[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc]
 */
@@ -915,10 +915,10 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 	TQString szMask; 
 	
 	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)
-	KviIrcMask tqmask(szMask);
-	KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserWithMask(tqmask);
+	KviIrcMask mask(szMask);
+	KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserWithMask(mask);
 	if(u) c->returnValue()->setString(u->name());
 	return true;
 }
@@ -932,24 +932,24 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 //	@short:
 //		Returns entries in the registered user database
 //	@syntax:
-//		$reguser.matches(<user_tqmask>)
+//		$reguser.matches(<user_mask>)
 //	@description:
-//		Returns a comma separated list of registered user masks that match <user_tqmask>.[br]
-//		User tqmask must be in the format <nick>!<user>@<host> , where <user> and
+//		Returns a comma separated list of registered user masks that match <user_mask>.[br]
+//		User mask must be in the format <nick>!<user>@<host> , where <user> and
 //		<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:
 //		[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())
 //	{
-//		if(u->matches(tqmask))
+//		if(u->matches(mask))
 //		{
 //			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:
 		function
 	@title:
-		$reguser.tqmask
+		$reguser.mask
 	@short:
 		Returns the registration masks for a db entry
 	@syntax:
-		$reguser.tqmask(<name>[,<N>])
+		$reguser.mask(<name>[,<N>])
 	@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]
 		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]
@@ -995,22 +995,22 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] Pragma
-			[cmd]reguser.addtqmask[/cmd] Pragma Pragma!*@*.it
-			[cmd]echo[/cmd] $reguser.tqmask(Pragma,0)
+			[cmd]reguser.addmask[/cmd] Pragma Pragma!*@*.it
+			[cmd]echo[/cmd] $reguser.mask(Pragma,0)
 		[/example]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
-		[cmd]reguser.deltqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
+		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
 */
 
-static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
+static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
 { 
 	TQString szName; 
 	TQString szN;
@@ -1058,7 +1058,7 @@ static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
 	@examples:
 		[example]
 			[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]echo[/cmd] $reguser.property(Pragma,isDev)
 		[/example]
@@ -1067,7 +1067,7 @@ static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
@@ -1100,19 +1100,19 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns a property of an entry in the registered user database
 	@syntax:
-		$reguser.matchProperty(<user_tqmask>,<property_name>)
+		$reguser.matchProperty(<user_mask>,<property_name>)
 	@description:
 		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 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]
 		[example]
-			%property = $reguser.matchProperty(<user_tqmask>,<property_name>)
+			%property = $reguser.matchProperty(<user_mask>,<property_name>)
 		[/example]
 		Is actually a shortcut for:[br]
 		[example]
-			%tmp = [fnc]$reguser.match[/fnc](<user_tqmask>)
+			%tmp = [fnc]$reguser.match[/fnc](<user_mask>)
 			if("%tmp" != "")%property = $reguser.property(%tmp,<property_name>)
 		[/example]
 	@seealso:
@@ -1120,7 +1120,7 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.property[/fnc]
@@ -1131,13 +1131,13 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
 	TQString szMask; 
 	TQString szProperty;
 	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_PARAMETERS_END(c)
 	
-	KviIrcMask tqmask(szMask);
-//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(tqmask.nick(),tqmask.user(),tqmask.host());
-	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(tqmask.nick(),tqmask.user(),tqmask.host());
+	KviIrcMask mask(szMask);
+//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
 	if(u)
 	{
 		TQString tmp;
@@ -1158,10 +1158,10 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
 	@short:
 		Shows a registration wizard dialog
 	@syntax:
-		reguser.wizard [tqmask]
+		reguser.wizard [mask]
 	@description:
 		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:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
@@ -1172,7 +1172,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
 {
 	TQString szMask;
 	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) 
 
 	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,"remove",reguser_kvs_cmd_remove);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"addtqmask",reguser_kvs_cmd_addtqmask);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"deltqmask",reguser_kvs_cmd_deltqmask);
+	KVSM_REGISTER_SIMPLE_COMMAND(m,"addmask",reguser_kvs_cmd_addmask);
+	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,"showlist",reguser_kvs_cmd_showlist);
 	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,"list",reguser_kvs_fnc_list);
 	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,"matchProperty",reguser_kvs_fnc_matchProperty);
 	KVSM_REGISTER_FUNCTION(m,"getIgnoreFlags",reguser_kvs_fnc_getIgnoreFlags);
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 75693b3..e42b3c3 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -57,7 +57,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	
 	m_bModal = bModal;
 
-	KviIrcMask tqmask(startMask ? startMask : "*!*@*");
+	KviIrcMask mask(startMask ? startMask : "*!*@*");
 
 	g_pRegistrationWizardList->append(this);
 
@@ -96,7 +96,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pPage1Layout->addWidget(m_pEditRealName,1,0);
     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 &)));
 
@@ -109,30 +109,30 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pPage2Layout->setMargin( 8 );
 
     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);
 
 	//KviStr szMask;
 
-	//tqmask.tqmask(szMask,11);
+	//mask.mask(szMask,11);
 
 	//KviIrcMask masktempl(szMask.ptr());
 
     m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
     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 &)));
     m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
 
     m_pUsernameEdit1 = new TQLineEdit(m_pPage2);
     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 &)));
     m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
 
 	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 &)));
 	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_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 &)));
     m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1);
 
@@ -415,11 +415,11 @@ void KviRegistrationWizard::maskChanged(const TQString &)
 		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 &)
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 446879a..712d120 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -52,7 +52,7 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 	@short:
 		Adds a file sharedfile
 	@syntax:
-		sharedfile.add [-t=<timeout:integer>] [-n=<visible name>] <filename> [user_tqmask]
+		sharedfile.add [-t=<timeout:integer>] [-n=<visible name>] <filename> [user_mask]
 	@switches:
 		!sw: -t=<timeout> | --timeout=<timeout>
 		Specified the timeout after that the share will be automatically removed
@@ -61,8 +61,8 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 	@description:
 		Adds <filename> to the list of the active shared files.
 		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
-		to the users that match this tqmask, otherwise the tqmask will
+		If [user_mask] is specified , the access to the file is limited
+		to the users that match this mask, otherwise the mask will
 		be automatically set to '*!*@*'.[br]
 		If the 't' switch is used, the sharedfile will be removed after
 		<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;
 	KVSM_PARAMETERS_BEGIN(c)
 		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)
 
 	if(!KviFileUtils::isReadable(szFileName))
@@ -92,7 +92,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	KviIrcMask u(szUserMask);
 	
 	TQString szm;
-	u.tqmask(szm);
+	u.mask(szm);
 
 	kvs_int_t timeout = 0;
 
@@ -138,9 +138,9 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	@short:
 		Removes a shared file
 	@syntax:
-		sharedfile.remove <visible name:string> <user tqmask:string> [filesize:integer]
+		sharedfile.remove <visible name:string> <user mask:string> [filesize:integer]
 	@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
 		to be removed.
 	@seealso:
@@ -153,12 +153,12 @@ static bool sharedfile_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 	kvs_uint_t uSize;
 	KVSM_PARAMETERS_BEGIN(c)
 		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_PARAMETERS_END(c)
 
 	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;
 }
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 7c40b6e..157e375 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -75,7 +75,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile *
 	g->addWidget( m_pBrowseButton, 1, 3 );
 	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 );
 
 	m_pUserMaskEdit = new TQLineEdit(this);
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index 04d6156..d261846 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -141,7 +141,7 @@ void KviTermWidget::konsoleDestroyed()
 void KviTermWidget::autoClose()
 {
 	if(m_bIsStandalone)delete this;
-	else ((KviWindow *)tqparent())->close();
+	else ((KviWindow *)parent())->close();
 }
 
 void KviTermWidget::changeTitle(int i,const TQString& str)
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 7ed10db..816917a 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -141,8 +141,8 @@ int KviThemeListBoxItem::height(const KviTalListBox * lb) const
 KviThemeManagementDialog * KviThemeManagementDialog::m_pInstance = 0;
 
 
-KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * tqparent)
-: TQDialog(tqparent,"theme_options_widget")
+KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent)
+: TQDialog(parent,"theme_options_widget")
 {
 	setCaption(__tr2qs_ctx("Manage Themes - KVIrc","theme"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME)));
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 97e4734..b7a3c94 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -76,7 +76,7 @@ class KviThemeManagementDialog : public TQDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeManagementDialog(TQWidget * tqparent);
+	KviThemeManagementDialog(TQWidget * parent);
 	virtual ~KviThemeManagementDialog();
 protected:
 	static KviThemeManagementDialog * m_pInstance;
diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp
index b609e8d..45b32db 100644
--- a/src/modules/torrent/tc_statusbarapplet.cpp
+++ b/src/modules/torrent/tc_statusbarapplet.cpp
@@ -4,8 +4,8 @@
 #include "tc_interface.h"
 #include "tc_statusbarapplet.h"
 
-KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *tqparent, KviStatusBarAppletDescriptor *desc)
-	: KviStatusBarApplet(tqparent, desc)
+KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc)
+	: KviStatusBarApplet(parent, desc)
 {
 	TQTimer *timer = new TQTimer(this);
 	connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
diff --git a/src/modules/torrent/tc_statusbarapplet.h b/src/modules/torrent/tc_statusbarapplet.h
index 63ab305..9051cf8 100644
--- a/src/modules/torrent/tc_statusbarapplet.h
+++ b/src/modules/torrent/tc_statusbarapplet.h
@@ -13,7 +13,7 @@ class KviTorrentStatusBarApplet : public KviStatusBarApplet
 
 public:
 
-	KviTorrentStatusBarApplet(KviStatusBar *tqparent, KviStatusBarAppletDescriptor *desc);
+	KviTorrentStatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc);
 	virtual ~KviTorrentStatusBarApplet();
 
 	static void selfRegister(KviStatusBar *bar);
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 9533eac..4bb7675 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -413,8 +413,8 @@ ConfigDialog::~ConfigDialog()
 
 // ---------------------------- CLASS BANFRAME ------------------------begin //
 
-BanFrame::BanFrame(TQWidget *tqparent, const char *name, bool banEnabled)
-:TQFrame(tqparent,name)
+BanFrame::BanFrame(TQWidget *parent, const char *name, bool banEnabled)
+:TQFrame(parent,name)
 {
 	setFrameStyle(TQFrame::Panel | TQFrame::Raised);
 
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index a0cc1ea..79d8d2a 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -96,7 +96,7 @@ class BanFrame : public TQFrame
 	Q_OBJECT
   TQ_OBJECT
 public:
-	BanFrame(TQWidget *tqparent=0, const char *name=0, bool banEnable = false);
+	BanFrame(TQWidget *parent=0, const char *name=0, bool banEnable = false);
 	~BanFrame();
 	void saveBans();
 private: