rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

25 files changed, 64 insertions, 64 deletions

diff --git a/plugins/infowidget/chunkdownloadview.cpp b/plugins/infowidget/chunkdownloadview.cpp
index 3258441..cec3386 100644
--- a/plugins/infowidget/chunkdownloadview.cpp
+++ b/plugins/infowidget/chunkdownloadview.cpp
@@ -95,7 +95,7 @@ namespace kt
 		
 	void ChunkDownloadView::removeDownload(kt::ChunkDownloadInterface* cd)
 	{
-		if (!items.tqcontains(cd))
+		if (!items.contains(cd))
 			return;
 		
 		ChunkDownloadViewItem* it = items[cd];
diff --git a/plugins/infowidget/flagdb.cpp b/plugins/infowidget/flagdb.cpp
index ceea6fc..c7ec520 100644
--- a/plugins/infowidget/flagdb.cpp
+++ b/plugins/infowidget/flagdb.cpp
@@ -92,7 +92,7 @@ bool kt::FlagDB::isFlagAvailable(const TQString& country)
 const TQPixmap& kt::FlagDB::getFlag(const TQString& country)
 {
 	const TQString& c = country.lower();
-	if (!db.tqcontains(c)) {
+	if (!db.contains(c)) {
 		TQImage img;
 		TQPixmap pixmap;
 		for (TQValueList<FlagDBSource>::const_iterator it = sources.constBegin(); it != sources.constEnd(); it++) {
diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp
index a3876c6..a6b0675 100644
--- a/plugins/infowidget/peerview.cpp
+++ b/plugins/infowidget/peerview.cpp
@@ -267,7 +267,7 @@ namespace kt
 	
 	void PeerView::removePeer(kt::PeerInterface* peer)
 	{
-		TQMap<kt::PeerInterface*,PeerViewItem*>::iterator it = items.tqfind(peer);
+		TQMap<kt::PeerInterface*,PeerViewItem*>::iterator it = items.find(peer);
 		if (it == items.end())
 		{
 			return;
diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp
index 158b4f8..5ca35c4 100644
--- a/plugins/partfileimport/importdialog.cpp
+++ b/plugins/partfileimport/importdialog.cpp
@@ -146,7 +146,7 @@ namespace kt
 				TQString durl = data_url.path();
 				if (durl.endsWith(bt::DirSeparator()))
 					durl = durl.left(durl.length() - 1);
-				int ds = durl.tqfindRev(bt::DirSeparator());
+				int ds = durl.findRev(bt::DirSeparator());
 				if (durl.mid(ds+1) == tor.getNameSuggestion())
 				{
 					durl = durl.left(ds);
@@ -163,7 +163,7 @@ namespace kt
 				// single file, just symlink the data_url to tor_dir/cache
 				bt::SymLink(data_url.path(),tor_dir + "cache");
 				TQString durl = data_url.path();
-				int ds = durl.tqfindRev(bt::DirSeparator());
+				int ds = durl.findRev(bt::DirSeparator());
 				durl = durl.left(ds);
 				saveStats(tor_dir + "stats",durl,imported,false);
 			}
diff --git a/plugins/rssfeed/rss/tools_p.cpp b/plugins/rssfeed/rss/tools_p.cpp
index 51fcbf5..fb161e8 100644
--- a/plugins/rssfeed/rss/tools_p.cpp
+++ b/plugins/rssfeed/rss/tools_p.cpp
@@ -20,7 +20,7 @@ time_t RSS::parseISO8601Date(const TQString &s)
         return 0; // error
 
     // FIXME: imho this is done in KRFCDate::parseDateISO8601() automatically, so we could omit it? -fo
-	if (s.tqfind('T') != -1)
+	if (s.find('T') != -1)
 		return KRFCDate::parseDateISO8601(s);
     else
         return KRFCDate::parseDateISO8601(s + "T12:00:00");
@@ -35,10 +35,10 @@ TQString RSS::extractNode(const TQDomNode &tqparent, const TQString &elemName, b
 
 	TQString result = node.toElement().text();
 
-	bool hasPre = result.tqcontains("<pre>",false);
-	bool hasHtml = hasPre || result.tqcontains("<");	// FIXME: test if we have html, should be more clever -> regexp
+	bool hasPre = result.contains("<pre>",false);
+	bool hasHtml = hasPre || result.contains("<");	// FIXME: test if we have html, should be more clever -> regexp
 	if(!isInlined && !hasHtml)						// perform nl2br if not a inline elt and it has no html elts
-		result = result = result.tqreplace(TQChar('\n'), "<br />");
+		result = result = result.replace(TQChar('\n'), "<br />");
 	if(!hasPre)										// strip white spaces if no <pre>
 		result = result.simplifyWhiteSpace();
 
diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index f5b4c64..ef81495 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -182,7 +182,7 @@ namespace kt
 	{
 		TQDir directory;
 		directory.mkdir(KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds");
-		return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).tqreplace("/", "_").tqreplace(":", "_") + ".ktr";
+		return KGlobal::dirs()->saveLocation("data","ktorrent") + "rssfeeds/" + m_feedUrl.prettyURL(-1).replace("/", "_").replace(":", "_") + ".ktr";
 		
 	}
 	
@@ -290,7 +290,7 @@ namespace kt
 			for (int i=doc.articles().count()-1; i>=0; i--)
 			{
 				curArticle = doc.articles()[i];
-				if (curArticle.pubDate().daysTo(TQDateTime::tqcurrentDateTime()) < m_articleAge && !m_articles.tqcontains(curArticle))
+				if (curArticle.pubDate().daysTo(TQDateTime::tqcurrentDateTime()) < m_articleAge && !m_articles.contains(curArticle))
 				{
 					m_articles.prepend(curArticle);
 					emit scanRssArticle(curArticle);
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index 6646f06..f9d0a2f 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -138,7 +138,7 @@ namespace kt
 	
 	void RssFeedManager::clearArticles()
 	{
-		int pos = feeds.tqfind((RssFeed *)sender());
+		int pos = feeds.find((RssFeed *)sender());
 			
 		if (pos >= 0)
 		{
@@ -606,7 +606,7 @@ namespace kt
 		if (item < 0)
 		{
 			//let's check which one sent the signal - if we can't figure it all then update them all
-			int pos = feeds.tqfind((RssFeed *)sender());
+			int pos = feeds.find((RssFeed *)sender());
 			
 			if (pos < 0)
 			{
@@ -639,7 +639,7 @@ namespace kt
 		if (item < 0)
 		{
 			//let's check which one sent the signal - if we can't figure it all then update them all
-			int pos = acceptFilters.tqfind((RssFilter *)sender());
+			int pos = acceptFilters.find((RssFilter *)sender());
 			
 			if (pos < 0)
 			{
@@ -672,7 +672,7 @@ namespace kt
 		if (item < 0)
 		{
 			//let's check which one sent the signal - if we can't figure it all then update them all
-			int pos = rejectFilters.tqfind((RssFilter *)sender());
+			int pos = rejectFilters.find((RssFilter *)sender());
 			
 			if (pos < 0)
 			{
@@ -1254,7 +1254,7 @@ namespace kt
 	
 	void RssFeedManager::rescanFilter()
 	{
-		int pos = acceptFilters.tqfind((RssFilter *)sender());
+		int pos = acceptFilters.find((RssFilter *)sender());
 		
 		if (pos >= 0)
 		{
diff --git a/plugins/rssfeed/rssfilter.cpp b/plugins/rssfeed/rssfilter.cpp
index e7c4925..8210bcc 100644
--- a/plugins/rssfeed/rssfilter.cpp
+++ b/plugins/rssfeed/rssfilter.cpp
@@ -276,14 +276,14 @@ namespace kt
 			
 			if (!invert)
 			{
-				if (!article.title().tqcontains(regEx) && !article.link().prettyURL().tqcontains(regEx) && !article.description().tqcontains(regEx) )
+				if (!article.title().contains(regEx) && !article.link().prettyURL().contains(regEx) && !article.description().contains(regEx) )
 				{
 					return false;
 				}
 			}
 			else
 			{
-				if (article.title().tqcontains(regEx) || article.link().prettyURL().tqcontains(regEx) || article.description().tqcontains(regEx) )
+				if (article.title().contains(regEx) || article.link().prettyURL().contains(regEx) || article.description().contains(regEx) )
 				{
 					return false;
 				}
diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
index 467055e..dd754e5 100644
--- a/plugins/rssfeed/rsslinkdownloader.cpp
+++ b/plugins/rssfeed/rsslinkdownloader.cpp
@@ -83,7 +83,7 @@ namespace kt
 						hrefTags.setMinimal(true);
 						
 						int matchPos = 0;
-						while (htmlline.tqfind(hrefTags, matchPos) >= 0)
+						while (htmlline.find(hrefTags, matchPos) >= 0)
 							{
 							matchPos += hrefTags.matchedLength();
 							//we're found an <a href tag - let's check it if contains download
@@ -100,7 +100,7 @@ namespace kt
 							hrefText = TQString("HREF=\"?([^\">< ]*)[\" ]");
 							hrefText.setCaseSensitive(false);
 				
-							hrefTags.tqcapturedTexts()[0].tqfind(hrefText);
+							hrefTags.tqcapturedTexts()[0].find(hrefText);
 							//lets get the captured
 							TQString hrefLink = hrefText.capturedTexts()[1];
 								
@@ -110,7 +110,7 @@ namespace kt
 								} 
 							else if (!hrefLink.tqstartsWith("http://", false)) 
 								{
-								hrefLink = url.url().left(url.url().tqfindRev("/")+1) + hrefLink;
+								hrefLink = url.url().left(url.url().findRev("/")+1) + hrefLink;
 								}
 								
 							subLinks.append(hrefLink);
diff --git a/plugins/scanfolder/scanfolder.cpp b/plugins/scanfolder/scanfolder.cpp
index 36b1ce2..fbac691 100644
--- a/plugins/scanfolder/scanfolder.cpp
+++ b/plugins/scanfolder/scanfolder.cpp
@@ -132,7 +132,7 @@ namespace kt
 			return;
 		
 		//search for entry
-		TQValueList<KURL>::iterator it = m_pendingURLs.tqfind(url);
+		TQValueList<KURL>::iterator it = m_pendingURLs.find(url);
 		
 		//if no entry is found than this torrent was not started by this plugin so - quit
 		if(it == m_pendingURLs.end())
diff --git a/plugins/search/searchenginelist.cpp b/plugins/search/searchenginelist.cpp
index 9e22990..a117f79 100644
--- a/plugins/search/searchenginelist.cpp
+++ b/plugins/search/searchenginelist.cpp
@@ -51,9 +51,9 @@ namespace kt
 
 			// replace spaces by %20
 			TQString name = e.name;
-			name = name.tqreplace(" ","%20");
+			name = name.replace(" ","%20");
 			TQString u = e.url.prettyURL();
-			u = u.tqreplace(" ","%20");
+			u = u.replace(" ","%20");
 			out << name << " " << u << ::endl;
 			i++;
 		}
@@ -85,7 +85,7 @@ namespace kt
 		
 			SearchEngine se;
 			se.name = tokens[0];
-			se.name = se.name.tqreplace("%20"," ");
+			se.name = se.name.replace("%20"," ");
 			se.url = KURL::fromPathOrURL(tokens[1]);
 		
 			for(Uint32 i=2; i<tokens.count(); ++i)
diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp
index 8638dfe..9b13680 100644
--- a/plugins/search/searchplugin.cpp
+++ b/plugins/search/searchplugin.cpp
@@ -102,7 +102,7 @@ namespace kt
 				engine = 0;
 		
 			TQString s_url = sl.getSearchURL(engine).prettyURL();
-			s_url.tqreplace("FOOBAR", KURL::encode_string(text), true);
+			s_url.replace("FOOBAR", KURL::encode_string(text), true);
 			KURL url = KURL::fromPathOrURL(s_url);
 			
 			if(SearchPluginSettings::useDefaultBrowser())
@@ -141,7 +141,7 @@ namespace kt
 	
 	void SearchPlugin::tabCloseRequest(kt::GUIInterface* gui,TQWidget* tab)
 	{
-		if (searches.tqcontains((SearchWidget*)tab))
+		if (searches.contains((SearchWidget*)tab))
 		{
 			searches.remove((SearchWidget*)tab);
 			gui->removeTabPage(tab);
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index e7ee9c3..197dd0f 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -112,7 +112,7 @@ namespace kt
 			TQListViewItem* item = itr.current();
 			TQString u = item->text(1);
 			TQString name = item->text(0);
-			out << name.tqreplace(" ","%20") << " " << u.tqreplace(" ","%20") <<  endl;
+			out << name.replace(" ","%20") << " " << u.replace(" ","%20") <<  endl;
 			itr++;
 		}
 	}
@@ -123,7 +123,7 @@ namespace kt
 		{
 			KMessageBox::error(this, i18n("You must enter the search engine's name and URL"));
 		}
-		else if ( m_engine_url->text().tqcontains("FOOBAR")  )
+		else if ( m_engine_url->text().contains("FOOBAR")  )
 		{
 			KURL url = KURL::fromPathOrURL(m_engine_url->text());
 			if ( !url.isValid() ) 
@@ -132,7 +132,7 @@ namespace kt
 				return; 
 			}
 			
-			if (m_engines->tqfindItem(m_engine_name->text(), 0)) 
+			if (m_engines->findItem(m_engine_name->text(), 0)) 
 			{
 				KMessageBox::error(this, i18n("A search engine with the same name already exists. Please use a different name.")); return; 
 			}
@@ -217,7 +217,7 @@ namespace kt
 
 			TQStringList tokens = TQStringList::split(" ", line);
 			TQString name = tokens[0];
-			name = name.tqreplace("%20"," ");
+			name = name.replace("%20"," ");
 			
 			KURL url = KURL::fromPathOrURL(tokens[1]);
 			for(Uint32 i=2; i<tokens.count(); ++i)
@@ -229,7 +229,7 @@ namespace kt
 		TQMap<TQString,KURL>::iterator i = engines.begin();
 		while (i != engines.end())
 		{	
-			TQListViewItem* item = m_engines->tqfindItem(i.key(),0);
+			TQListViewItem* item = m_engines->findItem(i.key(),0);
 			// if we have found the item, replace it if not make a new one
 			if (item)
 				item->setText(1, i.data().prettyURL());
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index b7e2627..abe1f39 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -172,7 +172,7 @@ namespace kt
 			engine = sbar->m_search_engine->currentItem();
 		
 		TQString s_url = sl.getSearchURL(engine).prettyURL();
-		s_url.tqreplace("FOOBAR", KURL::encode_string(text), true);
+		s_url.replace("FOOBAR", KURL::encode_string(text), true);
 		KURL url = KURL::fromPathOrURL(s_url);
 	
 		statusBarMsg(i18n("Searching for %1...").tqarg(text));
diff --git a/plugins/stats/ChartDrawer.cc b/plugins/stats/ChartDrawer.cc
index 5824684..4c7c1d3 100644
--- a/plugins/stats/ChartDrawer.cc
+++ b/plugins/stats/ChartDrawer.cc
@@ -433,8 +433,8 @@ void ChartDrawer::MakeLegendTooltip()
 			img[i].setPixel(15, px, 0); //r
 		}
 		
-		factory->setImage(mEls[i].GetName().tqreplace(' ', '_') + "-" + TQString::number(i), img[i]);
-		helpstr += TQString("<img src='%1'>&nbsp;&nbsp;-&nbsp;&nbsp;%2<br>").tqarg(mEls[i].GetName().tqreplace(" ", "_") + "-" + TQString::number(i)).tqarg( mEls[i].GetName() );	
+		factory->setImage(mEls[i].GetName().replace(' ', '_') + "-" + TQString::number(i), img[i]);
+		helpstr += TQString("<img src='%1'>&nbsp;&nbsp;-&nbsp;&nbsp;%2<br>").tqarg(mEls[i].GetName().replace(" ", "_") + "-" + TQString::number(i)).tqarg( mEls[i].GetName() );	
 	}
 	
 	TQToolTip::add(this, helpstr);
diff --git a/plugins/stats/PeerMonitor.cc b/plugins/stats/PeerMonitor.cc
index 8a903c3..083e158 100644
--- a/plugins/stats/PeerMonitor.cc
+++ b/plugins/stats/PeerMonitor.cc
@@ -43,7 +43,7 @@ void PeerMonitor::peerRemoved (kt::PeerInterface *peer)
 
 	TQMutexLocker lock(&mtx);
 
-	data_t::iterator it = std::tqfind(mPeers.begin(), mPeers.end(), peer);
+	data_t::iterator it = std::find(mPeers.begin(), mPeers.end(), peer);
 	
 	if(it != mPeers.end())
 	{
@@ -73,7 +73,7 @@ void PeerMonitor::stopped ()
 
 void PeerMonitor::destroyed () 
 { 
-	if(pmPeerMMgr -> tqfind(pmTorIface -> getInfoHash()) != pmPeerMMgr -> end() )
+	if(pmPeerMMgr -> find(pmTorIface -> getInfoHash()) != pmPeerMMgr -> end() )
 	{
 		pmTorIface -> setMonitor(0);
 		pmPeerMMgr -> erase(pmTorIface -> getInfoHash());
diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp
index 6395752..facf207 100644
--- a/plugins/upnp/upnpmcastsocket.cpp
+++ b/plugins/upnp/upnpmcastsocket.cpp
@@ -103,7 +103,7 @@ namespace kt
 		else
 		{
 			// add it to the list and emit the signal
-			if (!routers.tqcontains(r->getServer()))
+			if (!routers.contains(r->getServer()))
 			{
 				routers.insert(r->getServer(),r);
 				discovered(r);
@@ -164,13 +164,13 @@ namespace kt
 		
 		// first read first line and see if contains a HTTP 200 OK message
 		TQString line = lines.first();
-		if (!line.tqcontains("HTTP"))
+		if (!line.contains("HTTP"))
 		{
 			// it is either a 200 OK or a NOTIFY
-			if (!line.tqcontains("NOTIFY") && !line.tqcontains("200")) 
+			if (!line.contains("NOTIFY") && !line.contains("200")) 
 				return 0;
 		}
-		else if (line.tqcontains("M-SEARCH")) // ignore M-SEARCH 
+		else if (line.contains("M-SEARCH")) // ignore M-SEARCH 
 			return 0;
 		
 		// quick check that the response being parsed is valid 
@@ -178,7 +178,7 @@ namespace kt
 		for (Uint32 idx = 0;idx < lines.count() && !validDevice; idx++) 
 		{ 
 			line = lines[idx]; 
-			if ((line.tqcontains("ST:") || line.tqcontains("NT:")) && line.tqcontains("InternetGatewayDevice")) 
+			if ((line.contains("ST:") || line.contains("NT:")) && line.contains("InternetGatewayDevice")) 
 			{
 				validDevice = true; 
 			}
@@ -195,20 +195,20 @@ namespace kt
 			line = lines[i];
 			if (line.startsWith("Location") || line.startsWith("LOCATION") || line.startsWith("location"))
 			{
-				location = line.mid(line.tqfind(':') + 1).stripWhiteSpace();
+				location = line.mid(line.find(':') + 1).stripWhiteSpace();
 				if (!location.isValid())
 					return 0;
 			}
 			else if (line.startsWith("Server") || line.startsWith("server") || line.startsWith("SERVER"))
 			{
-				server = line.mid(line.tqfind(':') + 1).stripWhiteSpace();
+				server = line.mid(line.find(':') + 1).stripWhiteSpace();
 				if (server.length() == 0)
 					return 0;
 				
 			}
 		}
 		
-		if (routers.tqcontains(server))
+		if (routers.contains(server))
 		{
 			return 0;
 		}
@@ -265,7 +265,7 @@ namespace kt
 			TQString server, location;
 			server = fin.readLine();
 			location = fin.readLine();
-			if (!routers.tqcontains(server))
+			if (!routers.contains(server))
 			{
 				UPnPRouter* r = new UPnPRouter(server,location);
 				// download it's xml file
diff --git a/plugins/upnp/upnpmcastsocket.h b/plugins/upnp/upnpmcastsocket.h
index 86688a2..cc7a134 100644
--- a/plugins/upnp/upnpmcastsocket.h
+++ b/plugins/upnp/upnpmcastsocket.h
@@ -49,7 +49,7 @@ namespace kt
 		Uint32 getNumDevicesDiscovered() const {return routers.count();}
 		
 		/// Find a router using it's server name
-		UPnPRouter* findDevice(const TQString & name) {return routers.tqfind(name);}
+		UPnPRouter* findDevice(const TQString & name) {return routers.find(name);}
 		
 		/// Save all routers to a file (for convenience at startup)
 		void saveRouters(const TQString & file);
diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp
index bd4e593..bc05ad4 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/plugins/upnp/upnpprefwidget.cpp
@@ -201,7 +201,7 @@ namespace kt
 					msg += TQString::number(f.port.number) + " (";
 					TQString prot = (f.port.proto == net::UDP ? "UDP" : "TCP");
 					msg +=  prot + ")";
-					if (f.service->servicetype.tqcontains("WANPPPConnection"))
+					if (f.service->servicetype.contains("WANPPPConnection"))
 						services += "PPP";
 					else
 						services += "IP";
diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp
index 06d8d34..d04449b 100644
--- a/plugins/webinterface/httpserver.cpp
+++ b/plugins/webinterface/httpserver.cpp
@@ -88,7 +88,7 @@ namespace kt
 	void HttpServer::slotSocketReadyToRead()
 	{
 		TQSocket* client = (TQSocket*)sender();
-		HttpClientHandler* handler = clients.tqfind(client);
+		HttpClientHandler* handler = clients.find(client);
 		if (!handler)
 		{
 			client->deleteLater();
@@ -112,7 +112,7 @@ namespace kt
 		Uint8 h = (a.latin1() - (a.isNumber() ? '0' : 'a')) << 4;
 		Uint8 l = (b.latin1() - (b.isNumber() ? '0' : 'a'));
 		char r = (char) h | l; // combine them and cast to a char
-		password.tqreplace(idx,3,r);
+		password.replace(idx,3,r);
 		return idx + 1;
 	}
 	
@@ -134,7 +134,7 @@ namespace kt
 			
 			// check for passwords with url encoded stuff in them and decode them if necessary
 			int idx = 0;
-			while ((idx = password.tqfind('%',idx)) > 0)
+			while ((idx = password.find('%',idx)) > 0)
 			{
 				if (idx + 2 < password.length())
 				{
@@ -170,7 +170,7 @@ namespace kt
 		if (hdr.hasKey("Cookie"))
 		{
 			TQString cookie = hdr.value("Cookie");
-			int idx = cookie.tqfind("KT_SESSID=");
+			int idx = cookie.find("KT_SESSID=");
 			if (idx == -1)
 				return false;
 			
@@ -432,7 +432,7 @@ namespace kt
 	{
 		const char* ptr = data.data();
 		Uint32 len = data.size();
-		int pos = TQString(data).tqfind("\r\n\r\n");
+		int pos = TQString(data).find("\r\n\r\n");
 		
 		if (pos == -1 || pos + 4 >= len || ptr[pos + 4] != 'd')
 		{
@@ -540,7 +540,7 @@ namespace kt
 	
 	bt::MMapFile* HttpServer::cacheLookup(const TQString & name)
 	{
-		return cache.tqfind(name);
+		return cache.find(name);
 	}
 	
 	void HttpServer::insertIntoCache(const TQString & name,bt::MMapFile* file)
diff --git a/plugins/webinterface/php_handler.cpp b/plugins/webinterface/php_handler.cpp
index 852f1fd..87c8acd 100644
--- a/plugins/webinterface/php_handler.cpp
+++ b/plugins/webinterface/php_handler.cpp
@@ -48,7 +48,7 @@ namespace kt
 	bool PhpHandler::executeScript(const TQString & path,const TQMap<TQString,TQString> & args)
 	{
 		TQByteArray php_s;
-		if (!scripts.tqcontains(path))
+		if (!scripts.contains(path))
 		{
 			TQFile fptr(path);
 			if (!fptr.open(IO_ReadOnly))
@@ -66,7 +66,7 @@ namespace kt
 		
 		output.resize(0);
 	
-		int firstphptag = TQCString(php_s).tqfind("<?php");
+		int firstphptag = TQCString(php_s).find("<?php");
 		if (firstphptag == -1)
 			return false;
 		
diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
index 4206caa..fe98c00 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/plugins/webinterface/php_interface.cpp
@@ -114,13 +114,13 @@ namespace kt
 			out << TQString("\"leechers_connected_to\" => %1,\n").tqarg(stats.leechers_connected_to);
 			out << TQString("\"status\" => %1,\n").tqarg(stats.status);
 			out << TQString("\"running\" => %1,\n").tqarg(stats.running);
-			out << TQString("\"trackerstatus\" => \"%1\",\n").tqarg(stats.trackerstatus.tqreplace("\\", "\\\\").tqreplace("\"", "\\\"").tqreplace("$", "\\$"));
+			out << TQString("\"trackerstatus\" => \"%1\",\n").tqarg(stats.trackerstatus.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
 			out << TQString("\"session_bytes_downloaded\" => %1,\n").tqarg(stats.session_bytes_downloaded);
 			out << TQString("\"session_bytes_uploaded\" => %1,\n").tqarg(stats.session_bytes_uploaded);
 			out << TQString("\"trk_bytes_downloaded\" => %1,\n").tqarg(stats.trk_bytes_downloaded);
 			out << TQString("\"trk_bytes_uploaded\" => %1,\n").tqarg(stats.trk_bytes_uploaded);
-			out << TQString("\"torrent_name\" => \"%1\",\n").tqarg(stats.torrent_name.tqreplace("\\", "\\\\").tqreplace("\"", "\\\"").tqreplace("$", "\\$"));
-			out << TQString("\"output_path\" => \"%1\",\n").tqarg(stats.output_path.tqreplace("\\", "\\\\").tqreplace("\"", "\\\"").tqreplace("$", "\\$"));
+			out << TQString("\"torrent_name\" => \"%1\",\n").tqarg(stats.torrent_name.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
+			out << TQString("\"output_path\" => \"%1\",\n").tqarg(stats.output_path.replace("\\", "\\\\").replace("\"", "\\\"").replace("$", "\\$"));
 			out << TQString("\"stopped_by_error\" => \"%1\",\n").tqarg(stats.stopped_by_error);
 			out << TQString("\"completed\" => \"%1\",\n").tqarg(stats.completed);
 			out << TQString("\"user_controlled\" => \"%1\",\n").tqarg(stats.user_controlled);
@@ -263,7 +263,7 @@ namespace kt
 					break;
 				case 'f':
 					//parse argument into torrent number and file number
-					separator_loc=it.data().tqfind('-');
+					separator_loc=it.data().find('-');
 					parse=it.data();
 					torrent_num.append(parse.left(separator_loc));
 					file_num.append(parse.right(parse.length()-(separator_loc+1)));
diff --git a/plugins/webinterface/www/coldmilk/rest.php b/plugins/webinterface/www/coldmilk/rest.php
index a61cbfe..91b67a7 100644
--- a/plugins/webinterface/www/coldmilk/rest.php
+++ b/plugins/webinterface/www/coldmilk/rest.php
@@ -174,7 +174,7 @@ class RestInterface {
 	// Truncate long torrent name, and HTML escape it.
 	// This is a helper function for download_status.
 	private function _clean_name($name) {
-		$name = str_tqreplace("'", "\'", $name);
+		$name = str_replace("'", "\'", $name);
 		if (strlen($name) > 30) {
 				$name = substr($name, 0, 27);
 				$name .= "...";
diff --git a/plugins/webinterface/www/default/interface.php b/plugins/webinterface/www/default/interface.php
index 929bd94..f34e651 100644
--- a/plugins/webinterface/www/default/interface.php
+++ b/plugins/webinterface/www/default/interface.php
@@ -118,7 +118,7 @@ function generate_button_code($img, $alt, $href='')
 		foreach ($stats as $torrent) {
 			echo "\t\t".'<tr>'."\n\t\t\t";
 
-			$torrent_name = str_tqreplace("'", "\'", $torrent['torrent_name']);
+			$torrent_name = str_replace("'", "\'", $torrent['torrent_name']);
 			if($torrent['total_bytes_to_download']!=0) $perc = round(100.0 - ($torrent['bytes_left_to_download'] / $torrent['total_bytes_to_download']) * 100.0, 2);
 			else $perc = 0;
 			if(strlen($torrent['torrent_name'])>30) $display_name=substr($torrent['torrent_name'], 0, 30)." ...";
diff --git a/plugins/zeroconf/zeroconfplugin.cpp b/plugins/zeroconf/zeroconfplugin.cpp
index 462b6a0..3427900 100644
--- a/plugins/zeroconf/zeroconfplugin.cpp
+++ b/plugins/zeroconf/zeroconfplugin.cpp
@@ -84,7 +84,7 @@ namespace kt
 	
 	void ZeroConfPlugin::torrentAdded(kt::TorrentInterface* tc)
 	{
-		if (services.tqcontains(tc))
+		if (services.contains(tc))
 			return;
 		
 		bt::Uint16 port = bt::Globals::instance().getServer().getPortInUse();
@@ -100,7 +100,7 @@ namespace kt
 		
 	void ZeroConfPlugin::torrentRemoved(kt::TorrentInterface* tc)
 	{
-		AvahiService* av = services.tqfind(tc);
+		AvahiService* av = services.find(tc);
 		if (!av)
 			return;
 		Out(SYS_ZCO|LOG_NOTICE) << "ZeroConf service removed for "