summaryrefslogtreecommitdiffstats
path: root/src/rip
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit33881ea4441221b1ca0789a72c4c7249d923a0df (patch)
treeffe5603da373bb346bb29c8e0f533776f66560a5 /src/rip
parent6d99e1e138ae5aafc10f14682c48221bf563152e (diff)
downloadk3b-33881ea4441221b1ca0789a72c4c7249d923a0df.tar.gz
k3b-33881ea4441221b1ca0789a72c4c7249d923a0df.zip
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
Diffstat (limited to 'src/rip')
-rw-r--r--src/rip/k3baudioconvertingoptionwidget.cpp4
-rw-r--r--src/rip/k3baudioprojectconvertingthread.cpp22
-rw-r--r--src/rip/k3baudioripthread.cpp22
-rw-r--r--src/rip/k3bpatternparser.cpp50
-rw-r--r--src/rip/k3bpatternparser.h2
-rw-r--r--src/rip/k3bvideocdinfo.cpp4
-rw-r--r--src/rip/k3bvideocdrip.cpp24
-rw-r--r--src/rip/k3bvideocdrippingdialog.cpp2
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp4
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.cpp2
10 files changed, 68 insertions, 68 deletions
diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp
index 5c8070c..c03db69 100644
--- a/src/rip/k3baudioconvertingoptionwidget.cpp
+++ b/src/rip/k3baudioconvertingoptionwidget.cpp
@@ -171,7 +171,7 @@ void K3bAudioConvertingOptionWidget::slotUpdateFreeTempSpace()
TQString path = m_editBaseDir->url();
if( !TQFile::exists( path ) )
- path.truncate( path.tqfindRev('/') );
+ path.truncate( path.findRev('/') );
unsigned long size, avail;
if( K3b::kbFreeOnFs( path, size, avail ) ) {
@@ -257,7 +257,7 @@ void K3bAudioConvertingOptionWidget::saveConfig( KConfigBase* c )
c->writeEntry( "create_playlist", m_checkCreatePlaylist->isChecked() );
c->writeEntry( "relative_path_in_playlist", m_checkPlaylistRelative->isChecked() );
- if( d->extensionMap.tqcontains(m_comboFileType->currentItem()) )
+ if( d->extensionMap.contains(m_comboFileType->currentItem()) )
c->writeEntry( "filetype", d->extensionMap[m_comboFileType->currentItem()] );
else
c->writeEntry( "filetype", "wav" );
diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp
index 6d5cdf5..d0051e5 100644
--- a/src/rip/k3baudioprojectconvertingthread.cpp
+++ b/src/rip/k3baudioprojectconvertingthread.cpp
@@ -108,7 +108,7 @@ void K3bAudioProjectConvertingThread::run()
if( m_singleFile ) {
TQString& filename = m_tracks[0].second;
- TQString dir = filename.left( filename.tqfindRev("/") );
+ TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
emitFinished(false);
@@ -194,7 +194,7 @@ void K3bAudioProjectConvertingThread::run()
bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const TQString& filename )
{
- TQString dir = filename.left( filename.tqfindRev("/") );
+ TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
return false;
@@ -301,7 +301,7 @@ void K3bAudioProjectConvertingThread::cancel()
bool K3bAudioProjectConvertingThread::writePlaylist()
{
// this is an absolut path so there is always a "/"
- TQString playlistDir = m_playlistFilename.left( m_playlistFilename.tqfindRev( "/" ) );
+ TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
@@ -324,8 +324,8 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
if( !m_cddbEntry.cdArtist.isEmpty() && !m_cddbEntry.cdTitle.isEmpty() )
t << m_cddbEntry.cdArtist << " - " << m_cddbEntry.cdTitle << endl;
else
- t << m_tracks[0].second.mid(m_tracks[0].second.tqfindRev("/") + 1,
- m_tracks[0].second.length() - m_tracks[0].second.tqfindRev("/") - 5)
+ t << m_tracks[0].second.mid(m_tracks[0].second.findRev("/") + 1,
+ m_tracks[0].second.length() - m_tracks[0].second.findRev("/") - 5)
<< endl; // filename without extension
// filename
@@ -345,9 +345,9 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
if( !m_cddbEntry.artists[trackIndex].isEmpty() && !m_cddbEntry.titles[trackIndex].isEmpty() )
t << m_cddbEntry.artists[trackIndex] << " - " << m_cddbEntry.titles[trackIndex] << endl;
else
- t << m_tracks[i].second.mid(m_tracks[i].second.tqfindRev("/") + 1,
+ t << m_tracks[i].second.mid(m_tracks[i].second.findRev("/") + 1,
m_tracks[i].second.length()
- - m_tracks[i].second.tqfindRev("/") - 5)
+ - m_tracks[i].second.findRev("/") - 5)
<< endl; // filename without extension
// filename
@@ -406,7 +406,7 @@ bool K3bAudioProjectConvertingThread::writeCueFile()
// use the same base name as the image file
TQString cueFile = m_tracks[0].second;
- cueFile.truncate( cueFile.tqfindRev(".") );
+ cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue";
emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
@@ -421,17 +421,17 @@ TQString K3bAudioProjectConvertingThread::findRelativePath( const TQString& absP
TQString path = K3b::fixupPath( absPath );
// both paths have an equal beginning. That's just how it's configured by K3b
- int pos = baseDir_.tqfind( "/" );
+ int pos = baseDir_.find( "/" );
int oldPos = pos;
while( pos != -1 && path.left( pos+1 ) == baseDir_.left( pos+1 ) ) {
oldPos = pos;
- pos = baseDir_.tqfind( "/", pos+1 );
+ pos = baseDir_.find( "/", pos+1 );
}
// now the paths are equal up to oldPos, so that's how "deep" we go
path = path.mid( oldPos+1 );
baseDir_ = baseDir_.mid( oldPos+1 );
- int numberOfDirs = baseDir_.tqcontains( '/' );
+ int numberOfDirs = baseDir_.contains( '/' );
for( int i = 0; i < numberOfDirs; ++i )
path.prepend( "../" );
diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp
index 48e8780..9c410ad 100644
--- a/src/rip/k3baudioripthread.cpp
+++ b/src/rip/k3baudioripthread.cpp
@@ -194,7 +194,7 @@ void K3bAudioRipThread::run()
if( m_singleFile ) {
TQString& filename = m_tracks[0].second;
- TQString dir = filename.left( filename.tqfindRev("/") );
+ TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) {
d->paranoiaLib->close();
emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
@@ -298,7 +298,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
long trackSectorsRead = 0;
- TQString dir = filename.left( filename.tqfindRev("/") );
+ TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR );
return false;
@@ -444,7 +444,7 @@ void K3bAudioRipThread::cleanupAfterCancellation()
bool K3bAudioRipThread::writePlaylist()
{
// this is an absolut path so there is always a "/"
- TQString playlistDir = m_playlistFilename.left( m_playlistFilename.tqfindRev( "/" ) );
+ TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR );
@@ -467,8 +467,8 @@ bool K3bAudioRipThread::writePlaylist()
if( !m_cddbEntry.cdArtist.isEmpty() && !m_cddbEntry.cdTitle.isEmpty() )
t << m_cddbEntry.cdArtist << " - " << m_cddbEntry.cdTitle << endl;
else
- t << m_tracks[0].second.mid(m_tracks[0].second.tqfindRev("/") + 1,
- m_tracks[0].second.length() - m_tracks[0].second.tqfindRev("/") - 5)
+ t << m_tracks[0].second.mid(m_tracks[0].second.findRev("/") + 1,
+ m_tracks[0].second.length() - m_tracks[0].second.findRev("/") - 5)
<< endl; // filename without extension
// filename
@@ -488,9 +488,9 @@ bool K3bAudioRipThread::writePlaylist()
if( !m_cddbEntry.artists[trackIndex].isEmpty() && !m_cddbEntry.titles[trackIndex].isEmpty() )
t << m_cddbEntry.artists[trackIndex] << " - " << m_cddbEntry.titles[trackIndex] << endl;
else
- t << m_tracks[i].second.mid(m_tracks[i].second.tqfindRev("/") + 1,
+ t << m_tracks[i].second.mid(m_tracks[i].second.findRev("/") + 1,
m_tracks[i].second.length()
- - m_tracks[i].second.tqfindRev("/") - 5)
+ - m_tracks[i].second.findRev("/") - 5)
<< endl; // filename without extension
// filename
@@ -548,7 +548,7 @@ bool K3bAudioRipThread::writeCueFile()
// use the same base name as the image file
TQString cueFile = m_tracks[0].second;
- cueFile.truncate( cueFile.tqfindRev(".") );
+ cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue";
emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO );
@@ -563,17 +563,17 @@ TQString K3bAudioRipThread::findRelativePath( const TQString& absPath, const TQS
TQString path = K3b::fixupPath( absPath );
// both paths have an equal beginning. That's just how it's configured by K3b
- int pos = baseDir_.tqfind( "/" );
+ int pos = baseDir_.find( "/" );
int oldPos = pos;
while( pos != -1 && path.left( pos+1 ) == baseDir_.left( pos+1 ) ) {
oldPos = pos;
- pos = baseDir_.tqfind( "/", pos+1 );
+ pos = baseDir_.find( "/", pos+1 );
}
// now the paths are equal up to oldPos, so that's how "deep" we go
path = path.mid( oldPos+1 );
baseDir_ = baseDir_.mid( oldPos+1 );
- int numberOfDirs = baseDir_.tqcontains( '/' );
+ int numberOfDirs = baseDir_.contains( '/' );
for( int i = 0; i < numberOfDirs; ++i )
path.prepend( "../" );
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index 4d25ad2..d83fe49 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -28,7 +28,7 @@
TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
unsigned int trackNumber,
const TQString& pattern,
- bool tqreplace,
+ bool replace,
const TQString& replaceString )
{
if( entry.titles.count() < trackNumber )
@@ -115,18 +115,18 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
switch( c ) {
case ARTIST:
s = entry.artists[trackNumber-1];
- s.tqreplace( '/', '_' );
- s.tqreplace( '*', '_' );
- s.tqreplace( '}', '*' ); // for conditional inclusion
+ s.replace( '/', '_' );
+ s.replace( '*', '_' );
+ s.replace( '}', '*' ); // for conditional inclusion
dir.append( s.isEmpty()
? i18n("unknown") + TQString(" %1").tqarg(trackNumber)
: s );
break;
case TITLE:
s = entry.titles[trackNumber-1];
- s.tqreplace( '/', '_' );
- s.tqreplace( '*', '_' );
- s.tqreplace( '}', '*' );
+ s.replace( '/', '_' );
+ s.replace( '*', '_' );
+ s.replace( '}', '*' );
dir.append( s.isEmpty()
? i18n("Track %1").tqarg(trackNumber)
: s );
@@ -139,16 +139,16 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
break;
case COMMENT:
s = entry.extInfos[trackNumber-1];
- s.tqreplace( '/', '_' );
- s.tqreplace( '*', '_' );
- s.tqreplace( '}', '*' );
+ s.replace( '/', '_' );
+ s.replace( '*', '_' );
+ s.replace( '}', '*' );
dir.append( s );
break;
case GENRE:
s = ( entry.genre.isEmpty() ? entry.category : entry.genre );
- s.tqreplace( '/', '_' );
- s.tqreplace( '*', '_' );
- s.tqreplace( '}', '*' );
+ s.replace( '/', '_' );
+ s.replace( '*', '_' );
+ s.replace( '}', '*' );
dir.append( s );
break;
case ALBUMARTIST:
@@ -157,17 +157,17 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
break;
case ALBUMTITLE:
s = entry.cdTitle;
- s.tqreplace( '/', '_' );
- s.tqreplace( '*', '_' );
- s.tqreplace( '}', '*' );
+ s.replace( '/', '_' );
+ s.replace( '*', '_' );
+ s.replace( '}', '*' );
dir.append( s.isEmpty()
? i18n("unknown") : s );
break;
case ALBUMCOMMENT:
s = entry.cdExtInfo;
- s.tqreplace( '/', '_' );
- s.tqreplace( '*', '_' );
- s.tqreplace( '}', '*' );
+ s.replace( '/', '_' );
+ s.replace( '*', '_' );
+ s.replace( '}', '*' );
dir.append( s ); // I think it makes more sense to allow empty comments
break;
case DATE:
@@ -267,7 +267,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
else { // with string matching, e.g. ?y='2004'{text}
// Be aware that there might be ' in the condition text
- int endOfCondition = dir.tqfind( '{', offset+4 )-1;
+ int endOfCondition = dir.find( '{', offset+4 )-1;
TQString condition = dir.mid( offset+4,
endOfCondition - (offset+4) );
@@ -280,7 +280,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
isIncluded = !isIncluded;
// Leave it when it's '@'.
- dir.tqreplace( offset, length, ( isIncluded ? inclusion : TQString("") ) );
+ dir.replace( offset, length, ( isIncluded ? inclusion : TQString("") ) );
if( isIncluded == TRUE )
i -= length - inclusion.length();
@@ -289,17 +289,17 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
continue;
- } // end of tqreplace (at closing bracket '}')
+ } // end of replace (at closing bracket '}')
} // end of conditional inclusion for(...)
// end of Conditional Inclusion */
- dir.tqreplace( '*', '}' ); // bring the brackets back, if there were any
+ dir.replace( '*', '}' ); // bring the brackets back, if there were any
- if( tqreplace )
- dir.tqreplace( TQRegExp( "\\s" ), replaceString );
+ if( replace )
+ dir.replace( TQRegExp( "\\s" ), replaceString );
return dir;
}
diff --git a/src/rip/k3bpatternparser.h b/src/rip/k3bpatternparser.h
index 1f2cf86..3cf79e1 100644
--- a/src/rip/k3bpatternparser.h
+++ b/src/rip/k3bpatternparser.h
@@ -31,7 +31,7 @@ class K3bPatternParser
static TQString parsePattern( const K3bCddbResultEntry& entry,
unsigned int trackNumber,
const TQString& pattern,
- bool tqreplace = false,
+ bool replace = false,
const TQString& replaceString = "_" );
private:
diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp
index 9d6e8bc..c4da751 100644
--- a/src/rip/k3bvideocdinfo.cpp
+++ b/src/rip/k3bvideocdinfo.cpp
@@ -90,7 +90,7 @@ void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len )
TQStringList::Iterator end( lines.end());
for ( TQStringList::Iterator str = lines.begin(); str != end; ++str ) {
- if ( ( *str ).tqcontains( "<?xml" ) )
+ if ( ( *str ).contains( "<?xml" ) )
m_isXml = true;
if ( m_isXml )
@@ -98,7 +98,7 @@ void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len )
else
kdDebug() << "(K3bVideoCdInfo::slotParseOutput) " << *str << endl;
- if ( ( *str ).tqcontains( "</videocd>" ) )
+ if ( ( *str ).contains( "</videocd>" ) )
m_isXml = false;
}
}
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index a649e6e..04cf41b 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -97,7 +97,7 @@ void K3bVideoCdRip::vcdxRip()
if ( !bin ) {
kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl;
- emit infoMessage( i18n( "Could not tqfind %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR );
emit infoMessage( i18n( "To rip VideoCD's you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll();
@@ -288,7 +288,7 @@ void K3bVideoCdRip::slotVcdXRipFinished()
void K3bVideoCdRip::parseInformation( TQString text )
{
// parse warning
- if ( text.tqcontains( "encountered non-form2 sector" ) ) {
+ if ( text.contains( "encountered non-form2 sector" ) ) {
// I think this is an error not a warning. Finish ripping with invalid mpegs.
emit infoMessage( i18n( "%1 encountered non-form2 sector" ).tqarg("Vcdxrip"), K3bJob::ERROR );
emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR );
@@ -298,22 +298,22 @@ void K3bVideoCdRip::parseInformation( TQString text )
}
// parse extra info
- else if ( text.tqcontains( "detected extended VCD2.0 PBC files" ) )
+ else if ( text.contains( "detected extended VCD2.0 PBC files" ) )
emit infoMessage( i18n( "detected extended VCD2.0 PBC files" ), K3bJob::INFO );
// parse startposition and extracting sequence info
// extracting avseq05.mpg... (start lsn 32603 (+28514))
else if ( text.startsWith( "extracting" ) ) {
- if ( text.tqcontains( "(start lsn" ) ) {
- int index = text.tqfind( "(start lsn" );
- int end = text.tqfind( " (+" );
+ if ( text.contains( "(start lsn" ) ) {
+ int index = text.find( "(start lsn" );
+ int end = text.find( " (+" );
if ( end > 0) {
m_subPosition = text.mid( index + 11, end - index - 11 ).stripWhiteSpace().toLong();
}
else {
// found segment here we can get only the start lsn :)
// extracting item0001.mpg... (start lsn 225, 1 segments)
- int end = text.tqfind( ",", index );
+ int end = text.find( ",", index );
int overallPos = text.mid( index + 11, end - index - 11 ).stripWhiteSpace().toLong();
double relOverallWritten = ( ( double ) overallPos * 2352 ) / ( double ) m_videooptions ->getVideoCdSize() ;
int newpercent = ( int ) ( 100 * relOverallWritten );
@@ -325,17 +325,17 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = 11;
- end = text.tqfind( "(start lsn" );
+ end = text.find( "(start lsn" );
emit newSubTask( i18n( "Extracting %1" ).tqarg( text.mid( index, end - index ).stripWhiteSpace() ) );
}
// parse extracting files info
// extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1)
- else if ( text.tqcontains( "(lsn" ) && text.tqcontains( "size" ) ) {
+ else if ( text.contains( "(lsn" ) && text.contains( "size" ) ) {
int index = 11;
- int end = text.tqfind( "to" );
+ int end = text.find( "to" );
TQString extractFileName = text.mid( index, end - index ).stripWhiteSpace();
- index = text.tqfind( " to " );
- end = text.tqfind( " (lsn" );
+ index = text.find( " to " );
+ end = text.find( " (lsn" );
TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace();
emit newSubTask( i18n( "Extracting %1 to %2" ).tqarg( extractFileName ).tqarg( toFileName ) );
}
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index 24e3d2e..c8dbe6f 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -220,7 +220,7 @@ void K3bVideoCdRippingDialog::slotUpdateFreeSpace()
TQString path = m_editDirectory->url();
if( !TQFile::exists( path ) )
- path.truncate( path.tqfindRev('/') );
+ path.truncate( path.findRev('/') );
unsigned long size, avail;
if( K3b::kbFreeOnFs( path, size, avail ) )
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index bb7bbcf..072052f 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -262,7 +262,7 @@ void K3bVideoDVDRippingDialog::slotUpdateFilenames()
it != m_titleRipInfos.end(); ++it ) {
TQString f = d->fsInfo.fixupPath( createFilename( it.data(), m_w->m_comboFilenamePattern->currentText() ) );
if( m_w->m_checkBlankReplace->isChecked() )
- f.tqreplace( TQRegExp( "\\s" ), m_w->m_editBlankReplace->text() );
+ f.replace( TQRegExp( "\\s" ), m_w->m_editBlankReplace->text() );
it.data().filename = baseDir + f;
it.key()->setText( 3, f );
}
@@ -331,7 +331,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
// first check if we have a long keyword instead of a one-char
//
if( pattern[i] == '{' ) {
- int j = pattern.tqfind( '}', i );
+ int j = pattern.find( '}', i );
if( j < 0 ) // no closing bracket -> no valid pattern
c = '*';
else {
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 06214a0..a9cbb6c 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -249,7 +249,7 @@ void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace()
TQString path = m_editBaseDir->url();
if( !TQFile::exists( path ) )
- path.truncate( path.tqfindRev('/') );
+ path.truncate( path.findRev('/') );
unsigned long size, avail;
if( K3b::kbFreeOnFs( path, size, avail ) ) {