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

1 files changed, 11 insertions, 11 deletions

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 &)