rename the following methods:

tqparent parent
tqmask mask


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

4 files changed, 125 insertions, 125 deletions

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index c6a5f70a..648fdfb3 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 66e89d18..646261a1 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 6b8f7155..d40bfab4 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 75693b35..e42b3c33 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 &)