3 files changed, 16 insertions, 16 deletions
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index 52cd0d0..6db4ea3 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -218,16 +218,16 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
   // create the commandline
   TQStringList params = TQStringList::split( ' ', d->cmd.command, false );
   for( TQStringList::iterator it = params.begin(); it != params.end(); ++it ) {
-    (*it).tqreplace( "%f", d->fileName );
-    (*it).tqreplace( "%a", d->artist );
-    (*it).tqreplace( "%t", d->title );
-    (*it).tqreplace( "%c", d->comment );
-    (*it).tqreplace( "%y", d->year );
-    (*it).tqreplace( "%m", d->cdTitle );
-    (*it).tqreplace( "%r", d->cdArtist );
-    (*it).tqreplace( "%x", d->cdComment );
-    (*it).tqreplace( "%n", d->trackNumber );
-    (*it).tqreplace( "%g", d->genre );
+    (*it).replace( "%f", d->fileName );
+    (*it).replace( "%a", d->artist );
+    (*it).replace( "%t", d->title );
+    (*it).replace( "%c", d->comment );
+    (*it).replace( "%y", d->year );
+    (*it).replace( "%m", d->cdTitle );
+    (*it).replace( "%r", d->cdArtist );
+    (*it).replace( "%x", d->cdComment );
+    (*it).replace( "%n", d->trackNumber );
+    (*it).replace( "%g", d->genre );
 
     *d->process << *it;
   }
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
index 3daf9ad..473c2ab 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
@@ -86,7 +86,7 @@ void K3bExternalEncoderEditDialog::slotOk()
 			i18n("Please specify the command line."),
 			i18n("No command line specified") );
   }
-  else if( !m_editW->m_editCommand->text().tqcontains( "%f" ) ) {
+  else if( !m_editW->m_editCommand->text().contains( "%f" ) ) {
     KMessageBox::error( this, 
 			i18n("Please add the output filename (%f) to the command line."),
 			i18n("No filename specified") );
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index d170ab8..b9097d3 100644
--- a/plugins/encoder/sox/k3bsoxencoder.cpp
+++ b/plugins/encoder/sox/k3bsoxencoder.cpp
@@ -73,10 +73,10 @@ class K3bSoxProgram : public K3bExternalProgram
 
     vp << path << "-h";
     if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
-      int pos = out.output().tqfind( "sox: SoX Version" );
+      int pos = out.output().find( "sox: SoX Version" );
       if ( pos < 0 )
-          pos = out.output().tqfind( "sox: SoX v" ); // newer sox versions
-      int endPos = out.output().tqfind( "\n", pos );
+          pos = out.output().find( "sox: SoX v" ); // newer sox versions
+      int endPos = out.output().find( "\n", pos );
       if( pos > 0 && endPos > 0 ) {
 	pos += 17;
 	bin = new K3bExternalBin( this );
@@ -88,8 +88,8 @@ class K3bSoxProgram : public K3bExternalProgram
 	return true;
       }
       else {
-        pos = out.output().tqfind( "sox: Version" );
-        endPos = out.output().tqfind( "\n", pos );
+        pos = out.output().find( "sox: Version" );
+        endPos = out.output().find( "\n", pos );
         if( pos > 0 && endPos > 0 ) {
 	pos += 13;
 	bin = new K3bExternalBin( this );