From feae001a0240fdca57cc68779f59f88e6af49335 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:35:48 -0600 Subject: Remove additional unneeded tq method conversions (cherry picked from commit 5183781c5dddd8447b308c24b2d7f9257bd0bcad) --- libk3b/projects/videocd/k3bvcdjob.cpp | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'libk3b/projects/videocd/k3bvcdjob.cpp') diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index edbe9c1..18c5678 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -106,7 +106,7 @@ void K3bVcdJob::cancelAll() // remove bin-file if it is unfinished or the user selected to remove image if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS ); + emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS ); TQFile::remove ( m_doc->vcdImage() ); m_doc->setVcdImage( "" ); @@ -116,7 +116,7 @@ void K3bVcdJob::cancelAll() // remove cue-file if it is unfinished or the user selected to remove image if ( TQFile::exists( m_cueFile ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS ); + emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS ); TQFile::remove ( m_cueFile ); m_cueFile = ""; @@ -184,8 +184,8 @@ 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 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( "Could not find %1 executable." ).arg( "vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).arg( ">= 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(); jobFinished( false ); @@ -194,7 +194,7 @@ void K3bVcdJob::vcdxBuild() if ( bin->version < K3bVersion( "0.7.12" ) ) { kdDebug() << "(K3bVcdJob) vcdxbuild executable too old!" << endl; - emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).tqarg( "Vcdxbuild" ).tqarg( "0.7.12" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).arg( "Vcdxbuild" ).arg( "0.7.12" ), K3bJob::ERROR ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -202,7 +202,7 @@ void K3bVcdJob::vcdxBuild() } if ( !bin->copyright.isEmpty() ) - emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO ); + emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO ); *m_process << bin; @@ -219,11 +219,11 @@ void K3bVcdJob::vcdxBuild() *m_process << "--progress" << "--gui"; - *m_process << TQString( "--cue-file=%1" ).tqarg( m_cueFile ); + *m_process << TQString( "--cue-file=%1" ).arg( m_cueFile ); - *m_process << TQString( "--bin-file=%1" ).tqarg( m_doc->vcdImage() ); + *m_process << TQString( "--bin-file=%1" ).arg( m_doc->vcdImage() ); - *m_process << TQString( "%1" ).tqarg( TQFile::encodeName( m_xmlFile ).data() ); + *m_process << TQString( "%1" ).arg( TQFile::encodeName( m_xmlFile ).data() ); connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); @@ -245,7 +245,7 @@ void K3bVcdJob::vcdxBuild() if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { kdDebug() << "(K3bVcdJob) could not start vcdxbuild" << endl; - emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxbuild" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); } @@ -290,7 +290,7 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) 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() ) ); + emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).arg( index + 1 ).arg( doc() ->numOfTracks() ).arg( m_currentWrittenTrack->fileName() ) ); m_bytesFinished = 0; if ( !firstTrack ) { @@ -324,15 +324,15 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) if ( tel.isText() ) { const TQString text = tel.data(); if ( m_stage == stageWrite && level == "information" ) - kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).tqarg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).arg( text ) << endl; if ( ( text ).startsWith( "writing track" ) ) - emit newSubTask( i18n( "Creating Image for track %1" ).tqarg( ( text ).mid( 14 ) ) ); + emit newSubTask( i18n( "Creating Image for track %1" ).arg( ( text ).mid( 14 ) ) ); else { if ( level != "error" ) { - kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).tqarg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).arg( text ) << endl; parseInformation( text ); } else { - kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).tqarg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).arg( text ) << endl; emit infoMessage( text, K3bJob::ERROR ); } } @@ -353,7 +353,7 @@ void K3bVcdJob::slotVcdxBuildFinished() m_imageFinished = true; break; default: - emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxbuild" ).tqarg( m_process->exitStatus() ), + emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxbuild" ).arg( m_process->exitStatus() ), K3bJob::ERROR ); emit infoMessage( i18n( "Please send me an email with the last output." ), K3bJob::ERROR ); cancelAll(); @@ -361,7 +361,7 @@ void K3bVcdJob::slotVcdxBuildFinished() return ; } } else { - emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxbuild" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); return ; @@ -372,7 +372,7 @@ void K3bVcdJob::slotVcdxBuildFinished() TQFile::remove ( m_xmlFile ); - kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).tqarg( vcdDoc() ->onlyCreateImages() ) << endl; + kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).arg( vcdDoc() ->onlyCreateImages() ) << endl; if ( !vcdDoc() ->onlyCreateImages() ) startWriterjob(); else @@ -381,7 +381,7 @@ void K3bVcdJob::slotVcdxBuildFinished() void K3bVcdJob::startWriterjob() { - kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) << endl; + kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) << endl; if ( prepareWriterJob() ) { if ( waitForMedia( m_doc->burner() ) < 0 ) { cancel(); @@ -392,7 +392,7 @@ void K3bVcdJob::startWriterjob() return ; if ( m_doc->copies() > 1 ) - emit newTask( i18n( "Writing Copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) ); + emit newTask( i18n( "Writing Copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) ); emit burning( true ); m_writerJob->start(); @@ -461,7 +461,7 @@ void K3bVcdJob::slotProcessedSize( int cs, int ts ) void K3bVcdJob::slotWriterNextTrack( int t, int tt ) { - emit newSubTask( i18n( "Writing Track %1 of %2" ).tqarg( t ).tqarg( tt ) ); + emit newSubTask( i18n( "Writing Track %1 of %2" ).arg( t ).arg( tt ) ); } void K3bVcdJob::slotWriterJobFinished( bool success ) @@ -473,7 +473,7 @@ void K3bVcdJob::slotWriterJobFinished( bool success ) // remove bin-file if it is unfinished or the user selected to remove image if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS ); + emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS ); TQFile::remove ( m_doc->vcdImage() ); m_doc->setVcdImage( "" ); @@ -483,7 +483,7 @@ void K3bVcdJob::slotWriterJobFinished( bool success ) // remove cue-file if it is unfinished or the user selected to remove image if ( TQFile::exists( m_cueFile ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS ); + emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS ); TQFile::remove ( m_cueFile ); m_cueFile = ""; @@ -512,7 +512,7 @@ void K3bVcdJob::parseInformation( const TQString &text ) 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 ); + emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).arg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING ); } 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 ); @@ -523,7 +523,7 @@ void K3bVcdJob::parseInformation( const TQString &text ) 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( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).arg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).arg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING ); emit infoMessage( i18n( "Ignoring this aps" ), K3bJob::INFO ); } else if ( text.contains( "bad packet at packet" ) ) { @@ -532,8 +532,8 @@ void K3bVcdJob::parseInformation( const TQString &text ) 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 ); + emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).arg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).arg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).arg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING ); } } @@ -558,7 +558,7 @@ TQString K3bVcdJob::jobDetails() const { return ( i18n( "1 MPEG (%1)", "%n MPEGs (%1)", - m_doc->tracks() ->count() ).tqarg( KIO::convertSize( m_doc->size() ) ) + m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) ) + ( m_doc->copies() > 1 ? i18n( " - %n copy", " - %n copies", m_doc->copies() ) : TQString() ) ); -- cgit v1.2.3