4 files changed, 15 insertions, 15 deletions
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index d0131e8..5cee3da 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -171,7 +171,7 @@ void K3bCddb::slotQueryFinished( K3bCddbQuery* query )
 
 K3bCddbQuery* K3bCddb::getQuery( const TQString& s )
 {
-  TQStringList buf = TQStringList::split( ":", s.mid( s.tqfind(" ")+1 ) );
+  TQStringList buf = TQStringList::split( ":", s.mid( s.find(" ")+1 ) );
   TQString server = buf[0];
   int port = buf[1].toInt();
 
diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp
index f70b6d8..81f69e2 100644
--- a/libk3b/cddb/k3bcddblocalquery.cpp
+++ b/libk3b/cddb/k3bcddblocalquery.cpp
@@ -117,7 +117,7 @@ TQString K3bCddbLocalQuery::preparePath( const TQString& p )
 {
   TQString path = p;
   if( path.startsWith( "~" ) )
-    path.tqreplace( 0, 1, TQDir::homeDirPath() );
+    path.replace( 0, 1, TQDir::homeDirPath() );
   else if( !path.startsWith( "/" ) )
     path.prepend( TQDir::homeDirPath() );
   if( path[path.length()-1] != '/' )
diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp
index ed1fdcb..f7dc730 100644
--- a/libk3b/cddb/k3bcddblocalsubmit.cpp
+++ b/libk3b/cddb/k3bcddblocalsubmit.cpp
@@ -40,7 +40,7 @@ void K3bCddbLocalSubmit::doSubmit()
 {
   TQString path = m_cddbDir;
   if( path.startsWith( "~" ) )
-    path.tqreplace( 0, 1, TQDir::homeDirPath() + "/" );
+    path.replace( 0, 1, TQDir::homeDirPath() + "/" );
   else if( !path.startsWith( "/" ) )
     path.prepend( TQDir::homeDirPath() + "/" );
   if( path[path.length()-1] != '/' )
diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp
index 6cf8eb0..1c6605b 100644
--- a/libk3b/cddb/k3bcddbquery.cpp
+++ b/libk3b/cddb/k3bcddbquery.cpp
@@ -108,7 +108,7 @@ bool K3bCddbQuery::parseEntry( TQTextStream& stream, K3bCddbResultEntry& entry )
     }
     
     else if( line.startsWith( "TTITLE" ) ) {
-      int eqSgnPos = line.tqfind( "=" );
+      int eqSgnPos = line.find( "=" );
       bool ok;
       uint trackNum = (uint)line.mid( 6, eqSgnPos - 6 ).toInt( &ok );
       if( !ok )
@@ -129,7 +129,7 @@ bool K3bCddbQuery::parseEntry( TQTextStream& stream, K3bCddbResultEntry& entry )
     }
     
     else if( line.startsWith( "EXTT" ) ) {
-      int eqSgnPos = line.tqfind( "=" );
+      int eqSgnPos = line.find( "=" );
       bool ok;
       uint trackNum = (uint)line.mid( 4, eqSgnPos - 4 ).toInt( &ok );
       if( !ok )
@@ -158,7 +158,7 @@ bool K3bCddbQuery::parseEntry( TQTextStream& stream, K3bCddbResultEntry& entry )
   // if no " / " delimiter is present title and artist are the same
   // -------------------------------------------------------------------
   TQString fullTitle = entry.cdTitle;
-  int splitPos = fullTitle.tqfind( " / " );
+  int splitPos = fullTitle.find( " / " );
   if( splitPos < 0 )
     entry.cdArtist = fullTitle;
   else {
@@ -171,7 +171,7 @@ bool K3bCddbQuery::parseEntry( TQTextStream& stream, K3bCddbResultEntry& entry )
   for( TQStringList::iterator it = entry.titles.begin();
        it != entry.titles.end(); ++it ) {
     TQString fullTitle = *it;
-    int splitPos = fullTitle.tqfind( " / " );
+    int splitPos = fullTitle.find( " / " );
     if( splitPos < 0 )
       entry.artists.append( entry.cdArtist );
     else {
@@ -185,23 +185,23 @@ bool K3bCddbQuery::parseEntry( TQTextStream& stream, K3bCddbResultEntry& entry )
   // replace all "\\n" with "\n"
   for( TQStringList::iterator it = entry.titles.begin();
        it != entry.titles.end(); ++it ) {
-    (*it).tqreplace( "\\\\\\\\n", "\\n" );
+    (*it).replace( "\\\\\\\\n", "\\n" );
   }
 
   for( TQStringList::iterator it = entry.artists.begin();
        it != entry.artists.end(); ++it ) {
-    (*it).tqreplace( "\\\\\\\\n", "\\n" );
+    (*it).replace( "\\\\\\\\n", "\\n" );
   }
 
   for( TQStringList::iterator it = entry.extInfos.begin();
        it != entry.extInfos.end(); ++it ) {
-    (*it).tqreplace( "\\\\\\\\n", "\\n" );
+    (*it).replace( "\\\\\\\\n", "\\n" );
   }
 
-  entry.cdTitle.tqreplace( "\\\\\\\\n", "\\n" );
-  entry.cdArtist.tqreplace( "\\\\\\\\n", "\\n" );
-  entry.cdExtInfo.tqreplace( "\\\\\\\\n", "\\n" );
-  entry.genre.tqreplace( "\\\\\\\\n", "\\n" );
+  entry.cdTitle.replace( "\\\\\\\\n", "\\n" );
+  entry.cdArtist.replace( "\\\\\\\\n", "\\n" );
+  entry.cdExtInfo.replace( "\\\\\\\\n", "\\n" );
+  entry.genre.replace( "\\\\\\\\n", "\\n" );
 
   return true;
 }
@@ -254,7 +254,7 @@ bool K3bCddbQuery::parseMatchHeader( const TQString& line, K3bCddbResultHeader&
   header.category = line.section( ' ', 0, 0 );
   header.discid = line.section( ' ', 1, 1 );
   header.title = line.mid( header.category.length() + header.discid.length() + 2 );
-  int slashPos = header.title.tqfind( "/" );
+  int slashPos = header.title.find( "/" );
   if( slashPos > 0 ) {
     header.artist = header.title.left(slashPos).stripWhiteSpace();
     header.title = header.title.mid( slashPos+1 ).stripWhiteSpace();