rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 27 insertions, 27 deletions

diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 56864a6..1b1abcb 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -545,7 +545,7 @@ void PlayList::slotToggleShuffle()
 void PlayList::slotPlaylistLoad()
 {
 	TQString path = KFileDialog::getOpenFileName(":kaffeine_openPlaylist", TQString("*.kaffeine|") + i18n("Kaffeine Playlists") + "\n*.*|" + i18n("All Files"), 0, i18n("Open Playlist"));
-	if (path.isEmpty() || (!path.tqcontains(".kaffeine", false)))
+	if (path.isEmpty() || (!path.contains(".kaffeine", false)))
 		return;
 
 	loadPlaylist(path);
@@ -904,7 +904,7 @@ void PlayList::setCurrentEntry(TQListViewItem* item, bool playIcon)
 	}
 	m_currentEntry = item;
 	if (m_random)
-		m_currentRandomListEntry = m_randomList.tqfind(item);
+		m_currentRandomListEntry = m_randomList.find(item);
 	m_currentEntryMRL = newItem->toMRL();
 	roller->setTitle( m_currentEntryMRL );
 	m_list->setCurrentItem(m_currentEntry);
@@ -943,14 +943,14 @@ TQListViewItem* PlayList::insertItem(TQListViewItem* after, const MRL& m)
 	else
 		tmp->setPixmap(MIME_COLUMN, KMimeType::mimeType(mrl.mime())->pixmap(KIcon::Small));
 
-	if (tmp->length().tqcontains(':'))
+	if (tmp->length().contains(':'))
 		m_playTime += timeStringToMs(tmp->length());
 
 	if (m_searchSelection)
 	{
 		TQString text = m_playlistFilter->text();
-		if ((!tmp->title().tqcontains(text, false)) && (!tmp->url().tqcontains(text, false))
-		        && (!tmp->artist().tqcontains(text, false)) && (!tmp->album().tqcontains(text, false)))
+		if ((!tmp->title().contains(text, false)) && (!tmp->url().contains(text, false))
+		        && (!tmp->artist().contains(text, false)) && (!tmp->album().contains(text, false)))
 		{
 			tmp->setVisible(false);
 		}
@@ -958,7 +958,7 @@ TQListViewItem* PlayList::insertItem(TQListViewItem* after, const MRL& m)
 
 	if (tmp->isVisible())
 	{
-		if (tmp->length().tqcontains(':'));
+		if (tmp->length().contains(':'));
 		m_playTimeVisible += timeStringToMs(tmp->length());
 		m_countVisible++;
 	}
@@ -1042,7 +1042,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
 				mediaName = url.mid(14);
 			else
 				mediaName = url.mid(7);
-			int slash = mediaName.tqfind("/");
+			int slash = mediaName.find("/");
 			TQString filePath(mediaName.mid(slash));
 			if (filePath == "/")
 				filePath = "";
@@ -1099,7 +1099,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
 		/*********** determine extension and mime type ************/
 
 		ext = mrl.kurl().fileName();
-		ext = ext.remove(0 , ext.tqfindRev('.') +1).lower();
+		ext = ext.remove(0 , ext.findRev('.') +1).lower();
 		// kdDebug() << "Extension: " << ext << endl;
 
 		//kdDebug() << "PlayList: Try to determine mime of: " << mrl.url() << endl;
@@ -1130,24 +1130,24 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
 				TQString secondLine = stream.readLine();
 				file.close();
 
-				if (secondLine.tqcontains("kaffeine", false))
+				if (secondLine.contains("kaffeine", false))
 				{
 					kdDebug() << "PlayList: Try loading kaffeine playlist\n";
 					playlist = PlaylistImport::kaffeine(mrl.url(), mrlList);
 					if (!playlist)
 						continue;
 				}
-				if (secondLine.tqcontains("noatun", false))
+				if (secondLine.contains("noatun", false))
 				{
 					kdDebug() << "PlayList: Try loading noatun playlist\n";
 					playlist = PlaylistImport::noatun(mrl.url(), mrlList);
 				}
-				if (firstLine.tqcontains("asx", false))
+				if (firstLine.contains("asx", false))
 				{
 					kdDebug() << "PlayList: Try loading asx playlist\n";
 					playlist = PlaylistImport::asx(mrl.url(), mrlList);
 				}
-				if ( (firstLine.tqcontains("[playlist]", false)) || (ext == "pls") )
+				if ( (firstLine.contains("[playlist]", false)) || (ext == "pls") )
 				{
 					kdDebug() << "PlayList: Try loading pls playlist\n";
 					playlist = PlaylistImport::pls(mrl.url(), mrlList);
@@ -1228,7 +1228,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
 				TQListViewItemIterator it(m_list);
 				while (it.current())
 				{
-					if (dynamic_cast<PlaylistItem*>(*it)->mime().tqcontains("video"))
+					if (dynamic_cast<PlaylistItem*>(*it)->mime().contains("video"))
 						movies << dynamic_cast<PlaylistItem*>(*it)->url();
 					++it;
 				}
@@ -1263,7 +1263,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
 			 * those starting with a different name than the movie,
 			 * prompt the user to select a sub
 			 */
-			if (mime->name().tqcontains("video"))
+			if (mime->name().contains("video"))
 			{
 				kdDebug() << "PlayList: Check for subtitle files" << endl;
 				subtitleURL = TQString();
@@ -1331,7 +1331,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
 				if (!subtitleURL.isNull())
 				{
 					kdDebug() << "PlayList: Use subtitle file: " << subtitleURL << " for: " << mrl.url() << endl;
-					mrl.setCurrentSubtitle(subs.tqfindIndex(subtitleURL));
+					mrl.setCurrentSubtitle(subs.findIndex(subtitleURL));
 				}
 			}
 		} /* if localFile() */
@@ -1518,7 +1518,7 @@ void PlayList::getMetaInfo(MRL& mrl, const TQString& mimeName)
 			if (keys[n] == "Title")
 			{
 				title = metaGroup.item(keys[n]).value().toString().simplifyWhiteSpace();
-				if ((!title.isEmpty()) && (title.tqcontains(TQRegExp("\\w")) > 2) && (title.left(5).lower() != "track"))
+				if ((!title.isEmpty()) && (title.contains(TQRegExp("\\w")) > 2) && (title.left(5).lower() != "track"))
 				{
 					if ((m_useAlternateEncoding) && (CodecUtf8->heuristicContentMatch(title.ascii(), title.length()) < 0))
 					{
@@ -1596,7 +1596,7 @@ void PlayList::mergeMeta(const MRL& mrl)
 	}
 	if (addTime)
 	{
-		if (tmp->length().tqcontains(':'));
+		if (tmp->length().contains(':'));
 		{
 			m_playTime += timeStringToMs(tmp->length());
 			if (tmp->isVisible())
@@ -1681,7 +1681,7 @@ void PlayList::setCover( TQString s1, TQString s2, bool forceFetch )
 	TQImage img;
 	TQPixmap pix;
 	TQString fname = s1+"_"+s2;
-	fname = fname.tqreplace( TQChar( '/' ), "_" );
+	fname = fname.replace( TQChar( '/' ), "_" );
 	fname = fname.upper();
 	fname = s+"covers/"+fname;
 	if ( !forceFetch && TQFile( fname ).exists() )
@@ -1751,7 +1751,7 @@ void PlayList::slotRemoveSelected()
 	{
 		// kdDebug() << "Remove " << selected.at(i)->text(TITLE_COLUMN) << "\n";
 		item = dynamic_cast<PlaylistItem *>(selected.at(i));
-		if (item->length().tqcontains(':'))
+		if (item->length().contains(':'))
 		{
 			m_playTime -= timeStringToMs(item->length());
 			m_playTimeVisible -= timeStringToMs(item->length());
@@ -1803,8 +1803,8 @@ void PlayList::setPlaylist(const TQString& name, bool clear)
 	if (clear)
 		clearList();
 	int index = 0;
-	if (m_playlistSelector->listBox()->tqfindItem(name))
-		index = m_playlistSelector->listBox()->index(m_playlistSelector->listBox()->tqfindItem(name));
+	if (m_playlistSelector->listBox()->findItem(name))
+		index = m_playlistSelector->listBox()->index(m_playlistSelector->listBox()->findItem(name));
 	else
 		m_playlistSelector->insertItem(name, 0);
 	m_playlistSelector->setCurrentItem(index);
@@ -1855,7 +1855,7 @@ void PlayList::slotNewPlaylistName(const TQString& text)
 {
 	if ((text.isEmpty()) || (text == m_playlistSelector->text(m_currentPlaylist)))
 		return;
-	if (m_playlistSelector->listBox()->tqfindItem(text))
+	if (m_playlistSelector->listBox()->findItem(text))
 	{
 		kdDebug() << "PlayList: Name still exists!" << endl;
 		return;
@@ -1905,7 +1905,7 @@ void PlayList::loadPlaylist(const TQString& pl)
 	saveCurrentPlaylist();
 	TQString plName = KURL(pl).fileName();
 	plName = plName.remove(".kaffeine", false);
-	if (m_playlistSelector->listBox()->tqfindItem(plName))
+	if (m_playlistSelector->listBox()->findItem(plName))
 	{
 		TQString plNewName = NULL;
 		while (true)
@@ -1915,7 +1915,7 @@ void PlayList::loadPlaylist(const TQString& pl)
 			                                  i18n("Enter different playlist name:"), TQLineEdit::Normal, plName, &ok);
 			if ((ok) && (!plNewName.isEmpty()))
 			{
-				if (m_playlistSelector->listBox()->tqfindItem(plNewName))
+				if (m_playlistSelector->listBox()->findItem(plNewName))
 					continue;
 				else
 					break;
@@ -2093,11 +2093,11 @@ void PlayList::slotFindText(const TQString& text)
 	while ( it.current() )
 	{
 		tmp = dynamic_cast<PlaylistItem *>(it.current());
-		if (text.isEmpty() || tmp->title().tqcontains(text, false) || tmp->url().tqcontains(text, false)
-		        || tmp->artist().tqcontains(text, false) || tmp->album().tqcontains(text, false) )
+		if (text.isEmpty() || tmp->title().contains(text, false) || tmp->url().contains(text, false)
+		        || tmp->artist().contains(text, false) || tmp->album().contains(text, false) )
 		{
 			tmp->setVisible(true);
-			if (tmp->length().tqcontains(':'))
+			if (tmp->length().contains(':'))
 				m_playTimeVisible += timeStringToMs(tmp->length());
 
 			m_countVisible++;