Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

6 files changed, 36 insertions, 36 deletions

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 59c272d8..1f816ed4 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -344,7 +344,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint
 				// try to find the nicknames to be notified
 				TQString szMask;
 	
-				for(KviIrcMask * m = i->user()->tqmaskList()->first();m;m = i->user()->tqmaskList()->next())
+				for(KviIrcMask * m = i->user()->maskList()->first();m;m = i->user()->maskList()->next())
 				{
 					TQString tmp = m->nick();
 					if((tmp.tqfind('*') == -1) && (tmp.tqfind('?') == -1) && (!tmp.isEmpty()))
@@ -717,7 +717,7 @@ void KviRegisteredUsersDialog::exportClicked()
 				if(!f.save(0))goto write_error;
 			}
 
-			KviPointerList<KviIrcMask> * ml = u->tqmaskList();
+			KviPointerList<KviIrcMask> * ml = u->maskList();
 			if(ml)
 			{
 				if(!f.save(ml->count()))goto write_error;
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 6fd82caa..97019154 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -208,7 +208,7 @@ void KviReguserPropertiesDialog::delClicked()
 
 
 KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
-: TQDialog(p,"reguser_tqmask_editor",true)
+: TQDialog(p,"reguser_mask_editor",true)
 {
 	m_pMask = m;
 
@@ -356,7 +356,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	g->addMultiCellWidget(l,3,3,0,1);
 
 	m_pMaskListBox = new KviTalListBox(p1);
-	connect(m_pMaskListBox,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(tqmaskCurrentChanged(KviTalListBoxItem *)));
+	connect(m_pMaskListBox,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(maskCurrentChanged(KviTalListBoxItem *)));
 	m_pMaskListBox->setMinimumSize(300,200);
 
 	g->addMultiCellWidget(m_pMaskListBox,4,4,0,1);
@@ -494,7 +494,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	{
 		m_pNameEdit->setText(r->name());
 		m_pCommentEdit->setText(r->getProperty("comment"));
-		for(KviIrcMask * m = r->tqmaskList()->first();m;m = r->tqmaskList()->next())
+		for(KviIrcMask * m = r->maskList()->first();m;m = r->maskList()->next())
 		{
 			TQString mk = m->nick();
 			mk += TQChar('!');
@@ -555,7 +555,7 @@ KviRegisteredUserEntryDialog::~KviRegisteredUserEntryDialog()
 	delete m_pCustomColor;
 }
 
-void KviRegisteredUserEntryDialog::tqmaskCurrentChanged(KviTalListBoxItem *it)
+void KviRegisteredUserEntryDialog::maskCurrentChanged(KviTalListBoxItem *it)
 {
 	m_pDelMaskButton->setEnabled(it);
 	m_pEditMaskButton->setEnabled(it);
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index 0318dbdd..cba94c50 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -147,7 +147,7 @@ protected slots:
 	void delMaskClicked();
 	void editMaskClicked();
 	void editAllPropertiesClicked();
-	void tqmaskCurrentChanged(KviTalListBoxItem *it);
+	void maskCurrentChanged(KviTalListBoxItem *it);
 };
 
 
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index b8363175..86bac9f7 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -73,11 +73,11 @@ KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
 		[fnc]$reguser.list[/fnc]: lists the entries[br]
 		[cmd]reguser.setproperty[/cmd]: sets a property associated to an entry[br]
 		[cmd]reguser.edit[/cmd]: shows an editor for an user entry
-		[fnc]$reguser.match[/fnc](): finds an entry by matching tqmasks[br]
-		[fnc]$reguser.exactMatch[/fnc](): finds an entry by comparing tqmasks[br]
+		[fnc]$reguser.match[/fnc](): finds an entry by matching masks[br]
+		[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 tqmasks for an entry
+		[fnc]$reguser.tqmask[/fnc](): returns the registration masks for an entry
 */
 
 /*
@@ -155,7 +155,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		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 tqmasks: so it can't be "matched" yet. You have to add
+		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]
 		The <name> parameter may contain any character: even spaces are allowed (obviously you have to
@@ -293,7 +293,7 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		reguser.addtqmask [-f] <name> <tqmask>
 	@description:
 		Adds a registration tqmask to the database entry with name <name>.[br]
-		The <tqmask> has the common [doc:irc_tqmasks]irc tqmask[/doc] format.[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
 		have rather undefined results).[br]
@@ -301,7 +301,7 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		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"
 		by using the [fnc]$reguser.match[/fnc]() function.[br]
-		Each database entry can have an unlimited number of tqmasks.[br]
+		Each database entry can have an unlimited number of masks.[br]
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] "Szymon Stefanek"
@@ -370,7 +370,7 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
 		reguser.deltqmask <tqmask>
 	@description:
 		Removes a tqmask from the regusers database.[br]
-		Since tqmasks are unique in the database , you don't need to pass
+		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>
 		will surely remove it from that <user> entry. (contorsions ?)[br]
 	@examples:
@@ -720,13 +720,13 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 	@title:
 		$reguser.list
 	@short:
-		Get a list of registered user tqmasks
+		Get a list of registered user masks
 	@syntax:
 		$reguser.list([tqmask])
 	@description:
 		Returns an array of the entries in the registered users database.[br]
 		If <tqmask> is specified, only entries matching the <tqmask>
-		and the entries with no registration tqmasks are listed.[br]
+		and the entries with no registration masks are listed.[br]
 		Please note that <tqmask> is a wildcard string that will match
 		wildcard strings... don't get messed with that :D[br]
 	@seealso:
@@ -758,7 +758,7 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 
 	while(KviRegisteredUser * u = it.current())
 	{
-		KviPointerList<KviIrcMask> * ml = u->tqmaskList();
+		KviPointerList<KviIrcMask> * ml = u->maskList();
 		if(u->matches(tqmask) || (ml->count() == 0))
 		{
 			pArray->set(aid,new KviKvsVariant(u->name()));
@@ -785,7 +785,7 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	@description:
 		Lists the entries in the registered users database.[br]
 		If <tqmask> is specified, only entries matching the <tqmask>
-		and the entries with no registration tqmasks are listed.[br]
+		and the entries with no registration masks are listed.[br]
 		Please note that <tqmask> is a wildcard string that will match
 		wildcard strings... don't get messed with that :D[br]
 	@seealso:
@@ -813,14 +813,14 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	KviPointerHashTableIterator<TQString,KviRegisteredUser> it(*d);
 	while(KviRegisteredUser * u = it.current())
 	{
-		KviPointerList<KviIrcMask> * ml = u->tqmaskList();
+		KviPointerList<KviIrcMask> * ml = u->maskList();
 		if(u->matches(tqmask) || (ml->count() == 0))
 		{
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" User: %c%Q"),KVI_TEXT_BOLD,&(u->name()));
 
 			if(ml->count() == 0)
 			{
-				c->window()->output(KVI_OUT_SYSTEMWARNING,__tr2qs("    Warning: this user has no registration tqmasks"));
+				c->window()->output(KVI_OUT_SYSTEMWARNING,__tr2qs("    Warning: this user has no registration masks"));
 			} else {
 				for(KviIrcMask * m = ml->first();m;m = ml->next())
 				{
@@ -862,7 +862,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 		$reguser.match(<user_tqmask>)
 	@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_tqmasks]irc tqmask[/doc] format but can't contain wildcards.[br]
+		The <user_tqmask> has the common [doc:irc_masks]irc tqmask[/doc] format but can't contain wildcards.[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
@@ -899,7 +899,7 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 		$reguser.exactMatch(<user_tqmask>)
 	@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_tqmasks]wild irc tqmask[/doc] format and can contain wildcards.[br]
+		The <user_tqmask> has the common [doc:irc_masks]wild irc tqmask[/doc] format and can contain wildcards.[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
@@ -934,7 +934,7 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 //	@syntax:
 //		$reguser.matches(<user_tqmask>)
 //	@description:
-//		Returns a comma separated list of registered user tqmasks that match <user_tqmask>.[br]
+//		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
 //		<host> may contain '*' wildcards.[br]
 //		If no registered tqmask matches the <user_tqmask> an empty string is returned.[br]
@@ -983,14 +983,14 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 	@title:
 		$reguser.tqmask
 	@short:
-		Returns the registration tqmasks for a db entry
+		Returns the registration masks for a db entry
 	@syntax:
 		$reguser.tqmask(<name>[,<N>])
 	@description:
 		Returns the <N>th registration tqmask for the registered user database record identified
-		by <name>. If <N> is not given , returns an array of registration tqmasks for that entry.[br]
+		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 tqmasks at all) , an empty string is returned.[br]
+		if <N> is out of range (or there are no masks at all) , an empty string is returned.[br]
 		<N> is a ZERO BASED index.[br]
 	@examples:
 		[example]
@@ -1027,11 +1027,11 @@ static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
 		KviStr n = szName;
 		if(n.hasData() && n.isUnsignedNum())
 		{
-			KviIrcMask * m = u->tqmaskList()->at(n.toInt());
+			KviIrcMask * m = u->maskList()->at(n.toInt());
 			if(m) c->returnValue()->setString(m->nick()+"!"+m->user()+"@"+m->host());
 		} else {
 			int id=0;
-			for(KviIrcMask * m = u->tqmaskList()->first();m;m = u->tqmaskList()->next())
+			for(KviIrcMask * m = u->maskList()->first();m;m = u->maskList()->next())
 			{
 				pArray->set(aid,new KviKvsVariant(TQString(m->nick()+"!"+m->user()+"@"+m->host())));
 				aid++;
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 8d61617e..75693b35 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -109,7 +109,7 @@ 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 tqmasks</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 tqmasks, as they are the only way to verify the identity of a registered user.<br><br>You can enter at most two tqmasks here, if you wish to add more tqmasks, 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 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_pPage2Layout->addMultiCellWidget(m_pLabel2,0,0,0,4);
 
@@ -117,23 +117,23 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	//tqmask.tqmask(szMask,11);
 
-	//KviIrcMask tqmasktempl(szMask.ptr());
+	//KviIrcMask masktempl(szMask.ptr());
 
     m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
     m_pNicknameEdit1->tqsetAlignment(TQt::AlignRight);
 	if(tqmask.nick() != "*")m_pNicknameEdit1->setText(tqmask.nick());
-	connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(tqmaskChanged(const TQString &)));
+	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());
-	connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(tqmaskChanged(const TQString &)));
+	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());
-	connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(tqmaskChanged(const TQString &)));
+	connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
 
     m_pNicknameEdit2 = new TQLineEdit(m_pPage2);
@@ -255,7 +255,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	setFinishEnabled(m_pPage5,true);
 	TQString dummy;
-	tqmaskChanged(dummy);
+	maskChanged(dummy);
 	realNameChanged(dummy);
 	notifyCheckToggled(false);
 
@@ -391,7 +391,7 @@ void KviRegistrationWizard::showEvent(TQShowEvent *e)
 	KviTalWizard::showEvent(e);
 }
 
-void KviRegistrationWizard::tqmaskChanged(const TQString &)
+void KviRegistrationWizard::maskChanged(const TQString &)
 {
 	KviStr tmp1 = m_pNicknameEdit1->text();
 	KviStr tmp2 = m_pUsernameEdit1->text();
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index 23cb4572..209eaabc 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -82,7 +82,7 @@ protected:
 	virtual void reject();
 protected slots:
 	void realNameChanged(const TQString &str);
-	void tqmaskChanged(const TQString &str);
+	void maskChanged(const TQString &str);
 	void notifyNickChanged(const TQString &);
 	void notifyCheckToggled(bool);
 };