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 --- libk3b/jobs/k3bbinimagewritingjob.cpp | 2 +- libk3b/jobs/k3bcdcopyjob.cpp | 2 +- libk3b/jobs/k3bcdda2wavreader.cpp | 12 ++++++------ libk3b/jobs/k3bclonejob.cpp | 2 +- libk3b/jobs/k3bdvdcopyjob.cpp | 2 +- libk3b/jobs/k3bdvdformattingjob.cpp | 12 ++++++------ libk3b/jobs/k3breadcdreader.cpp | 22 +++++++++++----------- libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp | 6 +++--- libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp | 4 ++-- 9 files changed, 32 insertions(+), 32 deletions(-) (limited to 'libk3b/jobs') diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp index 3e39b1c..0f58f7c 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.cpp +++ b/libk3b/jobs/k3bbinimagewritingjob.cpp @@ -96,7 +96,7 @@ bool K3bBinImageWritingJob::prepareWriter() TQFile f( m_tocFile ); if( f.open( IO_ReadOnly ) ) { TQTextStream fStr( &f ); - if( fStr.read().tqcontains( "MODE1/2352" ) ) { + if( fStr.read().contains( "MODE1/2352" ) ) { kdDebug() << "(K3bBinImageWritingJob) cuefile contains MODE1/2352 track. using cdrdao." << endl; usedWritingApp = K3b::CDRDAO; } diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index c55e284..de93b4f 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -311,7 +311,7 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) } unsigned long avail, size; - TQString pathToTest = m_tempPath.left( m_tempPath.tqfindRev( '/' ) ); + TQString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) ); if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR ); d->error = true; diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp index 901f77b..c583ec8 100644 --- a/libk3b/jobs/k3bcdda2wavreader.cpp +++ b/libk3b/jobs/k3bcdda2wavreader.cpp @@ -95,7 +95,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) d->cdda2wavBin = k3bcore->externalBinManager()->binObject( "cdda2wav" ); if( !d->cdda2wavBin ) { - emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdda2wav"), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdda2wav"), ERROR ); jobFinished(false); d->running = false; return; @@ -181,9 +181,9 @@ void K3bCdda2wavReader::slotProcessLine( const TQString& line ) static TQRegExp rx( "T\\d\\d:" ); if( rx.exactMatch( line.left(4) ) || line.startsWith( "Leadout" ) ) { - int pos = line.tqfind( " " ); - int endpos = line.tqfind( TQRegExp( "\\d" ), pos ); - endpos = line.tqfind( " ", endpos ); + int pos = line.find( " " ); + int endpos = line.find( TQRegExp( "\\d" ), pos ); + endpos = line.find( " ", endpos ); bool ok; int offset = line.mid( pos, endpos-pos ).toInt(&ok); if( ok ) @@ -198,12 +198,12 @@ void K3bCdda2wavReader::slotProcessLine( const TQString& line ) emit nextTrack( d->currentTrack, d->trackOffsets.count() ); } - else if( line.tqcontains("successfully recorded") ) { + else if( line.contains("successfully recorded") ) { d->currentTrack++; emit nextTrack( d->currentTrack, d->trackOffsets.count() ); } - else if( line.tqcontains("%") ) { + else if( line.contains("%") ) { // parse progress bool ok; int p = line.left(3).toInt(&ok); diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp index 89c1c1f..8ed8cad 100644 --- a/libk3b/jobs/k3bclonejob.cpp +++ b/libk3b/jobs/k3bclonejob.cpp @@ -85,7 +85,7 @@ void K3bCloneJob::start() // const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" ); if( !cdrecordBin ) { - emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), ERROR ); jobFinished(false); m_running = false; return; diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index d00cc1d..bcbba68 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -314,7 +314,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // KIO::filesize_t imageSpaceNeeded = (KIO::filesize_t)(d->lastSector.lba()+1)*2048; unsigned long avail, size; - TQString pathToTest = m_imagePath.left( m_imagePath.tqfindRev( '/' ) ); + TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) ); if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR ); jobFinished(false); diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp index 62ea78e..9b6a58b 100644 --- a/libk3b/jobs/k3bdvdformattingjob.cpp +++ b/libk3b/jobs/k3bdvdformattingjob.cpp @@ -218,15 +218,15 @@ void K3bDvdFormattingJob::slotStderrLine( const TQString& line ) emit debuggingOutput( "dvd+rw-format", line ); // parsing for the -gui mode (since dvd+rw-format 4.6) - int pos = line.tqfind( "blanking" ); + int pos = line.find( "blanking" ); if( pos < 0 ) - pos = line.tqfind( "formatting" ); + pos = line.find( "formatting" ); if( pos >= 0 ) { - pos = line.tqfind( TQRegExp( "\\d" ), pos ); + pos = line.find( TQRegExp( "\\d" ), pos ); } // parsing for \b\b... stuff else if( !line.startsWith("*") ) { - pos = line.tqfind( TQRegExp( "\\d" ) ); + pos = line.find( TQRegExp( "\\d" ) ); } else if( line.startsWith( ":-(" ) ) { if( line.startsWith( ":-( unable to proceed with format" ) ) { @@ -235,7 +235,7 @@ void K3bDvdFormattingJob::slotStderrLine( const TQString& line ) } if( pos >= 0 ) { - int endPos = line.tqfind( TQRegExp("[^\\d\\.]"), pos ) - 1; + int endPos = line.find( TQRegExp("[^\\d\\.]"), pos ) - 1; bool ok; int progress = (int)(line.mid( pos, endPos - pos ).toDouble(&ok)); if( ok ) { @@ -472,7 +472,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" ); if( !d->dvdFormatBin ) { - emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("dvd+rw-format"), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").tqarg("dvd+rw-format"), ERROR ); d->running = false; jobFinished(false); return; diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index ae6df10..38adab1 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -104,7 +104,7 @@ void K3bReadcdReader::start() // the first thing to do is to check for readcd d->readcdBinObject = k3bcore->externalBinManager()->binObject( "readcd" ); if( !d->readcdBinObject ) { - emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("readcd"), ERROR ); + emit infoMessage( i18n("Could not find %1 executable.").tqarg("readcd"), ERROR ); jobFinished(false); return; } @@ -243,7 +243,7 @@ void K3bReadcdReader::slotStdLine( const TQString& line ) else if( line.startsWith( "addr:" ) ) { bool ok; - long currentReadBlock = line.mid( 6, line.tqfind("cnt")-7 ).toInt(&ok); + long currentReadBlock = line.mid( 6, line.find("cnt")-7 ).toInt(&ok); if( d->firstSector < d->lastSector ) currentReadBlock -= d->firstSector.lba(); if( ok ) { @@ -260,37 +260,37 @@ void K3bReadcdReader::slotStdLine( const TQString& line ) } else kdError() << "(K3bReadcdReader) currentReadBlock parsing error in line: " - << line.mid( 6, line.tqfind("cnt")-7 ) << endl; + << line.mid( 6, line.find("cnt")-7 ) << endl; } - else if( line.tqcontains("Cannot read source disk") ) { + else if( line.contains("Cannot read source disk") ) { emit infoMessage( i18n("Cannot read source disk."), ERROR ); } - else if( (pos = line.tqfind("Retrying from sector")) >= 0 ) { + else if( (pos = line.find("Retrying from sector")) >= 0 ) { // parse the sector pos += 21; bool ok; - int problemSector = line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ).toInt(&ok); + int problemSector = line.mid( pos, line.find( TQRegExp("\\D"), pos )-pos ).toInt(&ok); if( !ok ) { kdError() << "(K3bReadcdReader) problemSector parsing error in line: " - << line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ) << endl; + << line.mid( pos, line.find( TQRegExp("\\D"), pos )-pos ) << endl; } emit infoMessage( i18n("Retrying from sector %1.").tqarg(problemSector), INFO ); } - else if( (pos = line.tqfind("Error on sector")) >= 0 ) { + else if( (pos = line.find("Error on sector")) >= 0 ) { d->unreadableBlocks++; pos += 16; bool ok; - int problemSector = line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ).toInt(&ok); + int problemSector = line.mid( pos, line.find( TQRegExp("\\D"), pos )-pos ).toInt(&ok); if( !ok ) { kdError() << "(K3bReadcdReader) problemSector parsing error in line: " - << line.mid( pos, line.tqfind( TQRegExp("\\D"), pos )-pos ) << endl; + << line.mid( pos, line.find( TQRegExp("\\D"), pos )-pos ) << endl; } - if( line.tqcontains( "not corrected") ) { + if( line.contains( "not corrected") ) { emit infoMessage( i18n("Uncorrected error in sector %1").tqarg(problemSector), ERROR ); } else { diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp index 320717a..2d7fd43 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp @@ -206,8 +206,8 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const TQString& lin // parse progress // encoding frame [185], 24.02 fps, 93.0%, ETA: 0:00:00, ( 0| 0| 0) if( line.startsWith( "encoding frame" ) ) { - int pos1 = line.tqfind( '[', 15 ); - int pos2 = line.tqfind( ']', pos1+1 ); + int pos1 = line.find( '[', 15 ); + int pos2 = line.find( ']', pos1+1 ); if( pos1 > 0 && pos2 > 0 ) { bool ok; int encodedFrames = line.mid( pos1+1, pos2-pos1-1 ).toInt( &ok ); @@ -235,7 +235,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeStderr( const TQString& lin // [detectclipping#0] valid area: X: 5..719 Y: 72..507 -> -j 72,6,68,0 else if( line.startsWith( "[detectclipping" ) ) { - int pos = line.tqfind( "-j" ); + int pos = line.find( "-j" ); if( pos > 0 ) { TQStringList values = TQStringList::split( ',', line.mid( pos+3 ) ); m_clippingTop = TQMIN( m_clippingTop, values[0].toInt() ); diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index 5cbddfa..3af2278 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -385,8 +385,8 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeStderr( const TQString& line ) // parse progress // encoding frames [000000-000144], 27.58 fps, EMT: 0:00:05, ( 0| 0| 0) if( line.startsWith( "encoding frame" ) ) { - int pos1 = line.tqfind( '-', 15 ); - int pos2 = line.tqfind( ']', pos1+1 ); + int pos1 = line.find( '-', 15 ); + int pos2 = line.find( ']', pos1+1 ); if( pos1 > 0 && pos2 > 0 ) { bool ok; int encodedFrames = line.mid( pos1+1, pos2-pos1-1 ).toInt( &ok ); -- cgit v1.2.1