summaryrefslogtreecommitdiffstats
path: root/libk3b/projects/videocd
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b/projects/videocd')
-rw-r--r--libk3b/projects/videocd/cdi/cdi_vcd.appbin102402 -> 102400 bytes
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.cpp14
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.h2
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.cpp58
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.cpp2
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.cpp20
-rw-r--r--libk3b/projects/videocd/k3bvcdxmlview.cpp48
-rw-r--r--libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp38
8 files changed, 91 insertions, 91 deletions
diff --git a/libk3b/projects/videocd/cdi/cdi_vcd.app b/libk3b/projects/videocd/cdi/cdi_vcd.app
index 31a7527..ceb31fc 100644
--- a/libk3b/projects/videocd/cdi/cdi_vcd.app
+++ b/libk3b/projects/videocd/cdi/cdi_vcd.app
Binary files differ
diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index a361d5d..272591a 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -21,7 +21,7 @@
#include <tqdom.h>
#include <tqdatetime.h>
#include <tqtimer.h>
-#include <tqtextstream.h>
+#include <textstream.h>
// KDE-includes
#include <kprocess.h>
@@ -211,8 +211,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
i18n( "K3b will create a %1 image from the given MPEG "
"files, but these files must already be in %2 "
"format. K3b does not yet resample MPEG files." )
- .tqarg( i18n( "VCD" ) )
- .tqarg( i18n( "VCD" ) ),
+ .arg( i18n( "VCD" ) )
+ .arg( i18n( "VCD" ) ),
i18n( "Information" ) );
m_urlAddingTimer->start( 0 );
} else if ( vcdType() == NONE ) {
@@ -223,8 +223,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
i18n( "K3b will create a %1 image from the given MPEG "
"files, but these files must already be in %2 "
"format. K3b does not yet resample MPEG files." )
- .tqarg( i18n( "SVCD" ) )
- .tqarg( i18n( "SVCD" ) )
+ .arg( i18n( "SVCD" ) )
+ .arg( i18n( "SVCD" ) )
+ "\n\n"
+ i18n( "Note: Forcing MPEG2 as VCD is not supported by "
"some standalone DVD players." ),
@@ -448,7 +448,7 @@ void K3bVcdDoc::setPbcTracks()
if ( m_tracks ) {
int count = m_tracks->count();
- kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).tqarg( count ) << endl;
+ kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).arg( count ) << endl;
TQPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks );
K3bVcdTrack* track;
@@ -574,7 +574,7 @@ bool K3bVcdDoc::loadDocumentData( TQDomElement* root )
TQDomNode item = vcdNodes.item( i );
TQString name = item.nodeName();
- kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).tqarg( name ) << endl;
+ kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).arg( name ) << endl;
if ( name == "volumeId" )
vcdOptions() ->setVolumeId( item.toElement().text() );
diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h
index 1878c31..1e92fc9 100644
--- a/libk3b/projects/videocd/k3bvcddoc.h
+++ b/libk3b/projects/videocd/k3bvcddoc.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqimage.h>
// Kde Includes
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index 662145c..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();
@@ -438,7 +438,7 @@ bool K3bVcdJob::prepareWriterJob()
connect( m_writerJob, TQT_SIGNAL( subPercent( int ) ), this, TQT_SIGNAL( subPercent( int ) ) );
connect( m_writerJob, TQT_SIGNAL( processedSubSize( int, int ) ), this, TQT_SIGNAL( processedSubSize( int, int ) ) );
connect( m_writerJob, TQT_SIGNAL( nextTrack( int, int ) ), this, TQT_SLOT( slotWriterNextTrack( int, int ) ) );
- connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( buffertqStatus( int ) ) );
+ connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( bufferStatus( int ) ) );
connect( m_writerJob, TQT_SIGNAL( deviceBuffer( int ) ), this, TQT_SIGNAL( deviceBuffer( int ) ) );
connect( m_writerJob, TQT_SIGNAL( writeSpeed( int, int ) ), this, TQT_SIGNAL( writeSpeed( int, int ) ) );
connect( m_writerJob, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotWriterJobFinished( bool ) ) );
@@ -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() ) );
diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp
index 854919f..9b80a8d 100644
--- a/libk3b/projects/videocd/k3bvcdoptions.cpp
+++ b/libk3b/projects/videocd/k3bvcdoptions.cpp
@@ -37,7 +37,7 @@ K3bVcdOptions::K3bVcdOptions()
m_volumeID( "VIDEOCD" ),
m_albumID( "" ),
m_volumeSetId( "" ),
- m_publisher( TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ) ),
+ m_publisher( TQString( "K3b - Version %1" ).arg( k3bcore->version() ) ),
m_applicationId( "CDI/CDI_VCD.APP;1" ),
m_systemId( "CD-RTOS CD-BRIDGE" ),
m_vcdclass( "vcd" ),
diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp
index b008476..3ed27f9 100644
--- a/libk3b/projects/videocd/k3bvcdtrack.cpp
+++ b/libk3b/projects/videocd/k3bvcdtrack.cpp
@@ -159,7 +159,7 @@ const TQString K3bVcdTrack::resolution()
if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) {
- return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ i ].hsize ).tqarg( mpeg_info->video[ i ].vsize );
+ return TQString( "%1 x %2" ).arg( mpeg_info->video[ i ].hsize ).arg( mpeg_info->video[ i ].vsize );
}
}
}
@@ -171,7 +171,7 @@ const TQString K3bVcdTrack::highresolution()
{
if ( mpeg_info->has_video ) {
if ( mpeg_info->video[ 2 ].seen ) {
- return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ 2 ].hsize ).tqarg( mpeg_info->video[ 2 ].vsize );
+ return TQString( "%1 x %2" ).arg( mpeg_info->video[ 2 ].hsize ).arg( mpeg_info->video[ 2 ].vsize );
}
}
return i18n( "n/a" );
@@ -195,7 +195,7 @@ const TQString K3bVcdTrack::video_bitrate()
if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) {
- return i18n( "%1 bit/s" ).tqarg( mpeg_info->video[ i ].bitrate ) ;
+ return i18n( "%1 bit/s" ).arg( mpeg_info->video[ i ].bitrate ) ;
}
}
}
@@ -284,7 +284,7 @@ const TQString K3bVcdTrack::audio_bitrate()
if ( mpeg_info->has_audio ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->audio[ i ].seen ) {
- return i18n( "%1 bit/s" ).tqarg( mpeg_info->audio[ i ].bitrate ) ;
+ return i18n( "%1 bit/s" ).arg( mpeg_info->audio[ i ].bitrate ) ;
}
}
}
@@ -297,7 +297,7 @@ const TQString K3bVcdTrack::audio_sampfreq()
if ( mpeg_info->has_audio ) {
for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->audio[ i ].seen ) {
- return i18n( "%1 Hz" ).tqarg( mpeg_info->audio[ i ].sampfreq ) ;
+ return i18n( "%1 Hz" ).arg( mpeg_info->audio[ i ].sampfreq ) ;
}
}
}
@@ -337,16 +337,16 @@ const TQString K3bVcdTrack::mpegTypeS( bool audio )
for ( int i = 0; i < 3; i++ )
if ( mpeg_info->video[ i ].seen ) {
if ( i == 0 ) {
- return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Motion Picture" );
+ return TQString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Motion Picture" );
} else {
- return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Still Picture" );
+ return TQString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Still Picture" );
}
}
}
if ( mpeg_info->has_audio && audio ) {
for ( int i = 0; i < 3; i++ )
if ( mpeg_info->audio[ i ].seen ) {
- return TQString( "MPEG%1 " ).tqarg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).tqarg( mpeg_info->audio[ i ].layer );
+ return TQString( "MPEG%1 " ).arg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).arg( mpeg_info->audio[ i ].layer );
}
}
@@ -423,10 +423,10 @@ TQString K3bVcdTrack::SecsToHMS( double duration )
byte mins = ( byte ) ( ( duration / 60 ) - ( hours * 60 ) );
float secs = duration - 60 * mins - 3600 * hours;
if ( hours != 0 ) {
- return TQString( "%1:" ).tqarg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
+ return TQString( "%1:" ).arg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
}
if ( mins != 0 ) {
- return TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
+ return TQString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
}
return TQString::number( secs, 'f', 2 );
}
diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp
index 203f54f..6881946 100644
--- a/libk3b/projects/videocd/k3bvcdxmlview.cpp
+++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp
@@ -131,7 +131,7 @@ bool K3bVcdXmlView::write( const TQString& fname )
addSubElement( xmlDoc, elemPvd, "volume-id", m_doc->vcdOptions() ->volumeId().upper() );
addSubElement( xmlDoc, elemPvd, "system-id", m_doc->vcdOptions() ->systemId() );
addSubElement( xmlDoc, elemPvd, "application-id", m_doc->vcdOptions() ->applicationId() );
- addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ).upper() );
+ addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).arg( k3bcore->version() ).upper() );
addSubElement( xmlDoc, elemPvd, "publisher-id", m_doc->vcdOptions() ->publisher().upper() );
@@ -180,7 +180,7 @@ bool K3bVcdXmlView::write( const TQString& fname )
filename = locate( "data", "k3b/extra/k3bphotosvcd.mpg" );
elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" );
- elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( filename ).data() ) );
+ elemsequenceItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( filename ).data() ) );
elemsequenceItem.setAttribute( "id", "sequence-000" );
// default entry
TQDomElement elemdefaultEntry;
@@ -199,19 +199,19 @@ bool K3bVcdXmlView::write( const TQString& fname )
TQString seqId = TQString::number( it.current() ->index() ).rightJustify( 3, '0' );
elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" );
- elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
- elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).tqarg( seqId ) );
+ elemsequenceItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
+ elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).arg( seqId ) );
// default entry
TQDomElement elemdefaultEntry;
elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" );
- elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).tqarg( seqId ) );
+ elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).arg( seqId ) );
} else {
// sequence-items element needs at least one segment to fit the XML
elemsegmentItem = addSubElement( xmlDoc, elemsegmentItems, "segment-item" );
- elemsegmentItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
- elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).tqarg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) );
+ elemsegmentItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
+ elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).arg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) );
}
}
@@ -232,7 +232,7 @@ bool K3bVcdXmlView::write( const TQString& fname )
}
m_xmlstring = xmlDoc.toString();
- kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).tqarg( fname ) << endl;
+ kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).arg( fname ) << endl;
TQFile xmlFile( fname );
if ( xmlFile.open( IO_WriteOnly ) ) {
@@ -267,7 +267,7 @@ TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& par
TQDomElement element = doc.createElement( name );
parent.appendChild( element );
if ( value >= -1 ) {
- TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) );
+ TQDomText t = doc.createTextNode( TQString( "%1" ).arg( value ) );
element.appendChild( t );
}
return element;
@@ -284,7 +284,7 @@ TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement&
void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& parent, const TQString& src, const TQString& name, bool mixed )
{
TQDomElement elemFile = addSubElement( doc, parent, "file" );
- elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) );
+ elemFile.setAttribute( "src", TQString( "%1" ).arg( src ) );
if ( mixed )
elemFile.setAttribute( "format", "mixed" );
@@ -296,7 +296,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
TQString ref = ( track->isSegment() ) ? "segment" : "sequence";
TQDomElement elemSelection = addSubElement( doc, parent, "selection" );
- elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
setNumkeyBSN( doc, elemSelection, track );
@@ -310,24 +310,24 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
switch ( i ) {
case K3bVcdTrack::PREVIOUS:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "prev" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::NEXT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "next" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::RETURN:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "return" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::DEFAULT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "default" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::AFTERTIMEOUT:
if ( track->getWaitTime() >= 0 ) {
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "timeout" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
}
break;
}
@@ -369,7 +369,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
else
loop.setAttribute( "jump-timing", "immediate" );
- addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
setNumkeySEL( doc, elemSelection, track );
}
@@ -410,30 +410,30 @@ void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& parent, K3bV
for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) {
- kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl;
+ kdDebug() << TQString( "trackIt key: %1 none: %2" ).arg( trackIt.key() ).arg( none ) << endl;
while ( none < trackIt.key() ) {
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
- addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).arg( none ).arg( TQFile::encodeName( track->absPath() ).data() ) );
none++;
}
if ( trackIt.data() ) {
TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence";
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) );
- addComment( doc, parent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) );
+ addComment( doc, parent, TQString( "key %1 -> %2" ).arg( trackIt.key() ).arg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) );
} else {
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" );
- addComment( doc, parent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) );
+ addComment( doc, parent, TQString( "key %1 -> end" ).arg( trackIt.key() ) );
}
none++;
}
} else {
// default reference to itSelf
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
}
}
}
diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
index 089f22d..6192024 100644
--- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
+++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
@@ -41,19 +41,19 @@ K3bMpegInfo::K3bMpegInfo( const char* filename )
m_mpegfile = fopen( filename, "rb" );
if ( m_mpegfile == 0 ) {
- kdDebug() << TQString( "Unable to open %1" ).tqarg( m_filename ) << endl;
+ kdDebug() << TQString( "Unable to open %1" ).arg( m_filename ) << endl;
return ;
}
if ( fseeko( m_mpegfile, 0, SEEK_END ) ) {
- kdDebug() << TQString( "Unable to seek in file %1" ).tqarg( m_filename ) << endl;
+ kdDebug() << TQString( "Unable to seek in file %1" ).arg( m_filename ) << endl;
return ;
}
llong lof = ftello( m_mpegfile );
if ( lof == -1 ) {
- kdDebug() << TQString( "Seeking to end of input file %1 failed." ).tqarg( m_filename ) << endl;
+ kdDebug() << TQString( "Seeking to end of input file %1 failed." ).arg( m_filename ) << endl;
//give up..
return ;
} else
@@ -61,8 +61,8 @@ K3bMpegInfo::K3bMpegInfo( const char* filename )
// nothing to do on an empty file
if ( !m_filesize ) {
- kdDebug() << TQString( "File %1 is empty." ).tqarg( m_filename ) << endl;
- m_error_string = i18n( "File %1 is empty." ).tqarg( m_filename );
+ kdDebug() << TQString( "File %1 is empty." ).arg( m_filename ) << endl;
+ m_error_string = i18n( "File %1 is empty." ).arg( m_filename );
return ;
}
@@ -90,7 +90,7 @@ bool K3bMpegInfo::MpegParsePacket ()
if ( !EnsureMPEG( 0, MPEG_PACK_HEADER_CODE ) ) {
llong code = GetNBytes( 0, 4 );
- kdDebug() << TQString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).tqarg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).tqarg( code, 0, 16 ) << endl;
+ kdDebug() << TQString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).arg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).arg( code, 0, 16 ) << endl;
if ( code == 0x00000100 + MPEG_SEQUENCE_CODE ) {
kdDebug() << "...this looks like a elementary video stream but a multiplexed program stream was required." << endl;
@@ -120,7 +120,7 @@ bool K3bMpegInfo::MpegParsePacket ()
if ( offset != 0 ) {
// we actually skipped some zeroes
- kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).tqarg( offset ) << endl;
+ kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).arg( offset ) << endl;
}
// here while schleife
@@ -190,7 +190,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
int bits;
case MPEG_PACK_HEADER_CODE:
- // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).tqarg( offset ) << endl;
+ // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).arg( offset ) << endl;
offset += 4;
@@ -214,7 +214,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
if ( m_initial_TS == 0.0 )
{
m_initial_TS = ReadTS( offset );
- kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl;
+ kdDebug() << TQString( "Initial TS = %1" ).arg( m_initial_TS ) << endl;
}
} else if ( bits >> 2 == 0x1 ) /* %01xx ISO13818-1 */
@@ -231,11 +231,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
if ( m_initial_TS == 0.0 )
{
m_initial_TS = ReadTSMpeg2( offset );
- kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl;
+ kdDebug() << TQString( "Initial TS = %1" ).arg( m_initial_TS ) << endl;
}
} else {
- kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).tqarg( bits ) << endl;
+ kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).arg( bits ) << endl;
mpeg_info->version = MPEG_VERS_INVALID;
return -1;
}
@@ -254,11 +254,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
offset += 4;
size = GetSize( offset );
offset += 2;
- // kdDebug() << TQString( "offset = %1, size = %2" ).tqarg( offset ).tqarg( size ) << endl;
+ // kdDebug() << TQString( "offset = %1, size = %2" ).arg( offset ).arg( size ) << endl;
switch ( mark ) {
case MPEG_SYSTEM_HEADER_CODE:
- // kdDebug() << TQString( "Systemheader: %1" ).tqarg( m_code, 0, 16 ) << endl;
+ // kdDebug() << TQString( "Systemheader: %1" ).arg( m_code, 0, 16 ) << endl;
break;
case MPEG_VIDEO_E0_CODE:
@@ -296,18 +296,18 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
break;
case MPEG_PRIVATE_1_CODE:
- kdDebug() << TQString( "PrivateCode: %1" ).tqarg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "PrivateCode: %1" ).arg( mark, 0, 16 ) << endl;
break;
}
break;
case MPEG_PROGRAM_END_CODE:
- kdDebug() << TQString( "ProgramEndCode: %1" ).tqarg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "ProgramEndCode: %1" ).arg( mark, 0, 16 ) << endl;
offset += 4;
break;
case MPEG_PICTURE_CODE:
- kdDebug() << TQString( "PictureCode: %1" ).tqarg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "PictureCode: %1" ).arg( mark, 0, 16 ) << endl;
offset += 3;
break;
@@ -325,7 +325,7 @@ byte K3bMpegInfo::GetByte( llong offset )
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
if ( fseeko( m_mpegfile, offset, SEEK_SET ) ) {
- kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
return 0x11;
}
nread = fread( m_buffer, 1, BUFFERSIZE, m_mpegfile );
@@ -333,7 +333,7 @@ byte K3bMpegInfo::GetByte( llong offset )
m_buffend = offset + nread;
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
// weird
- kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
return 0x11;
}
}
@@ -355,7 +355,7 @@ byte K3bMpegInfo::bdGetByte( llong offset )
m_buffend = start + nread;
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
// weird
- kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
return 0x11;
}