3 files changed, 15 insertions, 15 deletions

diff --git a/kopete/plugins/nowlistening/nlnoatun.cpp b/kopete/plugins/nowlistening/nlnoatun.cpp
index 4f414a11..e563eb0e 100644
--- a/kopete/plugins/nowlistening/nlnoatun.cpp
+++ b/kopete/plugins/nowlistening/nlnoatun.cpp
@@ -39,7 +39,7 @@ void NLNoatun::update()
 	m_playing = false;
 	TQString newTrack;
 	// see if it's registered with DCOP
-	TQCString appname = tqfind();
+	TQCString appname = find();
 	if ( !appname.isEmpty() )
 	{
 		// see if it's playing
@@ -97,7 +97,7 @@ void NLNoatun::update()
 		kdDebug( 14307 ) << "NLNoatun::update() - noatun not found" << endl;
 }
 
-TQCString NLNoatun::tqfind() const
+TQCString NLNoatun::find() const
 {
 	TQCString app = "noatun";
 	if ( !m_client->isApplicationRegistered( app ) )
diff --git a/kopete/plugins/nowlistening/nlnoatun.h b/kopete/plugins/nowlistening/nlnoatun.h
index 30956611..85e1aaac 100644
--- a/kopete/plugins/nowlistening/nlnoatun.h
+++ b/kopete/plugins/nowlistening/nlnoatun.h
@@ -32,7 +32,7 @@ class NLNoatun : public NLMediaPlayer
 		NLNoatun( DCOPClient *client );
 		virtual void update();
  	protected:
-		TQCString tqfind() const;
+		TQCString find() const;
 		TQString currentProperty( TQCString appname, TQString property ) const;
 		DCOPClient *m_client;
 };
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index ca9c9316..b72df2a7 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -205,7 +205,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg)
 	for( Kopete::Contact *c = dest.first() ; c ; c = dest.next() )
 	{
 		const TQString& cId = c->contactId();
-		if( 0 == d->m_musicSentTo.tqcontains( cId ) )
+		if( 0 == d->m_musicSentTo.contains( cId ) )
 		{
 			mustSendAnyway = true;
 
@@ -318,7 +318,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 					{
 						if(statusSong.search(advert) != -1)
 						{
-							advert = advert.tqreplace(statusSong, TQString(" (%1)").tqarg(mediaPlayerAdvert(false)) );
+							advert = advert.replace(statusSong, TQString(" (%1)").tqarg(mediaPlayerAdvert(false)) );
 						}
 						else
 						{
@@ -327,7 +327,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 					}
 					else
 					{
-						advert = advert.tqreplace(statusSong, "");
+						advert = advert.replace(statusSong, "");
 					}
 				}
 				else
@@ -432,7 +432,7 @@ TQString NowListeningPlugin::substDepthFirst( NLMediaPlayer *player,
 						// recursively replace contents of matching ()
 						TQString substitution = substDepthFirst( player,
 								in.mid( i + 1, j - i - 1), true ) ;
-						in.tqreplace ( i, j - i + 1, substitution );
+						in.replace ( i, j - i + 1, substitution );
 						// perform substitution and return the result
 						i = i + substitution.length() - 1;
 						break;
@@ -446,34 +446,34 @@ TQString NowListeningPlugin::substDepthFirst( NLMediaPlayer *player,
 	// no () found, perform substitution!
 	// get each string (to) to substitute for (from)
 	bool done = false;
-	if ( in.tqcontains ( "%track" ) )
+	if ( in.contains ( "%track" ) )
 	{
 		if ( track.isEmpty() )
 			track = i18n("Unknown track");
 
-		in.tqreplace( "%track", track );
+		in.replace( "%track", track );
 		done = true;
 	}
 
-	if ( in.tqcontains ( "%artist" ) && !artist.isEmpty() )
+	if ( in.contains ( "%artist" ) && !artist.isEmpty() )
 	{
 		if ( artist.isEmpty() )
 			artist = i18n("Unknown artist");
-		in.tqreplace( "%artist", artist );
+		in.replace( "%artist", artist );
 		done = true;
 	}
-	if ( in.tqcontains ( "%album" ) && !album.isEmpty() )
+	if ( in.contains ( "%album" ) && !album.isEmpty() )
 	{
 		if ( album.isEmpty() )
 			album = i18n("Unknown album");
-		in.tqreplace( "%album", album );
+		in.replace( "%album", album );
 		done = true;
 	}
-	if ( in.tqcontains ( "%player" ) && !playerName.isEmpty() )
+	if ( in.contains ( "%player" ) && !playerName.isEmpty() )
 	{
 		if ( playerName.isEmpty() )
 			playerName = i18n("Unknown player");
-		in.tqreplace( "%player", playerName );
+		in.replace( "%player", playerName );
 		done = true;
 	}
 	// make whether we return anything dependent on whether we