From 33881ea4441221b1ca0789a72c4c7249d923a0df Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- plugins/decoder/mp3/k3bmaddecoder.cpp | 2 +- plugins/encoder/external/k3bexternalencoder.cpp | 20 ++++++++++---------- .../external/k3bexternalencoderconfigwidget.cpp | 2 +- plugins/encoder/sox/k3bsoxencoder.cpp | 10 +++++----- .../k3baudiometainforenamerplugin.cpp | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'plugins') diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp index 6f606c8..f23bfce 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.cpp +++ b/plugins/decoder/mp3/k3bmaddecoder.cpp @@ -510,7 +510,7 @@ bool K3bMadDecoderFactory::canDecode( const KURL& url ) unsigned int s = handle.madFrame->header.samplerate; // - // tqfind 4 more mp3 headers (random value since 2 was not enough) + // find 4 more mp3 headers (random value since 2 was not enough) // This way we get most of the mp3 files while sorting out // for example wave files. // 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 ); diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index c776b0e..db68657 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -264,7 +264,7 @@ TQString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) KMimeType::Ptr mimetype = KMimeType::findByPath( item->localPath() ); // sometimes ogg-vorbis files go as "application/x-ogg" if( mimetype != 0 && - ( mimetype->name().tqcontains( "audio" ) || mimetype->name().tqcontains("ogg") ) ) { + ( mimetype->name().contains( "audio" ) || mimetype->name().contains("ogg") ) ) { TQString artist, title, track; @@ -324,7 +324,7 @@ TQString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) // remove white spaces from end and beginning newName = newName.stripWhiteSpace(); - TQString extension = item->k3bName().mid( item->k3bName().tqfindRev(".") ); + TQString extension = item->k3bName().mid( item->k3bName().findRev(".") ); if( !newName.isEmpty() ) { // @@ -353,7 +353,7 @@ TQString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) bool K3bAudioMetainfoRenamerPluginWidget::existsOtherItemWithSameName( K3bFileItem* item, const TQString& name ) { K3bDirItem* dir = item->tqparent(); - K3bDataItem* otherItem = dir->tqfind( name ); + K3bDataItem* otherItem = dir->find( name ); if( otherItem && otherItem != item ) return true; -- cgit v1.2.3