rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

3 files changed, 17 insertions, 17 deletions

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 1f816ed4..c6a5f70a 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -347,7 +347,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint
 				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()))
+					if((tmp.find('*') == -1) && (tmp.find('?') == -1) && (!tmp.isEmpty()))
 					{
 						if(!szMask.isEmpty())szMask.append(' ');
 						szMask.append(tmp);
@@ -355,10 +355,10 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint
 				}
 				// if the nickname list is still empty , build a dummy nick to notify
 				szMask = i->user()->name();
-				szMask.tqreplace(" ","");
-				szMask.tqreplace("'","");
-				szMask.tqreplace("&","");
-				szMask.tqreplace(",","");
+				szMask.replace(" ","");
+				szMask.replace("'","");
+				szMask.replace("&","");
+				szMask.replace(",","");
 	
 				i->user()->setProperty("notify",szMask);
 			}
@@ -433,7 +433,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalListViewItem *
 			for(KviPointerHashTableEntry<TQString,KviRegisteredUserGroup> * g = pGroups->firstEntry();g;g = pGroups->nextEntry())
 			{
 				int id=groups->insertItem(g->key());
-				m_TmpDict.tqreplace(id,g->data());
+				m_TmpDict.replace(id,g->data());
 			}
 			
 			connect(groups,TQT_SIGNAL(activated ( int )),this,TQT_SLOT(moveToGroupMenuClicked(int)));
@@ -447,7 +447,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalListViewItem *
 
 void KviRegisteredUsersDialog::moveToGroupMenuClicked(int id)
 {
-	TQString szGroup=m_TmpDict.tqfind(id)->name();
+	TQString szGroup=m_TmpDict.find(id)->name();
 	KviTalListViewItemIterator it( m_pListView,  KviTalListViewItemIterator::Selected );
 	while ( it.current() ) {
 		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)(it.current());
@@ -481,10 +481,10 @@ void KviRegisteredUsersDialog::fillList()
 	{
 		if(u->group().isEmpty())
 			u->setGroup(__tr("Default"));
-		if(groupItems.tqfind(u->group()))
-			item = new KviRegisteredUsersDialogItem(groupItems.tqfind(u->group()),u);
-		else if(groupItems.tqfind(__tr("Default")))
-			item = new KviRegisteredUsersDialogItem(groupItems.tqfind(__tr("Default")),u);
+		if(groupItems.find(u->group()))
+			item = new KviRegisteredUsersDialogItem(groupItems.find(u->group()),u);
+		else if(groupItems.find(__tr("Default")))
+			item = new KviRegisteredUsersDialogItem(groupItems.find(__tr("Default")),u);
 		else { //should never be called
 			KviRegisteredUserGroup* pGroup = g_pLocalRegisteredUserDataBase->addGroup(__tr("Default"));
 			KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,pGroup);
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 97019154..66e89d18 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -171,7 +171,7 @@ void KviReguserPropertiesDialog::okClicked()
 		TQString szValue = m_pTable->text(i,1);
 		if((!szName.isEmpty()) && (!szValue.isEmpty()))
 		{
-			m_pPropertyDict->tqreplace(szName,new TQString(szValue));
+			m_pPropertyDict->replace(szName,new TQString(szValue));
 		}
 	}
 
@@ -725,7 +725,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	} else {
 		KviStr szPath = m_pAvatar->path();
 		if(szPath.isEmpty())m_pPropertyDict->remove("avatar");
-		else m_pPropertyDict->tqreplace("avatar",new TQString(szPath));
+		else m_pPropertyDict->replace("avatar",new TQString(szPath));
 	}
 
 	if(m_pNotifyCheck->isChecked())
@@ -734,7 +734,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	
 		if(!szNicks.isEmpty())
 		{
-			m_pPropertyDict->tqreplace("notify",new TQString(szNicks));
+			m_pPropertyDict->replace("notify",new TQString(szNicks));
 		} else {
 			m_pPropertyDict->remove("notify");
 		}
@@ -751,7 +751,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	}
 	delete dlg;
 
-	TQString * notify = m_pPropertyDict->tqfind("notify");
+	TQString * notify = m_pPropertyDict->find("notify");
 	bool bGotIt = false;
 	if(notify)
 	{
@@ -765,7 +765,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	m_pNotifyNick->setEnabled(bGotIt);
 	if(!bGotIt)m_pNotifyNick->setText("");
 
-	TQString * avatar = m_pPropertyDict->tqfind("avatar");
+	TQString * avatar = m_pPropertyDict->find("avatar");
 	bGotIt = false;
 	if(avatar)
 	{
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 86bac9f7..6b8f7155 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -190,7 +190,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	if(c->hasSwitch('r',"tqreplace"))g_pRegisteredUserDataBase->removeUser(szName);
+	if(c->hasSwitch('r',"replace"))g_pRegisteredUserDataBase->removeUser(szName);
 
 
 	KviRegisteredUser * u = g_pRegisteredUserDataBase->addUser(szName);