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

3 files changed, 29 insertions, 29 deletions

diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index 0898fdf..1695353 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -336,7 +336,7 @@ void K3bVcdDoc::removeTrack( K3bVcdTrack* track )
     }
 
     // set the current item to track
-    if ( m_tracks->tqfindRef( track ) >= 0 ) {
+    if ( m_tracks->findRef( track ) >= 0 ) {
         // take the current item
         track = m_tracks->take();
 
@@ -374,12 +374,12 @@ void K3bVcdDoc::moveTrack( const K3bVcdTrack* track, const K3bVcdTrack* after )
         return ;
 
     // set the current item to track
-    m_tracks->tqfindRef( track );
+    m_tracks->findRef( track );
     // take the current item
     track = m_tracks->take();
 
-    // if after == 0 tqfindRef returnes -1
-    int pos = m_tracks->tqfindRef( after );
+    // if after == 0 findRef returnes -1
+    int pos = m_tracks->findRef( after );
     m_tracks->insert( pos + 1, track );
 
     // reorder pbc tracks
@@ -645,8 +645,8 @@ bool K3bVcdDoc::loadDocumentData( TQDomElement* root )
                 track ->setPlayTime( trackElem.attribute( "playtime", "1" ).toInt() );
                 track ->setWaitTime( trackElem.attribute( "waittime", "2" ).toInt() );
                 track ->setReactivity( trackElem.attribute( "reactivity", "0" ).toInt() );
-                track -> setPbcNumKeys( ( trackElem.attribute( "numkeys", "yes" ).tqcontains( "yes" ) ) ? true : false );
-                track -> setPbcNumKeysUserdefined( ( trackElem.attribute( "userdefinednumkeys", "no" ).tqcontains( "yes" ) ) ? true : false );
+                track -> setPbcNumKeys( ( trackElem.attribute( "numkeys", "yes" ).contains( "yes" ) ) ? true : false );
+                track -> setPbcNumKeysUserdefined( ( trackElem.attribute( "userdefinednumkeys", "no" ).contains( "yes" ) ) ? true : false );
 
                 addTrack( track, m_tracks->count() );
             }
@@ -667,7 +667,7 @@ bool K3bVcdDoc::loadDocumentData( TQDomElement* root )
             for ( uint i = 0; i < trackNodes.length(); i++ ) {
                 TQDomElement trackElem = trackNodes.item( i ).toElement();
                 TQString name = trackElem.tagName();
-                if ( name.tqcontains( "pbc" ) ) {
+                if ( name.contains( "pbc" ) ) {
                     if ( trackElem.hasAttribute ( "type" ) ) {
                         type = trackElem.attribute ( "type" ).toInt();
                         if ( trackElem.hasAttribute ( "pbctrack" ) ) {
@@ -688,7 +688,7 @@ bool K3bVcdDoc::loadDocumentData( TQDomElement* root )
                             }
                         }
                     }
-                } else if ( name.tqcontains( "numkeys" ) ) {
+                } else if ( name.contains( "numkeys" ) ) {
                     if ( trackElem.hasAttribute ( "key" ) ) {
                         int key = trackElem.attribute ( "key" ).toInt();
                         if ( trackElem.hasAttribute ( "val" ) ) {
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index 156c79a..bdeebec 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -133,7 +133,7 @@ void K3bVcdJob::start()
     emit burning( false );
     m_canceled = false;
 
-    int pos = TQString( m_doc->vcdImage() ).tqfind( ".bin", TQString( m_doc->vcdImage() ).length() - 4 );
+    int pos = TQString( m_doc->vcdImage() ).find( ".bin", TQString( m_doc->vcdImage() ).length() - 4 );
     if ( pos > 0 ) {
         m_cueFile = m_doc->vcdImage().left( pos ) + ".cue";
     } else {
@@ -184,7 +184,7 @@ void K3bVcdJob::vcdxBuild()
     const K3bExternalBin* bin = k3bcore ->externalBinManager() ->binObject( "vcdxbuild" );
     if ( !bin ) {
         kdDebug() << "(K3bVcdJob) could not find vcdxbuild executable" << endl;
-        emit infoMessage( i18n( "Could not tqfind %1 executable." ).tqarg( "vcdxbuild" ), K3bJob::ERROR );
+        emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxbuild" ), K3bJob::ERROR );
         emit infoMessage( i18n( "To create VideoCDs 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();
@@ -287,7 +287,7 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len )
                 if ( oper == "scan" ) {
                     // Scan Video Files
                     if ( m_stage == stageUnknown || pos < m_bytesFinished ) {
-                        const uint index = el.attribute( "id" ).tqreplace( TQRegExp( "sequence-" ), "" ).toUInt();
+                        const uint index = el.attribute( "id" ).replace( TQRegExp( "sequence-" ), "" ).toUInt();
 
                         m_currentWrittenTrack = m_doc->at( m_currentWrittenTrackNumber );
                         emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).tqarg( index + 1 ).tqarg( doc() ->numOfTracks() ).tqarg( m_currentWrittenTrack->fileName() ) );
@@ -509,28 +509,28 @@ void K3bVcdJob::slotWriterJobFinished( bool success )
 void K3bVcdJob::parseInformation( const TQString &text )
 {
     // parse warning
-    if ( text.tqcontains( "mpeg user scan data: one or more BCD fields out of range for" ) ) {
-        int index = text.tqfind( " for" );
+    if ( text.contains( "mpeg user scan data: one or more BCD fields out of range for" ) ) {
+        int index = text.find( " for" );
 
         emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).tqarg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING );
 
-    } else if ( text.tqcontains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) {
+    } else if ( text.contains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) {
         emit infoMessage( i18n( "From now on, scan information data errors will not be reported anymore" ), K3bJob::INFO );
         emit infoMessage( i18n( "Consider enabling the 'update scan offsets' option, if it is not enabled already." ), K3bJob::INFO );
 
-    } else if ( text.tqcontains( "APS' pts seems out of order (actual pts" ) ) {
-        int index = text.tqfind( "(actual pts" );
-        int index2 = text.tqfind( ", last seen pts" );
-        int index3 = text.tqfind( ") -- ignoring this aps" );
+    } else if ( text.contains( "APS' pts seems out of order (actual pts" ) ) {
+        int index = text.find( "(actual pts" );
+        int index2 = text.find( ", last seen pts" );
+        int index3 = text.find( ") -- ignoring this aps" );
 
         emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).tqarg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING );
         emit infoMessage( i18n( "Ignoring this aps" ), K3bJob::INFO );
 
-    } else if ( text.tqcontains( "bad packet at packet" ) ) {
-        int index = text.tqfind( "at packet #" );
-        int index2 = text.tqfind( "(stream byte offset" );
-        int index3 = text.tqfind( ") -- remaining " );
-        int index4 = text.tqfind( "bytes of stream will be ignored" );
+    } else if ( text.contains( "bad packet at packet" ) ) {
+        int index = text.find( "at packet #" );
+        int index2 = text.find( "(stream byte offset" );
+        int index3 = text.find( ") -- remaining " );
+        int index4 = text.find( "bytes of stream will be ignored" );
 
         emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).tqarg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING );
         emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).tqarg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING );
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index 68d04fd..e3939cc 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -65,7 +65,7 @@ KIO::filesize_t K3bVcdTrack::size() const
 
 int K3bVcdTrack::index() const
 {
-    int i = m_parent->tqfind( this );
+    int i = m_parent->find( this );
     if ( i < 0 )
         kdDebug() << "(K3bVcdTrack) I'm not part of my tqparent!" << endl;
     return i;
@@ -119,23 +119,23 @@ void K3bVcdTrack::delRefFromUs()
 void K3bVcdTrack::setPbcTrack( int which, K3bVcdTrack* pbctrack )
 {
     kdDebug() << "K3bVcdTrack::setPbcTrack " << which << ", " << pbctrack << endl;
-    m_pbctrackmap.tqreplace( which, pbctrack );
+    m_pbctrackmap.replace( which, pbctrack );
 }
 
 void K3bVcdTrack::setPbcNonTrack( int which, int type )
 {
     kdDebug() << "K3bVcdTrack::setNonPbcTrack " << which << ", " << type << endl;
-    m_pbcnontrackmap.tqreplace( which, type );
+    m_pbcnontrackmap.replace( which, type );
 }
 
 void K3bVcdTrack::setUserDefined( int which, bool ud )
 {
-    m_pbcusrdefmap.tqreplace( which, ud );
+    m_pbcusrdefmap.replace( which, ud );
 }
 
 K3bVcdTrack* K3bVcdTrack::getPbcTrack( const int& which )
 {
-    if ( m_pbctrackmap.tqfind( which ) == m_pbctrackmap.end() )
+    if ( m_pbctrackmap.find( which ) == m_pbctrackmap.end() )
         return 0;
     else
         return m_pbctrackmap[ which ];
@@ -143,7 +143,7 @@ K3bVcdTrack* K3bVcdTrack::getPbcTrack( const int& which )
 
 int K3bVcdTrack::getNonPbcTrack( const int& which )
 {
-    if ( m_pbcnontrackmap.tqfind( which ) == m_pbcnontrackmap.end() )
+    if ( m_pbcnontrackmap.find( which ) == m_pbcnontrackmap.end() )
         return 0;
     else
         return m_pbcnontrackmap[ which ];