rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

15 files changed, 50 insertions, 50 deletions

diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index aaa4b9e6..9f28ec0f 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -450,7 +450,7 @@ TQString NoatunApp::mimeTypes()
 				continue;
 
 			const char *m = (*istr).c_str();
-			if ((KServiceType::serviceType(m)) && !mimeTypes.tqcontains(m))
+			if ((KServiceType::serviceType(m)) && !mimeTypes.contains(m))
 			{
 				mimeTypes += m;
 				mimeTypes += ' ';
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 5163ef8b..185c98bc 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -83,7 +83,7 @@ General::General(TQObject *tqparent)
 			NoatunApp::DontPlay
 		);
 
-	if (TQButton* b = mPlayOnStartup->tqfind(napp->startupPlayMode()))
+	if (TQButton* b = mPlayOnStartup->find(napp->startupPlayMode()))
 	{
 		b->toggle();
 	}
diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp
index d607ca6d..efb456ac 100644
--- a/noatun/library/downloader.cpp
+++ b/noatun/library/downloader.cpp
@@ -105,7 +105,7 @@ static TQString nonExistantFile(const TQString &file)
 	{
 		i++;
 		f=file;
-		f.insert(f.tqfindRev('.'), '_'+TQString::number(i));
+		f.insert(f.findRev('.'), '_'+TQString::number(i));
 	}
 	return f;
 }
diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp
index 33a3b8ad..cc64331d 100644
--- a/noatun/library/effects.cpp
+++ b/noatun/library/effects.cpp
@@ -102,7 +102,7 @@ TQString Effect::title() const
 
 TQString Effect::clean(const TQCString &name)
 {
-	int pos=name.tqfindRev("::");
+	int pos=name.findRev("::");
 	if (pos>0)
 		return name.right(name.length()-pos-2);
 	return name;
diff --git a/noatun/library/mimetypetree.cpp b/noatun/library/mimetypetree.cpp
index a63b49f6..8dba7fc6 100644
--- a/noatun/library/mimetypetree.cpp
+++ b/noatun/library/mimetypetree.cpp
@@ -17,7 +17,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *tqparent)
 	for (; i != list.end(); ++i)
 	{
 		TQString mimetype = (*i)->name();
-		int slash = mimetype.tqfind("/");
+		int slash = mimetype.find("/");
 		TQString major = mimetype.left(slash);
 		
 		// hide all and inode majors
diff --git a/noatun/library/noatunarts/Session_impl.cpp b/noatun/library/noatunarts/Session_impl.cpp
index edec216a..63912801 100644
--- a/noatun/library/noatunarts/Session_impl.cpp
+++ b/noatun/library/noatunarts/Session_impl.cpp
@@ -10,7 +10,7 @@ static bool compareArtsObjects(const Noatun::Listener &left, const Noatun::Liste
 	return left._isEqual(right);
 }
 
-list<Noatun::Listener>::iterator tqfind(list<Noatun::Listener> &v, const Noatun::Listener &is, 
+list<Noatun::Listener>::iterator find(list<Noatun::Listener> &v, const Noatun::Listener &is, 
 		bool (*compare)(const Noatun::Listener& left, const Noatun::Listener& right))
 {
 	for (list<Noatun::Listener>::iterator i=v.begin(); i!=v.end(); ++i)
@@ -55,7 +55,7 @@ public:
 	void removeListener(Noatun::Listener listener)
 	{
 		list<Listener>::iterator i=
-			tqfind(listeners, listener, &compareArtsObjects);
+			find(listeners, listener, &compareArtsObjects);
 		if (i!=listeners.end())
 			listeners.erase(i);
 	}
diff --git a/noatun/library/noatunarts/StereoEffectStack_impl.cpp b/noatun/library/noatunarts/StereoEffectStack_impl.cpp
index 107f06e9..684d9694 100644
--- a/noatun/library/noatunarts/StereoEffectStack_impl.cpp
+++ b/noatun/library/noatunarts/StereoEffectStack_impl.cpp
@@ -85,7 +85,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod
 			list<EffectEntry*>::iterator i = fx.begin();
 
 			bool found=false;
-			// seek through until we tqfind 'after'
+			// seek through until we find 'after'
 			while(i != fx.end())
 				if((*i)->id == after)
 				{
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 72c67d1c..851b846b 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -133,14 +133,14 @@ void VisActionMenu::fillPopup()
 		{
 			id = popupMenu()->insertItem((*i).name);
 			mSpecMap[id] = (*i).specfile;
-			popupMenu()->setItemChecked(id, loaded.tqcontains(*i));
+			popupMenu()->setItemChecked(id, loaded.contains(*i));
 		}
 	}
 }
 
 void VisActionMenu::toggleVisPlugin(int id)
 {
-	if(!mSpecMap.tqcontains(id))
+	if(!mSpecMap.contains(id))
 		return;
 
 	TQString specfile = mSpecMap[id];
diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp
index a86be118..33e5c1f0 100644
--- a/noatun/library/playlist.cpp
+++ b/noatun/library/playlist.cpp
@@ -62,12 +62,12 @@ TQString PlaylistItemData::title() const
 	// "$(property)"
 	TQString format=napp->titleFormat();
 
-	TQRegExp tqfind("(?:(?:\\\\\\\\))*\\$\\((.*)");
+	TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)");
 
 	int start=0;
 	while (start != -1)
 	{
-		start = tqfind.search(format, start);
+		start = find.search(format, start);
 		if (start == -1) break;
 
 		// test if there's an odd amount of backslashes
@@ -81,8 +81,8 @@ TQString PlaylistItemData::title() const
 			uint len=counter.cap(1).length()-1;
 
 			// and half them, and remove one more
-			format.tqreplace(start-1, len/2+1, "");
-			start=start-1+len/2+tqfind.cap(1).length()+3;
+			format.replace(start-1, len/2+1, "");
+			start=start-1+len/2+find.cap(1).length()+3;
 			continue;
 		}
 
@@ -96,12 +96,12 @@ TQString PlaylistItemData::title() const
 			uint len=counter.cap(1).length();
 
 			// and half them
-			format.tqreplace(start, len/2, "");
+			format.replace(start, len/2, "");
 			start=start+len/2;
 		}
 
 		// "sth"foo"sth"
-		TQString cont(tqfind.cap(1));
+		TQString cont(find.cap(1));
 		TQString prefix,suffix,propname;
 		unsigned int i=0;
 		if (cont[i] == '"')
@@ -150,18 +150,18 @@ TQString PlaylistItemData::title() const
 		{
 			// comments can contain newlines
 			// these are not wanted in a formatted title
-			propval.tqreplace('\n', ' ');
+			propval.replace('\n', ' ');
 		}
 
 		if (propval.length())
 		{
 			propval = prefix+propval+suffix;
-			format.tqreplace(start, i+2, propval);
+			format.replace(start, i+2, propval);
 			start += propval.length();
 		}
 		else
 		{
-			format.tqreplace(start, i+2, "");
+			format.replace(start, i+2, "");
 		}
 	}
 	return format;
@@ -356,7 +356,7 @@ TQValueList<PlaylistItem> Playlist::select(
 				}
 				else
 				{
-					if ((*val).tqfind(v, 0, caseSensitive)!=-1)
+					if ((*val).find(v, 0, caseSensitive)!=-1)
 					{
 						list.append(i);
 						limit--;
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index 15fcad58..f5bd09bd 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -291,7 +291,7 @@ public:
 						if(a.qName(i).lower()=="href")
 						{
 							TQString filename=a.value(i);
-							if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0)
+							if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0)
 							{
 								KURL url(filename);
 								KMimeType::Ptr mimetype = KMimeType::findByURL(url);
@@ -316,7 +316,7 @@ public:
 							{
 								KURL u1;
 								// we have to deal with a relative path
-								if (filename.tqfind('/'))
+								if (filename.find('/'))
 								{
 									u1.setPath(mAbsPath); //FIXME: how to get the path in this place?
 									u1.setFileName(filename);
@@ -541,7 +541,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
 		if (filename.isEmpty())
 			continue;
 
-		if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0)
+		if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0)
 		{
 			//kdDebug(66666) << k_funcinfo << "url filename = " << filename << endl;
 
@@ -569,7 +569,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
 		{
 			KURL u1;
 			// we have to deal with a relative path
-			if (filename.tqfind('/'))
+			if (filename.find('/'))
 			{
 				u1.setPath(file.path(0));
 				u1.setFileName(filename);
@@ -587,7 +587,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
 		{
 			extinf.remove(0,8); // remove "#EXTINF:"
 			//kdDebug(66666) << "EXTM3U extinf = '" << extinf << "'" << endl;
-			int timeTitleSep = extinf.tqfind(',', 0);
+			int timeTitleSep = extinf.find(',', 0);
 
 			int length = (extinf.left(timeTitleSep)).toInt();
 			if (length>0)
@@ -596,7 +596,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
 			TQString displayTitle=extinf.mid(timeTitleSep+1);
 			if (!displayTitle.isEmpty())
 			{
-				int artistTitleSep = displayTitle.tqfind(" - ",0);
+				int artistTitleSep = displayTitle.find(" - ",0);
 				if (artistTitleSep == -1) // no "artist - title" like format, just set it as title
 				{
 					prop["title"] = displayTitle;
@@ -718,7 +718,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/)
 	// some stupid Windows lusers like to be case insensitive
 	TQStringList groups = list.groupList().grep(TQRegExp("^playlist$", false));
 	/*
-	if (!groups.count()) // didn't tqfind "[playlist]", it's not a .pls file
+	if (!groups.count()) // didn't find "[playlist]", it's not a .pls file
 		return false;
 	*/
 
diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp
index 36c1a2cf..033ccace 100644
--- a/noatun/library/plugin.cpp
+++ b/noatun/library/plugin.cpp
@@ -187,7 +187,7 @@ int Visualization::noatunPid()
 		{
 			if ((*i).left(6) != "noatun")
 				continue;
-			int pid=(*i).mid((*i).tqfind('-')+1).toInt();
+			int pid=(*i).mid((*i).find('-')+1).toInt();
 			return pid;
 		}
 	return -1;
diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp
index 032761a0..0897e76d 100644
--- a/noatun/library/pluginloader.cpp
+++ b/noatun/library/pluginloader.cpp
@@ -81,7 +81,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
 	for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i)
 	{
 		NoatunLibraryInfo info=getInfo(*i);
-		if (!info.type.tqcontains("sm"))
+		if (!info.type.contains("sm"))
 			continue;
 		loadSO(*i);
 	}
@@ -90,7 +90,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
 	for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i)
 	{
 		NoatunLibraryInfo info=getInfo(*i);
-		if (!info.type.tqcontains("playlist"))
+		if (!info.type.contains("playlist"))
 			continue;
 		loadSO(*i);
 	}
@@ -106,7 +106,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
 	for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i)
 	{
 		NoatunLibraryInfo info=getInfo(*i);
-		if (!info.type.tqcontains("userinterface"))
+		if (!info.type.contains("userinterface"))
 			continue;
 		loadSO(*i);
 	}
@@ -121,9 +121,9 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
 	for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i)
 	{
 		NoatunLibraryInfo info=getInfo(*i);
-		if((!info.type.tqcontains("playlist"))
-		&& (!info.type.tqcontains("userinterface"))
-		&& (!info.type.tqcontains("sm")))
+		if((!info.type.contains("playlist"))
+		&& (!info.type.contains("userinterface"))
+		&& (!info.type.contains("sm")))
 		{
 			loadSO(*i);
 		}
@@ -139,7 +139,7 @@ NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const
 	if (!TQFile::exists(specPath))
 		return info;
 	KSimpleConfig file(specPath);
-	if (spec.tqfind('/')>=0)
+	if (spec.find('/')>=0)
 		info.specfile=KURL(spec).fileName();
 	else
 		info.specfile=spec;
@@ -197,7 +197,7 @@ bool LibraryLoader::loadSO(const TQString &spec)
 		plugInStart=(Plugin* (*)()) create;
 		listitem->plugin=plugInStart();
 
-		if (info.type.tqcontains("playlist"))
+		if (info.type.contains("playlist"))
 		{
 			//kdDebug(66666) << k_funcinfo << "Assigning mPlaylist to " << info.name << endl;
 			mPlaylist=listitem->plugin->playlist();
@@ -329,7 +329,7 @@ TQValueList<NoatunLibraryInfo> LibraryLoader::loadedByType(const TQString &type)
 		if (isLoaded(i.currentKey()))
 		{
 			NoatunLibraryInfo info = getInfo(i.currentKey());
-			if (info.type.tqcontains(type))
+			if (info.type.contains(type))
 				items.append(info);
 		}
 	}
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index 0cd47d6d..fb57f39b 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -230,7 +230,7 @@ void Plugins::reopen()
 
 		if(tqparent)
 		{
-			PluginListItem *item = new PluginListItem(exclusive, loaded.tqcontains(*i), *i, tqparent);
+			PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, tqparent);
 			item->setText(0, (*i).name);
 			item->setText(1, (*i).comment);
 			item->setText(2, (*i).author);
@@ -257,9 +257,9 @@ void Plugins::addPlugin(const NoatunLibraryInfo &info)
 		if(item) item->setOn(true);
 	}
 
-	if(mDeleted.tqcontains(info.specfile))
+	if(mDeleted.contains(info.specfile))
 		mDeleted.remove(info.specfile);
-	else if(!mAdded.tqcontains(info.specfile))
+	else if(!mAdded.contains(info.specfile))
 		mAdded.append(info.specfile);
 }
 
@@ -291,9 +291,9 @@ void Plugins::removePlugin(const NoatunLibraryInfo &info)
 		}
 	}
 
-	if (mAdded.tqcontains(info.specfile))
+	if (mAdded.contains(info.specfile))
 		mAdded.remove(info.specfile);
-	else if(!mDeleted.tqcontains(info.specfile))
+	else if(!mDeleted.contains(info.specfile))
 		mDeleted.append(info.specfile);
 }
 
@@ -382,7 +382,7 @@ void Plugins::save()
 	TQValueList<NoatunLibraryInfo> loaded = loader.loaded();
 	for(TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i)
 	{
-		if(!specList.tqcontains((*i).specfile) && loader.isLoaded((*i).specfile))
+		if(!specList.contains((*i).specfile) && loader.isLoaded((*i).specfile))
 			specList += (*i).specfile;
 	}
 
diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp
index bda84b18..c04fcbd4 100644
--- a/noatun/library/titleproxy.cpp
+++ b/noatun/library/titleproxy.cpp
@@ -258,11 +258,11 @@ bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead )
 
 			// Handle redirection
 			TQString loc( "Location: " );
-			int index = m_headerStr.tqfind( loc );
+			int index = m_headerStr.find( loc );
 			if ( index >= 0 )
 			{
 				int start = index + loc.length();
-				int end = m_headerStr.tqfind( "\n", index );
+				int end = m_headerStr.find( "\n", index );
 				m_url = m_headerStr.mid( start, end - start - 1 );
 
 				kdDebug(66666) << k_funcinfo <<
@@ -360,15 +360,15 @@ void Proxy::error()
 
 TQString Proxy::extractStr( const TQString &str, const TQString &key )
 {
-	int index = str.tqfind( key, 0, true );
+	int index = str.find( key, 0, true );
 	if ( index == -1 )
 	{
 		return TQString();
 	}
 	else
 	{
-		index = str.tqfind( "'", index ) + 1;
-		int indexEnd = str.tqfind( "'", index );
+		index = str.find( "'", index ) + 1;
+		int indexEnd = str.find( "'", index );
 		return str.mid( index, indexEnd - index );
 	}
 }
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index a61e3eec..b8506e6f 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -764,7 +764,7 @@ VPreset VEqualizer::presetByFile(const TQString &file)
 	KConfig *conf=KGlobal::config();
 	conf->setGroup("Equalizer");
 	TQStringList list=kapp->config()->readListEntry("presets");
-	if (list.tqcontains(file))
+	if (list.contains(file))
 		return VPreset(file);
 	return VPreset();
 }
@@ -920,7 +920,7 @@ void VPreset::remove()
 
 	emit EQ->removed(*this);
 
-	if (file().tqfind(kapp->dirs()->localkdedir())==0)
+	if (file().find(kapp->dirs()->localkdedir())==0)
 	{
 		TQFile f(file());
 		f.remove();