1 files changed, 15 insertions, 15 deletions

diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index ee1514e..2dcabd0 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -169,7 +169,7 @@ bool XinePart::openURL(const MRL& mrl)
 	bool playlist = false;
 
 	TQString ext = m_mrl.kurl().fileName();
-	ext = ext.remove( 0 , ext.tqfindRev('.')+1 ).lower();
+	ext = ext.remove( 0 , ext.findRev('.')+1 ).lower();
 
 	if (!m_mrl.mime().isNull())
 	{
@@ -194,22 +194,22 @@ bool XinePart::openURL(const MRL& mrl)
 			TQString secondLine = stream.readLine();
 			file.close();
 
-			if (secondLine.tqcontains("kaffeine", false))
+			if (secondLine.contains("kaffeine", false))
 			{
 				kdDebug() << "KafeinePart: Try loading kaffeine playlist\n";
 				playlist = PlaylistImport::kaffeine(localFile, m_playlist);
 			}
-			if (secondLine.tqcontains("noatun", false))
+			if (secondLine.contains("noatun", false))
 			{
 				kdDebug() << "XinePart: Try loading noatun playlist\n";
 				playlist = PlaylistImport::noatun(localFile, m_playlist);
 			}
-			if (firstLine.tqcontains("asx", false))
+			if (firstLine.contains("asx", false))
 			{
 				kdDebug() << "XinePart: Try loading asx playlist\n";
 				playlist = PlaylistImport::asx(localFile, m_playlist);
 			}
-			if (firstLine.tqcontains("smil", false))
+			if (firstLine.contains("smil", false))
 			{
 				kdDebug() << "XinePart: Try loading smil playlist\n";
 				if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any tqlayout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes)
@@ -223,7 +223,7 @@ bool XinePart::openURL(const MRL& mrl)
 				else
 					return false;
 			}
-			if (firstLine.tqcontains("[playlist]", false))
+			if (firstLine.contains("[playlist]", false))
 			{
 				kdDebug() << "XinePart: Try loading pls playlist\n";
 				playlist = PlaylistImport::pls(localFile, m_playlist);
@@ -299,7 +299,7 @@ void XinePart::slotPlay(bool forcePlay)
 	/*
 	 *  is protocol supported by xine or not known by KIO?
 	 */
-	if ((TQString(SUPPORTED_PROTOCOLS).tqcontains(mrl.kurl().protocol()))
+	if ((TQString(SUPPORTED_PROTOCOLS).contains(mrl.kurl().protocol()))
 	        ||  (!KProtocolInfo::isKnownProtocol(mrl.kurl())))
 	{
 		TQString sub;
@@ -617,7 +617,7 @@ void XinePart::slotAddSubtitle(void)
 
 	if (!(subtitleURL.isEmpty()))
 	{
-		if (!m_playlist[m_current].subtitleFiles().tqcontains(subtitleURL))
+		if (!m_playlist[m_current].subtitleFiles().contains(subtitleURL))
 		{
 			m_playlist[m_current].addSubtitleFile(subtitleURL);
 		}
@@ -711,7 +711,7 @@ void XinePart::slotChannelInfo(const TQStringList& audio, const TQStringList& su
 		for (TQStringList::ConstIterator it = subFiles.begin(); it != end; ++it)
 		{
 			sub = (*it);
-			sub = sub.remove(0 , sub.tqfindRev('/')+1);
+			sub = sub.remove(0 , sub.findRev('/')+1);
 			subs.append(sub);
 		}
 		m_subtitles->setItems(subs);
@@ -1051,7 +1051,7 @@ void XinePart::slotMessage(const TQString& message)
 {
 	TQString msg = message;
 	if ( msg.startsWith("@") ) {
-		if ( m_xine->isPlaying() && m_xine->getURL().tqcontains("#") ) // do not warn for url containing #
+		if ( m_xine->isPlaying() && m_xine->getURL().contains("#") ) // do not warn for url containing #
 			return;
 		msg.remove(0,1);
 	}
@@ -1088,8 +1088,8 @@ void XinePart::slotTrackPlaying()
 
 	if (mrl.length().isNull()) /* no meta */
 	{
-		if ((!m_xine->getTitle().isEmpty()) && (!m_xine->getTitle().tqcontains('/'))
-		        && (m_xine->getTitle().tqcontains(TQRegExp("\\w")) > 2) && (m_xine->getTitle().left(5).lower() != "track"))
+		if ((!m_xine->getTitle().isEmpty()) && (!m_xine->getTitle().contains('/'))
+		        && (m_xine->getTitle().contains(TQRegExp("\\w")) > 2) && (m_xine->getTitle().left(5).lower() != "track"))
 			mrl.setTitle(m_xine->getTitle());
 		if ((mrl.artist().isEmpty()) && (!m_xine->getArtist().isEmpty()))
 			mrl.setArtist(m_xine->getArtist());
@@ -1502,7 +1502,7 @@ void XinePart::loadConfig()
 
 	config->setGroup("Visualization");
 	TQString visual = config->readEntry("Visual Plugin", "goom");
-	m_audioVisual->setCurrentItem(m_audioVisual->items().tqfindIndex(visual));
+	m_audioVisual->setCurrentItem(m_audioVisual->items().findIndex(visual));
 	m_xine->slotSetVisualPlugin(visual);
 
 	config->setGroup("Deinterlace");
@@ -1833,7 +1833,7 @@ TQString XinePart::supportedExtensions()
 	ext = ext.remove("txt");
 	ext = "*." + ext;
 	ext.append(" smil");
-	ext = ext.tqreplace( ' ', " *." );
+	ext = ext.replace( ' ', " *." );
 	ext = ext + " " + ext.upper();
 
 	return ext;
@@ -2088,7 +2088,7 @@ void VolumeSlider::wheelEvent(TQWheelEvent* e)
 		TQMouseEvent *e = (TQMouseEvent *)ev;
 		TQRect r = sliderRect();
 
-		if( r.tqcontains( e->pos() ) || e->button() != LeftButton )
+		if( r.contains( e->pos() ) || e->button() != LeftButton )
 			return FALSE;
 
 		int range = maxValue() - minValue();