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

1 files changed, 17 insertions, 17 deletions

diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index 172da1f6..84bb5f39 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -69,7 +69,7 @@ KviIrcServer * KviIrcServerDataBaseRecord::findServer(const KviIrcServer * pServ
 
 void KviIrcServerDataBaseRecord::setCurrentServer(KviIrcServer *srv)
 {
-	if(m_pServerList->tqfindRef(srv) != -1)m_pCurrentServer = srv;
+	if(m_pServerList->findRef(srv) != -1)m_pCurrentServer = srv;
 }
 
 KviIrcServer * KviIrcServerDataBaseRecord::currentServer()
@@ -126,19 +126,19 @@ void KviIrcServerDataBase::clear()
 KviIrcServerDataBaseRecord * KviIrcServerDataBase::insertNetwork(KviIrcNetwork *n)
 {
 	KviIrcServerDataBaseRecord * r = new KviIrcServerDataBaseRecord(n);
-	m_pRecords->tqreplace(n->name(),r);
+	m_pRecords->replace(n->name(),r);
 	return r;
 }
 
 KviIrcServerDataBaseRecord * KviIrcServerDataBase::findRecord(const TQString &szNetName)
 {
-	return m_pRecords->tqfind(szNetName);
+	return m_pRecords->find(szNetName);
 }
 
 
 KviIrcNetwork * KviIrcServerDataBase::findNetwork(const TQString &szName)
 {
-	KviIrcServerDataBaseRecord * r = m_pRecords->tqfind(szName);
+	KviIrcServerDataBaseRecord * r = m_pRecords->find(szName);
 	if(!r)return 0;
 	return r->network();
 }
@@ -146,7 +146,7 @@ KviIrcNetwork * KviIrcServerDataBase::findNetwork(const TQString &szName)
 KviIrcServerDataBaseRecord * KviIrcServerDataBase::currentRecord()
 {
 	KviIrcServerDataBaseRecord * r = 0;
-	if(!m_szCurrentNetwork.isEmpty())r = m_pRecords->tqfind(m_szCurrentNetwork);
+	if(!m_szCurrentNetwork.isEmpty())r = m_pRecords->find(m_szCurrentNetwork);
 	if(r)return r;
 
 	KviPointerHashTableIterator<TQString,KviIrcServerDataBaseRecord> it(*m_pRecords);
@@ -185,11 +185,11 @@ bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const TQString &szNetN
 	for(KviIrcServer * s = r->m_pServerList->first();s;s = r->m_pServerList->next())
 	{
 #ifdef COMPILE_USE_QT4
-		if(s->m_szDescription.tqcontains("random",TQt::CaseInsensitive) ||
-			(s->m_szDescription.tqcontains("round",TQt::CaseInsensitive) && s->m_szDescription.tqcontains("robin",TQt::CaseInsensitive)))
+		if(s->m_szDescription.contains("random",TQt::CaseInsensitive) ||
+			(s->m_szDescription.contains("round",TQt::CaseInsensitive) && s->m_szDescription.contains("robin",TQt::CaseInsensitive)))
 #else
-		if(s->m_szDescription.tqcontains("random",false) ||
-			(s->m_szDescription.tqcontains("round",false) && s->m_szDescription.tqcontains("robin",false)))
+		if(s->m_szDescription.contains("random",false) ||
+			(s->m_szDescription.contains("round",false) && s->m_szDescription.contains("robin",false)))
 #endif
 		{
 			r->setCurrentServer(s);
@@ -234,7 +234,7 @@ bool KviIrcServerDataBase::makeCurrentServer(KviIrcServerDefinition * d,TQString
 		// net:networkname form
 		TQString szNet = d->szServer;
 		szNet.remove(0,4);
-		KviIrcServerDataBaseRecord * r = m_pRecords->tqfind(szNet);
+		KviIrcServerDataBaseRecord * r = m_pRecords->find(szNet);
 		if(r)return makeCurrentBestServerInNetwork(szNet,r,szError);
 		szError = __tr2qs("The server specification seems to be in the net:<string> but the network couln't be found in the database");
 		return false;
@@ -344,13 +344,13 @@ search_finished:
 	{
 		// is it a valid hostname ? (must contain at least one dot)
 #ifdef COMPILE_USE_QT4
-		if(!d->szServer.tqcontains('.'))
+		if(!d->szServer.contains('.'))
 #else
-		if(d->szServer.tqcontains('.') < 1)
+		if(d->szServer.contains('.') < 1)
 #endif
 		{
 			// assume it is a network name!
-			KviIrcServerDataBaseRecord * r = m_pRecords->tqfind(d->szServer);
+			KviIrcServerDataBaseRecord * r = m_pRecords->find(d->szServer);
 			if(r)return makeCurrentBestServerInNetwork(d->szServer,r,szError);
 			// else probably not a network name
 		}
@@ -358,11 +358,11 @@ search_finished:
 
 	// a valid hostname or ip address , not found in list : add it and make it current
 
-	r = m_pRecords->tqfind(__tr2qs("Standalone Servers"));
+	r = m_pRecords->find(__tr2qs("Standalone Servers"));
 	if(!r)
 	{
 		r = new KviIrcServerDataBaseRecord(new KviIrcNetwork(__tr2qs("Standalone Servers")));
-		m_pRecords->tqreplace(r->network()->name(),r);
+		m_pRecords->replace(r->network()->name(),r);
 	}
 
 	KviIrcServer * s = new KviIrcServer();
@@ -401,7 +401,7 @@ void parseMircServerRecord(TQString entry,TQString& szNet,
 						   TQString& szDescription,TQString& szHost,TQString& szPort,bool& bSsl,kvi_u32_t& uPort)
 {
 	bSsl = false;
-	int idx = KviTQString::tqfind(entry,"SERVER:");
+	int idx = KviTQString::find(entry,"SERVER:");
 	if(idx != -1)
 	{
 		szDescription = entry.left(idx);
@@ -409,7 +409,7 @@ void parseMircServerRecord(TQString entry,TQString& szNet,
 		szDescription=szDescription.section(':',1,1);
 
 		entry.remove(0,idx + 7);
-		idx = KviTQString::tqfind(entry,"GROUP:");
+		idx = KviTQString::find(entry,"GROUP:");
 		if(idx != -1)
 		{
 			szHost = entry.left(idx);