rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

2 files changed, 7 insertions, 7 deletions

diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index 616a90fb..645a9f19 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -371,7 +371,7 @@ StatusBar::newProgressOperation( TQObject *owner )
 {
     SHOULD_BE_GUI
 
-    if ( m_progressMap.tqcontains( owner ) )
+    if ( m_progressMap.contains( owner ) )
         return *m_progressMap[owner];
 
     if( allDone() )
@@ -437,7 +437,7 @@ StatusBar::endProgressOperation( TQObject *owner )
     //NOTE we don't delete it yet, as this upsets some
     //things, we just call setDone().
 
-    if ( !m_progressMap.tqcontains( owner ) )
+    if ( !m_progressMap.contains( owner ) )
     {
         SingleShotPool::startTimer( 2000, TQT_TQOBJECT(this), TQT_SLOT(hideMainProgressBar()) );
         return ;
@@ -521,7 +521,7 @@ StatusBar::setProgress( KIO::Job *job, unsigned long percent )
 void
 StatusBar::setProgress( const TQObject *owner, int steps )
 {
-    if ( !m_progressMap.tqcontains( owner ) )
+    if ( !m_progressMap.contains( owner ) )
         return ;
 
     m_progressMap[ owner ] ->setProgress( steps );
@@ -532,7 +532,7 @@ StatusBar::setProgress( const TQObject *owner, int steps )
 void
 StatusBar::incrementProgressTotalSteps( const TQObject *owner, int inc )
 {
-    if ( !m_progressMap.tqcontains( owner ) )
+    if ( !m_progressMap.contains( owner ) )
         return ;
 
     m_progressMap[ owner ] ->setTotalSteps( m_progressMap[ owner ] ->totalSteps() + inc );
@@ -543,7 +543,7 @@ StatusBar::incrementProgressTotalSteps( const TQObject *owner, int inc )
 void
 StatusBar::setProgresstqStatus( const TQObject *owner, const TQString &text )
 {
-    if ( !m_progressMap.tqcontains( owner ) )
+    if ( !m_progressMap.contains( owner ) )
         return ;
 
     m_progressMap[owner]->settqStatus( text );
@@ -557,7 +557,7 @@ void StatusBar::incrementProgress()
 void
 StatusBar::incrementProgress( const TQObject *owner )
 {
-    if ( !m_progressMap.tqcontains( owner ) )
+    if ( !m_progressMap.contains( owner ) )
         return;
 
     m_progressMap[owner]->setProgress( m_progressMap[ owner ] ->progress() + 1 );
diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp
index 72363027..8b210a84 100644
--- a/amarok/src/statusbar/statusbar.cpp
+++ b/amarok/src/statusbar/statusbar.cpp
@@ -164,7 +164,7 @@ StatusBar::engineStateChanged( Engine::State state, Engine::State /*oldState*/ )
 void
 StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ )
 {
-    #define escapeHTML(s) TQString(s).tqreplace( "&", "&amp;" ).tqreplace( "<", "&lt;" ).tqreplace( ">", "&gt;" )
+    #define escapeHTML(s) TQString(s).replace( "&", "&amp;" ).replace( "<", "&lt;" ).replace( ">", "&gt;" )
     TQString title       = escapeHTML( bundle.title() );
     TQString prettyTitle = escapeHTML( bundle.prettyTitle() );
     TQString artist      = escapeHTML( bundle.artist() );