TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 09c8631832
commit 5183781c5d
170 changed files with 1068 additions and 1068 deletions
Show Stats Download Patch File Download Diff File

6
k3bsetup/k3bsetup2.cpp
Unescape View File

@ -260,7 +260,7 @@ void K3bSetup2::updatePrograms()
if( perm != wantedPerm || if( perm != wantedPerm ||
fi.owner() != "root" || fi.owner() != "root" ||
fi.group() != wantedGroup ) { fi.group() != wantedGroup ) {
bi->setText( 4, TQString("%1 root.%2").tqarg(wantedPerm,0,8).tqarg(wantedGroup) ); bi->setText( 4, TQString("%1 root.%2").arg(wantedPerm,0,8).arg(wantedGroup) );
if( bi->isOn() ) if( bi->isOn() )
d->changesNeeded = true; d->changesNeeded = true;
} }
@ -405,7 +405,7 @@ void K3bSetup2::save()
// TODO: create the group if it's not there // TODO: create the group if it's not there
g = getgrnam( burningGroup().local8Bit() ); g = getgrnam( burningGroup().local8Bit() );
if( !g ) { if( !g ) {
KMessageBox::error( this, i18n("There is no group %1.").tqarg(burningGroup()) ); KMessageBox::error( this, i18n("There is no group %1.").arg(burningGroup()) );
return; return;
} }
} }
@ -536,7 +536,7 @@ void K3bSetup2::slotAddDevice()
emit changed( d->changesNeeded ); emit changed( d->changesNeeded );
} }
else else
KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename), KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename),
i18n("Error"), false ); i18n("Error"), false );
} }
} }

4
libk3b/cddb/k3bcddbhttpquery.cpp
Unescape View File

@ -58,7 +58,7 @@ void K3bCddbHttpQuery::doMatchQuery()
m_state = READ; m_state = READ;
m_parsingBuffer.truncate(0); m_parsingBuffer.truncate(0);
performCommand( TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ) ); performCommand( TQString( "cddb read %1 %2").arg( header().category ).arg( header().discid ) );
} }
@ -82,7 +82,7 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd )
if( !job ) { if( !job ) {
setError( CONNECTION_ERROR ); setError( CONNECTION_ERROR );
emit infoMessage( i18n("Could not connect to host %1").tqarg(m_server) ); emit infoMessage( i18n("Could not connect to host %1").arg(m_server) );
emitQueryFinished(); emitQueryFinished();
return; return;
} }

2
libk3b/cddb/k3bcddblocalquery.cpp
Unescape View File

@ -38,7 +38,7 @@ K3bCddbLocalQuery::~K3bCddbLocalQuery()
void K3bCddbLocalQuery::doQuery() void K3bCddbLocalQuery::doQuery()
{ {
emit infoMessage( i18n("Searching entry in %1").tqarg( m_cddbDir ) ); emit infoMessage( i18n("Searching entry in %1").arg( m_cddbDir ) );
kapp->processEvents(); //BAD! kapp->processEvents(); //BAD!
TQString path = preparePath( m_cddbDir ); TQString path = preparePath( m_cddbDir );

2
libk3b/cddb/k3bcddblocalsubmit.cpp
Unescape View File

@ -94,7 +94,7 @@ void K3bCddbLocalSubmit::doSubmit()
else { else {
kdDebug() << "(K3bCddbLocalSubmit) could not find directory: " << path << endl; kdDebug() << "(K3bCddbLocalSubmit) could not find directory: " << path << endl;
setError( IO_ERROR ); setError( IO_ERROR );
emit infoMessage( i18n("Could not find directory: %1").tqarg(path) ); emit infoMessage( i18n("Could not find directory: %1").arg(path) );
emit submitFinished( this ); emit submitFinished( this );
} }
} }

16
libk3b/cddb/k3bcddbpquery.cpp
Unescape View File

@ -54,7 +54,7 @@ void K3bCddbpQuery::doQuery()
// connect to the server // connect to the server
m_socket->connectToHost( m_server, m_port ); m_socket->connectToHost( m_server, m_port );
emit infoMessage( i18n("Searching %1 on port %2").tqarg(m_server).tqarg(m_port) ); emit infoMessage( i18n("Searching %1 on port %2").arg(m_server).arg(m_port) );
} }
@ -63,7 +63,7 @@ void K3bCddbpQuery::doMatchQuery()
// we should still be connected // we should still be connected
// TODO: check this // TODO: check this
TQString read = TQString( "cddb read %1 %2").tqarg( header().category ).tqarg( header().discid ); TQString read = TQString( "cddb read %1 %2").arg( header().category ).arg( header().discid );
m_state = READ; m_state = READ;
m_parsingBuffer = ""; m_parsingBuffer = "";
@ -258,16 +258,16 @@ void K3bCddbpQuery::slotError( int e )
{ {
switch(e) { switch(e) {
case TQSocket::ErrConnectionRefused: case TQSocket::ErrConnectionRefused:
kdDebug() << i18n("Connection to %1 refused").tqarg( m_server ) << endl; kdDebug() << i18n("Connection to %1 refused").arg( m_server ) << endl;
emit infoMessage( i18n("Connection to %1 refused").tqarg( m_server ) ); emit infoMessage( i18n("Connection to %1 refused").arg( m_server ) );
break; break;
case TQSocket::ErrHostNotFound: case TQSocket::ErrHostNotFound:
kdDebug() << i18n("Could not find host %1").tqarg( m_server ) << endl; kdDebug() << i18n("Could not find host %1").arg( m_server ) << endl;
emit infoMessage( i18n("Could not find host %1").tqarg( m_server ) ); emit infoMessage( i18n("Could not find host %1").arg( m_server ) );
break; break;
case TQSocket::ErrSocketRead: case TQSocket::ErrSocketRead:
kdDebug() << i18n("Error while reading from %1").tqarg( m_server ) << endl; kdDebug() << i18n("Error while reading from %1").arg( m_server ) << endl;
emit infoMessage( i18n("Error while reading from %1").tqarg( m_server ) ); emit infoMessage( i18n("Error while reading from %1").arg( m_server ) );
break; break;
} }

6
libk3b/cddb/k3bcddbquery.cpp
Unescape View File

@ -226,7 +226,7 @@ TQString K3bCddbQuery::handshakeString() const
if( host.isEmpty() ) if( host.isEmpty() )
host = "kde-host"; host = "kde-host";
return TQString("%1 %2 K3b %3").tqarg(user).tqarg(host).tqarg(kapp->aboutData()->version()); return TQString("%1 %2 K3b %3").arg(user).arg(host).arg(kapp->aboutData()->version());
} }
@ -238,10 +238,10 @@ TQString K3bCddbQuery::queryString() const
+ TQString::number( (unsigned int)m_toc.count() ); + TQString::number( (unsigned int)m_toc.count() );
for( K3bDevice::Toc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) { for( K3bDevice::Toc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) {
query.append( TQString( " %1" ).tqarg( (*it).firstSector().lba() ) ); query.append( TQString( " %1" ).arg( (*it).firstSector().lba() ) );
} }
query.append( TQString( " %1" ).tqarg( m_toc.length().lba() / 75 ) ); query.append( TQString( " %1" ).arg( m_toc.length().lba() / 75 ) );
return query; return query;
} }

2
libk3b/core/k3bglobals.cpp
Unescape View File

@ -387,7 +387,7 @@ TQString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExter
else if( (plainAtapiSupport() && bin->hasFeature("plain-atapi") ) ) else if( (plainAtapiSupport() && bin->hasFeature("plain-atapi") ) )
return dev->blockDeviceName(); return dev->blockDeviceName();
else else
return TQString("ATAPI:%1").tqarg(dev->blockDeviceName()); return TQString("ATAPI:%1").arg(dev->blockDeviceName());
} }

4
libk3b/core/k3bversion.cpp
Unescape View File

@ -157,9 +157,9 @@ TQString K3bVersion::createVersionString( int majorVersion,
TQString s = TQString::number(majorVersion); TQString s = TQString::number(majorVersion);
if( minorVersion > -1 ) { if( minorVersion > -1 ) {
s.append( TQString(".%1").tqarg(minorVersion) ); s.append( TQString(".%1").arg(minorVersion) );
if( patchlevel > -1 ) if( patchlevel > -1 )
s.append( TQString(".%1").tqarg(patchlevel) ); s.append( TQString(".%1").arg(patchlevel) );
} }
if( !suffix.isNull() ) if( !suffix.isNull() )

6
libk3b/jobs/k3baudiocuefilewritingjob.cpp
Unescape View File

@ -252,19 +252,19 @@ void K3bAudioCueFileWritingJob::importCueInProject()
// now analyze the source // now analyze the source
emit newTask( i18n("Analysing the audio file") ); emit newTask( i18n("Analysing the audio file") );
emit newSubTask( i18n("Analysing %1").tqarg( parser.imageFilename() ) ); emit newSubTask( i18n("Analysing %1").arg( parser.imageFilename() ) );
// start the analyser thread // start the analyser thread
m_analyserThread->setDecoder( m_decoder ); m_analyserThread->setDecoder( m_decoder );
m_analyserJob->start(); m_analyserJob->start();
} }
else { else {
emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").tqarg( m_cueFile ), ERROR ); emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").arg( m_cueFile ), ERROR );
jobFinished(false); jobFinished(false);
} }
} }
else { else {
emit infoMessage( i18n("No valid audio cue file: '%1'").tqarg( m_cueFile ), ERROR ); emit infoMessage( i18n("No valid audio cue file: '%1'").arg( m_cueFile ), ERROR );
jobFinished(false); jobFinished(false);
} }
} }

6
libk3b/jobs/k3baudiosessionreadingjob.cpp
Unescape View File

@ -93,7 +93,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
toc = device->readToc(); toc = device->readToc();
if( !paranoia->initParanoia( device, toc ) ) { if( !paranoia->initParanoia( device, toc ) ) {
emitInfoMessage( i18n("Could not open device %1").tqarg(device->blockDeviceName()), emitInfoMessage( i18n("Could not open device %1").arg(device->blockDeviceName()),
K3bJob::ERROR ); K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
@ -154,7 +154,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
} }
if( !waveFileWriter->open( filenames[currentTrack-1] ) ) { if( !waveFileWriter->open( filenames[currentTrack-1] ) ) {
emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filenames[currentTrack-1]), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filenames[currentTrack-1]), K3bJob::ERROR );
writeError = true; writeError = true;
break; break;
} }
@ -188,7 +188,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
device->block( false ); device->block( false );
if( status != K3bCdparanoiaLib::S_OK ) { if( status != K3bCdparanoiaLib::S_OK ) {
emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(trackNum), K3bJob::ERROR ); emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(trackNum), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
} }

2
libk3b/jobs/k3bbinimagewritingjob.cpp
Unescape View File

@ -207,7 +207,7 @@ void K3bBinImageWritingJob::writerFinished(bool ok)
void K3bBinImageWritingJob::slotNextTrack( int t, int tt ) void K3bBinImageWritingJob::slotNextTrack( 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) );
} }

6
libk3b/jobs/k3bblankingjob.cpp
Unescape View File

@ -131,9 +131,9 @@ void K3bBlankingJob::slotStartErasing()
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE, K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
K3bDevice::MEDIA_CD_RW, K3bDevice::MEDIA_CD_RW,
i18n("Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>.") i18n("Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(m_device->vendor()) .arg(m_device->vendor())
.tqarg(m_device->description()) .arg(m_device->description())
.tqarg(m_device->devicename()) ) < 0 ) { .arg(m_device->devicename()) ) < 0 ) {
emit canceled(); emit canceled();
jobFinished(false); jobFinished(false);
return; return;

50
libk3b/jobs/k3bcdcopyjob.cpp
Unescape View File

@ -313,7 +313,7 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
unsigned long avail, size; unsigned long avail, size;
TQString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) ); TQString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR ); emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
d->error = true; d->error = true;
canCopy = false; canCopy = false;
} }
@ -379,7 +379,7 @@ void K3bCdCopyJob::slotCdTextReady( K3bDevice::DeviceHandler* dh )
if( dh->success() ) { if( dh->success() ) {
if( K3bDevice::CdText::checkCrc( dh->cdTextRaw() ) ) { if( K3bDevice::CdText::checkCrc( dh->cdTextRaw() ) ) {
K3bDevice::CdText cdt( dh->cdTextRaw() ); K3bDevice::CdText cdt( dh->cdTextRaw() );
emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").tqarg(cdt.performer()).tqarg(cdt.title()), SUCCESS ); emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").arg(cdt.performer()).arg(cdt.title()), SUCCESS );
d->haveCdText = true; d->haveCdText = true;
d->cdTextRaw = dh->cdTextRaw(); d->cdTextRaw = dh->cdTextRaw();
} }
@ -429,7 +429,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error )
d->cddbInfo = d->cddb->result(); d->cddbInfo = d->cddb->result();
d->haveCddb = true; d->haveCddb = true;
emit infoMessage( i18n("Found Cddb entry (%1 - %2).").tqarg(d->cddbInfo.cdArtist).tqarg(d->cddbInfo.cdTitle), SUCCESS ); emit infoMessage( i18n("Found Cddb entry (%1 - %2).").arg(d->cddbInfo.cdArtist).arg(d->cddbInfo.cdTitle), SUCCESS );
// save the entry locally // save the entry locally
KConfig* c = k3bcore->config(); KConfig* c = k3bcore->config();
@ -441,7 +441,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error )
emit infoMessage( i18n("No Cddb entry found."), WARNING ); emit infoMessage( i18n("No Cddb entry found."), WARNING );
} }
else { else {
emit infoMessage( i18n("Cddb error (%1).").tqarg(d->cddb->errorString()), ERROR ); emit infoMessage( i18n("Cddb error (%1).").arg(d->cddb->errorString()), ERROR );
} }
startCopy(); startCopy();
@ -524,24 +524,24 @@ bool K3bCdCopyJob::prepareImageFiles()
m_tempPath = K3b::findUniqueFilePrefix( "k3bCdCopy", m_tempPath ); m_tempPath = K3b::findUniqueFilePrefix( "k3bCdCopy", m_tempPath );
kdDebug() << "(K3bCdCopyJob) creating temp dir: " << m_tempPath << endl; kdDebug() << "(K3bCdCopyJob) creating temp dir: " << m_tempPath << endl;
if( !dir.mkdir( m_tempPath, true ) ) { if( !dir.mkdir( m_tempPath, true ) ) {
emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(m_tempPath), ERROR ); emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(m_tempPath), ERROR );
return false; return false;
} }
d->deleteTempDir = true; d->deleteTempDir = true;
} }
m_tempPath = K3b::prepareDir( m_tempPath ); m_tempPath = K3b::prepareDir( m_tempPath );
emit infoMessage( i18n("Using temporary directory %1.").tqarg(m_tempPath), INFO ); emit infoMessage( i18n("Using temporary directory %1.").arg(m_tempPath), INFO );
// create temp filenames // create temp filenames
int i = 1; int i = 1;
for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) { for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) {
if( (*it).type() == K3bDevice::Track::AUDIO ) { if( (*it).type() == K3bDevice::Track::AUDIO ) {
d->imageNames.append( m_tempPath + TQString("Track%1.wav").tqarg(TQString::number(i).rightJustify(2, '0')) ); d->imageNames.append( m_tempPath + TQString("Track%1.wav").arg(TQString::number(i).rightJustify(2, '0')) );
d->infNames.append( m_tempPath + TQString("Track%1.inf").tqarg(TQString::number(i).rightJustify(2, '0')) ); d->infNames.append( m_tempPath + TQString("Track%1.inf").arg(TQString::number(i).rightJustify(2, '0')) );
} }
else else
d->imageNames.append( m_tempPath + TQString("Track%1.iso").tqarg(TQString::number(i).rightJustify(2, '0')) ); d->imageNames.append( m_tempPath + TQString("Track%1.iso").arg(TQString::number(i).rightJustify(2, '0')) );
++i; ++i;
} }
@ -554,7 +554,7 @@ bool K3bCdCopyJob::prepareImageFiles()
else { else {
// we only need a single image file // we only need a single image file
if( !fi.isFile() || if( !fi.isFile() ||
questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_tempPath), questionYesNo( i18n("Do you want to overwrite %1?").arg(m_tempPath),
i18n("File Exists") ) ) { i18n("File Exists") ) ) {
if( fi.isDir() ) if( fi.isDir() )
m_tempPath = K3b::findTempFile( "iso", m_tempPath ); m_tempPath = K3b::findTempFile( "iso", m_tempPath );
@ -564,7 +564,7 @@ bool K3bCdCopyJob::prepareImageFiles()
} }
// else the user specified a file in an existing dir // else the user specified a file in an existing dir
emit infoMessage( i18n("Writing image file to %1.").tqarg(m_tempPath), INFO ); emit infoMessage( i18n("Writing image file to %1.").arg(m_tempPath), INFO );
} }
else else
return false; return false;
@ -580,12 +580,12 @@ void K3bCdCopyJob::readNextSession()
{ {
if( !m_onTheFly || m_onlyCreateImages ) { if( !m_onTheFly || m_onlyCreateImages ) {
if( d->numSessions > 1 ) if( d->numSessions > 1 )
emit newTask( i18n("Reading Session %1").tqarg(d->currentReadSession) ); emit newTask( i18n("Reading Session %1").arg(d->currentReadSession) );
else else
emit newTask( i18n("Reading Source Medium") ); emit newTask( i18n("Reading Source Medium") );
if( d->currentReadSession == 1 ) if( d->currentReadSession == 1 )
emit newSubTask( i18n("Reading track %1 of %2").tqarg(1).tqarg(d->toc.count()) ); emit newSubTask( i18n("Reading track %1 of %2").arg(1).arg(d->toc.count()) );
} }
// there is only one situation where we need the audiosessionreader: // there is only one situation where we need the audiosessionreader:
@ -677,17 +677,17 @@ bool K3bCdCopyJob::writeNextSession()
// we emit our own task since the cdrecord task is way too simple // we emit our own task since the cdrecord task is way too simple
if( d->numSessions > 1 ) { if( d->numSessions > 1 ) {
if( m_simulate ) if( m_simulate )
emit newTask( i18n("Simulating Session %1").tqarg(d->currentWrittenSession) ); emit newTask( i18n("Simulating Session %1").arg(d->currentWrittenSession) );
else if( m_copies > 1 ) else if( m_copies > 1 )
emit newTask( i18n("Writing Copy %1 (Session %2)").tqarg(d->doneCopies+1).tqarg(d->currentWrittenSession) ); emit newTask( i18n("Writing Copy %1 (Session %2)").arg(d->doneCopies+1).arg(d->currentWrittenSession) );
else else
emit newTask( i18n("Writing Copy (Session %2)").tqarg(d->currentWrittenSession) ); emit newTask( i18n("Writing Copy (Session %2)").arg(d->currentWrittenSession) );
} }
else { else {
if( m_simulate ) if( m_simulate )
emit newTask( i18n("Simulating") ); emit newTask( i18n("Simulating") );
else if( m_copies > 1 ) else if( m_copies > 1 )
emit newTask( i18n("Writing Copy %1").tqarg(d->doneCopies+1) ); emit newTask( i18n("Writing Copy %1").arg(d->doneCopies+1) );
else else
emit newTask( i18n("Writing Copy") ); emit newTask( i18n("Writing Copy") );
} }
@ -923,7 +923,7 @@ bool K3bCdCopyJob::writeNextSession()
trackLen = trackLen * 2056; // see k3bdatatrackreader.h trackLen = trackLen * 2056; // see k3bdatatrackreader.h
else else
trackLen = trackLen * 2332; // see k3bdatatrackreader.h trackLen = trackLen * 2332; // see k3bdatatrackreader.h
d->cdrecordWriter->addArgument( TQString("-tsize=%1").tqarg(trackLen) )->addArgument("-"); d->cdrecordWriter->addArgument( TQString("-tsize=%1").arg(trackLen) )->addArgument("-");
} }
else if( d->toc.contentType() == K3bDevice::MIXED ) else if( d->toc.contentType() == K3bDevice::MIXED )
d->cdrecordWriter->addArgument( d->imageNames[d->toc.count()-1] ); d->cdrecordWriter->addArgument( d->imageNames[d->toc.count()-1] );
@ -953,7 +953,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success )
if( success ) { if( success ) {
if( d->numSessions > 1 ) if( d->numSessions > 1 )
emit infoMessage( i18n("Successfully read session %1.").tqarg(d->currentReadSession), SUCCESS ); emit infoMessage( i18n("Successfully read session %1.").arg(d->currentReadSession), SUCCESS );
else else
emit infoMessage( i18n("Successfully read source disk."), SUCCESS ); emit infoMessage( i18n("Successfully read source disk."), SUCCESS );
@ -987,7 +987,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success )
} }
else { else {
if( !d->canceled ) { if( !d->canceled ) {
emit infoMessage( i18n("Error while reading session %1.").tqarg(d->currentReadSession), ERROR ); emit infoMessage( i18n("Error while reading session %1.").arg(d->currentReadSession), ERROR );
if( m_onTheFly ) if( m_onTheFly )
d->cdrecordWriter->setSourceUnreadable(true); d->cdrecordWriter->setSourceUnreadable(true);
} }
@ -1137,14 +1137,14 @@ void K3bCdCopyJob::slotWritingNextTrack( int t, int tt )
{ {
if( d->toc.contentType() == K3bDevice::MIXED ) { if( d->toc.contentType() == K3bDevice::MIXED ) {
if( d->currentWrittenSession == 1 ) if( d->currentWrittenSession == 1 )
emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(d->toc.count()) ); emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(d->toc.count()) );
else else
emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->toc.count()).tqarg(d->toc.count()) ); emit newSubTask( i18n("Writing track %1 of %2").arg(d->toc.count()).arg(d->toc.count()) );
} }
else if( d->numSessions > 1 ) else if( d->numSessions > 1 )
emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->currentWrittenSession).tqarg(d->toc.count()) ); emit newSubTask( i18n("Writing track %1 of %2").arg(d->currentWrittenSession).arg(d->toc.count()) );
else else
emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) ); emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) );
} }
@ -1159,7 +1159,7 @@ void K3bCdCopyJob::slotReadingNextTrack( int t, int )
else else
track = d->currentReadSession; track = d->currentReadSession;
emit newSubTask( i18n("Reading track %1 of %2").tqarg(track).tqarg(d->toc.count()) ); emit newSubTask( i18n("Reading track %1 of %2").arg(track).arg(d->toc.count()) );
} }
} }

10
libk3b/jobs/k3bcdda2wavreader.cpp
Unescape View File

@ -95,7 +95,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
d->cdda2wavBin = k3bcore->externalBinManager()->binObject( "cdda2wav" ); d->cdda2wavBin = k3bcore->externalBinManager()->binObject( "cdda2wav" );
if( !d->cdda2wavBin ) { if( !d->cdda2wavBin ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdda2wav"), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("cdda2wav"), ERROR );
jobFinished(false); jobFinished(false);
d->running = false; d->running = false;
return; return;
@ -115,7 +115,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
*d->process << d->cdda2wavBin->path; *d->process << d->cdda2wavBin->path;
*d->process << "-vall" << ( d->cdda2wavBin->hasFeature( "gui" ) ? "-gui" : "-g" ); *d->process << "-vall" << ( d->cdda2wavBin->hasFeature( "gui" ) ? "-gui" : "-g" );
if( d->cdda2wavBin->hasFeature( "dev" ) ) if( d->cdda2wavBin->hasFeature( "dev" ) )
*d->process << TQString("dev=%1").tqarg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin)); *d->process << TQString("dev=%1").arg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin));
else else
*d->process << "-D" << K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin); *d->process << "-D" << K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin);
*d->process << ( d->cdda2wavBin->hasFeature( "bulk" ) ? "-bulk" : "-B" ); *d->process << ( d->cdda2wavBin->hasFeature( "bulk" ) ? "-bulk" : "-B" );
@ -134,7 +134,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
kdDebug() << "(K3bCdda2wavReader) could not start cdda2wav" << endl; kdDebug() << "(K3bCdda2wavReader) could not start cdda2wav" << endl;
emit infoMessage( i18n("Could not start %1.").tqarg("cdda2wav"), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg("cdda2wav"), K3bJob::ERROR );
d->running = false; d->running = false;
jobFinished(false); jobFinished(false);
} }
@ -240,12 +240,12 @@ void K3bCdda2wavReader::slotProcessExited( KProcess* p )
} }
else { else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).") emit infoMessage( i18n("%1 returned an unknown error (code %2).")
.tqarg("Cdda2wav").tqarg(p->exitStatus()), ERROR ); .arg("Cdda2wav").arg(p->exitStatus()), ERROR );
jobFinished( false ); jobFinished( false );
} }
} }
else { else {
emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Cdda2wav"), emit infoMessage( i18n("%1 did not exit cleanly.").arg("Cdda2wav"),
ERROR ); ERROR );
jobFinished( false ); jobFinished( false );
} }

14
libk3b/jobs/k3bclonejob.cpp
Unescape View File

@ -85,13 +85,13 @@ void K3bCloneJob::start()
// //
const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" ); const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" );
if( !cdrecordBin ) { if( !cdrecordBin ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR );
jobFinished(false); jobFinished(false);
m_running = false; m_running = false;
return; return;
} }
else if( !cdrecordBin->hasFeature( "clone" ) ) { else if( !cdrecordBin->hasFeature( "clone" ) ) {
emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").tqarg(cdrecordBin->version), ERROR ); emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").arg(cdrecordBin->version), ERROR );
jobFinished(false); jobFinished(false);
m_running = false; m_running = false;
return; return;
@ -109,8 +109,8 @@ void K3bCloneJob::start()
if( !writer()->supportsWritingMode( K3bDevice::RAW_R96R ) && if( !writer()->supportsWritingMode( K3bDevice::RAW_R96R ) &&
!writer()->supportsWritingMode( K3bDevice::RAW_R16 ) ) { !writer()->supportsWritingMode( K3bDevice::RAW_R16 ) ) {
emit infoMessage( i18n("CD writer %1 does not support cloning.") emit infoMessage( i18n("CD writer %1 does not support cloning.")
.tqarg(writer()->vendor()) .arg(writer()->vendor())
.tqarg(writer()->description()), ERROR ); .arg(writer()->description()), ERROR );
m_running = false; m_running = false;
jobFinished(false); jobFinished(false);
return; return;
@ -222,7 +222,7 @@ void K3bCloneJob::slotWriterPercent( int p )
void K3bCloneJob::slotWriterNextTrack( int t, int tt ) void K3bCloneJob::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) );
} }
@ -239,7 +239,7 @@ void K3bCloneJob::slotWriterFinished( bool success )
if( success ) { if( success ) {
d->doneCopies++; d->doneCopies++;
emit infoMessage( i18n("Successfully written clone copy %1.").tqarg(d->doneCopies), INFO ); emit infoMessage( i18n("Successfully written clone copy %1.").arg(d->doneCopies), INFO );
if( d->doneCopies < m_copies ) { if( d->doneCopies < m_copies ) {
K3bDevice::eject( writer() ); K3bDevice::eject( writer() );
@ -330,7 +330,7 @@ void K3bCloneJob::startWriting()
if( m_simulate ) if( m_simulate )
emit newTask( i18n("Simulating clone copy") ); emit newTask( i18n("Simulating clone copy") );
else else
emit newTask( i18n("Writing clone copy %1").tqarg(d->doneCopies+1) ); emit newTask( i18n("Writing clone copy %1").arg(d->doneCopies+1) );
m_writerJob->start(); m_writerJob->start();
} }

42
libk3b/jobs/k3bdatatrackreader.cpp
Unescape View File

@ -109,7 +109,7 @@ void K3bDataTrackReader::WorkThread::run()
emitStarted(); emitStarted();
if( !m_device->open() ) { if( !m_device->open() ) {
emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR ); emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
} }
@ -142,7 +142,7 @@ void K3bDataTrackReader::WorkThread::run()
} }
if( !m_libcss->open(m_device) ) { if( !m_libcss->open(m_device) ) {
emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR ); emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
} }
@ -183,14 +183,14 @@ void K3bDataTrackReader::WorkThread::run()
} }
} }
emitInfoMessage( i18n("Reading with sector size %1.").tqarg(m_usedSectorSize), K3bJob::INFO ); emitInfoMessage( i18n("Reading with sector size %1.").arg(m_usedSectorSize), K3bJob::INFO );
emitDebuggingOutput( "K3bDataTrackReader", emitDebuggingOutput( "K3bDataTrackReader",
TQString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.") TQString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.")
.tqarg( m_firstSector.lba() ) .arg( m_firstSector.lba() )
.tqarg( m_lastSector.lba() ) .arg( m_lastSector.lba() )
.tqarg( m_usedSectorSize ) .arg( m_usedSectorSize )
.tqarg( m_lastSector.lba() - m_firstSector.lba() + 1 ) .arg( m_lastSector.lba() - m_firstSector.lba() + 1 )
.tqarg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) ); .arg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) );
TQFile file; TQFile file;
if( m_fd == -1 ) { if( m_fd == -1 ) {
@ -199,7 +199,7 @@ void K3bDataTrackReader::WorkThread::run()
m_device->close(); m_device->close();
if( m_useLibdvdcss ) if( m_useLibdvdcss )
m_libcss->close(); m_libcss->close();
emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), K3bJob::ERROR );
emitFinished( false ); emitFinished( false );
return; return;
} }
@ -231,7 +231,7 @@ void K3bDataTrackReader::WorkThread::run()
// s_bufferSizeSectors = K3bDevice::determineMaxReadingBufferSize( m_device, m_firstSector ); // s_bufferSizeSectors = K3bDevice::determineMaxReadingBufferSize( m_device, m_firstSector );
if( s_bufferSizeSectors <= 0 ) { if( s_bufferSizeSectors <= 0 ) {
emitInfoMessage( i18n("Error while reading sector %1.").tqarg(m_firstSector.lba()), K3bJob::ERROR ); emitInfoMessage( i18n("Error while reading sector %1.").arg(m_firstSector.lba()), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
m_device->block( false ); m_device->block( false );
k3bcore->unblockDevice( m_device ); k3bcore->unblockDevice( m_device );
@ -239,7 +239,7 @@ void K3bDataTrackReader::WorkThread::run()
} }
kdDebug() << "(K3bDataTrackReader) using buffer size of " << s_bufferSizeSectors << " blocks." << endl; kdDebug() << "(K3bDataTrackReader) using buffer size of " << s_bufferSizeSectors << " blocks." << endl;
emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").tqarg( s_bufferSizeSectors ) ); emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").arg( s_bufferSizeSectors ) );
// 2. get it on // 2. get it on
K3b::Msf currentSector = m_firstSector; K3b::Msf currentSector = m_firstSector;
@ -279,7 +279,7 @@ void K3bDataTrackReader::WorkThread::run()
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl; << " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader", emitDebuggingOutput( "K3bDataTrackReader",
TQString("Error while writing to fd %1. Current sector is %2.") TQString("Error while writing to fd %1. Current sector is %2.")
.tqarg(m_fd).tqarg(currentSector.lba()-m_firstSector.lba()) ); .arg(m_fd).arg(currentSector.lba()-m_firstSector.lba()) );
writeError = true; writeError = true;
break; break;
} }
@ -290,7 +290,7 @@ void K3bDataTrackReader::WorkThread::run()
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl; << " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader", emitDebuggingOutput( "K3bDataTrackReader",
TQString("Error while writing to file %1. Current sector is %2.") TQString("Error while writing to file %1. Current sector is %2.")
.tqarg(m_imagePath).tqarg(currentSector.lba()-m_firstSector.lba()) ); .arg(m_imagePath).arg(currentSector.lba()-m_firstSector.lba()) );
writeError = true; writeError = true;
break; break;
} }
@ -331,8 +331,8 @@ void K3bDataTrackReader::WorkThread::run()
emitDebuggingOutput( "K3bDataTrackReader", emitDebuggingOutput( "K3bDataTrackReader",
TQString("Read a total of %1 sectors (%2 bytes)") TQString("Read a total of %1 sectors (%2 bytes)")
.tqarg(totalReadSectors.lba()) .arg(totalReadSectors.lba())
.tqarg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) ); .arg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) );
if( m_canceled ) if( m_canceled )
emitCanceled(); emitCanceled();
@ -386,8 +386,8 @@ int K3bDataTrackReader::WorkThread::read( unsigned char* buffer, unsigned long s
// here we read every single sector for itself to find the troubleing ones // here we read every single sector for itself to find the troubleing ones
bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned long startSector, unsigned int len ) bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned long startSector, unsigned int len )
{ {
emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").tqarg(startSector) ); emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").arg(startSector) );
emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").tqarg(startSector), K3bJob::WARNING ); emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").arg(startSector), K3bJob::WARNING );
int sectorsRead = -1; int sectorsRead = -1;
bool success = true; bool success = true;
@ -403,16 +403,16 @@ bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned
if( !success ) { if( !success ) {
if( m_ignoreReadErrors ) { if( m_ignoreReadErrors ) {
emitInfoMessage( i18n("Ignoring read error in sector %1.").tqarg(sector), K3bJob::ERROR ); emitInfoMessage( i18n("Ignoring read error in sector %1.").arg(sector), K3bJob::ERROR );
emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").tqarg(sector) ); emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").arg(sector) );
++m_errorSectorCount; ++m_errorSectorCount;
// ::memset( &buffer[i], 0, 1 ); // ::memset( &buffer[i], 0, 1 );
success = true; success = true;
} }
else { else {
emitInfoMessage( i18n("Error while reading sector %1.").tqarg(sector), K3bJob::ERROR ); emitInfoMessage( i18n("Error while reading sector %1.").arg(sector), K3bJob::ERROR );
emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").tqarg(sector) ); emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").arg(sector) );
break; break;
} }
} }

32
libk3b/jobs/k3bdvdcopyjob.cpp
Unescape View File

@ -122,7 +122,7 @@ void K3bDvdCopyJob::start()
k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) { k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) {
m_onTheFly = false; m_onTheFly = false;
emit infoMessage( i18n("K3b does not support writing on-the-fly with growisofs %1.") emit infoMessage( i18n("K3b does not support writing on-the-fly with growisofs %1.")
.tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR ); .arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR );
emit infoMessage( i18n("Disabling on-the-fly writing."), INFO ); emit infoMessage( i18n("Disabling on-the-fly writing."), INFO );
} }
@ -295,7 +295,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
// //
TQFileInfo fi( m_imagePath ); TQFileInfo fi( m_imagePath );
if( !fi.isFile() || if( !fi.isFile() ||
questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_imagePath), questionYesNo( i18n("Do you want to overwrite %1?").arg(m_imagePath),
i18n("File Exists") ) ) { i18n("File Exists") ) ) {
if( fi.isDir() ) if( fi.isDir() )
m_imagePath = K3b::findTempFile( "iso", m_imagePath ); m_imagePath = K3b::findTempFile( "iso", m_imagePath );
@ -305,7 +305,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
} }
// else the user specified a file in an existing dir // else the user specified a file in an existing dir
emit infoMessage( i18n("Writing image file to %1.").tqarg(m_imagePath), INFO ); emit infoMessage( i18n("Writing image file to %1.").arg(m_imagePath), INFO );
emit newSubTask( i18n("Reading source medium.") ); emit newSubTask( i18n("Reading source medium.") );
} }
@ -316,7 +316,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
unsigned long avail, size; unsigned long avail, size;
TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) ); TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR ); emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
jobFinished(false); jobFinished(false);
d->running = false; d->running = false;
return; return;
@ -332,7 +332,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
d->imageFile.setName( m_imagePath ); d->imageFile.setName( m_imagePath );
if( !d->imageFile.open( IO_WriteOnly ) ) { if( !d->imageFile.open( IO_WriteOnly ) ) {
emit infoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), ERROR ); emit infoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), ERROR );
jobFinished( false ); jobFinished( false );
d->running = false; d->running = false;
return; return;
@ -353,7 +353,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
if( m_simulate ) if( m_simulate )
emit newTask( i18n("Simulating DVD copy") ); emit newTask( i18n("Simulating DVD copy") );
else if( m_copies > 1 ) else if( m_copies > 1 )
emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
else else
emit newTask( i18n("Writing DVD copy") ); emit newTask( i18n("Writing DVD copy") );
@ -548,7 +548,7 @@ void K3bDvdCopyJob::slotReaderFinished( bool success )
if( waitForDvd() ) { if( waitForDvd() ) {
prepareWriter(); prepareWriter();
if( m_copies > 1 ) if( m_copies > 1 )
emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
else else
emit newTask( i18n("Writing DVD copy") ); emit newTask( i18n("Writing DVD copy") );
@ -597,7 +597,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
} }
if( success ) { if( success ) {
emit infoMessage( i18n("Successfully written DVD copy %1.").tqarg(d->doneCopies+1), INFO ); emit infoMessage( i18n("Successfully written DVD copy %1.").arg(d->doneCopies+1), INFO );
if( d->verifyData && !m_simulate ) { if( d->verifyData && !m_simulate ) {
if( !d->verificationJob ) { if( !d->verificationJob ) {
@ -620,7 +620,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
d->verificationJob->addTrack( 1, d->inPipe.checksum(), d->lastSector+1 ); d->verificationJob->addTrack( 1, d->inPipe.checksum(), d->lastSector+1 );
if( m_copies > 1 ) if( m_copies > 1 )
emit newTask( i18n("Verifying DVD copy %1").tqarg(d->doneCopies+1) ); emit newTask( i18n("Verifying DVD copy %1").arg(d->doneCopies+1) );
else else
emit newTask( i18n("Verifying DVD copy") ); emit newTask( i18n("Verifying DVD copy") );
@ -637,7 +637,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
if( waitForDvd() ) { if( waitForDvd() ) {
prepareWriter(); prepareWriter();
emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
emit burning(true); emit burning(true);
@ -686,7 +686,7 @@ void K3bDvdCopyJob::slotVerificationFinished( bool success )
if( waitForDvd() ) { if( waitForDvd() ) {
prepareWriter(); prepareWriter();
emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) ); emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
emit burning(true); emit burning(true);
@ -790,8 +790,8 @@ bool K3bDvdCopyJob::waitForDvd()
if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. " if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. "
"Do you really want to continue? The media will be written " "Do you really want to continue? The media will be written "
"for real.") "for real.")
.tqarg(m_writerDevice->vendor()) .arg(m_writerDevice->vendor())
.tqarg(m_writerDevice->description()), .arg(m_writerDevice->description()),
i18n("No Simulation with DVD-R(W)") ) ) { i18n("No Simulation with DVD-R(W)") ) ) {
cancel(); cancel();
return false; return false;
@ -839,11 +839,11 @@ bool K3bDvdCopyJob::waitForDvd()
if( m_writingMode == K3b::DAO ) { if( m_writingMode == K3b::DAO ) {
// ( m_writingMode == K3b::WRITING_MODE_AUTO && // ( m_writingMode == K3b::WRITING_MODE_AUTO &&
// ( sizeWithDao || !m_onTheFly ) ) ) { // ( sizeWithDao || !m_onTheFly ) ) ) {
emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO ); emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO );
d->usedWritingMode = K3b::DAO; d->usedWritingMode = K3b::DAO;
} }
else { else {
emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO ); emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO );
d->usedWritingMode = K3b::WRITING_MODE_INCR_SEQ; d->usedWritingMode = K3b::WRITING_MODE_INCR_SEQ;
} }
} }
@ -859,7 +859,7 @@ void K3bDvdCopyJob::removeImageFiles()
{ {
if( TQFile::exists( m_imagePath ) ) { if( TQFile::exists( m_imagePath ) ) {
d->imageFile.remove(); d->imageFile.remove();
emit infoMessage( i18n("Removed image file %1").tqarg(m_imagePath), K3bJob::SUCCESS ); emit infoMessage( i18n("Removed image file %1").arg(m_imagePath), K3bJob::SUCCESS );
} }
} }

24
libk3b/jobs/k3bdvdformattingjob.cpp
Unescape View File

@ -142,7 +142,7 @@ void K3bDvdFormattingJob::start()
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY, K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY,
K3bDevice::MEDIA_WRITABLE_DVD, K3bDevice::MEDIA_WRITABLE_DVD,
i18n("Please insert a rewritable DVD medium into drive<p><b>%1 %2 (%3)</b>.") i18n("Please insert a rewritable DVD medium into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) { .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) {
emit canceled(); emit canceled();
d->running = false; d->running = false;
jobFinished(false); jobFinished(false);
@ -267,7 +267,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
d->success = true; d->success = true;
} }
else { else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdFormatBin->name()).tqarg(p->exitStatus()), emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdFormatBin->name()).arg(p->exitStatus()),
K3bJob::ERROR ); K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
@ -275,7 +275,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
} }
} }
else { else {
emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdFormatBin->name()), emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdFormatBin->name()),
ERROR ); ERROR );
d->success = false; d->success = false;
} }
@ -362,7 +362,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
if( diskInfo.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) { if( diskInfo.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) {
emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)),
INFO ); INFO );
// mode is ignored // mode is ignored
@ -375,7 +375,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
} }
else { else {
emit infoMessage( i18n("No need to format %1 media more than once.") emit infoMessage( i18n("No need to format %1 media more than once.")
.tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO ); .arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO );
emit infoMessage( i18n("It may simply be overwritten."), INFO ); emit infoMessage( i18n("It may simply be overwritten."), INFO );
if( d->force ) { if( d->force ) {
@ -401,11 +401,11 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
// //
else { // MEDIA_DVD_RW else { // MEDIA_DVD_RW
emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)), emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)),
INFO ); INFO );
if( diskInfo.currentProfile() != K3bDevice::MEDIA_UNKNOWN ) { if( diskInfo.currentProfile() != K3bDevice::MEDIA_UNKNOWN ) {
emit infoMessage( i18n("Formatted in %1 mode.").tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); emit infoMessage( i18n("Formatted in %1 mode.").arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
// //
@ -428,7 +428,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
else if( diskInfo.currentProfile() == K3bDevice::MEDIA_DVD_RW_OVWR && else if( diskInfo.currentProfile() == K3bDevice::MEDIA_DVD_RW_OVWR &&
d->mode != K3b::WRITING_MODE_INCR_SEQ ) { d->mode != K3b::WRITING_MODE_INCR_SEQ ) {
emit infoMessage( i18n("No need to format %1 media more than once.") emit infoMessage( i18n("No need to format %1 media more than once.")
.tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO ); .arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
emit infoMessage( i18n("It may simply be overwritten."), INFO ); emit infoMessage( i18n("It may simply be overwritten."), INFO );
if( d->force ) if( d->force )
@ -448,7 +448,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
} }
emit newSubTask( i18n("Formatting" emit newSubTask( i18n("Formatting"
" DVD-RW in %1 mode.").tqarg(K3bDevice::mediaTypeString( blank ? " DVD-RW in %1 mode.").arg(K3bDevice::mediaTypeString( blank ?
K3bDevice::MEDIA_DVD_RW_SEQ : K3bDevice::MEDIA_DVD_RW_SEQ :
K3bDevice::MEDIA_DVD_RW_OVWR )) ); K3bDevice::MEDIA_DVD_RW_OVWR )) );
} }
@ -472,14 +472,14 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" ); d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" );
if( !d->dvdFormatBin ) { if( !d->dvdFormatBin ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg("dvd+rw-format"), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-format"), ERROR );
d->running = false; d->running = false;
jobFinished(false); jobFinished(false);
return; return;
} }
if( !d->dvdFormatBin->copyright.isEmpty() ) if( !d->dvdFormatBin->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(d->dvdFormatBin->name()).tqarg(d->dvdFormatBin->version).tqarg(d->dvdFormatBin->copyright), INFO ); emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(d->dvdFormatBin->name()).arg(d->dvdFormatBin->version).arg(d->dvdFormatBin->copyright), INFO );
*d->process << d->dvdFormatBin; *d->process << d->dvdFormatBin;
@ -517,7 +517,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
kdDebug() << "(K3bDvdFormattingJob) could not start " << d->dvdFormatBin->path << endl; kdDebug() << "(K3bDvdFormattingJob) could not start " << d->dvdFormatBin->path << endl;
emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdFormatBin->name()), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg(d->dvdFormatBin->name()), K3bJob::ERROR );
d->running = false; d->running = false;
jobFinished(false); jobFinished(false);
} }

10
libk3b/jobs/k3biso9660imagewritingjob.cpp
Unescape View File

@ -86,7 +86,7 @@ void K3bIso9660ImageWritingJob::start()
emit newTask( i18n("Preparing data") ); emit newTask( i18n("Preparing data") );
if( !TQFile::exists( m_imagePath ) ) { if( !TQFile::exists( m_imagePath ) ) {
emit infoMessage( i18n("Could not find image %1").tqarg(m_imagePath), K3bJob::ERROR ); emit infoMessage( i18n("Could not find image %1").arg(m_imagePath), K3bJob::ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
@ -133,7 +133,7 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success )
if( m_copies == 1 ) if( m_copies == 1 )
emit newTask( i18n("Verifying written data") ); emit newTask( i18n("Verifying written data") );
else else
emit newTask( i18n("Verifying written copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) ); emit newTask( i18n("Verifying written copy %1 of %2").arg(m_currentCopy).arg(m_copies) );
m_verifyJob->start(); m_verifyJob->start();
} }
@ -200,7 +200,7 @@ void K3bIso9660ImageWritingJob::slotNextTrack( int, int )
if( m_copies == 1 ) if( m_copies == 1 )
emit newSubTask( i18n("Writing image") ); emit newSubTask( i18n("Writing image") );
else else
emit newSubTask( i18n("Writing copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) ); emit newSubTask( i18n("Writing copy %1 of %2").arg(m_currentCopy).arg(m_copies) );
} }
@ -350,7 +350,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
writer->addArgument("-data"); writer->addArgument("-data");
// read from stdin // read from stdin
writer->addArgument( TQString("-tsize=%1s").tqarg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" ); writer->addArgument( TQString("-tsize=%1s").arg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" );
m_writer = writer; m_writer = writer;
} }
@ -451,7 +451,7 @@ TQString K3bIso9660ImageWritingJob::jobDescription() const
TQString K3bIso9660ImageWritingJob::jobDetails() const TQString K3bIso9660ImageWritingJob::jobDetails() const
{ {
return m_imagePath.section("/", -1) + TQString( " (%1)" ).tqarg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath)))); return m_imagePath.section("/", -1) + TQString( " (%1)" ).arg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
} }

24
libk3b/jobs/k3breadcdreader.cpp
Unescape View File

@ -104,7 +104,7 @@ void K3bReadcdReader::start()
// the first thing to do is to check for readcd // the first thing to do is to check for readcd
d->readcdBinObject = k3bcore->externalBinManager()->binObject( "readcd" ); d->readcdBinObject = k3bcore->externalBinManager()->binObject( "readcd" );
if( !d->readcdBinObject ) { if( !d->readcdBinObject ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg("readcd"), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("readcd"), ERROR );
jobFinished(false); jobFinished(false);
return; return;
} }
@ -120,7 +120,7 @@ void K3bReadcdReader::start()
for( TQPtrListIterator<K3bExternalBin> it( readcdBins ); it.current(); ++it ) { for( TQPtrListIterator<K3bExternalBin> it( readcdBins ); it.current(); ++it ) {
if( it.current()->hasFeature( "clone" ) ) { if( it.current()->hasFeature( "clone" ) ) {
d->readcdBinObject = it.current(); d->readcdBinObject = it.current();
emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").tqarg(d->readcdBinObject->version), INFO ); emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").arg(d->readcdBinObject->version), INFO );
foundCloneSupport = true; foundCloneSupport = true;
break; break;
} }
@ -148,10 +148,10 @@ void K3bReadcdReader::start()
*d->process << "-v"; *d->process << "-v";
// Again we assume the device to be set! // Again we assume the device to be set!
*d->process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(m_readDevice, *d->process << TQString("dev=%1").arg(K3b::externalBinDeviceParameter(m_readDevice,
d->readcdBinObject)); d->readcdBinObject));
if( m_speed > 0 ) if( m_speed > 0 )
*d->process << TQString("speed=%1").tqarg(m_speed); *d->process << TQString("speed=%1").arg(m_speed);
// output // output
@ -160,8 +160,8 @@ void K3bReadcdReader::start()
d->process->dupStdout( d->fdToWriteTo ); d->process->dupStdout( d->fdToWriteTo );
} }
else { else {
emit newTask( i18n("Writing image to %1.").tqarg(m_imagePath) ); emit newTask( i18n("Writing image to %1.").arg(m_imagePath) );
emit infoMessage( i18n("Writing image to %1.").tqarg(m_imagePath), INFO ); emit infoMessage( i18n("Writing image to %1.").arg(m_imagePath), INFO );
*d->process << "f=" + m_imagePath; *d->process << "f=" + m_imagePath;
} }
@ -177,11 +177,11 @@ void K3bReadcdReader::start()
if( m_c2Scan ) if( m_c2Scan )
*d->process << "-c2scan"; *d->process << "-c2scan";
*d->process << TQString("retries=%1").tqarg(m_retries); *d->process << TQString("retries=%1").arg(m_retries);
// readcd does not read the last sector specified // readcd does not read the last sector specified
if( d->firstSector < d->lastSector ) if( d->firstSector < d->lastSector )
*d->process << TQString("sectors=%1-%2").tqarg(d->firstSector.lba()).tqarg(d->lastSector.lba()+1); *d->process << TQString("sectors=%1-%2").arg(d->firstSector.lba()).arg(d->lastSector.lba()+1);
// Joerg sais it is a Linux kernel bug, anyway, with the default value it does not work // Joerg sais it is a Linux kernel bug, anyway, with the default value it does not work
*d->process << "ts=128k"; *d->process << "ts=128k";
@ -276,7 +276,7 @@ void K3bReadcdReader::slotStdLine( const TQString& line )
kdError() << "(K3bReadcdReader) problemSector parsing error in line: " kdError() << "(K3bReadcdReader) problemSector parsing error in line: "
<< line.mid( pos, line.find( 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 ); emit infoMessage( i18n("Retrying from sector %1.").arg(problemSector), INFO );
} }
else if( (pos = line.find("Error on sector")) >= 0 ) { else if( (pos = line.find("Error on sector")) >= 0 ) {
@ -291,10 +291,10 @@ void K3bReadcdReader::slotStdLine( const TQString& line )
} }
if( line.contains( "not corrected") ) { if( line.contains( "not corrected") ) {
emit infoMessage( i18n("Uncorrected error in sector %1").tqarg(problemSector), ERROR ); emit infoMessage( i18n("Uncorrected error in sector %1").arg(problemSector), ERROR );
} }
else { else {
emit infoMessage( i18n("Corrected error in sector %1").tqarg(problemSector), ERROR ); emit infoMessage( i18n("Corrected error in sector %1").arg(problemSector), ERROR );
} }
} }
@ -314,7 +314,7 @@ void K3bReadcdReader::slotProcessExited( KProcess* p )
jobFinished( true ); jobFinished( true );
} }
else { else {
emit infoMessage( i18n("%1 returned error: %2").tqarg("Readcd").tqarg(p->exitStatus()), ERROR ); emit infoMessage( i18n("%1 returned error: %2").arg("Readcd").arg(p->exitStatus()), ERROR );
jobFinished( false ); jobFinished( false );
} }
} }

6
libk3b/jobs/k3bverificationjob.cpp
Unescape View File

@ -203,7 +203,7 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
if( (int)d->toc.count() < (*it).trackNumber ) { if( (int)d->toc.count() < (*it).trackNumber ) {
if ( d->mediumHasBeenReloaded ) { if ( d->mediumHasBeenReloaded ) {
emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)") emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)")
.tqarg( "Specified track number not found on medium" ), ERROR ); .arg( "Specified track number not found on medium" ), ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
@ -236,7 +236,7 @@ void K3bVerificationJob::readTrack( int trackIndex )
return; return;
} }
emit newTask( i18n("Verifying track %1").tqarg( d->tracks[trackIndex].trackNumber ) ); emit newTask( i18n("Verifying track %1").arg( d->tracks[trackIndex].trackNumber ) );
d->pipe.open(); d->pipe.open();
@ -304,7 +304,7 @@ void K3bVerificationJob::slotMd5JobFinished( bool success )
if( success && !d->canceled && d->readSuccessful ) { if( success && !d->canceled && d->readSuccessful ) {
// compare the two sums // compare the two sums
if( d->tracks[d->currentTrackIndex].checksum != d->md5Job->hexDigest() ) { if( d->tracks[d->currentTrackIndex].checksum != d->md5Job->hexDigest() ) {
emit infoMessage( i18n("Written data in track %1 differs from original.").tqarg(d->tracks[d->currentTrackIndex].trackNumber), ERROR ); emit infoMessage( i18n("Written data in track %1 differs from original.").arg(d->tracks[d->currentTrackIndex].trackNumber), ERROR );
jobFinished(false); jobFinished(false);
} }
else { else {

26
libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
Unescape View File

@ -88,15 +88,15 @@ void K3bVideoDVDTitleDetectClippingJob::start()
d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode"); d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode");
if( !d->usedTranscodeBin ) { if( !d->usedTranscodeBin ) {
emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR ); emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){ if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){
emit infoMessage( i18n("%1 version %2 is too old.") emit infoMessage( i18n("%1 version %2 is too old.")
.tqarg("transcode") .arg("transcode")
.tqarg(d->usedTranscodeBin->version), ERROR ); .arg(d->usedTranscodeBin->version), ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
@ -105,11 +105,11 @@ void K3bVideoDVDTitleDetectClippingJob::start()
if( !d->usedTranscodeBin->copyright.isEmpty() ) if( !d->usedTranscodeBin->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
.tqarg(d->usedTranscodeBin->name()) .arg(d->usedTranscodeBin->name())
.tqarg(d->usedTranscodeBin->version) .arg(d->usedTranscodeBin->version)
.tqarg(d->usedTranscodeBin->copyright), INFO ); .arg(d->usedTranscodeBin->copyright), INFO );
emit newTask( i18n("Analysing Title %1 of Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) ); emit newTask( i18n("Analysing Title %1 of Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) );
startTranscode( 1 ); startTranscode( 1 );
} }
@ -151,16 +151,16 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
*d->process << "-i" << m_dvd.device()->blockDeviceName(); *d->process << "-i" << m_dvd.device()->blockDeviceName();
// select the title number and chapter // select the title number and chapter
*d->process << "-T" << TQString("%1,%2").tqarg(m_titleNumber).tqarg(chapter); *d->process << "-T" << TQString("%1,%2").arg(m_titleNumber).arg(chapter);
// null output // null output
*d->process << "-y" << "null,null" << "-o" << "/dev/null"; *d->process << "-y" << "null,null" << "-o" << "/dev/null";
// analyze the first 200 frames // analyze the first 200 frames
*d->process << "-J" << TQString("detectclipping=range=0-%1/5").tqarg(d->currentFrames); *d->process << "-J" << TQString("detectclipping=range=0-%1/5").arg(d->currentFrames);
// also only decode the first 200 frames // also only decode the first 200 frames
*d->process << "-c" << TQString("0-%1").tqarg(d->currentFrames+1); *d->process << "-c" << TQString("0-%1").arg(d->currentFrames+1);
// additional user parameters from config // additional user parameters from config
const TQStringList& params = d->usedTranscodeBin->userParameters(); const TQStringList& params = d->usedTranscodeBin->userParameters();
@ -181,11 +181,11 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
jobFinished(false); jobFinished(false);
} }
else { else {
emit newSubTask( i18n("Analysing Chapter %1 of %2").tqarg(chapter).tqarg(m_dvd[m_titleNumber-1].numPTTs()) ); emit newSubTask( i18n("Analysing Chapter %1 of %2").arg(chapter).arg(m_dvd[m_titleNumber-1].numPTTs()) );
emit subPercent( 0 ); emit subPercent( 0 );
} }
} }
@ -279,7 +279,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p )
} }
else { else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).") emit infoMessage( i18n("%1 returned an unknown error (code %2).")
.tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()), .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()),
K3bJob::ERROR ); K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
} }

50
libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
Unescape View File

@ -87,15 +87,15 @@ void K3bVideoDVDTitleTranscodingJob::start()
d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode"); d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode");
if( !d->usedTranscodeBin ) { if( !d->usedTranscodeBin ) {
emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR ); emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){ if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){
emit infoMessage( i18n("%1 version %2 is too old.") emit infoMessage( i18n("%1 version %2 is too old.")
.tqarg("transcode") .arg("transcode")
.tqarg(d->usedTranscodeBin->version), ERROR ); .arg(d->usedTranscodeBin->version), ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
@ -104,9 +104,9 @@ void K3bVideoDVDTitleTranscodingJob::start()
if( !d->usedTranscodeBin->copyright.isEmpty() ) if( !d->usedTranscodeBin->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
.tqarg(d->usedTranscodeBin->name()) .arg(d->usedTranscodeBin->name())
.tqarg(d->usedTranscodeBin->version) .arg(d->usedTranscodeBin->version)
.tqarg(d->usedTranscodeBin->copyright), INFO ); .arg(d->usedTranscodeBin->copyright), INFO );
// //
// Let's take a look at the filename // Let's take a look at the filename
@ -119,11 +119,11 @@ void K3bVideoDVDTitleTranscodingJob::start()
TQFileInfo fileInfo( m_filename ); TQFileInfo fileInfo( m_filename );
TQFileInfo dirInfo( fileInfo.dirPath() ); TQFileInfo dirInfo( fileInfo.dirPath() );
if( !dirInfo.exists() && !KStandardDirs::makeDir( dirInfo.absFilePath() ) ) { if( !dirInfo.exists() && !KStandardDirs::makeDir( dirInfo.absFilePath() ) ) {
emit infoMessage( i18n("Unable to create folder '%1'").tqarg(dirInfo.filePath()), ERROR ); emit infoMessage( i18n("Unable to create folder '%1'").arg(dirInfo.filePath()), ERROR );
return; return;
} }
else if( !dirInfo.isDir() || !dirInfo.isWritable() ) { else if( !dirInfo.isDir() || !dirInfo.isWritable() ) {
emit infoMessage( i18n("Invalid filename: '%1'").tqarg(m_filename), ERROR ); emit infoMessage( i18n("Invalid filename: '%1'").arg(m_filename), ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
@ -134,7 +134,7 @@ void K3bVideoDVDTitleTranscodingJob::start()
// //
d->twoPassEncodingLogFile = K3b::findTempFile( "log" ); d->twoPassEncodingLogFile = K3b::findTempFile( "log" );
emit newTask( i18n("Transcoding title %1 from Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) ); emit newTask( i18n("Transcoding title %1 from Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) );
// //
// Ok then, let's begin // Ok then, let's begin
@ -159,7 +159,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
break; break;
default: default:
emit infoMessage( i18n("Invalid Video codec set: %1").tqarg(m_videoCodec), ERROR ); emit infoMessage( i18n("Invalid Video codec set: %1").arg(m_videoCodec), ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
@ -182,7 +182,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
break; break;
default: default:
emit infoMessage( i18n("Invalid Audio codec set: %1").tqarg(m_audioCodec), ERROR ); emit infoMessage( i18n("Invalid Audio codec set: %1").arg(m_audioCodec), ERROR );
jobFinished( false ); jobFinished( false );
return; return;
} }
@ -218,7 +218,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
*d->process << "-x" << "dvd"; *d->process << "-x" << "dvd";
// select the title number // select the title number
*d->process << "-T" << TQString("%1,-1,1").tqarg( m_titleNumber ); *d->process << "-T" << TQString("%1,-1,1").arg( m_titleNumber );
// select the audio stream to extract // select the audio stream to extract
if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 ) if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 )
@ -226,14 +226,14 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
// clipping // clipping
*d->process << "-j" << TQString("%1,%2,%3,%4") *d->process << "-j" << TQString("%1,%2,%3,%4")
.tqarg(m_clippingTop) .arg(m_clippingTop)
.tqarg(m_clippingLeft) .arg(m_clippingLeft)
.tqarg(m_clippingBottom) .arg(m_clippingBottom)
.tqarg(m_clippingRight); .arg(m_clippingRight);
// select the encoding type (single pass or two-pass) and the log file for two-pass encoding // select the encoding type (single pass or two-pass) and the log file for two-pass encoding
// the latter is unused for pass = 0 // the latter is unused for pass = 0
*d->process << "-R" << TQString("%1,%2").tqarg( pass ).tqarg( d->twoPassEncodingLogFile ); *d->process << "-R" << TQString("%1,%2").arg( pass ).arg( d->twoPassEncodingLogFile );
// depending on the pass we use different options // depending on the pass we use different options
if( pass != 1 ) { if( pass != 1 ) {
@ -249,7 +249,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
} }
else { else {
// audio quality settings // audio quality settings
*d->process << "-b" << TQString("%1,%2").tqarg(m_audioBitrate).tqarg(m_audioVBR ? 1 : 0); *d->process << "-b" << TQString("%1,%2").arg(m_audioBitrate).arg(m_audioVBR ? 1 : 0);
// resample audio stream to 44.1 khz // resample audio stream to 44.1 khz
if( m_resampleAudio ) if( m_resampleAudio )
@ -261,7 +261,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
} }
else { else {
// gather information about the video stream, ignore audio // gather information about the video stream, ignore audio
*d->process << "-y" << TQString("%1,null").tqarg( videoCodecString ); *d->process << "-y" << TQString("%1,null").arg( videoCodecString );
// we ignore the output from the first pass // we ignore the output from the first pass
*d->process << "-o" << "/dev/null"; *d->process << "-o" << "/dev/null";
@ -317,8 +317,8 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
// we only give information about the resizing of the video once // we only give information about the resizing of the video once
if( pass < 2 ) if( pass < 2 )
emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").tqarg(m_titleNumber).tqarg(usedWidth).tqarg(usedHeight), INFO ); emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").arg(m_titleNumber).arg(usedWidth).arg(usedHeight), INFO );
*d->process << "-Z" << TQString("%1x%2").tqarg(usedWidth).tqarg(usedHeight); *d->process << "-Z" << TQString("%1x%2").arg(usedWidth).arg(usedHeight);
// additional user parameters from config // additional user parameters from config
const TQStringList& params = d->usedTranscodeBin->userParameters(); const TQStringList& params = d->usedTranscodeBin->userParameters();
@ -339,7 +339,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
jobFinished(false); jobFinished(false);
} }
else { else {
@ -372,7 +372,7 @@ void K3bVideoDVDTitleTranscodingJob::cleanup( bool success )
} }
if( !success && TQFile::exists( m_filename ) ) { if( !success && TQFile::exists( m_filename ) ) {
emit infoMessage( i18n("Removing incomplete video file '%1'").tqarg(m_filename), INFO ); emit infoMessage( i18n("Removing incomplete video file '%1'").arg(m_filename), INFO );
TQFile::remove( m_filename ); TQFile::remove( m_filename );
} }
} }
@ -440,7 +440,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p )
// FIXME: error handling // FIXME: error handling
emit infoMessage( i18n("%1 returned an unknown error (code %2).") emit infoMessage( i18n("%1 returned an unknown error (code %2).")
.tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()), .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()),
K3bJob::ERROR ); K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
@ -450,7 +450,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p )
} }
else { else {
cleanup( false ); cleanup( false );
emit infoMessage( i18n("Execution of %1 failed.").tqarg("transcode"), ERROR ); emit infoMessage( i18n("Execution of %1 failed.").arg("transcode"), ERROR );
emit infoMessage( i18n("Please consult the debugging output for details."), ERROR ); emit infoMessage( i18n("Please consult the debugging output for details."), ERROR );
jobFinished( false ); jobFinished( false );
} }

4
libk3b/plugin/k3baudioserver.cpp
Unescape View File

@ -153,8 +153,8 @@ void K3bAudioServer::attachClient( K3bAudioClient* c )
if( m_usedOutputPlugin && !m_pluginInitialized ) { if( m_usedOutputPlugin && !m_pluginInitialized ) {
if( !m_usedOutputPlugin->init() ) { if( !m_usedOutputPlugin->init() ) {
emit error( i18n("Could not initialize Audio Output plugin %1 (%2)") emit error( i18n("Could not initialize Audio Output plugin %1 (%2)")
.tqarg(m_usedOutputPlugin->pluginInfo().name()) .arg(m_usedOutputPlugin->pluginInfo().name())
.tqarg(m_usedOutputPlugin->lastErrorMessage()) ); .arg(m_usedOutputPlugin->lastErrorMessage()) );
} }
else else
m_pluginInitialized = true; m_pluginInitialized = true;

4
libk3b/plugin/k3bpluginmanager.cpp
Unescape View File

@ -168,7 +168,7 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, con
KDialogBase dlg( parent, KDialogBase dlg( parent,
name, name,
true, true,
i18n("Configure plugin %1").tqarg( plugin->pluginInfo().name() ) ); i18n("Configure plugin %1").arg( plugin->pluginInfo().name() ) );
K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg ); K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg );
if( configWidget ) { if( configWidget ) {
@ -181,7 +181,7 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, con
return r; return r;
} }
else { else {
KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) ); KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").arg( plugin->pluginInfo().name() ) );
return 0; return 0;
} }
} }

6
libk3b/projects/audiocd/k3baudiocdtracksource.cpp
Unescape View File

@ -99,8 +99,8 @@ bool K3bAudioCdTrackSource::initParanoia()
if( !m_lastUsedDevice ) { if( !m_lastUsedDevice ) {
// could not find the CD, so ask for it // could not find the CD, so ask for it
TQString s = i18n("Please insert Audio CD %1%2") TQString s = i18n("Please insert Audio CD %1%2")
.tqarg(m_discId, 0, 16) .arg(m_discId, 0, 16)
.tqarg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty() .arg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty()
? TQString() ? TQString()
: " (" + m_cddbEntry.cdArtist + " - " + m_cddbEntry.cdTitle + ")"); : " (" + m_cddbEntry.cdArtist + " - " + m_cddbEntry.cdTitle + ")");
@ -252,7 +252,7 @@ TQString K3bAudioCdTrackSource::type() const
TQString K3bAudioCdTrackSource::sourceComment() const TQString K3bAudioCdTrackSource::sourceComment() const
{ {
return i18n("Track %1 from Audio CD %2").tqarg(m_cdTrackNumber).tqarg(m_discId,0,16); return i18n("Track %1 from Audio CD %2").arg(m_cdTrackNumber).arg(m_discId,0,16);
} }

6
libk3b/projects/audiocd/k3baudioimager.cpp
Unescape View File

@ -85,7 +85,7 @@ void K3bAudioImager::WorkThread::run()
// Seek to the beginning of the track // Seek to the beginning of the track
// //
if( !track->seek(0) ) { if( !track->seek(0) ) {
emitInfoMessage( i18n("Unable to seek in track %1.").tqarg(trackNumber), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to seek in track %1.").arg(trackNumber), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
} }
@ -101,7 +101,7 @@ void K3bAudioImager::WorkThread::run()
// //
if( m_fd == -1 ) { if( m_fd == -1 ) {
if( !waveFileWriter.open( *imageFileIt ) ) { if( !waveFileWriter.open( *imageFileIt ) ) {
emitInfoMessage( i18n("Could not open %1 for writing").tqarg(*imageFileIt), K3bJob::ERROR ); emitInfoMessage( i18n("Could not open %1 for writing").arg(*imageFileIt), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
} }
@ -142,7 +142,7 @@ void K3bAudioImager::WorkThread::run()
} }
if( read < 0 ) { if( read < 0 ) {
emitInfoMessage( i18n("Error while decoding track %1.").tqarg(trackNumber), K3bJob::ERROR ); emitInfoMessage( i18n("Error while decoding track %1.").arg(trackNumber), K3bJob::ERROR );
kdDebug() << "(K3bAudioImager::WorkThread) read error on track " << trackNumber kdDebug() << "(K3bAudioImager::WorkThread) read error on track " << trackNumber
<< " at pos " << K3b::Msf(trackRead/2352) << endl; << " at pos " << K3b::Msf(trackRead/2352) << endl;
lastError = K3bAudioImager::ERROR_DECODING_TRACK; lastError = K3bAudioImager::ERROR_DECODING_TRACK;

22
libk3b/projects/audiocd/k3baudiojob.cpp
Unescape View File

@ -297,7 +297,7 @@ void K3bAudioJob::start()
d->useCdText ) { d->useCdText ) {
if( !cdrecordCdText ) { if( !cdrecordCdText ) {
emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.") emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.")
.tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); .arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
d->useCdText = false; d->useCdText = false;
} }
else if( m_usedWritingMode == K3b::TAO ) { else if( m_usedWritingMode == K3b::TAO ) {
@ -346,7 +346,7 @@ void K3bAudioJob::start()
} }
else { else {
emit burning(false); emit burning(false);
emit infoMessage( i18n("Creating image files in %1").tqarg(m_doc->tempDir()), INFO ); emit infoMessage( i18n("Creating image files in %1").arg(m_doc->tempDir()), INFO );
emit newTask( i18n("Creating image files") ); emit newTask( i18n("Creating image files") );
m_tempData->prepareTempFileNames( doc()->tempDir() ); m_tempData->prepareTempFileNames( doc()->tempDir() );
TQStringList filenames; TQStringList filenames;
@ -480,9 +480,9 @@ void K3bAudioJob::slotAudioDecoderNextTrack( int t, int tt )
if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) { if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) {
K3bAudioTrack* track = m_doc->getTrack(t); K3bAudioTrack* track = m_doc->getTrack(t);
emit newSubTask( i18n("Decoding audio track %1 of %2%3") emit newSubTask( i18n("Decoding audio track %1 of %2%3")
.tqarg(t) .arg(t)
.tqarg(tt) .arg(tt)
.tqarg( track->title().isEmpty() || track->artist().isEmpty() .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString() ? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) ); : " (" + track->artist() + " - " + track->title() + ")" ) );
} }
@ -588,9 +588,9 @@ void K3bAudioJob::slotWriterNextTrack( int t, int tt )
if( m_doc->hideFirstTrack() ) if( m_doc->hideFirstTrack() )
track = m_doc->getTrack(t+1); track = m_doc->getTrack(t+1);
emit newSubTask( i18n("Writing track %1 of %2%3") emit newSubTask( i18n("Writing track %1 of %2%3")
.tqarg(t) .arg(t)
.tqarg(tt) .arg(tt)
.tqarg( track->title().isEmpty() || track->artist().isEmpty() .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString() ? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) ); : " (" + track->artist() + " - " + track->title() + ")" ) );
} }
@ -650,7 +650,7 @@ bool K3bAudioJob::startWriting()
if( m_doc->dummy() ) if( m_doc->dummy() )
emit newTask( i18n("Simulating") ); emit newTask( i18n("Simulating") );
else if( d->copies > 1 ) else if( d->copies > 1 )
emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) );
else else
emit newTask( i18n("Writing") ); emit newTask( i18n("Writing") );
@ -847,7 +847,7 @@ TQString K3bAudioJob::jobDescription() const
return i18n("Writing Audio CD") return i18n("Writing Audio CD")
+ ( m_doc->title().isEmpty() + ( m_doc->title().isEmpty()
? TQString() ? TQString()
: TQString( " (%1)" ).tqarg(m_doc->title()) ); : TQString( " (%1)" ).arg(m_doc->title()) );
} }
@ -855,7 +855,7 @@ TQString K3bAudioJob::jobDetails() const
{ {
return ( i18n( "1 track (%1 minutes)", return ( i18n( "1 track (%1 minutes)",
"%n tracks (%1 minutes)", "%n tracks (%1 minutes)",
m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) m_doc->numOfTracks() ).arg(m_doc->length().toString())
+ ( m_doc->copies() > 1 && !m_doc->dummy() + ( m_doc->copies() > 1 && !m_doc->dummy()
? i18n(" - %n copy", " - %n copies", m_doc->copies()) ? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) ); : TQString() ) );

14
libk3b/projects/audiocd/k3baudionormalizejob.cpp
Unescape View File

@ -61,7 +61,7 @@ void K3bAudioNormalizeJob::start()
} }
if( !bin->copyright.isEmpty() ) 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 );
// create the commandline // create the commandline
*m_process << bin; *m_process << bin;
@ -104,7 +104,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
{ {
// percent, subPercent, newTask (compute level and adjust) // percent, subPercent, newTask (compute level and adjust)
// emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").tqarg(t).tqarg(tt).tqarg(m_files.at(t-1)) ); // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) );
emit debuggingOutput( "normalize-audio", line ); emit debuggingOutput( "normalize-audio", line );
@ -123,13 +123,13 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
else if( line.contains( "already normalized" ) ) { else if( line.contains( "already normalized" ) ) {
// no normalization necessary for the current track // no normalization necessary for the current track
emit infoMessage( i18n("Track %1 is already normalized.").tqarg(m_currentTrack), INFO ); emit infoMessage( i18n("Track %1 is already normalized.").arg(m_currentTrack), INFO );
m_currentTrack++; m_currentTrack++;
} }
else if( line.contains( "--% done") ) { else if( line.contains( "--% done") ) {
if( m_currentAction == ADJUSTING_LEVELS ) { if( m_currentAction == ADJUSTING_LEVELS ) {
emit newTask( i18n("Adjusting volume level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) ); emit newTask( i18n("Adjusting volume level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track " kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track "
<< m_currentTrack << m_currentTrack
<< " " << " "
@ -137,7 +137,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line )
<< endl; << endl;
} }
else { else {
emit newTask( i18n("Computing level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) ); emit newTask( i18n("Computing level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) );
kdDebug() << "(K3bAudioNormalizeJob) computing level for track " kdDebug() << "(K3bAudioNormalizeJob) computing level for track "
<< m_currentTrack << m_currentTrack
<< " " << " "
@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p )
break; break;
default: default:
if( !m_canceled ) { if( !m_canceled ) {
emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("normalize-audio").tqarg(p->exitStatus()), emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()),
K3bJob::ERROR ); K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
emit infoMessage( i18n("Error while normalizing tracks."), ERROR ); emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
@ -197,7 +197,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p )
} }
} }
else { else {
emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Normalize"), K3bJob::ERROR ); emit infoMessage( i18n("%1 did not exit cleanly.").arg("Normalize"), K3bJob::ERROR );
jobFinished( false ); jobFinished( false );
} }
} }

18
libk3b/projects/datacd/k3bdatadoc.cpp
Unescape View File

@ -92,8 +92,8 @@ bool K3bDataDoc::newDocument()
m_bExistingItemsReplaceAll = m_bExistingItemsIgnoreAll = false; m_bExistingItemsReplaceAll = m_bExistingItemsIgnoreAll = false;
if( m_root ) { if( m_root ) {
while( m_root->tqchildren().getFirst() ) while( m_root->children().getFirst() )
removeItem( m_root->tqchildren().getFirst() ); removeItem( m_root->children().getFirst() );
} }
else else
m_root = new K3bRootItem( this ); m_root = new K3bRootItem( this );
@ -164,7 +164,7 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
ok = true; ok = true;
TQString name( k3bname ); TQString name( k3bname );
if( cnt > 0 ) if( cnt > 0 )
name += TQString("_%1").tqarg(cnt); name += TQString("_%1").arg(cnt);
if( K3bDataItem* oldItem = dir->find( name ) ) { if( K3bDataItem* oldItem = dir->find( name ) ) {
if( f.isDir() && oldItem->isDir() ) { if( f.isDir() && oldItem->isDir() ) {
// ok, just reuse the dir // ok, just reuse the dir
@ -182,7 +182,7 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir )
} }
} }
if( cnt > 0 ) if( cnt > 0 )
k3bname += TQString("_%1").tqarg(cnt); k3bname += TQString("_%1").arg(cnt);
// TQFileInfo::exists and TQFileInfo::isReadable return false for broken symlinks :( // TQFileInfo::exists and TQFileInfo::isReadable return false for broken symlinks :(
if( f.isDir() && !f.isSymLink() ) { if( f.isDir() && !f.isSymLink() ) {
@ -624,7 +624,7 @@ bool K3bDataDoc::saveDocumentData( TQDomElement* docElem )
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
TQDomElement topElem = doc.createElement( "files" ); TQDomElement topElem = doc.createElement( "files" );
TQPtrListIterator<K3bDataItem> it( root()->tqchildren() ); TQPtrListIterator<K3bDataItem> it( root()->children() );
for( ; it.current(); ++it ) { for( ; it.current(); ++it ) {
saveDataItem( it.current(), &doc, &topElem ); saveDataItem( it.current(), &doc, &topElem );
} }
@ -883,7 +883,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme
if( item->sortWeight() != 0 ) if( item->sortWeight() != 0 )
topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) ); topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) );
TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); TQPtrListIterator<K3bDataItem> it( dirItem->children() );
for( ; it.current(); ++it ) { for( ; it.current(); ++it ) {
saveDataItem( it.current(), doc, &topElem ); saveDataItem( it.current(), doc, &topElem );
} }
@ -1065,7 +1065,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir )
return; return;
TQPtrList<K3bDataItem> sortedChildren; TQPtrList<K3bDataItem> sortedChildren;
TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); TQPtrListIterator<K3bDataItem> it( dir->children() );
for( it.toLast(); it.current(); --it ) { for( it.toLast(); it.current(); --it ) {
K3bDataItem* item = it.current(); K3bDataItem* item = it.current();
@ -1277,7 +1277,7 @@ void K3bDataDoc::clearImportedSession()
delete dir; delete dir;
} }
else { else {
for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( dir->children() ); it.current(); ++it ) {
if( !m_oldSession.contains(it.current()) ) { if( !m_oldSession.contains(it.current()) ) {
m_oldSession.remove(); m_oldSession.remove();
// now the dir becomes a totally normal dir // now the dir becomes a totally normal dir
@ -1343,7 +1343,7 @@ K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir )
int i = 0; int i = 0;
while( dir->alreadyInDirectory( "boot.catalog" ) ) { while( dir->alreadyInDirectory( "boot.catalog" ) ) {
++i; ++i;
newName = TQString( "boot%1.catalog" ).tqarg(i); newName = TQString( "boot%1.catalog" ).arg(i);
} }
K3bSpecialDataItem* b = new K3bSpecialDataItem( this, 0, dir, newName ); K3bSpecialDataItem* b = new K3bSpecialDataItem( this, 0, dir, newName );

22
libk3b/projects/datacd/k3bdatajob.cpp
Unescape View File

@ -196,7 +196,7 @@ void K3bDataJob::slotMsInfoFetched(bool success)
prepareData(); prepareData();
if( d->usedWritingApp == K3b::CDRDAO ) // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord if( d->usedWritingApp == K3b::CDRDAO ) // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord
m_isoImager->setMultiSessionInfo( TQString("%1,%2").tqarg(m_msInfoFetcher->lastSessionStart()).tqarg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() ); m_isoImager->setMultiSessionInfo( TQString("%1,%2").arg(m_msInfoFetcher->lastSessionStart()).arg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() );
else else
m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo(), d->doc->burner() ); m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo(), d->doc->burner() );
@ -226,7 +226,7 @@ void K3bDataJob::writeImage()
emit newTask( i18n("Creating image file") ); emit newTask( i18n("Creating image file") );
emit newSubTask( i18n("Track 1 of 1") ); emit newSubTask( i18n("Track 1 of 1") );
emit infoMessage( i18n("Creating image file in %1").tqarg(d->doc->tempDir()), INFO ); emit infoMessage( i18n("Creating image file in %1").arg(d->doc->tempDir()), INFO );
m_isoImager->writeToImageFile( d->doc->tempDir() ); m_isoImager->writeToImageFile( d->doc->tempDir() );
m_isoImager->start(); m_isoImager->start();
@ -324,7 +324,7 @@ void K3bDataJob::slotIsoImagerFinished( bool success )
d->doc->onlyCreateImages() ) { d->doc->onlyCreateImages() ) {
if( success ) { if( success ) {
emit infoMessage( i18n("Image successfully created in %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS ); emit infoMessage( i18n("Image successfully created in %1").arg(d->doc->tempDir()), K3bJob::SUCCESS );
d->imageFinished = true; d->imageFinished = true;
if( d->doc->onlyCreateImages() ) { if( d->doc->onlyCreateImages() ) {
@ -370,7 +370,7 @@ bool K3bDataJob::startWriterJob()
if( d->doc->dummy() ) if( d->doc->dummy() )
emit newTask( i18n("Simulating") ); emit newTask( i18n("Simulating") );
else if( d->copies > 1 ) else if( d->copies > 1 )
emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) );
else else
emit newTask( i18n("Writing") ); emit newTask( i18n("Writing") );
@ -408,7 +408,7 @@ void K3bDataJob::slotWriterJobPercent( int p )
void K3bDataJob::slotWriterNextTrack( int t, int tt ) void K3bDataJob::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) );
} }
@ -632,7 +632,7 @@ bool K3bDataJob::prepareWriterJob()
writer->addArgument( "-xa1" ); writer->addArgument( "-xa1" );
} }
writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-"); writer->addArgument( TQString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-");
setWriterJob( writer ); setWriterJob( writer );
} }
@ -915,13 +915,13 @@ TQString K3bDataJob::jobDescription() const
return i18n("Writing Data CD") return i18n("Writing Data CD")
+ ( d->doc->isoOptions().volumeID().isEmpty() + ( d->doc->isoOptions().volumeID().isEmpty()
? TQString() ? TQString()
: TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) ); : TQString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) );
} }
else { else {
return i18n("Writing Multisession CD") return i18n("Writing Multisession CD")
+ ( d->doc->isoOptions().volumeID().isEmpty() + ( d->doc->isoOptions().volumeID().isEmpty()
? TQString() ? TQString()
: TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) ); : TQString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) );
} }
} }
@ -935,10 +935,10 @@ TQString K3bDataJob::jobDetails() const
return i18n("ISO9660 Filesystem (Size: %1) - %n copy", return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
"ISO9660 Filesystem (Size: %1) - %n copies", "ISO9660 Filesystem (Size: %1) - %n copies",
d->doc->copies() ) d->doc->copies() )
.tqarg(KIO::convertSize( d->doc->size() )); .arg(KIO::convertSize( d->doc->size() ));
else else
return i18n("ISO9660 Filesystem (Size: %1)") return i18n("ISO9660 Filesystem (Size: %1)")
.tqarg(KIO::convertSize( d->doc->size() )); .arg(KIO::convertSize( d->doc->size() ));
} }
@ -953,7 +953,7 @@ void K3bDataJob::cleanup()
if( !d->doc->onTheFly() && d->doc->removeImages() ) { if( !d->doc->onTheFly() && d->doc->removeImages() ) {
if( TQFile::exists( d->doc->tempDir() ) ) { if( TQFile::exists( d->doc->tempDir() ) ) {
d->imageFile.remove(); d->imageFile.remove();
emit infoMessage( i18n("Removed image file %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS ); emit infoMessage( i18n("Removed image file %1").arg(d->doc->tempDir()), K3bJob::SUCCESS );
} }
} }

8
libk3b/projects/datacd/k3bdatapreparationjob.cpp
Unescape View File

@ -77,8 +77,8 @@ void K3bDataPreparationJob::Private::run()
++it, --maxlines ) { ++it, --maxlines ) {
K3bDataItem* item = *it; K3bDataItem* item = *it;
listOfRenamedItems += i18n("<em>%1</em> renamed to <em>%2</em>") listOfRenamedItems += i18n("<em>%1</em> renamed to <em>%2</em>")
.tqarg( KStringHandler::csqueeze( item->k3bName(), 30 ) ) .arg( KStringHandler::csqueeze( item->k3bName(), 30 ) )
.tqarg( KStringHandler::csqueeze( item->writtenName(), 30 ) ); .arg( KStringHandler::csqueeze( item->writtenName(), 30 ) );
listOfRenamedItems += "<br>"; listOfRenamedItems += "<br>";
} }
if( it != doc->needToCutFilenameItems().end() ) if( it != doc->needToCutFilenameItems().end() )
@ -182,7 +182,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success )
"of the Joliet extensions. If the Joliet extensions are disabled filenames " "of the Joliet extensions. If the Joliet extensions are disabled filenames "
"do not have to be shortened but long filenames will not be available on " "do not have to be shortened but long filenames will not be available on "
"Windows systems.") "Windows systems.")
.tqarg( d->doc->isoOptions().jolietLong() ? 103 : 64 ) .arg( d->doc->isoOptions().jolietLong() ? 103 : 64 )
+ "<p>" + d->listOfRenamedItems, + "<p>" + d->listOfRenamedItems,
i18n("Warning"), i18n("Warning"),
i18n("Shorten Filenames"), i18n("Shorten Filenames"),
@ -207,7 +207,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success )
"restrict the length of the volume descriptior (the name of the filesystem) " "restrict the length of the volume descriptior (the name of the filesystem) "
"to %1 characters. The selected descriptor '%2' is longer than that. Do you " "to %1 characters. The selected descriptor '%2' is longer than that. Do you "
"want it to be cut or do you want to go back and change it manually?") "want it to be cut or do you want to go back and change it manually?")
.tqarg( 16 ).tqarg( d->doc->isoOptions().volumeID() ), .arg( 16 ).arg( d->doc->isoOptions().volumeID() ),
i18n("Warning"), i18n("Warning"),
i18n("Cut volume descriptor in the Joliet tree"), i18n("Cut volume descriptor in the Joliet tree"),
i18n("Cancel and go back") ) ) { i18n("Cancel and go back") ) ) {

36
libk3b/projects/datacd/k3bdiritem.cpp
Unescape View File

@ -52,26 +52,26 @@ K3bDirItem::K3bDirItem( const K3bDirItem& item )
m_dirs(0), m_dirs(0),
m_localPath( item.m_localPath ) m_localPath( item.m_localPath )
{ {
for( TQPtrListIterator<K3bDataItem> it( item.tqchildren() ); *it; ++it ) for( TQPtrListIterator<K3bDataItem> it( item.children() ); *it; ++it )
addDataItem( (*it)->copy() ); addDataItem( (*it)->copy() );
} }
K3bDirItem::~K3bDirItem() K3bDirItem::~K3bDirItem()
{ {
// delete all tqchildren // delete all children
// doing this by hand is much saver than using the // doing this by hand is much saver than using the
// auto-delete feature since some of the items' destructors // auto-delete feature since some of the items' destructors
// may change the list // may change the list
K3bDataItem* i = m_tqchildren.first(); K3bDataItem* i = m_children.first();
while( i ) { while( i ) {
// it is important to use takeDataItem here to be sure // it is important to use takeDataItem here to be sure
// the size gets updated properly // the size gets updated properly
takeDataItem(i); takeDataItem(i);
delete i; delete i;
i = m_tqchildren.first(); i = m_children.first();
} }
// this has to be done after deleting the tqchildren // this has to be done after deleting the children
// because the directory itself has a size of 0 in K3b // because the directory itself has a size of 0 in K3b
// and all it's files' sizes have already been substracted // and all it's files' sizes have already been substracted
take(); take();
@ -99,7 +99,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
} }
} }
if( m_tqchildren.findRef( item ) == -1 ) { if( m_children.findRef( item ) == -1 ) {
if( item->isFile() ) { if( item->isFile() ) {
// do we replace an old item? // do we replace an old item?
TQString name = item->k3bName(); TQString name = item->k3bName();
@ -126,7 +126,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
item->setK3bName( name ); item->setK3bName( name );
} }
m_tqchildren.append( item->take() ); m_children.append( item->take() );
updateSize( item, false ); updateSize( item, false );
if( item->isDir() ) if( item->isDir() )
updateFiles( ((K3bDirItem*)item)->numFiles(), ((K3bDirItem*)item)->numDirs()+1 ); updateFiles( ((K3bDirItem*)item)->numFiles(), ((K3bDirItem*)item)->numDirs()+1 );
@ -146,9 +146,9 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item )
K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item ) K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item )
{ {
int x = m_tqchildren.findRef( item ); int x = m_children.findRef( item );
if( x > -1 ) { if( x > -1 ) {
K3bDataItem* item = m_tqchildren.take(); K3bDataItem* item = m_children.take();
updateSize( item, true ); updateSize( item, true );
if( item->isDir() ) if( item->isDir() )
updateFiles( -1*((K3bDirItem*)item)->numFiles(), -1*((K3bDirItem*)item)->numDirs()-1 ); updateFiles( -1*((K3bDirItem*)item)->numFiles(), -1*((K3bDirItem*)item)->numDirs()-1 );
@ -176,8 +176,8 @@ K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item )
K3bDataItem* K3bDirItem::nextSibling() const K3bDataItem* K3bDirItem::nextSibling() const
{ {
if( !m_tqchildren.isEmpty() ) if( !m_children.isEmpty() )
return m_tqchildren.getFirst(); return m_children.getFirst();
else else
return K3bDataItem::nextSibling(); return K3bDataItem::nextSibling();
} }
@ -185,12 +185,12 @@ K3bDataItem* K3bDirItem::nextSibling() const
K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const
{ {
// search for prev in tqchildren // search for prev in children
if( m_tqchildren.findRef( prev ) < 0 ) { if( m_children.findRef( prev ) < 0 ) {
return 0; return 0;
} }
else else
return m_tqchildren.next(); return m_children.next();
} }
@ -202,7 +202,7 @@ bool K3bDirItem::alreadyInDirectory( const TQString& filename ) const
K3bDataItem* K3bDirItem::find( const TQString& filename ) const K3bDataItem* K3bDirItem::find( const TQString& filename ) const
{ {
for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
if( it.current()->k3bName() == filename ) if( it.current()->k3bName() == filename )
return it.current(); return it.current();
} }
@ -323,7 +323,7 @@ bool K3bDirItem::isRemoveable() const
if( !K3bDataItem::isRemoveable() ) if( !K3bDataItem::isRemoveable() )
return false; return false;
for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
if( !it.current()->isRemoveable() ) if( !it.current()->isRemoveable() )
return false; return false;
} }
@ -364,7 +364,7 @@ void K3bDirItem::updateFiles( long files, long dirs )
bool K3bDirItem::isFromOldSession() const bool K3bDirItem::isFromOldSession() const
{ {
for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
if( (*it)->isFromOldSession() ) if( (*it)->isFromOldSession() )
return true; return true;
} }
@ -375,7 +375,7 @@ bool K3bDirItem::isFromOldSession() const
bool K3bDirItem::writeToCd() const bool K3bDirItem::writeToCd() const
{ {
// check if this dir contains items to write // check if this dir contains items to write
for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
if( (*it)->writeToCd() ) if( (*it)->writeToCd() )
return true; return true;
} }

8
libk3b/projects/datacd/k3bdiritem.h
Unescape View File

@ -37,8 +37,8 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 ); K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 );
/** /**
* Default copy constructor. Copies the dir including all tqchildren. However, none of the * Default copy constructor. Copies the dir including all children. However, none of the
* tqchildren will have set a doc and the copy dir will not have set a parent dir. * children will have set a doc and the copy dir will not have set a parent dir.
*/ */
K3bDirItem( const K3bDirItem& ); K3bDirItem( const K3bDirItem& );
@ -48,7 +48,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
K3bDirItem* getDirItem() const; K3bDirItem* getDirItem() const;
const TQPtrList<K3bDataItem>& tqchildren() const { return m_tqchildren; } const TQPtrList<K3bDataItem>& children() const { return m_children; }
K3bDirItem* addDataItem( K3bDataItem* item ); K3bDirItem* addDataItem( K3bDataItem* item );
K3bDataItem* takeDataItem( K3bDataItem* item ); K3bDataItem* takeDataItem( K3bDataItem* item );
@ -121,7 +121,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
*/ */
void updateFiles( long files, long dirs ); void updateFiles( long files, long dirs );
mutable TQPtrList<K3bDataItem> m_tqchildren; mutable TQPtrList<K3bDataItem> m_children;
// size of the items simply added // size of the items simply added
KIO::filesize_t m_size; KIO::filesize_t m_size;

34
libk3b/projects/datacd/k3bisoimager.cpp
Unescape View File

@ -165,14 +165,14 @@ void K3bIsoImager::slotProcessExited( KProcess* p )
emit debuggingOutput( "K3bIsoImager", emit debuggingOutput( "K3bIsoImager",
TQString("Pipe throughput: %1 bytes read, %2 bytes written.") TQString("Pipe throughput: %1 bytes read, %2 bytes written.")
.tqarg(d->pipe->bytesRead()).tqarg(d->pipe->bytesWritten()) ); .arg(d->pipe->bytesRead()).arg(d->pipe->bytesWritten()) );
if( d->imageFile.isOpen() ) { if( d->imageFile.isOpen() ) {
d->imageFile.close(); d->imageFile.close();
if( m_canceled || p->exitStatus() != 0 ) { if( m_canceled || p->exitStatus() != 0 ) {
d->imageFile.remove(); d->imageFile.remove();
emit infoMessage( i18n("Removed incomplete image file %1.").tqarg(d->imageFile.name()), WARNING ); emit infoMessage( i18n("Removed incomplete image file %1.").arg(d->imageFile.name()), WARNING );
} }
} }
@ -210,7 +210,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p )
default: default:
if( !d->knownError && !mkisofsReadError() ) { if( !d->knownError && !mkisofsReadError() ) {
emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("mkisofs").tqarg(p->exitStatus()), emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("mkisofs").arg(p->exitStatus()),
K3bJob::ERROR ); K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
} }
@ -220,7 +220,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p )
} }
} }
else { else {
emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("mkisofs"), ERROR ); emit infoMessage( i18n("%1 did not exit cleanly.").arg("mkisofs"), ERROR );
jobFinished( false ); jobFinished( false );
} }
} }
@ -356,7 +356,7 @@ void K3bIsoImager::startSizeCalculation()
m_mkisofsPrintSizeResult = 0; m_mkisofsPrintSizeResult = 0;
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR );
cleanup(); cleanup();
jobFinished( false ); jobFinished( false );
@ -410,8 +410,8 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished()
emit debuggingOutput( "K3bIsoImager", emit debuggingOutput( "K3bIsoImager",
TQString("mkisofs print size result: %1 (%2 bytes)") TQString("mkisofs print size result: %1 (%2 bytes)")
.tqarg(m_mkisofsPrintSizeResult) .arg(m_mkisofsPrintSizeResult)
.tqarg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) ); .arg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) );
cleanup(); cleanup();
@ -496,7 +496,7 @@ void K3bIsoImager::start()
if( m_fdToWriteTo == -1 ) { if( m_fdToWriteTo == -1 ) {
d->imageFile.setName( d->imagePath ); d->imageFile.setName( d->imagePath );
if( !d->imageFile.open( IO_WriteOnly ) ) { if( !d->imageFile.open( IO_WriteOnly ) ) {
emit infoMessage( i18n("Could not open %1 for writing").tqarg(d->imagePath), ERROR ); emit infoMessage( i18n("Could not open %1 for writing").arg(d->imagePath), ERROR );
cleanup(); cleanup();
jobFinished(false); jobFinished(false);
return; return;
@ -532,7 +532,7 @@ void K3bIsoImager::start()
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
kdDebug() << "(K3bIsoImager) could not start mkisofs" << endl; kdDebug() << "(K3bIsoImager) could not start mkisofs" << endl;
emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR );
jobFinished( false ); jobFinished( false );
cleanup(); cleanup();
} }
@ -814,7 +814,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream
// now create the graft points // now create the graft points
int num = 0; int num = 0;
for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) {
K3bDataItem* item = it.current(); K3bDataItem* item = it.current();
bool writeItem = item->writeToCd(); bool writeItem = item->writeToCd();
@ -828,14 +828,14 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream
TQFileInfo f( K3b::resolveLink( item->localPath() ) ); TQFileInfo f( K3b::resolveLink( item->localPath() ) );
if( !f.exists() ) { if( !f.exists() ) {
emit infoMessage( i18n("Could not follow link %1 to non-existing file %2. Skipping...") emit infoMessage( i18n("Could not follow link %1 to non-existing file %2. Skipping...")
.tqarg(item->k3bName()) .arg(item->k3bName())
.tqarg(f.filePath()), WARNING ); .arg(f.filePath()), WARNING );
writeItem = false; writeItem = false;
} }
else if( f.isDir() ) { else if( f.isDir() ) {
emit infoMessage( i18n("Ignoring link %1 to folder %2. K3b is unable to follow links to folders.") emit infoMessage( i18n("Ignoring link %1 to folder %2. K3b is unable to follow links to folders.")
.tqarg(item->k3bName()) .arg(item->k3bName())
.tqarg(f.filePath()), WARNING ); .arg(f.filePath()), WARNING );
writeItem = false; writeItem = false;
} }
} }
@ -843,11 +843,11 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream
else if( item->isFile() ) { else if( item->isFile() ) {
TQFileInfo f( item->localPath() ); TQFileInfo f( item->localPath() );
if( !f.exists() ) { if( !f.exists() ) {
emit infoMessage( i18n("Could not find file %1. Skipping...").tqarg(item->localPath()), WARNING ); emit infoMessage( i18n("Could not find file %1. Skipping...").arg(item->localPath()), WARNING );
writeItem = false; writeItem = false;
} }
else if( !f.isReadable() ) { else if( !f.isReadable() ) {
emit infoMessage( i18n("Could not read file %1. Skipping...").tqarg(item->localPath()), WARNING ); emit infoMessage( i18n("Could not read file %1. Skipping...").arg(item->localPath()), WARNING );
writeItem = false; writeItem = false;
} }
} }
@ -895,7 +895,7 @@ void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream
temp.unlink(); temp.unlink();
if( !KIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) { if( !KIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) {
emit infoMessage( i18n("Failed to backup boot image file %1").tqarg(item->localPath()), ERROR ); emit infoMessage( i18n("Failed to backup boot image file %1").arg(item->localPath()), ERROR );
return; return;
} }

6
libk3b/projects/datacd/k3bmkisofshandler.cpp
Unescape View File

@ -61,7 +61,7 @@ const K3bExternalBin* K3bMkisofsHandler::initMkisofs()
if( d->mkisofsBin ) { if( d->mkisofsBin ) {
if( !d->mkisofsBin->copyright.isEmpty() ) if( !d->mkisofsBin->copyright.isEmpty() )
handleMkisofsInfoMessage( i18n("Using %1 %2 - Copyright (C) %3") handleMkisofsInfoMessage( i18n("Using %1 %2 - Copyright (C) %3")
.tqarg("mkisofs").tqarg(d->mkisofsBin->version).tqarg(d->mkisofsBin->copyright), .arg("mkisofs").arg(d->mkisofsBin->version).arg(d->mkisofsBin->copyright),
K3bJob::INFO ); K3bJob::INFO );
d->firstProgressValue = -1; d->firstProgressValue = -1;
@ -83,7 +83,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line )
// error or warning // error or warning
TQString errorLine = line.mid( d->mkisofsBin->path.length() + 2 ); TQString errorLine = line.mid( d->mkisofsBin->path.length() + 2 );
if( errorLine.startsWith( "Input/output error. Cannot read from" ) ) { if( errorLine.startsWith( "Input/output error. Cannot read from" ) ) {
handleMkisofsInfoMessage( i18n("Read error from file '%1'").tqarg( errorLine.mid( 38, errorLine.length()-40 ) ), handleMkisofsInfoMessage( i18n("Read error from file '%1'").arg( errorLine.mid( 38, errorLine.length()-40 ) ),
K3bJob::ERROR ); K3bJob::ERROR );
d->readError = true; d->readError = true;
} }
@ -103,7 +103,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line )
} }
else if( line.startsWith( "Incorrectly encoded string" ) ) { else if( line.startsWith( "Incorrectly encoded string" ) ) {
handleMkisofsInfoMessage( i18n("Encountered an incorrectly encoded filename '%1'") handleMkisofsInfoMessage( i18n("Encountered an incorrectly encoded filename '%1'")
.tqarg(line.section( TQRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR ); .arg(line.section( TQRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR );
handleMkisofsInfoMessage( i18n("This may be caused by a system update which changed the local character set."), K3bJob::ERROR ); handleMkisofsInfoMessage( i18n("This may be caused by a system update which changed the local character set."), K3bJob::ERROR );
handleMkisofsInfoMessage( i18n("You may use convmv (http://j3e.de/linux/convmv/) to fix the filename encoding."), K3bJob::ERROR ); handleMkisofsInfoMessage( i18n("You may use convmv (http://j3e.de/linux/convmv/) to fix the filename encoding."), K3bJob::ERROR );
d->readError = true; d->readError = true;

10
libk3b/projects/datacd/k3bmsinfofetcher.cpp
Unescape View File

@ -53,7 +53,7 @@ void K3bMsInfoFetcher::start()
if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) { if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) {
kdDebug() << "(K3bMsInfoFetcher) could not find cdrecord executable" << endl; kdDebug() << "(K3bMsInfoFetcher) could not find cdrecord executable" << endl;
emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), K3bJob::ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), K3bJob::ERROR );
jobFinished(false); jobFinished(false);
return; return;
} }
@ -89,7 +89,7 @@ void K3bMsInfoFetcher::getMsInfo()
bin = k3bcore->externalBinManager()->binObject( "cdrecord" ); bin = k3bcore->externalBinManager()->binObject( "cdrecord" );
if( !bin ) { if( !bin ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR );
jobFinished(false); jobFinished(false);
return; return;
} }
@ -97,7 +97,7 @@ void K3bMsInfoFetcher::getMsInfo()
*m_process << bin->path; *m_process << bin->path;
// add the device (e.g. /dev/sg1) // add the device (e.g. /dev/sg1)
*m_process << TQString("dev=%1").tqarg( K3b::externalBinDeviceParameter(m_device, bin) ); *m_process << TQString("dev=%1").arg( K3b::externalBinDeviceParameter(m_device, bin) );
*m_process << "-msinfo"; *m_process << "-msinfo";
@ -128,7 +128,7 @@ void K3bMsInfoFetcher::getMsInfo()
m_canceled = false; m_canceled = false;
if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
emit infoMessage( i18n("Could not start %1.").tqarg(bin->name()), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg(bin->name()), K3bJob::ERROR );
jobFinished(false); jobFinished(false);
} }
} }
@ -161,7 +161,7 @@ void K3bMsInfoFetcher::slotMediaDetectionFinished( K3bDevice::DeviceHandler* h )
} }
else { else {
emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.") emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.")
.tqarg( m_device->vendor() + " " + m_device->description() ), ERROR ); .arg( m_device->vendor() + " " + m_device->description() ), ERROR );
jobFinished( false ); jobFinished( false );
} }
} }

10
libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
Unescape View File

@ -118,7 +118,7 @@ void K3bDvdBooktypeJob::start()
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY, K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY,
K3bDevice::MEDIA_DVD_PLUS_RW|K3bDevice::MEDIA_DVD_PLUS_R, K3bDevice::MEDIA_DVD_PLUS_RW|K3bDevice::MEDIA_DVD_PLUS_R,
i18n("Please insert an empty DVD+R or a DVD+RW medium into drive<p><b>%1 %2 (%3)</b>.") i18n("Please insert an empty DVD+R or a DVD+RW medium into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) { .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) {
emit canceled(); emit canceled();
jobFinished(false); jobFinished(false);
d->running = false; d->running = false;
@ -189,7 +189,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p )
d->success = true; d->success = true;
} }
else { else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdBooktypeBin->name()).tqarg(p->exitStatus()), emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdBooktypeBin->name()).arg(p->exitStatus()),
K3bJob::ERROR ); K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
@ -197,7 +197,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p )
} }
} }
else { else {
emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdBooktypeBin->name()), emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdBooktypeBin->name()),
ERROR ); ERROR );
d->success = false; d->success = false;
} }
@ -285,7 +285,7 @@ void K3bDvdBooktypeJob::startBooktypeChange()
d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" ); d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" );
if( !d->dvdBooktypeBin ) { if( !d->dvdBooktypeBin ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg("dvd+rw-booktype"), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-booktype"), ERROR );
d->running = false; d->running = false;
jobFinished(false); jobFinished(false);
return; return;
@ -338,7 +338,7 @@ void K3bDvdBooktypeJob::startBooktypeChange()
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdBooktypeBin->name()), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg(d->dvdBooktypeBin->name()), K3bJob::ERROR );
d->running = false; d->running = false;
jobFinished(false); jobFinished(false);
} }

24
libk3b/projects/datadvd/k3bdvdjob.cpp
Unescape View File

@ -243,8 +243,8 @@ bool K3bDvdJob::waitForMedium()
if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. " if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. "
"Do you really want to continue? The media will be written " "Do you really want to continue? The media will be written "
"for real.") "for real.")
.tqarg(m_doc->burner()->vendor()) .arg(m_doc->burner()->vendor())
.tqarg(m_doc->burner()->description()), .arg(m_doc->burner()->description()),
i18n("No Simulation with DVD-R(W)") ) ) { i18n("No Simulation with DVD-R(W)") ) ) {
return false; return false;
} }
@ -271,7 +271,7 @@ bool K3bDvdJob::waitForMedium()
if( m_doc->writingMode() == K3b::DAO ) if( m_doc->writingMode() == K3b::DAO )
// || ( m_doc->writingMode() == K3b::WRITING_MODE_AUTO && // || ( m_doc->writingMode() == K3b::WRITING_MODE_AUTO &&
// usedMultiSessionMode() == K3bDataDoc::NONE ) ) // usedMultiSessionMode() == K3bDataDoc::NONE ) )
emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
else { else {
// check if the writer supports writing sequential and thus multisession (on -1 the burner cannot handle // check if the writer supports writing sequential and thus multisession (on -1 the burner cannot handle
@ -279,14 +279,14 @@ bool K3bDvdJob::waitForMedium()
if( m_doc->burner()->featureCurrent( K3bDevice::FEATURE_INCREMENTAL_STREAMING_WRITABLE ) == 0 ) { if( m_doc->burner()->featureCurrent( K3bDevice::FEATURE_INCREMENTAL_STREAMING_WRITABLE ) == 0 ) {
if( !questionYesNo( i18n("Your writer (%1 %2) does not support Incremental Streaming with %3 " if( !questionYesNo( i18n("Your writer (%1 %2) does not support Incremental Streaming with %3 "
"media. Multisession will not be possible. Continue anyway?") "media. Multisession will not be possible. Continue anyway?")
.tqarg(m_doc->burner()->vendor()) .arg(m_doc->burner()->vendor())
.tqarg(m_doc->burner()->description()) .arg(m_doc->burner()->description())
.tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), .arg( K3bDevice::mediaTypeString(foundMedium, true) ),
i18n("No Incremental Streaming") ) ) { i18n("No Incremental Streaming") ) ) {
return false; return false;
} }
else { else {
emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
} }
} }
else { else {
@ -294,7 +294,7 @@ bool K3bDvdJob::waitForMedium()
m_doc->writingMode() == K3b::WRITING_MODE_RES_OVWR ) m_doc->writingMode() == K3b::WRITING_MODE_RES_OVWR )
emit infoMessage( i18n("Restricted Overwrite is not possible with DVD-R media."), INFO ); emit infoMessage( i18n("Restricted Overwrite is not possible with DVD-R media."), INFO );
emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
} }
} }
} }
@ -315,13 +315,13 @@ TQString K3bDvdJob::jobDescription() const
return i18n("Writing Data DVD") return i18n("Writing Data DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty() + ( m_doc->isoOptions().volumeID().isEmpty()
? TQString() ? TQString()
: TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
} }
else { else {
return i18n("Writing Multisession DVD") return i18n("Writing Multisession DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty() + ( m_doc->isoOptions().volumeID().isEmpty()
? TQString() ? TQString()
: TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
} }
} }
@ -335,10 +335,10 @@ TQString K3bDvdJob::jobDetails() const
return i18n("ISO9660 Filesystem (Size: %1) - %n copy", return i18n("ISO9660 Filesystem (Size: %1) - %n copy",
"ISO9660 Filesystem (Size: %1) - %n copies", "ISO9660 Filesystem (Size: %1) - %n copies",
m_doc->copies()) m_doc->copies())
.tqarg(KIO::convertSize( m_doc->size() )); .arg(KIO::convertSize( m_doc->size() ));
else else
return i18n("ISO9660 Filesystem (Size: %1)") return i18n("ISO9660 Filesystem (Size: %1)")
.tqarg(KIO::convertSize( m_doc->size() )); .arg(KIO::convertSize( m_doc->size() ));
} }
#include "k3bdvdjob.moc" #include "k3bdvdjob.moc"

58
libk3b/projects/k3bcdrdaowriter.cpp
Unescape View File

@ -253,7 +253,7 @@ void K3bCdrdaoWriter::setWriteArguments()
{ {
*m_process << "--driver"; *m_process << "--driver";
if( burnDevice()->cdTextCapable() == 1 ) if( burnDevice()->cdTextCapable() == 1 )
*m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() ); *m_process << TQString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() );
else else
*m_process << burnDevice()->cdrdaoDriver(); *m_process << burnDevice()->cdrdaoDriver();
} }
@ -264,7 +264,7 @@ void K3bCdrdaoWriter::setWriteArguments()
// burn speed // burn speed
if( d->usedSpeed != 0 ) if( d->usedSpeed != 0 )
*m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed); *m_process << "--speed" << TQString("%1").arg(d->usedSpeed);
//simulate //simulate
if( simulate() ) if( simulate() )
@ -283,7 +283,7 @@ void K3bCdrdaoWriter::setWriteArguments()
if( m_cdrdaoBinObject->hasFeature( "disable-burnproof" ) ) if( m_cdrdaoBinObject->hasFeature( "disable-burnproof" ) )
*m_process << "--buffer-under-run-protection" << "0"; *m_process << "--buffer-under-run-protection" << "0";
else else
emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").tqarg(m_cdrdaoBinObject->version), WARNING ); emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").arg(m_cdrdaoBinObject->version), WARNING );
} }
if( k3bcore->globalSettings()->force() ) { if( k3bcore->globalSettings()->force() ) {
@ -307,7 +307,7 @@ void K3bCdrdaoWriter::setWriteArguments()
if( m_cdrdaoBinObject->hasFeature("overburn") ) if( m_cdrdaoBinObject->hasFeature("overburn") )
*m_process << "--overburn"; *m_process << "--overburn";
else else
emit infoMessage( i18n("Cdrdao %1 does not support overburning.").tqarg(m_cdrdaoBinObject->version), WARNING ); emit infoMessage( i18n("Cdrdao %1 does not support overburning.").arg(m_cdrdaoBinObject->version), WARNING );
} }
} }
@ -342,17 +342,17 @@ void K3bCdrdaoWriter::setReadArguments()
// TAO Source Adjust // TAO Source Adjust
if ( m_taoSourceAdjust != -1 ) if ( m_taoSourceAdjust != -1 )
*m_process << "--tao-source-adjust" *m_process << "--tao-source-adjust"
<< TQString("%1").tqarg(m_taoSourceAdjust); << TQString("%1").arg(m_taoSourceAdjust);
// paranoia Mode // paranoia Mode
if ( m_paranoiaMode != -1 ) if ( m_paranoiaMode != -1 )
*m_process << "--paranoia-mode" *m_process << "--paranoia-mode"
<< TQString("%1").tqarg(m_paranoiaMode); << TQString("%1").arg(m_paranoiaMode);
// session // session
if ( m_session != -1 ) if ( m_session != -1 )
*m_process << "--session" *m_process << "--session"
<< TQString("%1").tqarg(m_session); << TQString("%1").arg(m_session);
// fast TOC // fast TOC
if ( m_fastToc ) if ( m_fastToc )
@ -386,7 +386,7 @@ void K3bCdrdaoWriter::setBlankArguments()
{ {
*m_process << "--driver"; *m_process << "--driver";
if( burnDevice()->cdTextCapable() == 1 ) if( burnDevice()->cdTextCapable() == 1 )
*m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() ); *m_process << TQString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() );
else else
*m_process << burnDevice()->cdrdaoDriver(); *m_process << burnDevice()->cdrdaoDriver();
} }
@ -397,7 +397,7 @@ void K3bCdrdaoWriter::setBlankArguments()
// burn speed // burn speed
if( d->usedSpeed != 0 ) if( d->usedSpeed != 0 )
*m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed); *m_process << "--speed" << TQString("%1").arg(d->usedSpeed);
// blank-mode // blank-mode
*m_process << "--blank-mode"; *m_process << "--blank-mode";
@ -432,7 +432,7 @@ void K3bCdrdaoWriter::setCommonArguments()
*m_process << "--eject"; *m_process << "--eject";
// remote // remote
*m_process << "--remote" << TQString("%1").tqarg(m_cdrdaoComm[0]); *m_process << "--remote" << TQString("%1").arg(m_cdrdaoComm[0]);
// data File // data File
if ( ! m_dataFile.isEmpty() ) if ( ! m_dataFile.isEmpty() )
@ -475,7 +475,7 @@ void K3bCdrdaoWriter::start()
m_cdrdaoBinObject = k3bcore->externalBinManager()->binObject("cdrdao"); m_cdrdaoBinObject = k3bcore->externalBinManager()->binObject("cdrdao");
if( !m_cdrdaoBinObject ) { if( !m_cdrdaoBinObject ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrdao"), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("cdrdao"), ERROR );
jobFinished(false); jobFinished(false);
return; return;
} }
@ -483,7 +483,7 @@ void K3bCdrdaoWriter::start()
emit debuggingOutput( "Used versions", "cdrdao: " + m_cdrdaoBinObject->version ); emit debuggingOutput( "Used versions", "cdrdao: " + m_cdrdaoBinObject->version );
if( !m_cdrdaoBinObject->copyright.isEmpty() ) if( !m_cdrdaoBinObject->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(m_cdrdaoBinObject->name()).tqarg(m_cdrdaoBinObject->version).tqarg(m_cdrdaoBinObject->copyright), INFO ); emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(m_cdrdaoBinObject->name()).arg(m_cdrdaoBinObject->version).arg(m_cdrdaoBinObject->copyright), INFO );
// the message size changed in cdrdao 1.1.8) // the message size changed in cdrdao 1.1.8)
@ -582,7 +582,7 @@ void K3bCdrdaoWriter::start()
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
kdDebug() << "(K3bCdrdaoWriter) could not start cdrdao" << endl; kdDebug() << "(K3bCdrdaoWriter) could not start cdrdao" << endl;
emit infoMessage( i18n("Could not start %1.").tqarg("cdrdao"), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg("cdrdao"), K3bJob::ERROR );
jobFinished(false); jobFinished(false);
} }
else else
@ -592,13 +592,13 @@ void K3bCdrdaoWriter::start()
case WRITE: case WRITE:
if( simulate() ) if( simulate() )
{ {
emit infoMessage(i18n("Starting DAO simulation at %1x speed...").tqarg(d->usedSpeed), emit infoMessage(i18n("Starting DAO simulation at %1x speed...").arg(d->usedSpeed),
K3bJob::INFO ); K3bJob::INFO );
emit newTask( i18n("Simulating") ); emit newTask( i18n("Simulating") );
} }
else else
{ {
emit infoMessage( i18n("Starting DAO writing at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit infoMessage( i18n("Starting DAO writing at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Writing") ); emit newTask( i18n("Writing") );
} }
break; break;
@ -609,12 +609,12 @@ void K3bCdrdaoWriter::start()
case COPY: case COPY:
if( simulate() ) if( simulate() )
{ {
emit infoMessage(i18n("Starting simulation copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit infoMessage(i18n("Starting simulation copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Simulating") ); emit newTask( i18n("Simulating") );
} }
else else
{ {
emit infoMessage( i18n("Starting copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit infoMessage( i18n("Starting copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Copying") ); emit newTask( i18n("Copying") );
} }
break; break;
@ -676,8 +676,8 @@ bool K3bCdrdaoWriter::cueSheet()
line = line.mid( pos, endPos-pos ); line = line.mid( pos, endPos-pos );
TQFileInfo fi( TQFileInfo( m_tocFile ).dirPath() + "/" + TQFileInfo( line ).fileName() ); TQFileInfo fi( TQFileInfo( m_tocFile ).dirPath() + "/" + TQFileInfo( line ).fileName() );
TQString binpath = fi.filePath(); TQString binpath = fi.filePath();
kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").tqarg( line ) << endl; kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").arg( line ) << endl;
kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").tqarg( binpath ) << endl; kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").arg( binpath ) << endl;
if ( !fi.exists() ) if ( !fi.exists() )
return false; return false;
@ -691,8 +691,8 @@ bool K3bCdrdaoWriter::cueSheet()
if ( symlink(TQFile::encodeName( m_tocFile ), TQFile::encodeName( tempFile + ".cue") ) == -1 ) if ( symlink(TQFile::encodeName( m_tocFile ), TQFile::encodeName( tempFile + ".cue") ) == -1 )
return false; return false;
kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").tqarg( tempFile ) << endl; kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").arg( tempFile ) << endl;
kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").tqarg( tempFile ) << endl; kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").arg( tempFile ) << endl;
m_binFileLnk = tempFile + ".bin"; m_binFileLnk = tempFile + ".bin";
m_cueFileLnk = tempFile + ".cue"; m_cueFileLnk = tempFile + ".cue";
return true; return true;
@ -733,7 +733,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
{ {
kdDebug() << "(K3bCdrdaoWriter) restoring tocfile " << m_tocFile << " failed." << endl; kdDebug() << "(K3bCdrdaoWriter) restoring tocfile " << m_tocFile << " failed." << endl;
emit infoMessage( i18n("Due to a bug in cdrdao the toc/cue file %1 has been deleted. " emit infoMessage( i18n("Due to a bug in cdrdao the toc/cue file %1 has been deleted. "
"K3b was unable to restore it from the backup %2.").tqarg(m_tocFile).tqarg(m_backupTocFile), ERROR ); "K3b was unable to restore it from the backup %2.").arg(m_tocFile).arg(m_backupTocFile), ERROR );
} }
else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (TQWidget*) 0) ) else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (TQWidget*) 0) )
{ {
@ -775,7 +775,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
if( m_command == WRITE || m_command == COPY ) { if( m_command == WRITE || m_command == COPY ) {
int s = d->speedEst->average(); int s = d->speedEst->average();
emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
} }
jobFinished( true ); jobFinished( true );
@ -783,7 +783,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
default: default:
if( !m_knownError && !wasSourceUnreadable() ) { if( !m_knownError && !wasSourceUnreadable() ) {
emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(m_cdrdaoBinObject->name()).tqarg(p->exitStatus()), emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(m_cdrdaoBinObject->name()).arg(p->exitStatus()),
K3bJob::ERROR ); K3bJob::ERROR );
emit infoMessage( i18n("Please include the debugging output in your problem report."), K3bJob::ERROR ); emit infoMessage( i18n("Please include the debugging output in your problem report."), K3bJob::ERROR );
} }
@ -794,7 +794,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p )
} }
else else
{ {
emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("cdrdao"), K3bJob::ERROR ); emit infoMessage( i18n("%1 did not exit cleanly.").arg("cdrdao"), K3bJob::ERROR );
jobFinished( false ); jobFinished( false );
} }
} }
@ -810,8 +810,8 @@ void K3bCdrdaoWriter::unknownCdrdaoLine( const TQString& line )
int speed = line.mid( pos+9, po2-pos-9 ).toInt(); int speed = line.mid( pos+9, po2-pos-9 ).toInt();
if( speed < d->usedSpeed ) if( speed < d->usedSpeed )
{ {
emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING ); emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING );
emit infoMessage( i18n("Switching down burn speed to %1x").tqarg(speed), K3bJob::WARNING ); emit infoMessage( i18n("Switching down burn speed to %1x").arg(speed), K3bJob::WARNING );
} }
} }
} }
@ -870,7 +870,7 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const TQString& str )
} }
else if( str.startsWith( "Found pre-gap" ) ) else if( str.startsWith( "Found pre-gap" ) )
{ {
emit infoMessage( i18n("Found pregap: %1").tqarg( str.mid(str.find(":")+1) ), K3bJob::INFO ); emit infoMessage( i18n("Found pregap: %1").arg( str.mid(str.find(":")+1) ), K3bJob::INFO );
} }
else else
unknownCdrdaoLine(str); unknownCdrdaoLine(str);
@ -903,7 +903,7 @@ void K3bCdrdaoWriter::parseCdrdaoError( const TQString& line )
} }
else if( (pos = line.find( "Illegal option" )) > 0 ) { else if( (pos = line.find( "Illegal option" )) > 0 ) {
// ERROR: Illegal option: -wurst // ERROR: Illegal option: -wurst
emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrdaoBinObject->name()).tqarg(line.mid(pos+16)), emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrdaoBinObject->name()).arg(line.mid(pos+16)),
ERROR ); ERROR );
m_knownError = true; m_knownError = true;
} }

48
libk3b/projects/k3bcdrecordwriter.cpp
Unescape View File

@ -163,7 +163,7 @@ void K3bCdrecordWriter::prepareProcess()
*m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?) *m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?)
// Again we assume the device to be set! // Again we assume the device to be set!
*m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); *m_process << TQString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
d->usedSpeed = burnSpeed(); d->usedSpeed = burnSpeed();
if( d->usedSpeed == 0 ) { if( d->usedSpeed == 0 ) {
@ -174,7 +174,7 @@ void K3bCdrecordWriter::prepareProcess()
} }
d->usedSpeed /= 175; d->usedSpeed /= 175;
if( d->usedSpeed != 0 ) if( d->usedSpeed != 0 )
*m_process << TQString("speed=%1").tqarg(d->usedSpeed); *m_process << TQString("speed=%1").arg(d->usedSpeed);
if( m_writingMode == K3b::DAO || m_cue ) { if( m_writingMode == K3b::DAO || m_cue ) {
if( burnDevice()->dao() ) if( burnDevice()->dao() )
@ -227,7 +227,7 @@ void K3bCdrecordWriter::prepareProcess()
if( m_cue ) { if( m_cue ) {
m_process->setWorkingDirectory(TQUrl(m_cueFile).dirPath()); m_process->setWorkingDirectory(TQUrl(m_cueFile).dirPath());
*m_process << TQString("cuefile=%1").tqarg( m_cueFile ); *m_process << TQString("cuefile=%1").arg( m_cueFile );
} }
if( m_clone ) if( m_clone )
@ -249,7 +249,7 @@ void K3bCdrecordWriter::prepareProcess()
bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
if( manualBufferSize ) { if( manualBufferSize ) {
*m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->bufferSize() ); *m_process << TQString("fs=%1m").arg( k3bcore->globalSettings()->bufferSize() );
} }
bool overburn = k3bcore->globalSettings()->overburn(); bool overburn = k3bcore->globalSettings()->overburn();
@ -257,7 +257,7 @@ void K3bCdrecordWriter::prepareProcess()
if( m_cdrecordBinObject->hasFeature("overburn") ) if( m_cdrecordBinObject->hasFeature("overburn") )
*m_process << "-overburn"; *m_process << "-overburn";
else else
emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), WARNING ); emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), WARNING );
// additional user parameters from config // additional user parameters from config
const TQStringList& params = m_cdrecordBinObject->userParameters(); const TQStringList& params = m_cdrecordBinObject->userParameters();
@ -293,7 +293,7 @@ void K3bCdrecordWriter::start()
prepareProcess(); prepareProcess();
if( !m_cdrecordBinObject ) { if( !m_cdrecordBinObject ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR );
jobFinished(false); jobFinished(false);
return; return;
} }
@ -302,9 +302,9 @@ void K3bCdrecordWriter::start()
if( !m_cdrecordBinObject->copyright.isEmpty() ) if( !m_cdrecordBinObject->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
.tqarg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" ) .arg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" )
.tqarg(m_cdrecordBinObject->version) .arg(m_cdrecordBinObject->version)
.tqarg(m_cdrecordBinObject->copyright), INFO ); .arg(m_cdrecordBinObject->copyright), INFO );
kdDebug() << "***** " << m_cdrecordBinObject->name() << " parameters:\n"; kdDebug() << "***** " << m_cdrecordBinObject->name() << " parameters:\n";
@ -343,22 +343,22 @@ void K3bCdrecordWriter::start()
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
kdDebug() << "(K3bCdrecordWriter) could not start " << m_cdrecordBinObject->name() << endl; kdDebug() << "(K3bCdrecordWriter) could not start " << m_cdrecordBinObject->name() << endl;
emit infoMessage( i18n("Could not start %1.").tqarg(m_cdrecordBinObject->name()), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg(m_cdrecordBinObject->name()), K3bJob::ERROR );
jobFinished(false); jobFinished(false);
} }
else { else {
if( simulate() ) { if( simulate() ) {
emit newTask( i18n("Simulating") ); emit newTask( i18n("Simulating") );
emit infoMessage( i18n("Starting %1 simulation at %2x speed...") emit infoMessage( i18n("Starting %1 simulation at %2x speed...")
.tqarg(K3b::writingModeString(m_writingMode)) .arg(K3b::writingModeString(m_writingMode))
.tqarg(d->usedSpeed), .arg(d->usedSpeed),
K3bJob::INFO ); K3bJob::INFO );
} }
else { else {
emit newTask( i18n("Writing") ); emit newTask( i18n("Writing") );
emit infoMessage( i18n("Starting %1 writing at %2x speed...") emit infoMessage( i18n("Starting %1 writing at %2x speed...")
.tqarg(K3b::writingModeString(m_writingMode)) .arg(K3b::writingModeString(m_writingMode))
.tqarg(d->usedSpeed), .arg(d->usedSpeed),
K3bJob::INFO ); K3bJob::INFO );
} }
} }
@ -510,7 +510,7 @@ void K3bCdrecordWriter::slotStdLine( const TQString& line )
// parse option // parse option
int pos = line.find( "Bad Option" ) + 13; int pos = line.find( "Bad Option" ) + 13;
int len = line.length() - pos - 1; int len = line.length() - pos - 1;
emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrecordBinObject->name()).tqarg(line.mid(pos, len)), emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrecordBinObject->name()).arg(line.mid(pos, len)),
ERROR ); ERROR );
} }
else if( errStr.startsWith("Cannot set speed/dummy") ) { else if( errStr.startsWith("Cannot set speed/dummy") ) {
@ -562,11 +562,11 @@ void K3bCdrecordWriter::slotStdLine( const TQString& line )
int pos2 = line.find( "in", pos+9 ); int pos2 = line.find( "in", pos+9 );
int speed = static_cast<int>( line.mid( pos+9, pos2-pos-10 ).toDouble() ); // cdrecord-dvd >= 2.01a25 uses 8.0 and stuff int speed = static_cast<int>( line.mid( pos+9, pos2-pos-10 ).toDouble() ); // cdrecord-dvd >= 2.01a25 uses 8.0 and stuff
if( speed != d->usedSpeed ) { if( speed != d->usedSpeed ) {
emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING ); emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING );
if( speed > d->usedSpeed ) if( speed > d->usedSpeed )
emit infoMessage( i18n("Switching burn speed up to %1x").tqarg(speed), K3bJob::WARNING ); emit infoMessage( i18n("Switching burn speed up to %1x").arg(speed), K3bJob::WARNING );
else else
emit infoMessage( i18n("Switching burn speed down to %1x").tqarg(speed), K3bJob::WARNING ); emit infoMessage( i18n("Switching burn speed down to %1x").arg(speed), K3bJob::WARNING );
} }
} }
else if( line.startsWith( "Starting new" ) ) { else if( line.startsWith( "Starting new" ) ) {
@ -682,7 +682,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
emit infoMessage( i18n("Writing successfully completed"), K3bJob::SUCCESS ); emit infoMessage( i18n("Writing successfully completed"), K3bJob::SUCCESS );
int s = d->speedEst->average(); int s = d->speedEst->average();
emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
jobFinished( true ); jobFinished( true );
} }
@ -709,14 +709,14 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
// error message has already been emited earlier since we needed the actual line // error message has already been emited earlier since we needed the actual line
break; break;
case SHMGET_FAILED: case SHMGET_FAILED:
emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").tqarg(m_cdrecordBinObject->name()), ERROR ); emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").arg(m_cdrecordBinObject->name()), ERROR );
emit infoMessage( i18n("Probably you chose a too large buffer size."), ERROR ); emit infoMessage( i18n("Probably you chose a too large buffer size."), ERROR );
break; break;
case OPC_FAILED: case OPC_FAILED:
emit infoMessage( i18n("OPC failed. Probably the writer does not like the medium."), ERROR ); emit infoMessage( i18n("OPC failed. Probably the writer does not like the medium."), ERROR );
break; break;
case CANNOT_SET_SPEED: case CANNOT_SET_SPEED:
emit infoMessage( i18n("Unable to set write speed to %1.").tqarg(d->usedSpeed), ERROR ); emit infoMessage( i18n("Unable to set write speed to %1.").arg(d->usedSpeed), ERROR );
emit infoMessage( i18n("Probably this is lower than your writer's lowest writing speed."), ERROR ); emit infoMessage( i18n("Probably this is lower than your writer's lowest writing speed."), ERROR );
break; break;
case CANNOT_SEND_CUE_SHEET: case CANNOT_SEND_CUE_SHEET:
@ -734,7 +734,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
emit infoMessage( i18n("Try DAO writing mode."), ERROR ); emit infoMessage( i18n("Try DAO writing mode."), ERROR );
break; break;
case PERMISSION_DENIED: case PERMISSION_DENIED:
emit infoMessage( i18n("%1 has no permission to open the device.").tqarg("Cdrecord"), ERROR ); emit infoMessage( i18n("%1 has no permission to open the device.").arg("Cdrecord"), ERROR );
#ifdef HAVE_K3BSETUP #ifdef HAVE_K3BSETUP
emit infoMessage( i18n("You may use K3bsetup2 to solve this problem."), ERROR ); emit infoMessage( i18n("You may use K3bsetup2 to solve this problem."), ERROR );
#endif #endif
@ -776,7 +776,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
} }
else if( !wasSourceUnreadable() ) { else if( !wasSourceUnreadable() ) {
emit infoMessage( i18n("%1 returned an unknown error (code %2).") emit infoMessage( i18n("%1 returned an unknown error (code %2).")
.tqarg(m_cdrecordBinObject->name()).tqarg(p->exitStatus()), .arg(m_cdrecordBinObject->name()).arg(p->exitStatus()),
K3bJob::ERROR ); K3bJob::ERROR );
if( p->exitStatus() >= 254 && m_writingMode == K3b::DAO ) { if( p->exitStatus() >= 254 && m_writingMode == K3b::DAO ) {
@ -795,7 +795,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p )
} }
} }
else { else {
emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(m_cdrecordBinObject->name()), emit infoMessage( i18n("%1 did not exit cleanly.").arg(m_cdrecordBinObject->name()),
ERROR ); ERROR );
jobFinished( false ); jobFinished( false );
} }

8
libk3b/projects/k3bdvdrecordwriter.cpp
Unescape View File

@ -66,8 +66,8 @@ void K3bDvdrecordWriter::prepareProcess()
*m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?) *m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?)
// Again we assume the device to be set! // Again we assume the device to be set!
*m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); *m_process << TQString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
*m_process << TQString("speed=%1").tqarg(burnSpeed()); *m_process << TQString("speed=%1").arg(burnSpeed());
// DVDs are only written in DAO mode (and Packet, but we do not support that since it does not // DVDs are only written in DAO mode (and Packet, but we do not support that since it does not
// make much sense here) // make much sense here)
@ -95,7 +95,7 @@ void K3bDvdrecordWriter::prepareProcess()
bool manualBufferSize = k3bcore->globalSettings()->manualBufferSize(); bool manualBufferSize = k3bcore->globalSettings()->manualBufferSize();
if( manualBufferSize ) { if( manualBufferSize ) {
*m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->writingBuffer() ); *m_process << TQString("fs=%1m").arg( k3bcore->globalSettings()->writingBuffer() );
} }
bool overburn = k3bcore->globalSettings()->overburn(); bool overburn = k3bcore->globalSettings()->overburn();
@ -103,7 +103,7 @@ void K3bDvdrecordWriter::prepareProcess()
if( m_cdrecordBinObject->hasFeature("overburn") ) if( m_cdrecordBinObject->hasFeature("overburn") )
*m_process << "-overburn"; *m_process << "-overburn";
else else
emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), INFO ); emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), INFO );
// additional user parameters from config // additional user parameters from config
const TQStringList& params = m_cdrecordBinObject->userParameters(); const TQStringList& params = m_cdrecordBinObject->userParameters();

8
libk3b/projects/k3bgrowisofshandler.cpp
Unescape View File

@ -177,8 +177,8 @@ void K3bGrowisofsHandler::handleLine( const TQString& line )
double speed = line.mid( pos, endPos-pos ).toDouble(&ok); double speed = line.mid( pos, endPos-pos ).toDouble(&ok);
if( ok ) if( ok )
emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)") emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)")
.tqarg((int)(speed*1385.0)) .arg((int)(speed*1385.0))
.tqarg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO );
else else
kdDebug() << "(K3bGrowisofsHandler) parsing error: '" << line.mid( pos, endPos-pos ) << "'" << endl; kdDebug() << "(K3bGrowisofsHandler) parsing error: '" << line.mid( pos, endPos-pos ) << "'" << endl;
} }
@ -274,7 +274,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode )
// for now we just emit a message with the error // for now we just emit a message with the error
// in the future when I know more about what kinds of errors may occur // in the future when I know more about what kinds of errors may occur
// we will enhance this // we will enhance this
emit infoMessage( i18n("Fatal error at startup: %1").tqarg(strerror(exitCode-128)), emit infoMessage( i18n("Fatal error at startup: %1").arg(strerror(exitCode-128)),
K3bJob::ERROR ); K3bJob::ERROR );
} }
else if( exitCode == 1 ) { else if( exitCode == 1 ) {
@ -286,7 +286,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode )
emit infoMessage( i18n("Most likely mkisofs failed in some way."), K3bJob::ERROR ); emit infoMessage( i18n("Most likely mkisofs failed in some way."), K3bJob::ERROR );
} }
else { else {
emit infoMessage( i18n("Fatal error during recording: %1").tqarg(strerror(exitCode)), emit infoMessage( i18n("Fatal error during recording: %1").arg(strerror(exitCode)),
K3bJob::ERROR ); K3bJob::ERROR );
} }
} }

18
libk3b/projects/k3bgrowisofswriter.cpp
Unescape View File

@ -155,13 +155,13 @@ bool K3bGrowisofsWriter::prepareProcess()
{ {
d->growisofsBin = k3bcore->externalBinManager()->binObject( "growisofs" ); d->growisofsBin = k3bcore->externalBinManager()->binObject( "growisofs" );
if( !d->growisofsBin ) { if( !d->growisofsBin ) {
emit infoMessage( i18n("Could not find %1 executable.").tqarg("growisofs"), ERROR ); emit infoMessage( i18n("Could not find %1 executable.").arg("growisofs"), ERROR );
return false; return false;
} }
if( d->growisofsBin->version < K3bVersion( 5, 10 ) ) { if( d->growisofsBin->version < K3bVersion( 5, 10 ) ) {
emit infoMessage( i18n("Growisofs version %1 is too old. " emit infoMessage( i18n("Growisofs version %1 is too old. "
"K3b needs at least version 5.10.").tqarg(d->growisofsBin->version), "K3b needs at least version 5.10.").arg(d->growisofsBin->version),
ERROR ); ERROR );
return false; return false;
} }
@ -169,8 +169,8 @@ bool K3bGrowisofsWriter::prepareProcess()
emit debuggingOutput( "Used versions", "growisofs: " + d->growisofsBin->version ); emit debuggingOutput( "Used versions", "growisofs: " + d->growisofsBin->version );
if( !d->growisofsBin->copyright.isEmpty() ) if( !d->growisofsBin->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg("growisofs") emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg("growisofs")
.tqarg(d->growisofsBin->version).tqarg(d->growisofsBin->copyright), INFO ); .arg(d->growisofsBin->version).arg(d->growisofsBin->copyright), INFO );
// //
@ -234,7 +234,7 @@ bool K3bGrowisofsWriter::prepareProcess()
d->inputFile.setName( d->image ); d->inputFile.setName( d->image );
d->trackSize = (K3b::filesize( d->image ) + 1024) / 2048; d->trackSize = (K3b::filesize( d->image ) + 1024) / 2048;
if( !d->inputFile.open( IO_ReadOnly ) ) { if( !d->inputFile.open( IO_ReadOnly ) ) {
emit infoMessage( i18n("Could not open file %1.").tqarg(d->image), ERROR ); emit infoMessage( i18n("Could not open file %1.").arg(d->image), ERROR );
return false; return false;
} }
} }
@ -299,7 +299,7 @@ bool K3bGrowisofsWriter::prepareProcess()
// speed may be a float number. example: DVD+R(W): 2.4x // speed may be a float number. example: DVD+R(W): 2.4x
if( speed != 0 ) if( speed != 0 )
*d->process << TQString("-speed=%1").tqarg( speed%1385 > 0 *d->process << TQString("-speed=%1").arg( speed%1385 > 0
? TQString::number( (float)speed/1385.0, 'f', 1 ) ? TQString::number( (float)speed/1385.0, 'f', 1 )
: TQString::number( speed/1385 ) ); : TQString::number( speed/1385 ) );
} }
@ -310,7 +310,7 @@ bool K3bGrowisofsWriter::prepareProcess()
if( !d->usingRingBuffer && d->growisofsBin->version >= K3bVersion( 6, 0 ) ) { if( !d->usingRingBuffer && d->growisofsBin->version >= K3bVersion( 6, 0 ) ) {
bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
int bufSize = ( manualBufferSize ? k3bcore->globalSettings()->bufferSize() : 32 ); int bufSize = ( manualBufferSize ? k3bcore->globalSettings()->bufferSize() : 32 );
*d->process << TQString("-use-the-force-luke=bufsize:%1m").tqarg(bufSize); *d->process << TQString("-use-the-force-luke=bufsize:%1m").arg(bufSize);
} }
// additional user parameters from config // additional user parameters from config
@ -374,7 +374,7 @@ void K3bGrowisofsWriter::start()
// something went wrong when starting the program // something went wrong when starting the program
// it "should" be the executable // it "should" be the executable
kdDebug() << "(K3bGrowisofsWriter) could not start " << d->growisofsBin->path << endl; kdDebug() << "(K3bGrowisofsWriter) could not start " << d->growisofsBin->path << endl;
emit infoMessage( i18n("Could not start %1.").tqarg(d->growisofsBin->name()), K3bJob::ERROR ); emit infoMessage( i18n("Could not start %1.").arg(d->growisofsBin->name()), K3bJob::ERROR );
jobFinished(false); jobFinished(false);
} }
else { else {
@ -551,7 +551,7 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p )
int s = d->speedEst->average(); int s = d->speedEst->average();
if( s > 0 ) if( s > 0 )
emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)") emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)")
.tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO ); .arg(s).arg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO );
if( simulate() ) if( simulate() )
emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS ); emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS );

2
libk3b/projects/k3binffilewriter.cpp
Unescape View File

@ -130,7 +130,7 @@ bool K3bInfFileWriter::save( TQTextStream& s )
s << "Index0=\t\t" << m_index0 << endl; s << "Index0=\t\t" << m_index0 << endl;
return ( s.tqdevice()->status() == IO_Ok ); return ( s.device()->status() == IO_Ok );
} }

2
libk3b/projects/k3btocfilewriter.cpp
Unescape View File

@ -149,7 +149,7 @@ bool K3bTocFileWriter::save( TQTextStream& t )
trackIndex++; trackIndex++;
} }
return ( t.tqdevice()->status() == IO_Ok ); return ( t.device()->status() == IO_Ok );
} }

46
libk3b/projects/mixedcd/k3bmixedjob.cpp
Unescape View File

@ -271,7 +271,7 @@ void K3bMixedJob::startFirstCopy()
else { else {
emit burning(false); emit burning(false);
emit infoMessage( i18n("Creating audio image files in %1").tqarg(m_doc->tempDir()), INFO ); emit infoMessage( i18n("Creating audio image files in %1").arg(m_doc->tempDir()), INFO );
m_tempFilePrefix = K3b::findUniqueFilePrefix( ( !m_doc->audioDoc()->title().isEmpty() m_tempFilePrefix = K3b::findUniqueFilePrefix( ( !m_doc->audioDoc()->title().isEmpty()
? m_doc->audioDoc()->title() ? m_doc->audioDoc()->title()
@ -375,8 +375,8 @@ void K3bMixedJob::slotMsInfoFetched( bool success )
m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo() ); m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo() );
else // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord else // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord
m_isoImager->setMultiSessionInfo( TQString("%1,%2") m_isoImager->setMultiSessionInfo( TQString("%1,%2")
.tqarg(m_msInfoFetcher->lastSessionStart()) .arg(m_msInfoFetcher->lastSessionStart())
.tqarg(m_msInfoFetcher->nextSessionStart()+150) ); .arg(m_msInfoFetcher->nextSessionStart()+150) );
if( m_doc->onTheFly() ) { if( m_doc->onTheFly() ) {
m_currentAction = PREPARING_DATA; m_currentAction = PREPARING_DATA;
@ -611,9 +611,9 @@ void K3bMixedJob::slotAudioDecoderNextTrack( int t, int tt )
if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) { if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) {
K3bAudioTrack* track = m_doc->audioDoc()->getTrack(t); K3bAudioTrack* track = m_doc->audioDoc()->getTrack(t);
emit newSubTask( i18n("Decoding audio track %1 of %2%3") emit newSubTask( i18n("Decoding audio track %1 of %2%3")
.tqarg(t) .arg(t)
.tqarg(tt) .arg(tt)
.tqarg( track->title().isEmpty() || track->artist().isEmpty() .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString() ? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) ); : " (" + track->artist() + " - " + track->title() + ")" ) );
} }
@ -850,7 +850,7 @@ void K3bMixedJob::addDataTrack( K3bCdrecordWriter* writer )
writer->addArgument( "-data" ); writer->addArgument( "-data" );
if( m_doc->onTheFly() ) if( m_doc->onTheFly() )
writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-"); writer->addArgument( TQString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-");
else else
writer->addArgument( m_isoImageFilePath ); writer->addArgument( m_isoImageFilePath );
} }
@ -875,13 +875,13 @@ void K3bMixedJob::slotWriterNextTrack( int t, int )
if( track ) if( track )
emit newSubTask( i18n("Writing track %1 of %2%3") emit newSubTask( i18n("Writing track %1 of %2%3")
.tqarg(t) .arg(t)
.tqarg(m_doc->numOfTracks()) .arg(m_doc->numOfTracks())
.tqarg( track->title().isEmpty() || track->artist().isEmpty() .arg( track->title().isEmpty() || track->artist().isEmpty()
? TQString() ? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) ); : " (" + track->artist() + " - " + track->title() + ")" ) );
else else
emit newSubTask( i18n("Writing track %1 of %2 (%3)").tqarg(t).tqarg(m_doc->numOfTracks()).tqarg(i18n("ISO9660 data")) ); emit newSubTask( i18n("Writing track %1 of %2 (%3)").arg(t).arg(m_doc->numOfTracks()).arg(i18n("ISO9660 data")) );
} }
@ -989,7 +989,7 @@ bool K3bMixedJob::startWriting()
if( m_doc->dummy() ) if( m_doc->dummy() )
emit newTask( i18n("Simulating second session") ); emit newTask( i18n("Simulating second session") );
else if( d->copies > 1 ) else if( d->copies > 1 )
emit newTask( i18n("Writing second session of copy %1").tqarg(d->copiesDone+1) ); emit newTask( i18n("Writing second session of copy %1").arg(d->copiesDone+1) );
else else
emit newTask( i18n("Writing second session") ); emit newTask( i18n("Writing second session") );
} }
@ -997,7 +997,7 @@ bool K3bMixedJob::startWriting()
if( m_doc->dummy() ) if( m_doc->dummy() )
emit newTask( i18n("Simulating first session") ); emit newTask( i18n("Simulating first session") );
else if( d->copies > 1 ) else if( d->copies > 1 )
emit newTask( i18n("Writing first session of copy %1").tqarg(d->copiesDone+1) ); emit newTask( i18n("Writing first session of copy %1").arg(d->copiesDone+1) );
else else
emit newTask( i18n("Writing first session") ); emit newTask( i18n("Writing first session") );
} }
@ -1005,7 +1005,7 @@ bool K3bMixedJob::startWriting()
else if( m_doc->dummy() ) else if( m_doc->dummy() )
emit newTask( i18n("Simulating") ); emit newTask( i18n("Simulating") );
else else
emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) );
// if we append the second session the cd is already in the drive // if we append the second session the cd is already in the drive
@ -1070,8 +1070,8 @@ void K3bMixedJob::createIsoImage()
if( !m_doc->onTheFly() ) if( !m_doc->onTheFly() )
emit newTask( i18n("Creating ISO image file") ); emit newTask( i18n("Creating ISO image file") );
emit newSubTask( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath) ); emit newSubTask( i18n("Creating ISO image in %1").arg(m_isoImageFilePath) );
emit infoMessage( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath), INFO ); emit infoMessage( i18n("Creating ISO image in %1").arg(m_isoImageFilePath), INFO );
m_isoImager->writeToImageFile( m_isoImageFilePath ); m_isoImager->writeToImageFile( m_isoImageFilePath );
m_isoImager->start(); m_isoImager->start();
@ -1102,7 +1102,7 @@ void K3bMixedJob::removeBufferFiles()
if( TQFile::exists( m_isoImageFilePath ) ) if( TQFile::exists( m_isoImageFilePath ) )
if( !TQFile::remove( m_isoImageFilePath ) ) if( !TQFile::remove( m_isoImageFilePath ) )
emit infoMessage( i18n("Could not delete file %1.").tqarg(m_isoImageFilePath), ERROR ); emit infoMessage( i18n("Could not delete file %1.").arg(m_isoImageFilePath), ERROR );
// removes buffer images and temp toc or inf files // removes buffer images and temp toc or inf files
m_tempData->cleanup(); m_tempData->cleanup();
@ -1213,7 +1213,7 @@ void K3bMixedJob::determineWritingMode()
if( m_doc->audioDoc()->cdText() ) { if( m_doc->audioDoc()->cdText() ) {
if( !cdrecordCdText ) { if( !cdrecordCdText ) {
m_doc->audioDoc()->writeCdText( false ); m_doc->audioDoc()->writeCdText( false );
emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
} }
else if( m_usedAudioWritingMode == K3b::TAO ) { else if( m_usedAudioWritingMode == K3b::TAO ) {
emit infoMessage( i18n("It is not possible to write CD-Text in TAO mode. Try DAO or RAW."), WARNING ); emit infoMessage( i18n("It is not possible to write CD-Text in TAO mode. Try DAO or RAW."), WARNING );
@ -1316,21 +1316,21 @@ TQString K3bMixedJob::jobDescription() const
return i18n("Writing Enhanced Audio CD") return i18n("Writing Enhanced Audio CD")
+ ( m_doc->audioDoc()->title().isEmpty() + ( m_doc->audioDoc()->title().isEmpty()
? TQString() ? TQString()
: TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) ); : TQString( " (%1)" ).arg(m_doc->audioDoc()->title()) );
else else
return i18n("Writing Mixed Mode CD") return i18n("Writing Mixed Mode CD")
+ ( m_doc->audioDoc()->title().isEmpty() + ( m_doc->audioDoc()->title().isEmpty()
? TQString() ? TQString()
: TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) ); : TQString( " (%1)" ).arg(m_doc->audioDoc()->title()) );
} }
TQString K3bMixedJob::jobDetails() const TQString K3bMixedJob::jobDetails() const
{ {
return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)") return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)")
.tqarg(m_doc->numOfTracks()) .arg(m_doc->numOfTracks())
.tqarg(m_doc->audioDoc()->length().toString()) .arg(m_doc->audioDoc()->length().toString())
.tqarg(KIO::convertSize(m_doc->dataDoc()->size())) .arg(KIO::convertSize(m_doc->dataDoc()->size()))
+ ( m_doc->copies() > 1 && !m_doc->dummy() + ( m_doc->copies() > 1 && !m_doc->dummy()
? i18n(" - %n copy", " - %n copies", m_doc->copies()) ? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) ); : TQString() ) );

2
libk3b/projects/movixcd/k3bmovixdoc.cpp
Unescape View File

@ -417,7 +417,7 @@ void K3bMovixDoc::addSubTitleItem( K3bMovixFileItem* item, const KURL& url )
TQString name = K3bMovixFileItem::subTitleFileName( item->k3bName() ); TQString name = K3bMovixFileItem::subTitleFileName( item->k3bName() );
if( nameAlreadyInDir( name, root() ) ) { if( nameAlreadyInDir( name, root() ) ) {
KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").tqarg(name) ); KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").arg(name) );
return; return;
} }

6
libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
Unescape View File

@ -190,7 +190,7 @@ bool K3bMovixDocPreparer::writePlaylistFile()
return true; return true;
} }
else { else {
emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->playlistFile->name()), ERROR ); emit infoMessage( i18n("Could not write to temporary file %1").arg(d->playlistFile->name()), ERROR );
return false; return false;
} }
} }
@ -229,7 +229,7 @@ bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const TQString& originalPath
return false; return false;
} }
else { else {
emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->isolinuxConfigFile->name()), ERROR ); emit infoMessage( i18n("Could not write to temporary file %1").arg(d->isolinuxConfigFile->name()), ERROR );
return false; return false;
} }
} }
@ -263,7 +263,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile()
return true; return true;
} }
else { else {
emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->movixRcFile->name()), ERROR ); emit infoMessage( i18n("Could not write to temporary file %1").arg(d->movixRcFile->name()), ERROR );
return false; return false;
} }
} }

4
libk3b/projects/movixcd/k3bmovixjob.cpp
Unescape View File

@ -115,7 +115,7 @@ TQString K3bMovixJob::jobDescription() const
if( m_doc->isoOptions().volumeID().isEmpty() ) if( m_doc->isoOptions().volumeID().isEmpty() )
return i18n("Writing eMovix CD"); return i18n("Writing eMovix CD");
else else
return i18n("Writing eMovix CD (%1)").tqarg(m_doc->isoOptions().volumeID()); return i18n("Writing eMovix CD (%1)").arg(m_doc->isoOptions().volumeID());
} }
@ -123,7 +123,7 @@ TQString K3bMovixJob::jobDetails() const
{ {
return ( i18n("1 file (%1) and about 8 MB eMovix data", return ( i18n("1 file (%1) and about 8 MB eMovix data",
"%n files (%1) and about 8 MB eMovix data", "%n files (%1) and about 8 MB eMovix data",
m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size()))
+ ( m_doc->copies() > 1 + ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies()) ? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) ); : TQString() ) );

4
libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
Unescape View File

@ -114,7 +114,7 @@ TQString K3bMovixDvdJob::jobDescription() const
if( m_doc->isoOptions().volumeID().isEmpty() ) if( m_doc->isoOptions().volumeID().isEmpty() )
return i18n("Writing eMovix DVD"); return i18n("Writing eMovix DVD");
else else
return i18n("Writing eMovix DVD (%1)").tqarg(m_doc->isoOptions().volumeID()); return i18n("Writing eMovix DVD (%1)").arg(m_doc->isoOptions().volumeID());
} }
@ -122,7 +122,7 @@ TQString K3bMovixDvdJob::jobDetails() const
{ {
return ( i18n("1 file (%1) and about 8 MB eMovix data", return ( i18n("1 file (%1) and about 8 MB eMovix data",
"%n files (%1) and about 8 MB eMovix data", "%n files (%1) and about 8 MB eMovix data",
m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size()))
+ ( m_doc->copies() > 1 + ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies()) ? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) ); : TQString() ) );

BIN
libk3b/projects/videocd/cdi/cdi_vcd.app
View File

Binary file not shown.

12
libk3b/projects/videocd/k3bvcddoc.cpp
Unescape View File

@ -211,8 +211,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url )
i18n( "K3b will create a %1 image from the given MPEG " i18n( "K3b will create a %1 image from the given MPEG "
"files, but these files must already be in %2 " "files, but these files must already be in %2 "
"format. K3b does not yet resample MPEG files." ) "format. K3b does not yet resample MPEG files." )
.tqarg( i18n( "VCD" ) ) .arg( i18n( "VCD" ) )
.tqarg( i18n( "VCD" ) ), .arg( i18n( "VCD" ) ),
i18n( "Information" ) ); i18n( "Information" ) );
m_urlAddingTimer->start( 0 ); m_urlAddingTimer->start( 0 );
} else if ( vcdType() == NONE ) { } 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 " i18n( "K3b will create a %1 image from the given MPEG "
"files, but these files must already be in %2 " "files, but these files must already be in %2 "
"format. K3b does not yet resample MPEG files." ) "format. K3b does not yet resample MPEG files." )
.tqarg( i18n( "SVCD" ) ) .arg( i18n( "SVCD" ) )
.tqarg( i18n( "SVCD" ) ) .arg( i18n( "SVCD" ) )
+ "\n\n" + "\n\n"
+ i18n( "Note: Forcing MPEG2 as VCD is not supported by " + i18n( "Note: Forcing MPEG2 as VCD is not supported by "
"some standalone DVD players." ), "some standalone DVD players." ),
@ -448,7 +448,7 @@ void K3bVcdDoc::setPbcTracks()
if ( m_tracks ) { if ( m_tracks ) {
int count = m_tracks->count(); 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 ); TQPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks );
K3bVcdTrack* track; K3bVcdTrack* track;
@ -574,7 +574,7 @@ bool K3bVcdDoc::loadDocumentData( TQDomElement* root )
TQDomNode item = vcdNodes.item( i ); TQDomNode item = vcdNodes.item( i );
TQString name = item.nodeName(); 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" ) if ( name == "volumeId" )
vcdOptions() ->setVolumeId( item.toElement().text() ); vcdOptions() ->setVolumeId( item.toElement().text() );

56
libk3b/projects/videocd/k3bvcdjob.cpp
Unescape View File

@ -106,7 +106,7 @@ void K3bVcdJob::cancelAll()
// remove bin-file if it is unfinished or the user selected to remove image // remove bin-file if it is unfinished or the user selected to remove image
if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( TQFile::exists( m_doc->vcdImage() ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { 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 TQFile::remove
( m_doc->vcdImage() ); ( m_doc->vcdImage() );
m_doc->setVcdImage( "" ); m_doc->setVcdImage( "" );
@ -116,7 +116,7 @@ void K3bVcdJob::cancelAll()
// remove cue-file if it is unfinished or the user selected to remove image // remove cue-file if it is unfinished or the user selected to remove image
if ( TQFile::exists( m_cueFile ) ) { if ( TQFile::exists( m_cueFile ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { 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 TQFile::remove
( m_cueFile ); ( m_cueFile );
m_cueFile = ""; m_cueFile = "";
@ -184,8 +184,8 @@ void K3bVcdJob::vcdxBuild()
const K3bExternalBin* bin = k3bcore ->externalBinManager() ->binObject( "vcdxbuild" ); const K3bExternalBin* bin = k3bcore ->externalBinManager() ->binObject( "vcdxbuild" );
if ( !bin ) { if ( !bin ) {
kdDebug() << "(K3bVcdJob) could not find vcdxbuild executable" << endl; kdDebug() << "(K3bVcdJob) could not find vcdxbuild executable" << endl;
emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxbuild" ), K3bJob::ERROR ); emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxbuild" ), K3bJob::ERROR );
emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO ); 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 ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll(); cancelAll();
jobFinished( false ); jobFinished( false );
@ -194,7 +194,7 @@ void K3bVcdJob::vcdxBuild()
if ( bin->version < K3bVersion( "0.7.12" ) ) { if ( bin->version < K3bVersion( "0.7.12" ) ) {
kdDebug() << "(K3bVcdJob) vcdxbuild executable too old!" << endl; 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 ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll(); cancelAll();
jobFinished( false ); jobFinished( false );
@ -202,7 +202,7 @@ void K3bVcdJob::vcdxBuild()
} }
if ( !bin->copyright.isEmpty() ) 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; *m_process << bin;
@ -219,11 +219,11 @@ void K3bVcdJob::vcdxBuild()
*m_process << "--progress" << "--gui"; *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 ) ), connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
this, TQT_SLOT( slotParseVcdxBuildOutput( 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 ) ) { if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
kdDebug() << "(K3bVcdJob) could not start vcdxbuild" << endl; 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(); cancelAll();
jobFinished( false ); jobFinished( false );
} }
@ -290,7 +290,7 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len )
const uint index = el.attribute( "id" ).replace( TQRegExp( "sequence-" ), "" ).toUInt(); const uint index = el.attribute( "id" ).replace( TQRegExp( "sequence-" ), "" ).toUInt();
m_currentWrittenTrack = m_doc->at( m_currentWrittenTrackNumber ); 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; m_bytesFinished = 0;
if ( !firstTrack ) { if ( !firstTrack ) {
@ -324,15 +324,15 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len )
if ( tel.isText() ) { if ( tel.isText() ) {
const TQString text = tel.data(); const TQString text = tel.data();
if ( m_stage == stageWrite && level == "information" ) 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" ) ) 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 { else {
if ( level != "error" ) { if ( level != "error" ) {
kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).tqarg( text ) << endl; kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).arg( text ) << endl;
parseInformation( text ); parseInformation( text );
} else { } else {
kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).tqarg( text ) << endl; kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).arg( text ) << endl;
emit infoMessage( text, K3bJob::ERROR ); emit infoMessage( text, K3bJob::ERROR );
} }
} }
@ -353,7 +353,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
m_imageFinished = true; m_imageFinished = true;
break; break;
default: 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 ); K3bJob::ERROR );
emit infoMessage( i18n( "Please send me an email with the last output." ), K3bJob::ERROR ); emit infoMessage( i18n( "Please send me an email with the last output." ), K3bJob::ERROR );
cancelAll(); cancelAll();
@ -361,7 +361,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
return ; return ;
} }
} else { } 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(); cancelAll();
jobFinished( false ); jobFinished( false );
return ; return ;
@ -372,7 +372,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
TQFile::remove TQFile::remove
( m_xmlFile ); ( 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() ) if ( !vcdDoc() ->onlyCreateImages() )
startWriterjob(); startWriterjob();
else else
@ -381,7 +381,7 @@ void K3bVcdJob::slotVcdxBuildFinished()
void K3bVcdJob::startWriterjob() 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 ( prepareWriterJob() ) {
if ( waitForMedia( m_doc->burner() ) < 0 ) { if ( waitForMedia( m_doc->burner() ) < 0 ) {
cancel(); cancel();
@ -392,7 +392,7 @@ void K3bVcdJob::startWriterjob()
return ; return ;
if ( m_doc->copies() > 1 ) 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 ); emit burning( true );
m_writerJob->start(); m_writerJob->start();
@ -461,7 +461,7 @@ void K3bVcdJob::slotProcessedSize( int cs, int ts )
void K3bVcdJob::slotWriterNextTrack( int t, int tt ) 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 ) 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 // remove bin-file if it is unfinished or the user selected to remove image
if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( TQFile::exists( m_doc->vcdImage() ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { 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 TQFile::remove
( m_doc->vcdImage() ); ( m_doc->vcdImage() );
m_doc->setVcdImage( "" ); 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 // remove cue-file if it is unfinished or the user selected to remove image
if ( TQFile::exists( m_cueFile ) ) { if ( TQFile::exists( m_cueFile ) ) {
if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { 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 TQFile::remove
( m_cueFile ); ( m_cueFile );
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" ) ) { if ( text.contains( "mpeg user scan data: one or more BCD fields out of range for" ) ) {
int index = text.find( " 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" ) ) { } 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( "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 index2 = text.find( ", last seen pts" );
int index3 = text.find( ") -- ignoring this aps" ); 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 ); emit infoMessage( i18n( "Ignoring this aps" ), K3bJob::INFO );
} else if ( text.contains( "bad packet at packet" ) ) { } else if ( text.contains( "bad packet at packet" ) ) {
@ -532,8 +532,8 @@ void K3bVcdJob::parseInformation( const TQString &text )
int index3 = text.find( ") -- remaining " ); int index3 = text.find( ") -- remaining " );
int index4 = text.find( "bytes of stream will be ignored" ); 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( "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." ).tqarg( text.mid( index3 + 15, index4 - index3 - 15 ).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)", return ( i18n( "1 MPEG (%1)",
"%n MPEGs (%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 + ( m_doc->copies() > 1
? i18n( " - %n copy", " - %n copies", m_doc->copies() ) ? i18n( " - %n copy", " - %n copies", m_doc->copies() )
: TQString() ) ); : TQString() ) );

2
libk3b/projects/videocd/k3bvcdoptions.cpp
Unescape View File

@ -37,7 +37,7 @@ K3bVcdOptions::K3bVcdOptions()
m_volumeID( "VIDEOCD" ), m_volumeID( "VIDEOCD" ),
m_albumID( "" ), m_albumID( "" ),
m_volumeSetId( "" ), 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_applicationId( "CDI/CDI_VCD.APP;1" ),
m_systemId( "CD-RTOS CD-BRIDGE" ), m_systemId( "CD-RTOS CD-BRIDGE" ),
m_vcdclass( "vcd" ), m_vcdclass( "vcd" ),

20
libk3b/projects/videocd/k3bvcdtrack.cpp
Unescape View File

@ -159,7 +159,7 @@ const TQString K3bVcdTrack::resolution()
if ( mpeg_info->has_video ) { if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) { for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) { 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->has_video ) {
if ( mpeg_info->video[ 2 ].seen ) { 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" ); return i18n( "n/a" );
@ -195,7 +195,7 @@ const TQString K3bVcdTrack::video_bitrate()
if ( mpeg_info->has_video ) { if ( mpeg_info->has_video ) {
for ( int i = 0; i < 2; i++ ) { for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->video[ i ].seen ) { 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 ) { if ( mpeg_info->has_audio ) {
for ( int i = 0; i < 2; i++ ) { for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->audio[ i ].seen ) { 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 ) { if ( mpeg_info->has_audio ) {
for ( int i = 0; i < 2; i++ ) { for ( int i = 0; i < 2; i++ ) {
if ( mpeg_info->audio[ i ].seen ) { 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++ ) for ( int i = 0; i < 3; i++ )
if ( mpeg_info->video[ i ].seen ) { if ( mpeg_info->video[ i ].seen ) {
if ( i == 0 ) { 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 { } 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 ) { if ( mpeg_info->has_audio && audio ) {
for ( int i = 0; i < 3; i++ ) for ( int i = 0; i < 3; i++ )
if ( mpeg_info->audio[ i ].seen ) { 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 ) ); byte mins = ( byte ) ( ( duration / 60 ) - ( hours * 60 ) );
float secs = duration - 60 * mins - 3600 * hours; float secs = duration - 60 * mins - 3600 * hours;
if ( hours != 0 ) { 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 ) { 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 ); return TQString::number( secs, 'f', 2 );
} }

48
libk3b/projects/videocd/k3bvcdxmlview.cpp
Unescape View File

@ -131,7 +131,7 @@ bool K3bVcdXmlView::write( const TQString& fname )
addSubElement( xmlDoc, elemPvd, "volume-id", m_doc->vcdOptions() ->volumeId().upper() ); addSubElement( xmlDoc, elemPvd, "volume-id", m_doc->vcdOptions() ->volumeId().upper() );
addSubElement( xmlDoc, elemPvd, "system-id", m_doc->vcdOptions() ->systemId() ); addSubElement( xmlDoc, elemPvd, "system-id", m_doc->vcdOptions() ->systemId() );
addSubElement( xmlDoc, elemPvd, "application-id", m_doc->vcdOptions() ->applicationId() ); 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() ); 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" ); filename = locate( "data", "k3b/extra/k3bphotosvcd.mpg" );
elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" ); 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" ); elemsequenceItem.setAttribute( "id", "sequence-000" );
// default entry // default entry
TQDomElement elemdefaultEntry; TQDomElement elemdefaultEntry;
@ -199,19 +199,19 @@ bool K3bVcdXmlView::write( const TQString& fname )
TQString seqId = TQString::number( it.current() ->index() ).rightJustify( 3, '0' ); TQString seqId = TQString::number( it.current() ->index() ).rightJustify( 3, '0' );
elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" ); elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" );
elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); elemsequenceItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).tqarg( seqId ) ); elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).arg( seqId ) );
// default entry // default entry
TQDomElement elemdefaultEntry; TQDomElement elemdefaultEntry;
elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" ); elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" );
elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).tqarg( seqId ) ); elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).arg( seqId ) );
} else { } else {
// sequence-items element needs at least one segment to fit the XML // sequence-items element needs at least one segment to fit the XML
elemsegmentItem = addSubElement( xmlDoc, elemsegmentItems, "segment-item" ); elemsegmentItem = addSubElement( xmlDoc, elemsegmentItems, "segment-item" );
elemsegmentItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); elemsegmentItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).tqarg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) ); 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(); 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 ); TQFile xmlFile( fname );
if ( xmlFile.open( IO_WriteOnly ) ) { if ( xmlFile.open( IO_WriteOnly ) ) {
@ -267,7 +267,7 @@ TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& par
TQDomElement element = doc.createElement( name ); TQDomElement element = doc.createElement( name );
parent.appendChild( element ); parent.appendChild( element );
if ( value >= -1 ) { if ( value >= -1 ) {
TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) ); TQDomText t = doc.createTextNode( TQString( "%1" ).arg( value ) );
element.appendChild( t ); element.appendChild( t );
} }
return element; 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 ) void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& parent, const TQString& src, const TQString& name, bool mixed )
{ {
TQDomElement elemFile = addSubElement( doc, parent, "file" ); TQDomElement elemFile = addSubElement( doc, parent, "file" );
elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) ); elemFile.setAttribute( "src", TQString( "%1" ).arg( src ) );
if ( mixed ) if ( mixed )
elemFile.setAttribute( "format", "mixed" ); elemFile.setAttribute( "format", "mixed" );
@ -296,7 +296,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
TQString ref = ( track->isSegment() ) ? "segment" : "sequence"; TQString ref = ( track->isSegment() ) ? "segment" : "sequence";
TQDomElement elemSelection = addSubElement( doc, parent, "selection" ); 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 ); setNumkeyBSN( doc, elemSelection, track );
@ -310,24 +310,24 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
switch ( i ) { switch ( i ) {
case K3bVcdTrack::PREVIOUS: case K3bVcdTrack::PREVIOUS:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "prev" ); 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; break;
case K3bVcdTrack::NEXT: case K3bVcdTrack::NEXT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "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; break;
case K3bVcdTrack::RETURN: case K3bVcdTrack::RETURN:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "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; break;
case K3bVcdTrack::DEFAULT: case K3bVcdTrack::DEFAULT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "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; break;
case K3bVcdTrack::AFTERTIMEOUT: case K3bVcdTrack::AFTERTIMEOUT:
if ( track->getWaitTime() >= 0 ) { if ( track->getWaitTime() >= 0 ) {
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "timeout" ); 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; break;
} }
@ -369,7 +369,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack
else else
loop.setAttribute( "jump-timing", "immediate" ); 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 ); setNumkeySEL( doc, elemSelection, track );
} }
@ -410,30 +410,30 @@ void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& parent, K3bV
for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) { 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() ) { while ( none < trackIt.key() ) {
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); 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' ) ) );
addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) ); addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).arg( none ).arg( TQFile::encodeName( track->absPath() ).data() ) );
none++; none++;
} }
if ( trackIt.data() ) { if ( trackIt.data() ) {
TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence"; TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence";
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) ); 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" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) ); addComment( doc, parent, TQString( "key %1 -> %2" ).arg( trackIt.key() ).arg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) );
} else { } else {
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" ); 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++; none++;
} }
} else { } else {
// default reference to itSelf // default reference to itSelf
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); 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' ) ) );
} }
} }
} }

38
libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
Unescape View File

@ -41,19 +41,19 @@ K3bMpegInfo::K3bMpegInfo( const char* filename )
m_mpegfile = fopen( filename, "rb" ); m_mpegfile = fopen( filename, "rb" );
if ( m_mpegfile == 0 ) { 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 ; return ;
} }
if ( fseeko( m_mpegfile, 0, SEEK_END ) ) { 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 ; return ;
} }
llong lof = ftello( m_mpegfile ); llong lof = ftello( m_mpegfile );
if ( lof == -1 ) { 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.. //give up..
return ; return ;
} else } else
@ -61,8 +61,8 @@ K3bMpegInfo::K3bMpegInfo( const char* filename )
// nothing to do on an empty file // nothing to do on an empty file
if ( !m_filesize ) { if ( !m_filesize ) {
kdDebug() << TQString( "File %1 is empty." ).tqarg( m_filename ) << endl; kdDebug() << TQString( "File %1 is empty." ).arg( m_filename ) << endl;
m_error_string = i18n( "File %1 is empty." ).tqarg( m_filename ); m_error_string = i18n( "File %1 is empty." ).arg( m_filename );
return ; return ;
} }
@ -90,7 +90,7 @@ bool K3bMpegInfo::MpegParsePacket ()
if ( !EnsureMPEG( 0, MPEG_PACK_HEADER_CODE ) ) { if ( !EnsureMPEG( 0, MPEG_PACK_HEADER_CODE ) ) {
llong code = GetNBytes( 0, 4 ); 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 ) { if ( code == 0x00000100 + MPEG_SEQUENCE_CODE ) {
kdDebug() << "...this looks like a elementary video stream but a multiplexed program stream was required." << endl; 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 ) { if ( offset != 0 ) {
// we actually skipped some zeroes // 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 // here while schleife
@ -190,7 +190,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
int bits; int bits;
case MPEG_PACK_HEADER_CODE: 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; offset += 4;
@ -214,7 +214,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
if ( m_initial_TS == 0.0 ) if ( m_initial_TS == 0.0 )
{ {
m_initial_TS = ReadTS( offset ); 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 */ } else if ( bits >> 2 == 0x1 ) /* %01xx ISO13818-1 */
@ -231,11 +231,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
if ( m_initial_TS == 0.0 ) if ( m_initial_TS == 0.0 )
{ {
m_initial_TS = ReadTSMpeg2( offset ); 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 { } 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; mpeg_info->version = MPEG_VERS_INVALID;
return -1; return -1;
} }
@ -254,11 +254,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
offset += 4; offset += 4;
size = GetSize( offset ); size = GetSize( offset );
offset += 2; 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 ) { switch ( mark ) {
case MPEG_SYSTEM_HEADER_CODE: 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; break;
case MPEG_VIDEO_E0_CODE: case MPEG_VIDEO_E0_CODE:
@ -296,18 +296,18 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset )
break; break;
case MPEG_PRIVATE_1_CODE: 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;
} }
break; break;
case MPEG_PROGRAM_END_CODE: 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; offset += 4;
break; break;
case MPEG_PICTURE_CODE: case MPEG_PICTURE_CODE:
kdDebug() << TQString( "PictureCode: %1" ).tqarg( mark, 0, 16 ) << endl; kdDebug() << TQString( "PictureCode: %1" ).arg( mark, 0, 16 ) << endl;
offset += 3; offset += 3;
break; break;
@ -325,7 +325,7 @@ byte K3bMpegInfo::GetByte( llong offset )
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
if ( fseeko( m_mpegfile, offset, SEEK_SET ) ) { 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; return 0x11;
} }
nread = fread( m_buffer, 1, BUFFERSIZE, m_mpegfile ); nread = fread( m_buffer, 1, BUFFERSIZE, m_mpegfile );
@ -333,7 +333,7 @@ byte K3bMpegInfo::GetByte( llong offset )
m_buffend = offset + nread; m_buffend = offset + nread;
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
// weird // 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; return 0x11;
} }
} }
@ -355,7 +355,7 @@ byte K3bMpegInfo::bdGetByte( llong offset )
m_buffend = start + nread; m_buffend = start + nread;
if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) {
// weird // 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; return 0x11;
} }

14
libk3b/projects/videodvd/k3bvideodvdimager.cpp
Unescape View File

@ -108,26 +108,26 @@ int K3bVideoDvdImager::writePathSpec()
d->tempPath = K3b::findUniqueFilePrefix( "k3bVideoDvd", dir.path() ); d->tempPath = K3b::findUniqueFilePrefix( "k3bVideoDvd", dir.path() );
kdDebug() << "(K3bVideoDvdImager) creating temp dir: " << d->tempPath << endl; kdDebug() << "(K3bVideoDvdImager) creating temp dir: " << d->tempPath << endl;
if( !dir.mkdir( d->tempPath, true ) ) { if( !dir.mkdir( d->tempPath, true ) ) {
emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath), ERROR ); emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath), ERROR );
return -1; return -1;
} }
dir.cd( d->tempPath ); dir.cd( d->tempPath );
if( !dir.mkdir( "VIDEO_TS" ) ) { if( !dir.mkdir( "VIDEO_TS" ) ) {
emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath + "/VIDEO_TS"), ERROR ); emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath + "/VIDEO_TS"), ERROR );
return -1; return -1;
} }
for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) { for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it ) {
if( (*it)->isDir() ) { if( (*it)->isDir() ) {
emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").tqarg((*it)->k3bName()), ERROR ); emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").arg((*it)->k3bName()), ERROR );
return -1; return -1;
} }
// convert to upper case names // convert to upper case names
if( ::symlink( TQFile::encodeName( (*it)->localPath() ), if( ::symlink( TQFile::encodeName( (*it)->localPath() ),
TQFile::encodeName( d->tempPath + "/VIDEO_TS/" + (*it)->k3bName().upper() ) ) == -1 ) { TQFile::encodeName( d->tempPath + "/VIDEO_TS/" + (*it)->k3bName().upper() ) ) == -1 ) {
emit infoMessage( i18n("Unable to link temporary file in folder %1.").tqarg( d->tempPath ), ERROR ); emit infoMessage( i18n("Unable to link temporary file in folder %1.").arg( d->tempPath ), ERROR );
return -1; return -1;
} }
} }
@ -148,7 +148,7 @@ int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& s
} }
int num = 0; int num = 0;
for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) {
K3bDataItem* item = it.current(); K3bDataItem* item = it.current();
num++; num++;
@ -195,7 +195,7 @@ void K3bVideoDvdImager::cleanup()
if( TQFile::exists( d->tempPath ) ) { if( TQFile::exists( d->tempPath ) ) {
TQDir dir( d->tempPath ); TQDir dir( d->tempPath );
dir.cd( "VIDEO_TS" ); dir.cd( "VIDEO_TS" );
for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it )
dir.remove( (*it)->k3bName().upper() ); dir.remove( (*it)->k3bName().upper() );
dir.cdUp(); dir.cdUp();
dir.rmdir( "VIDEO_TS" ); dir.rmdir( "VIDEO_TS" );

4
libk3b/projects/videodvd/k3bvideodvdjob.cpp
Unescape View File

@ -85,14 +85,14 @@ TQString K3bVideoDvdJob::jobDescription() const
return i18n("Writing Video DVD") return i18n("Writing Video DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty() + ( m_doc->isoOptions().volumeID().isEmpty()
? TQString() ? TQString()
: TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
} }
} }
TQString K3bVideoDvdJob::jobDetails() const TQString K3bVideoDvdJob::jobDetails() const
{ {
return ( i18n("ISO9660/Udf Filesystem (Size: %1)").tqarg(KIO::convertSize( doc()->size() )) return ( i18n("ISO9660/Udf Filesystem (Size: %1)").arg(KIO::convertSize( doc()->size() ))
+ ( m_doc->copies() > 1 + ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies()) ? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) ); : TQString() ) );

20
libk3b/tools/k3blistview.cpp
Unescape View File

@ -272,7 +272,7 @@ void K3bListViewItem::setBackgroundColor( int col, const TQColor& c )
ColumnInfo* info = getColumnInfo( col ); ColumnInfo* info = getColumnInfo( col );
info->backgroundColorSet = true; info->backgroundColorSet = true;
info->backgroundColor = c; info->backgroundColor = c;
tqrepaint(); repaint();
} }
@ -281,7 +281,7 @@ void K3bListViewItem::setForegroundColor( int col, const TQColor& c )
ColumnInfo* info = getColumnInfo( col ); ColumnInfo* info = getColumnInfo( col );
info->foregroundColorSet = true; info->foregroundColorSet = true;
info->foregroundColor = c; info->foregroundColor = c;
tqrepaint(); repaint();
} }
@ -299,7 +299,7 @@ void K3bListViewItem::setProgress( int col, int p )
setDisplayProgressBar( col, true ); setDisplayProgressBar( col, true );
if( info->progressValue != p ) { if( info->progressValue != p ) {
info->progressValue = p; info->progressValue = p;
tqrepaint(); repaint();
} }
} }
@ -309,7 +309,7 @@ void K3bListViewItem::setTotalSteps( int col, int steps )
ColumnInfo* info = getColumnInfo( col ); ColumnInfo* info = getColumnInfo( col );
info->totalProgressSteps = steps; info->totalProgressSteps = steps;
tqrepaint(); repaint();
} }
@ -318,14 +318,14 @@ void K3bListViewItem::setMarginHorizontal( int col, int margin )
ColumnInfo* info = getColumnInfo( col ); ColumnInfo* info = getColumnInfo( col );
info->margin = margin; info->margin = margin;
tqrepaint(); repaint();
} }
void K3bListViewItem::setMarginVertical( int margin ) void K3bListViewItem::setMarginVertical( int margin )
{ {
m_vMargin = margin; m_vMargin = margin;
tqrepaint(); repaint();
} }
@ -364,7 +364,7 @@ void K3bListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col,
if( info->backgroundColorSet ) if( info->backgroundColorSet )
cgh.setColor( TQColorGroup::Base, info->backgroundColor ); cgh.setColor( TQColorGroup::Base, info->backgroundColor );
// in case this is the selected row has a margin we need to tqrepaint the selection bar // in case this is the selected row has a margin we need to repaint the selection bar
if( isSelected() && if( isSelected() &&
(col == 0 || listView()->allColumnsShowFocus()) && (col == 0 || listView()->allColumnsShowFocus()) &&
info->margin > 0 ) { info->margin > 0 ) {
@ -445,7 +445,7 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i
s_dummyProgressBar->setTotalSteps( info->totalProgressSteps ); s_dummyProgressBar->setTotalSteps( info->totalProgressSteps );
s_dummyProgressBar->setProgress( info->progressValue ); s_dummyProgressBar->setProgress( info->progressValue );
// some styles use the widget's tqgeometry // some styles use the widget's geometry
s_dummyProgressBar->setGeometry( r ); s_dummyProgressBar->setGeometry( r );
listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags );
@ -498,7 +498,7 @@ bool K3bCheckListViewItem::isChecked() const
void K3bCheckListViewItem::setChecked( bool checked ) void K3bCheckListViewItem::setChecked( bool checked )
{ {
m_checked = checked; m_checked = checked;
tqrepaint(); repaint();
} }
@ -1142,7 +1142,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) { TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) {
// make sure we did not lose the focus to one of the edit widgets' tqchildren // make sure we did not lose the focus to one of the edit widgets' children
if( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) { if( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
doRename(); doRename();
hideEditor(); hideEditor();

12
libk3b/tools/k3bmd5job.cpp
Unescape View File

@ -97,14 +97,14 @@ void K3bMd5Job::start()
} }
else if( !d->filename.isEmpty() ) { else if( !d->filename.isEmpty() ) {
if( !TQFile::exists( d->filename ) ) { if( !TQFile::exists( d->filename ) ) {
emit infoMessage( i18n("Could not find file %1").tqarg(d->filename), ERROR ); emit infoMessage( i18n("Could not find file %1").arg(d->filename), ERROR );
jobFinished(false); jobFinished(false);
return; return;
} }
d->file.setName( d->filename ); d->file.setName( d->filename );
if( !d->file.open( IO_ReadOnly ) ) { if( !d->file.open( IO_ReadOnly ) ) {
emit infoMessage( i18n("Could not open file %1").tqarg(d->filename), ERROR ); emit infoMessage( i18n("Could not open file %1").arg(d->filename), ERROR );
jobFinished(false); jobFinished(false);
return; return;
} }
@ -204,7 +204,7 @@ void K3bMd5Job::slotUpdate()
if( readSize <= 0 ) { if( readSize <= 0 ) {
// kdDebug() << "(K3bMd5Job) reached max size of " << d->maxSize << ". Stopping." << endl; // kdDebug() << "(K3bMd5Job) reached max size of " << d->maxSize << ". Stopping." << endl;
emit debuggingOutput( "K3bMd5Job", TQString("Reached max read of %1. Stopping after %2 bytes.").tqarg(d->maxSize).tqarg(d->readData) ); emit debuggingOutput( "K3bMd5Job", TQString("Reached max read of %1. Stopping after %2 bytes.").arg(d->maxSize).arg(d->readData) );
stopAll(); stopAll();
emit percent( 100 ); emit percent( 100 );
jobFinished(true); jobFinished(true);
@ -252,13 +252,13 @@ void K3bMd5Job::slotUpdate()
} }
if( read < 0 ) { if( read < 0 ) {
emit infoMessage( i18n("Error while reading from file %1").tqarg(d->filename), ERROR ); emit infoMessage( i18n("Error while reading from file %1").arg(d->filename), ERROR );
stopAll(); stopAll();
jobFinished(false); jobFinished(false);
} }
else if( read == 0 ) { else if( read == 0 ) {
// kdDebug() << "(K3bMd5Job) read all data. Total size: " << d->readData << ". Stopping." << endl; // kdDebug() << "(K3bMd5Job) read all data. Total size: " << d->readData << ". Stopping." << endl;
emit debuggingOutput( "K3bMd5Job", TQString("All data read. Stopping after %1 bytes.").tqarg(d->readData) ); emit debuggingOutput( "K3bMd5Job", TQString("All data read. Stopping after %1 bytes.").arg(d->readData) );
stopAll(); stopAll();
emit percent( 100 ); emit percent( 100 );
jobFinished(true); jobFinished(true);
@ -303,7 +303,7 @@ TQCString K3bMd5Job::base64Digest()
void K3bMd5Job::stop() void K3bMd5Job::stop()
{ {
emit debuggingOutput( "K3bMd5Job", TQString("Stopped manually after %1 bytes.").tqarg(d->readData) ); emit debuggingOutput( "K3bMd5Job", TQString("Stopped manually after %1 bytes.").arg(d->readData) );
stopAll(); stopAll();
jobFinished( true ); jobFinished( true );
} }

14
libk3b/tools/k3btitlelabel.cpp
Unescape View File

@ -30,7 +30,7 @@ public:
Private() { Private() {
titleLength = subTitleLength = 0; titleLength = subTitleLength = 0;
margin = 2; margin = 2;
tqalignment = TQt::AlignLeft; alignment = TQt::AlignLeft;
cachedMinimumWidth = 0; cachedMinimumWidth = 0;
titleBaseLine = 0; titleBaseLine = 0;
} }
@ -41,7 +41,7 @@ public:
TQString displayTitle; TQString displayTitle;
TQString displaySubTitle; TQString displaySubTitle;
int tqalignment; int alignment;
int titleLength; int titleLength;
int subTitleLength; int subTitleLength;
@ -71,9 +71,9 @@ public:
neededWidth += m_label->d->displaySubTitleLength + 5; neededWidth += m_label->d->displaySubTitleLength + 5;
int startPos = 0; int startPos = 0;
if( m_label->d->tqalignment & TQt::AlignHCenter ) if( m_label->d->alignment & TQt::AlignHCenter )
startPos = r.left() + ( r.width() - 2*m_label->d->margin - neededWidth ) / 2; startPos = r.left() + ( r.width() - 2*m_label->d->margin - neededWidth ) / 2;
else if( m_label->d->tqalignment & TQt::AlignRight ) else if( m_label->d->alignment & TQt::AlignRight )
startPos = r.right() - m_label->d->margin - neededWidth; startPos = r.right() - m_label->d->margin - neededWidth;
else else
startPos = r.left() + m_label->d->margin; startPos = r.left() + m_label->d->margin;
@ -128,7 +128,7 @@ void K3bTitleLabel::setSubTitle( const TQString& subTitle )
void K3bTitleLabel::setAlignment( int align ) void K3bTitleLabel::setAlignment( int align )
{ {
d->tqalignment = align; d->alignment = align;
update(); update();
} }
@ -168,9 +168,9 @@ void K3bTitleLabel::drawContents( TQPainter* p )
neededWidth += d->displaySubTitleLength + 5; neededWidth += d->displaySubTitleLength + 5;
int startPos = 0; int startPos = 0;
if( d->tqalignment & TQt::AlignHCenter ) if( d->alignment & TQt::AlignHCenter )
startPos = r.left() + ( r.width() - 2*d->margin - neededWidth ) / 2; startPos = r.left() + ( r.width() - 2*d->margin - neededWidth ) / 2;
else if( d->tqalignment & TQt::AlignRight ) else if( d->alignment & TQt::AlignRight )
startPos = r.right() - d->margin - neededWidth; startPos = r.right() - d->margin - neededWidth;
else else
startPos = r.left() + d->margin; startPos = r.left() + d->margin;

2
libk3b/tools/k3btitlelabel.h
Unescape View File

@ -47,7 +47,7 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame
/** /**
* The title label only supports alignments left, hcenter, and right * The title label only supports alignments left, hcenter, and right
* *
* Default tqalignment is left. * Default alignment is left.
*/ */
// FIXME: honor right-to-left languages // FIXME: honor right-to-left languages
void setAlignment( int align ); void setAlignment( int align );

6
libk3b/videodvd/k3bvideodvd.cpp
Unescape View File

@ -305,13 +305,13 @@ TQString K3bVideoDVD::subPictureCodeExtensionString( int ext )
case SUBPIC_CODE_EXT_CAPTION_BIGGER_SIZE: case SUBPIC_CODE_EXT_CAPTION_BIGGER_SIZE:
return i18n("Caption with bigger size character"); return i18n("Caption with bigger size character");
case SUBPIC_CODE_EXT_CAPTION_FOR_CHILDREN: case SUBPIC_CODE_EXT_CAPTION_FOR_CHILDREN:
return i18n("Caption for tqchildren"); return i18n("Caption for children");
case SUBPIC_CODE_EXT_CLOSED_CAPTION_NORMAL_SIZE: case SUBPIC_CODE_EXT_CLOSED_CAPTION_NORMAL_SIZE:
return i18n("Closed caption with normal size character"); return i18n("Closed caption with normal size character");
case SUBPIC_CODE_EXT_CLOSED_CAPTION_BIGGER_SIZE: case SUBPIC_CODE_EXT_CLOSED_CAPTION_BIGGER_SIZE:
return i18n("Closed caption with bigger size character"); return i18n("Closed caption with bigger size character");
case SUBPIC_CODE_EXT_CLOSED_CAPTION_FOR_CHILDREN: case SUBPIC_CODE_EXT_CLOSED_CAPTION_FOR_CHILDREN:
return i18n("Closed caption for tqchildren"); return i18n("Closed caption for children");
case SUBPIC_CODE_EXT_FORCED_CAPTION: case SUBPIC_CODE_EXT_FORCED_CAPTION:
return i18n("Forced caption"); return i18n("Forced caption");
case SUBPIC_CODE_EXT_DIR_COMMENTS_NORMAL_SIZE: case SUBPIC_CODE_EXT_DIR_COMMENTS_NORMAL_SIZE:
@ -319,7 +319,7 @@ TQString K3bVideoDVD::subPictureCodeExtensionString( int ext )
case SUBPIC_CODE_EXT_DIR_COMMENTS_BIGGER_SIZE: case SUBPIC_CODE_EXT_DIR_COMMENTS_BIGGER_SIZE:
return i18n("Director's comments with bigger size characters"); return i18n("Director's comments with bigger size characters");
case SUBPIC_CODE_EXT_DIR_COMMENTS_FOR_CHILDREN: case SUBPIC_CODE_EXT_DIR_COMMENTS_FOR_CHILDREN:
return i18n("Director's comments for tqchildren"); return i18n("Director's comments for children");
default: default:
return i18n("unknown code extension"); return i18n("unknown code extension");
} }

18
libk3bdevice/k3bcdtext.cpp
Unescape View File

@ -65,12 +65,12 @@ namespace K3bDevice {
for( int i = 0; i < dataLen/18; ++i ) { for( int i = 0; i < dataLen/18; ++i ) {
TQString s; TQString s;
s += TQString( " %1 |" ).tqarg( pack[i].id1, 6, 16 ); s += TQString( " %1 |" ).arg( pack[i].id1, 6, 16 );
s += TQString( " %1 |" ).tqarg( pack[i].id2, 6 ); s += TQString( " %1 |" ).arg( pack[i].id2, 6 );
s += TQString( " %1 |" ).tqarg( pack[i].id3, 6 ); s += TQString( " %1 |" ).arg( pack[i].id3, 6 );
s += TQString( " %1 |" ).tqarg( pack[i].charpos, 6 ); s += TQString( " %1 |" ).arg( pack[i].charpos, 6 );
s += TQString( " %1 |" ).tqarg( pack[i].blocknum, 6 ); s += TQString( " %1 |" ).arg( pack[i].blocknum, 6 );
s += TQString( " %1 |" ).tqarg( pack[i].dbcc, 4 ); s += TQString( " %1 |" ).arg( pack[i].dbcc, 4 );
// char str[12]; // char str[12];
// sprintf( str, "%c%c%c%c%c%c%c%c%c%c%c%c", // sprintf( str, "%c%c%c%c%c%c%c%c%c%c%c%c",
// pack[i].data[0] == '\0' ? '<27>' : pack[i].data[0], // pack[i].data[0] == '\0' ? '<27>' : pack[i].data[0],
@ -85,9 +85,9 @@ namespace K3bDevice {
// pack[i].data[9] == '\0' ? '<27>' : pack[i].data[9], // pack[i].data[9] == '\0' ? '<27>' : pack[i].data[9],
// pack[i].data[10] == '\0' ? '<27>' : pack[i].data[10], // pack[i].data[10] == '\0' ? '<27>' : pack[i].data[10],
// pack[i].data[11] == '\0' ? '<27>' : pack[i].data[11] ); // pack[i].data[11] == '\0' ? '<27>' : pack[i].data[11] );
// s += TQString( " %1 |" ).tqarg( "'" + TQCString(str,13) + "'", 14 ); // s += TQString( " %1 |" ).arg( "'" + TQCString(str,13) + "'", 14 );
// TQ_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1]; // TQ_UINT16 crc = pack[i].crc[0]<<8|pack[i].crc[1];
// s += TQString( " %1 |" ).tqarg( crc ); // s += TQString( " %1 |" ).arg( crc );
k3bDebug() << s << endl; k3bDebug() << s << endl;
} }
} }
@ -471,7 +471,7 @@ void K3bDevice::CdText::savePack( cdtext_pack* pack, TQByteArray& data, unsigned
// append the pack to data // append the pack to data
if( data.size() < dataFill + sizeof(cdtext_pack) ) if( data.size() < dataFill + sizeof(cdtext_pack) )
data.tqresize( dataFill + sizeof(cdtext_pack), TQGArray::SpeedOptim ); data.resize( dataFill + sizeof(cdtext_pack), TQGArray::SpeedOptim );
::memcpy( &data.data()[dataFill], reinterpret_cast<char*>( pack ), sizeof(cdtext_pack) ); ::memcpy( &data.data()[dataFill], reinterpret_cast<char*>( pack ), sizeof(cdtext_pack) );

26
libk3bdevice/k3bdevice.cpp
Unescape View File

@ -563,7 +563,7 @@ const TQString& K3bDevice::Device::devicename() const
TQString K3bDevice::Device::busTargetLun() const TQString K3bDevice::Device::busTargetLun() const
{ {
return TQString("%1,%2,%3").tqarg(m_bus).tqarg(m_target).tqarg(m_lun); return TQString("%1,%2,%3").arg(m_bus).arg(m_target).arg(m_lun);
} }
@ -1056,18 +1056,18 @@ bool K3bDevice::Device::readRawToc( K3bDevice::Toc& toc ) const
k3bDebug() << "Session | ADR | CONTROL| TNO | POINT | Min | Sec | Frame | Zero | PMIN | PSEC | PFRAME |" << endl; k3bDebug() << "Session | ADR | CONTROL| TNO | POINT | Min | Sec | Frame | Zero | PMIN | PSEC | PFRAME |" << endl;
for( unsigned int i = 0; i < (dataLen-4)/(int)sizeof(toc_raw_track_descriptor); ++i ) { for( unsigned int i = 0; i < (dataLen-4)/(int)sizeof(toc_raw_track_descriptor); ++i ) {
TQString s; TQString s;
s += TQString( " %1 |" ).tqarg( (int)tr[i].session_number, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].session_number, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].adr, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].adr, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].control, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].control, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].tno, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].tno, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].point, 6, 16 ); s += TQString( " %1 |" ).arg( (int)tr[i].point, 6, 16 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].min, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].min, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].sec, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].sec, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].frame, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].frame, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].zero, 6, 16 ); s += TQString( " %1 |" ).arg( (int)tr[i].zero, 6, 16 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].p_min, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].p_min, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].p_sec, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].p_sec, 6 );
s += TQString( " %1 |" ).tqarg( (int)tr[i].p_frame, 6 ); s += TQString( " %1 |" ).arg( (int)tr[i].p_frame, 6 );
k3bDebug() << s << endl; k3bDebug() << s << endl;
} }

6
libk3bdevice/k3bdevicemanager.cpp
Unescape View File

@ -275,7 +275,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
int i = 1; int i = 1;
TQString dev; TQString dev;
while( !(dev = line.section(re, i, i)).isEmpty() ) { while( !(dev = line.section(re, i, i)).isEmpty() ) {
if( addDevice( TQString("/dev/%1").tqarg(dev) ) ) { if( addDevice( TQString("/dev/%1").arg(dev) ) ) {
devstring += dev + "|"; devstring += dev + "|";
} }
// according to the LINUX ALLOCATED DEVICES document (http://www.lanana.org/docs/device-list/), // according to the LINUX ALLOCATED DEVICES document (http://www.lanana.org/docs/device-list/),
@ -285,7 +285,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
// each physical device the next line should be better // each physical device the next line should be better
// else if ( dev.startsWith("sr") ) // else if ( dev.startsWith("sr") )
if ( dev.startsWith("sr") ) { if ( dev.startsWith("sr") ) {
if( addDevice(TQString("/dev/%1").tqarg(dev.replace(TQRegExp("r"),"cd"))) ) if( addDevice(TQString("/dev/%1").arg(dev.replace(TQRegExp("r"),"cd"))) )
devstring += dev + "|"; devstring += dev + "|";
} }
++i; ++i;
@ -304,7 +304,7 @@ void K3bDevice::DeviceManager::LinuxDeviceScan()
// //
k3bDebug() << "(K3bDevice::DeviceManager) SCANNING FOR GENERIC DEVICES." << endl; k3bDebug() << "(K3bDevice::DeviceManager) SCANNING FOR GENERIC DEVICES." << endl;
for( int i = 0; i < 16; i++ ) { for( int i = 0; i < 16; i++ ) {
TQString sgDev = resolveSymLink( TQString("/dev/sg%1").tqarg(i) ); TQString sgDev = resolveSymLink( TQString("/dev/sg%1").arg(i) );
int bus = -1, id = -1, lun = -1; int bus = -1, id = -1, lun = -1;
if( determineBusIdLun( sgDev, bus, id, lun ) ) { if( determineBusIdLun( sgDev, bus, id, lun ) ) {
if( Device* dev = findDevice( bus, id, lun ) ) { if( Device* dev = findDevice( bus, id, lun ) ) {

4
libk3bdevice/k3bscsicommand.cpp
Unescape View File

@ -169,8 +169,8 @@ void K3bDevice::ScsiCommand::debugError( int command, int errorCode, int senseKe
if( m_printErrors ) { if( m_printErrors ) {
k3bDebug() << "(K3bDevice::ScsiCommand) failed: " << endl k3bDebug() << "(K3bDevice::ScsiCommand) failed: " << endl
<< " command: " << TQString("%1 (%2)") << " command: " << TQString("%1 (%2)")
.tqarg( K3bDevice::commandString( command ) ) .arg( K3bDevice::commandString( command ) )
.tqarg( TQString::number(command, 16) ) << endl .arg( TQString::number(command, 16) ) << endl
<< " errorcode: " << TQString::number(errorCode, 16) << endl << " errorcode: " << TQString::number(errorCode, 16) << endl
<< " sense key: " << senseKeyToString(senseKey) << endl << " sense key: " << senseKeyToString(senseKey) << endl
<< " asc: " << TQString::number(asc, 16) << endl << " asc: " << TQString::number(asc, 16) << endl

20
plugins/audiooutput/alsa/k3balsaoutputplugin.cpp
Unescape View File

@ -109,7 +109,7 @@ bool K3bAlsaOutputPlugin::recoverFromError( int err )
if( err == -EPIPE ) { if( err == -EPIPE ) {
err = snd_pcm_prepare( d->pcm_playback ); err = snd_pcm_prepare( d->pcm_playback );
if( err < 0 ) { if( err < 0 ) {
d->lastErrorMessage = i18n("Internal Alsa problem: %1").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Internal Alsa problem: %1").arg(snd_strerror(err));
return false; return false;
} }
} }
@ -121,7 +121,7 @@ bool K3bAlsaOutputPlugin::recoverFromError( int err )
// unable to wake up pcm device, restart it // unable to wake up pcm device, restart it
err = snd_pcm_prepare( d->pcm_playback ); err = snd_pcm_prepare( d->pcm_playback );
if( err < 0 ) { if( err < 0 ) {
d->lastErrorMessage = i18n("Internal Alsa problem: %1").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Internal Alsa problem: %1").arg(snd_strerror(err));
return false; return false;
} }
} }
@ -153,7 +153,7 @@ bool K3bAlsaOutputPlugin::init()
int err = snd_pcm_open( &d->pcm_playback, alsaDevice.local8Bit(), SND_PCM_STREAM_PLAYBACK, 0 ); int err = snd_pcm_open( &d->pcm_playback, alsaDevice.local8Bit(), SND_PCM_STREAM_PLAYBACK, 0 );
if( err < 0 ) { if( err < 0 ) {
d->lastErrorMessage = i18n("Could not open alsa audio device '%1' (%2).").tqarg(alsaDevice).tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Could not open alsa audio device '%1' (%2).").arg(alsaDevice).arg(snd_strerror(err));
d->error = true; d->error = true;
return false; return false;
} }
@ -174,20 +174,20 @@ bool K3bAlsaOutputPlugin::setupHwParams()
int err = 0; int err = 0;
if( ( err = snd_pcm_hw_params_malloc( &hw_params ) ) < 0 ) { if( ( err = snd_pcm_hw_params_malloc( &hw_params ) ) < 0 ) {
d->lastErrorMessage = i18n("Could not allocate hardware parameter structure (%1)").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Could not allocate hardware parameter structure (%1)").arg(snd_strerror(err));
d->error = true; d->error = true;
return false; return false;
} }
if( (err = snd_pcm_hw_params_any( d->pcm_playback, hw_params )) < 0) { if( (err = snd_pcm_hw_params_any( d->pcm_playback, hw_params )) < 0) {
d->lastErrorMessage = i18n("Could not initialize hardware parameter structure (%1).").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Could not initialize hardware parameter structure (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params ); snd_pcm_hw_params_free( hw_params );
d->error = true; d->error = true;
return false; return false;
} }
if( (err = snd_pcm_hw_params_set_access( d->pcm_playback, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { if( (err = snd_pcm_hw_params_set_access( d->pcm_playback, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
d->lastErrorMessage = i18n("Could not set access type (%1).").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Could not set access type (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params ); snd_pcm_hw_params_free( hw_params );
d->error = true; d->error = true;
return false; return false;
@ -195,7 +195,7 @@ bool K3bAlsaOutputPlugin::setupHwParams()
if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_BE)) < 0) { if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_BE)) < 0) {
if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) { if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) {
d->lastErrorMessage = i18n("Could not set sample format (%1).").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Could not set sample format (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params ); snd_pcm_hw_params_free( hw_params );
d->error = true; d->error = true;
return false; return false;
@ -208,7 +208,7 @@ bool K3bAlsaOutputPlugin::setupHwParams()
d->sampleRate = 44100; d->sampleRate = 44100;
if( (err = snd_pcm_hw_params_set_rate_near( d->pcm_playback, hw_params, &d->sampleRate, 0)) < 0) { if( (err = snd_pcm_hw_params_set_rate_near( d->pcm_playback, hw_params, &d->sampleRate, 0)) < 0) {
d->lastErrorMessage = i18n("Could not set sample rate (%1).").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Could not set sample rate (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params ); snd_pcm_hw_params_free( hw_params );
d->error = true; d->error = true;
return false; return false;
@ -217,14 +217,14 @@ bool K3bAlsaOutputPlugin::setupHwParams()
kdDebug() << "(K3bAlsaOutputPlugin) samplerate set to " << d->sampleRate << endl; kdDebug() << "(K3bAlsaOutputPlugin) samplerate set to " << d->sampleRate << endl;
if( (err = snd_pcm_hw_params_set_channels( d->pcm_playback, hw_params, 2)) < 0) { if( (err = snd_pcm_hw_params_set_channels( d->pcm_playback, hw_params, 2)) < 0) {
d->lastErrorMessage = i18n("Could not set channel count (%1).").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Could not set channel count (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params ); snd_pcm_hw_params_free( hw_params );
d->error = true; d->error = true;
return false; return false;
} }
if( (err = snd_pcm_hw_params( d->pcm_playback, hw_params )) < 0) { if( (err = snd_pcm_hw_params( d->pcm_playback, hw_params )) < 0) {
d->lastErrorMessage = i18n("Could not set parameters (%1).").tqarg(snd_strerror(err)); d->lastErrorMessage = i18n("Could not set parameters (%1).").arg(snd_strerror(err));
snd_pcm_hw_params_free( hw_params ); snd_pcm_hw_params_free( hw_params );
d->error = true; d->error = true;
return false; return false;

4
plugins/decoder/flac/k3bflacdecoder.cpp
Unescape View File

@ -394,9 +394,9 @@ TQString K3bFLACDecoder::technicalInfo( const TQString& info ) const
else if( info == i18n("Channels") ) else if( info == i18n("Channels") )
return TQString::number(d->channels); return TQString::number(d->channels);
else if( info == i18n("Sampling Rate") ) else if( info == i18n("Sampling Rate") )
return i18n("%1 Hz").tqarg(d->rate); return i18n("%1 Hz").arg(d->rate);
else if( info == i18n("Sample Size") ) else if( info == i18n("Sample Size") )
return i18n("%1 bits").tqarg(d->bitsPerSample); return i18n("%1 bits").arg(d->bitsPerSample);
} }
return TQString(); return TQString();

2
plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
Unescape View File

@ -125,7 +125,7 @@ bool K3bLibsndfileDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerat
addMetaInfo( META_COMMENT, sf_get_string(d->sndfile, SF_STR_COMMENT) ); addMetaInfo( META_COMMENT, sf_get_string(d->sndfile, SF_STR_COMMENT) );
addTechnicalInfo( i18n("Channels"), TQString::number(d->sndinfo.channels) ); addTechnicalInfo( i18n("Channels"), TQString::number(d->sndinfo.channels) );
addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").tqarg(d->sndinfo.samplerate) ); addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").arg(d->sndinfo.samplerate) );
frames = (unsigned long)ceil(d->sndinfo.frames / d->sndinfo.samplerate * 75.0); frames = (unsigned long)ceil(d->sndinfo.frames / d->sndinfo.samplerate * 75.0);
samplerate = d->sndinfo.samplerate; samplerate = d->sndinfo.samplerate;

4
plugins/decoder/mp3/k3bmaddecoder.cpp
Unescape View File

@ -415,12 +415,12 @@ TQString K3bMadDecoder::technicalInfo( const TQString& name ) const
} }
} }
else if( name == i18n("Sampling Rate") ) else if( name == i18n("Sampling Rate") )
return i18n("%1 Hz").tqarg(d->firstHeader.samplerate); return i18n("%1 Hz").arg(d->firstHeader.samplerate);
else if( name == i18n("Bitrate") ) { else if( name == i18n("Bitrate") ) {
if( d->vbr ) if( d->vbr )
return i18n("VBR"); return i18n("VBR");
else else
return i18n("%1 bps").tqarg(d->firstHeader.bitrate); return i18n("%1 bps").arg(d->firstHeader.bitrate);
} }
else if( name == i18n("Layer") ){ else if( name == i18n("Layer") ){
switch( d->firstHeader.layer ) { switch( d->firstHeader.layer ) {

8
plugins/decoder/ogg/k3boggvorbisdecoder.cpp
Unescape View File

@ -120,13 +120,13 @@ bool K3bOggVorbisDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate
// add technical infos // add technical infos
addTechnicalInfo( i18n("Version"), TQString::number(d->vInfo->version) ); addTechnicalInfo( i18n("Version"), TQString::number(d->vInfo->version) );
addTechnicalInfo( i18n("Channels"), TQString::number(d->vInfo->channels) ); addTechnicalInfo( i18n("Channels"), TQString::number(d->vInfo->channels) );
addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").tqarg(d->vInfo->rate) ); addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").arg(d->vInfo->rate) );
if( d->vInfo->bitrate_upper > 0 ) if( d->vInfo->bitrate_upper > 0 )
addTechnicalInfo( i18n("Bitrate Upper"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_upper) ); addTechnicalInfo( i18n("Bitrate Upper"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_upper) );
if( d->vInfo->bitrate_nominal > 0 ) if( d->vInfo->bitrate_nominal > 0 )
addTechnicalInfo( i18n("Bitrate Nominal"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_nominal) ); addTechnicalInfo( i18n("Bitrate Nominal"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_nominal) );
if( d->vInfo->bitrate_lower > 0 ) if( d->vInfo->bitrate_lower > 0 )
addTechnicalInfo( i18n("Bitrate Lower"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_lower) ); addTechnicalInfo( i18n("Bitrate Lower"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_lower) );
frames = K3b::Msf::fromSeconds(seconds); frames = K3b::Msf::fromSeconds(seconds);
samplerate = d->vInfo->rate; samplerate = d->vInfo->rate;

4
plugins/decoder/wave/k3bwavedecoder.cpp
Unescape View File

@ -350,9 +350,9 @@ TQString K3bWaveDecoder::technicalInfo( const TQString& name ) const
if( name == i18n("Channels") ) if( name == i18n("Channels") )
return TQString::number(d->channels); return TQString::number(d->channels);
else if( name == i18n("Sampling Rate") ) else if( name == i18n("Sampling Rate") )
return i18n("%1 Hz").tqarg(d->sampleRate); return i18n("%1 Hz").arg(d->sampleRate);
else if( name == i18n("Sample Size") ) else if( name == i18n("Sample Size") )
return i18n("%1 bits").tqarg(d->sampleSize); return i18n("%1 bits").arg(d->sampleSize);
else else
return TQString(); return TQString();
} }

4
plugins/encoder/external/k3bexternalencoder.cpp vendored
Unescape View File

@ -242,7 +242,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
kdDebug() << s << flush << endl; kdDebug() << s << flush << endl;
// set one general error message // set one general error message
setLastError( i18n("Command failed: %1").tqarg( s ) ); setLastError( i18n("Command failed: %1").arg( s ) );
if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
if( d->cmd.writeWaveHeader ) if( d->cmd.writeWaveHeader )
@ -253,7 +253,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
else { else {
TQString commandName = d->cmd.command.section( TQRegExp("\\s+"), 0 ); TQString commandName = d->cmd.command.section( TQRegExp("\\s+"), 0 );
if( !KStandardDirs::findExe( commandName ).isEmpty() ) if( !KStandardDirs::findExe( commandName ).isEmpty() )
setLastError( i18n("Could not find program '%1'").tqarg(commandName) ); setLastError( i18n("Could not find program '%1'").arg(commandName) );
return false; return false;
} }

8
plugins/encoder/lame/base_k3blameencodersettingswidget.ui
Unescape View File

@ -77,7 +77,7 @@
<property name="text"> <property name="text">
<string>textLabel1</string> <string>textLabel1</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -143,7 +143,7 @@
<property name="text"> <property name="text">
<string>high quality</string> <string>high quality</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -229,7 +229,7 @@
<property name="text"> <property name="text">
<string>textLabel2</string> <string>textLabel2</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -360,7 +360,7 @@
<property name="text"> <property name="text">
<string>high quality</string> <string>high quality</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

18
plugins/encoder/lame/k3blameencoder.cpp
Unescape View File

@ -411,13 +411,13 @@ K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* parent, co
m_manualSettingsDlg->setMainWidget( m_brW ); m_manualSettingsDlg->setMainWidget( m_brW );
for( int i = 0; s_lame_bitrates[i]; ++i ) for( int i = 0; s_lame_bitrates[i]; ++i )
m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
for( int i = 0; s_lame_bitrates[i]; ++i ) for( int i = 0; s_lame_bitrates[i]; ++i )
m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
for( int i = 0; s_lame_bitrates[i]; ++i ) for( int i = 0; s_lame_bitrates[i]; ++i )
m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
TQHBoxLayout* lay = new TQHBoxLayout( this ); TQHBoxLayout* lay = new TQHBoxLayout( this );
@ -469,11 +469,11 @@ void K3bLameEncoderSettingsWidget::updateManualSettingsLabel()
{ {
if( m_brW->m_radioConstantBitrate->isChecked() ) if( m_brW->m_radioConstantBitrate->isChecked() )
m_w->m_labelManualSettings->setText( i18n("Constant Bitrate: %1 kbps (%2)") m_w->m_labelManualSettings->setText( i18n("Constant Bitrate: %1 kbps (%2)")
.tqarg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()]) .arg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()])
.tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
else else
m_w->m_labelManualSettings->setText( i18n("Variable Bitrate (%1)") m_w->m_labelManualSettings->setText( i18n("Variable Bitrate (%1)")
.tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
} }
@ -507,9 +507,9 @@ void K3bLameEncoderSettingsWidget::loadConfig()
else else
m_brW->m_radioConstantBitrate->setChecked( true ); m_brW->m_radioConstantBitrate->setChecked( true );
m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Constant Bitrate", 128 )) ); m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Constant Bitrate", 128 )) );
m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Maximum Bitrate", 224 )) ); m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Maximum Bitrate", 224 )) );
m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Minimum Bitrate", 32 )) ); m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Minimum Bitrate", 32 )) );
m_brW->m_spinAverageBitrate->setValue( c->readNumEntry( "Average Bitrate", 128) ); m_brW->m_spinAverageBitrate->setValue( c->readNumEntry( "Average Bitrate", 128) );
m_brW->m_checkBitrateMaximum->setChecked( c->readBoolEntry( "Use Maximum Bitrate", false ) ); m_brW->m_checkBitrateMaximum->setChecked( c->readBoolEntry( "Use Maximum Bitrate", false ) );

4
plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
Unescape View File

@ -68,7 +68,7 @@
<property name="text"> <property name="text">
<string>textLabel1</string> <string>textLabel1</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -148,7 +148,7 @@
<property name="text"> <property name="text">
<string>high quality</string> <string>high quality</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

2
plugins/encoder/ogg/k3boggvorbisencoder.cpp
Unescape View File

@ -470,7 +470,7 @@ K3bOggVorbisEncoderSettingsWidget::~K3bOggVorbisEncoderSettingsWidget()
void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val ) void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val )
{ {
w->m_labelQualityLevel->setText( TQString::number(val) + " " w->m_labelQualityLevel->setText( TQString::number(val) + " "
+ i18n("(targetted VBR of %1)").tqarg(s_rough_average_quality_level_bitrates[val+1]) ); + i18n("(targetted VBR of %1)").arg(s_rough_average_quality_level_bitrates[val+1]) );
} }

6
plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp
Unescape View File

@ -203,7 +203,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewIt
d->dirItemDict.insert( dir, viewRoot ); d->dirItemDict.insert( dir, viewRoot );
for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( dir->children() ); it.current(); ++it ) {
K3bDataItem* item = it.current(); K3bDataItem* item = it.current();
if( item->isFile() ) { if( item->isFile() ) {
@ -334,9 +334,9 @@ TQString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item )
kdDebug() << "(K3bAudioMetainfoRenamerPluginWidget) file with name " kdDebug() << "(K3bAudioMetainfoRenamerPluginWidget) file with name "
<< newName << extension << " already exists" << endl; << newName << extension << " already exists" << endl;
int i = 1; int i = 1;
while( existsOtherItemWithSameName( item, newName + TQString( " (%1)").tqarg(i) + extension ) ) while( existsOtherItemWithSameName( item, newName + TQString( " (%1)").arg(i) + extension ) )
i++; i++;
newName.append( TQString( " (%1)").tqarg(i) ); newName.append( TQString( " (%1)").arg(i) );
} }
// append extension // append extension

2
src/fastscale/scale.cpp
Unescape View File

@ -1925,7 +1925,7 @@ TQImage scale(const TQImage& image, int width, int height,
if( image.isNull()) return image.copy(); if( image.isNull()) return image.copy();
TQSize newSize( image.size() ); TQSize newSize( image.size() );
newSize.tqscale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0 newSize.scale( TQSize( width, height ), (TQSize::ScaleMode)mode ); // ### remove cast in TQt 4.0
newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null newSize = newSize.expandedTo( TQSize( 1, 1 )); // make sure it doesn't become null
if ( newSize == image.size() ) return image.copy(); if ( newSize == image.size() ) return image.copy();

24
src/k3b.cpp
Unescape View File

@ -288,7 +288,7 @@ void K3bMainWindow::initActions()
actionToolsBlankCdrw = new KAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()), actionToolsBlankCdrw = new KAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()),
actionCollection(), "tools_blank_cdrw" ); actionCollection(), "tools_blank_cdrw" );
KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").tqarg("<EFBFBD>"), "formatdvd", 0, TQT_TQOBJECT(this), KAction* actionToolsFormatDVD = new KAction( i18n("&Format DVD%1RW...").arg("<EFBFBD>"), "formatdvd", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" );
actionToolsWriteCdImage = new KAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()), actionToolsWriteCdImage = new KAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()),
actionCollection(), "tools_write_cd_image" ); actionCollection(), "tools_write_cd_image" );
@ -330,7 +330,7 @@ void K3bMainWindow::initActions()
actionFileNewMovix->setToolTip( i18n("Creates a new eMovix CD project") ); actionFileNewMovix->setToolTip( i18n("Creates a new eMovix CD project") );
actionFileNewVcd->setToolTip( i18n("Creates a new Video CD project") ); actionFileNewVcd->setToolTip( i18n("Creates a new Video CD project") );
actionToolsBlankCdrw->setToolTip( i18n("Open the CD-RW erasing dialog") ); actionToolsBlankCdrw->setToolTip( i18n("Open the CD-RW erasing dialog") );
actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").tqarg("<EFBFBD>") ); actionToolsFormatDVD->setToolTip( i18n("Open the DVD%1RW formatting dialog").arg("<EFBFBD>") );
actionCdCopy->setToolTip( i18n("Open the CD copy dialog") ); actionCdCopy->setToolTip( i18n("Open the CD copy dialog") );
actionToolsWriteCdImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to CD") ); actionToolsWriteCdImage->setToolTip( i18n("Write an Iso9660, cue/bin, or cdrecord clone image to CD") );
actionToolsWriteDvdImage->setToolTip( i18n("Write an Iso9660 image to DVD") ); actionToolsWriteDvdImage->setToolTip( i18n("Write an Iso9660 image to DVD") );
@ -635,20 +635,20 @@ void K3bMainWindow::saveProperties( KConfig* c )
int cnt = 1; int cnt = 1;
for( TQPtrListIterator<K3bDoc> it( docs ); *it; ++it ) { for( TQPtrListIterator<K3bDoc> it( docs ); *it; ++it ) {
// the "name" of the project (or the original url if isSaved()) // the "name" of the project (or the original url if isSaved())
c->writePathEntry( TQString("%1 url").tqarg(cnt), (*it)->URL().url() ); c->writePathEntry( TQString("%1 url").arg(cnt), (*it)->URL().url() );
// is the doc modified // is the doc modified
c->writeEntry( TQString("%1 modified").tqarg(cnt), (*it)->isModified() ); c->writeEntry( TQString("%1 modified").arg(cnt), (*it)->isModified() );
// has the doc already been saved? // has the doc already been saved?
c->writeEntry( TQString("%1 saved").tqarg(cnt), (*it)->isSaved() ); c->writeEntry( TQString("%1 saved").arg(cnt), (*it)->isSaved() );
// where does the session management save it? If it's not modified and saved this is // where does the session management save it? If it's not modified and saved this is
// the same as the url // the same as the url
KURL saveUrl = (*it)->URL(); KURL saveUrl = (*it)->URL();
if( !(*it)->isSaved() || (*it)->isModified() ) if( !(*it)->isSaved() || (*it)->isModified() )
saveUrl = KURL::fromPathOrURL( saveDir + TQString::number(cnt) ); saveUrl = KURL::fromPathOrURL( saveDir + TQString::number(cnt) );
c->writePathEntry( TQString("%1 saveurl").tqarg(cnt), saveUrl.url() ); c->writePathEntry( TQString("%1 saveurl").arg(cnt), saveUrl.url() );
// finally save it // finally save it
k3bappcore->projectManager()->saveProject( *it, saveUrl ); k3bappcore->projectManager()->saveProject( *it, saveUrl );
@ -690,13 +690,13 @@ void K3bMainWindow::readProperties( KConfig* c )
for( int i = 1; i <= cnt; ++i ) { for( int i = 1; i <= cnt; ++i ) {
// in this case the constructor works since we saved as url() // in this case the constructor works since we saved as url()
KURL url = c->readPathEntry( TQString("%1 url").tqarg(i) ); KURL url = c->readPathEntry( TQString("%1 url").arg(i) );
bool modified = c->readBoolEntry( TQString("%1 modified").tqarg(i) ); bool modified = c->readBoolEntry( TQString("%1 modified").arg(i) );
bool saved = c->readBoolEntry( TQString("%1 saved").tqarg(i) ); bool saved = c->readBoolEntry( TQString("%1 saved").arg(i) );
KURL saveUrl = c->readPathEntry( TQString("%1 saveurl").tqarg(i) ); KURL saveUrl = c->readPathEntry( TQString("%1 saveurl").arg(i) );
// now load the project // now load the project
if( K3bDoc* doc = k3bappcore->projectManager()->openProject( saveUrl ) ) { if( K3bDoc* doc = k3bappcore->projectManager()->openProject( saveUrl ) ) {
@ -826,7 +826,7 @@ bool K3bMainWindow::canCloseDocument( K3bDoc* doc )
return true; return true;
switch ( KMessageBox::warningYesNoCancel( this, switch ( KMessageBox::warningYesNoCancel( this,
i18n("%1 has unsaved data.").tqarg( doc->URL().fileName() ), i18n("%1 has unsaved data.").arg( doc->URL().fileName() ),
i18n("Closing Project"), i18n("Closing Project"),
KStdGuiItem::save(), KStdGuiItem::save(),
KGuiItem( i18n("&Discard"), "editshred" ) ) ) KGuiItem( i18n("&Discard"), "editshred" ) ) )
@ -940,7 +940,7 @@ void K3bMainWindow::fileSaveAs( K3bDoc* doc )
bool exists = KIO::NetAccess::exists( url, false, 0 ); bool exists = KIO::NetAccess::exists( url, false, 0 );
if( !exists || if( !exists ||
( exists && ( exists &&
KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").tqarg( url.prettyURL() ), KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").arg( url.prettyURL() ),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) ) { == KMessageBox::Continue ) ) {

2
src/k3b.h
Unescape View File

@ -249,7 +249,7 @@ class K3bMainWindow : public KParts::DockMainWindow
void fileSaveAs( K3bDoc* doc = 0 ); void fileSaveAs( K3bDoc* doc = 0 );
void closeProject( K3bDoc* ); void closeProject( K3bDoc* );
/** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file * file
*/ */
void saveOptions(); void saveOptions();

2
src/k3bappdevicemanager.cpp
Unescape View File

@ -230,7 +230,7 @@ void K3bAppDeviceManager::setReadSpeed()
"and the spinning noise is intrusive." "and the spinning noise is intrusive."
"<p>Be aware that this has no influence on K3b since it will " "<p>Be aware that this has no influence on K3b since it will "
"change the reading speed again when copying CDs or DVDs.") "change the reading speed again when copying CDs or DVDs.")
.tqarg(currentDevice()->vendor() + " " + currentDevice()->description()), .arg(currentDevice()->vendor() + " " + currentDevice()->description()),
12, 12,
1, 1,
currentDevice()->maxReadSpeed(), currentDevice()->maxReadSpeed(),

2
src/k3bapplication.cpp
Unescape View File

@ -297,7 +297,7 @@ bool K3bApplication::processCmdLineArgs()
// FIXME: seems not like the right place... // FIXME: seems not like the right place...
if( args->isSet( "ao" ) ) if( args->isSet( "ao" ) )
if( !m_audioServer->setOutputMethod( args->getOption( "ao" ) ) ) if( !m_audioServer->setOutputMethod( args->getOption( "ao" ) ) )
K3bPassivePopup::showPopup( i18n("Could not find Audio Output plugin '%1'").tqarg( args->getOption("ao").data() ), K3bPassivePopup::showPopup( i18n("Could not find Audio Output plugin '%1'").arg( args->getOption("ao").data() ),
i18n("Initialization Problem"), i18n("Initialization Problem"),
K3bPassivePopup::Warning ); K3bPassivePopup::Warning );

6
src/k3baudioplayer.cpp
Unescape View File

@ -586,13 +586,13 @@ void K3bAudioPlayer::slotUpdateFilename()
switch( state() ) { switch( state() ) {
case PLAYING: case PLAYING:
display.prepend( TQString("(%1) ").tqarg(i18n("playing")) ); display.prepend( TQString("(%1) ").arg(i18n("playing")) );
break; break;
case PAUSED: case PAUSED:
display.prepend( TQString("(%1) ").tqarg(i18n("paused")) ); display.prepend( TQString("(%1) ").arg(i18n("paused")) );
break; break;
case STOPPED: case STOPPED:
display.prepend( TQString("(%1) ").tqarg(i18n("stopped")) ); display.prepend( TQString("(%1) ").arg(i18n("stopped")) );
break; break;
default: default:
break; break;

4
src/k3bburnprogressdialog.cpp
Unescape View File

@ -91,7 +91,7 @@ void K3bBurnProgressDialog::setBurnJob( K3bBurnJob* burnJob )
connect( burnJob, TQT_SIGNAL(burning(bool)), m_labelWritingSpeed, TQT_SLOT(setEnabled(bool)) ); connect( burnJob, TQT_SIGNAL(burning(bool)), m_labelWritingSpeed, TQT_SLOT(setEnabled(bool)) );
if( burnJob->writer() ) if( burnJob->writer() )
m_labelWriter->setText( i18n("Writer: %1 %2").tqarg(burnJob->writer()->vendor()). m_labelWriter->setText( i18n("Writer: %1 %2").arg(burnJob->writer()->vendor()).
arg(burnJob->writer()->description()) ); arg(burnJob->writer()->description()) );
m_labelWritingSpeed->setText( i18n("no info") ); m_labelWritingSpeed->setText( i18n("no info") );
@ -128,7 +128,7 @@ void K3bBurnProgressDialog::slotDeviceBuffer( int b )
void K3bBurnProgressDialog::slotWriteSpeed( int s, int multiplicator ) void K3bBurnProgressDialog::slotWriteSpeed( int s, int multiplicator )
{ {
m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) ); m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) );
} }
#include "k3bburnprogressdialog.moc" #include "k3bburnprogressdialog.moc"

4
src/k3bdataprojectinterface.cpp
Unescape View File

@ -102,12 +102,12 @@ bool K3bDataProjectInterface::isFolder( const TQString& path ) const
} }
TQStringList K3bDataProjectInterface::tqchildren( const TQString& path ) const TQStringList K3bDataProjectInterface::children( const TQString& path ) const
{ {
TQStringList l; TQStringList l;
K3bDataItem* item = m_dataDoc->root()->findByPath( path ); K3bDataItem* item = m_dataDoc->root()->findByPath( path );
if( item && item->isDir() ) { if( item && item->isDir() ) {
const TQPtrList<K3bDataItem>& cl = static_cast<K3bDirItem*>(item)->tqchildren(); const TQPtrList<K3bDataItem>& cl = static_cast<K3bDirItem*>(item)->children();
for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it )
l.append( it.current()->k3bName() ); l.append( it.current()->k3bName() );
} }

2
src/k3bdataprojectinterface.h
Unescape View File

@ -90,7 +90,7 @@ class K3bDataProjectInterface : public K3bProjectInterface
/** /**
* \return the names of the child elements of the item determined by path. * \return the names of the child elements of the item determined by path.
*/ */
TQStringList tqchildren( const TQString& path ) const; TQStringList children( const TQString& path ) const;
/** /**
* Set the sort weight of an item * Set the sort weight of an item

16
src/k3bdebuggingoutputdialog.cpp
Unescape View File

@ -122,12 +122,12 @@ void K3bDebuggingOutputDialog::clear()
K3bDevice::Device* dev = *it; K3bDevice::Device* dev = *it;
addOutput( "Devices", addOutput( "Devices",
TQString( "%1 (%2, %3) [%5] [%6] [%7]" ) TQString( "%1 (%2, %3) [%5] [%6] [%7]" )
.tqarg( dev->vendor() + " " + dev->description() + " " + dev->version() ) .arg( dev->vendor() + " " + dev->description() + " " + dev->version() )
.tqarg( dev->blockDeviceName() ) .arg( dev->blockDeviceName() )
.tqarg( dev->genericDevice() ) .arg( dev->genericDevice() )
.tqarg( K3bDevice::deviceTypeString( dev->type() ) ) .arg( K3bDevice::deviceTypeString( dev->type() ) )
.tqarg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) ) .arg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
.tqarg( K3bDevice::writingModeString( dev->writingModes() ) ) ); .arg( K3bDevice::writingModeString( dev->writingModes() ) ) );
} }
} }
@ -138,7 +138,7 @@ void K3bDebuggingOutputDialog::slotUser1()
if( !filename.isEmpty() ) { if( !filename.isEmpty() ) {
TQFile f( filename ); TQFile f( filename );
if( !f.exists() || KMessageBox::warningContinueCancel( this, if( !f.exists() || KMessageBox::warningContinueCancel( this,
i18n("Do you want to overwrite %1?").tqarg(filename), i18n("Do you want to overwrite %1?").arg(filename),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) { == KMessageBox::Continue ) {
@ -147,7 +147,7 @@ void K3bDebuggingOutputDialog::slotUser1()
t << debugView->text(); t << debugView->text();
} }
else { else {
KMessageBox::error( this, i18n("Could not open file %1").tqarg(filename) ); KMessageBox::error( this, i18n("Could not open file %1").arg(filename) );
} }
} }
} }

12
src/k3bdebuggingoutputfile.cpp
Unescape View File

@ -50,12 +50,12 @@ bool K3bDebuggingOutputFile::open()
K3bDevice::Device* dev = *it; K3bDevice::Device* dev = *it;
addOutput( "Devices", addOutput( "Devices",
TQString( "%1 (%2, %3) [%5] [%6] [%7]" ) TQString( "%1 (%2, %3) [%5] [%6] [%7]" )
.tqarg( dev->vendor() + " " + dev->description() + " " + dev->version() ) .arg( dev->vendor() + " " + dev->description() + " " + dev->version() )
.tqarg( dev->blockDeviceName() ) .arg( dev->blockDeviceName() )
.tqarg( dev->genericDevice() ) .arg( dev->genericDevice() )
.tqarg( K3bDevice::deviceTypeString( dev->type() ) ) .arg( K3bDevice::deviceTypeString( dev->type() ) )
.tqarg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) ) .arg( K3bDevice::mediaTypeString( dev->supportedProfiles() ) )
.tqarg( K3bDevice::writingModeString( dev->writingModes() ) ) ); .arg( K3bDevice::writingModeString( dev->writingModes() ) ) );
} }
return true; return true;

16
src/k3bdirview.cpp
Unescape View File

@ -247,7 +247,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium )
else { else {
if( KMessageBox::questionYesNo( this, if( KMessageBox::questionYesNo( this,
i18n("Found %1. Do you want K3b to mount the data part " i18n("Found %1. Do you want K3b to mount the data part "
"or show all the tracks?").tqarg( i18n("Video CD") ), "or show all the tracks?").arg( i18n("Video CD") ),
i18n("Video CD"), i18n("Video CD"),
i18n("Mount CD"), i18n("Mount CD"),
i18n("Show Video Tracks") ) == KMessageBox::No ) { i18n("Show Video Tracks") ) == KMessageBox::No ) {
@ -260,7 +260,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium )
else if( medium.content() & K3bMedium::CONTENT_AUDIO ) { else if( medium.content() & K3bMedium::CONTENT_AUDIO ) {
if( KMessageBox::questionYesNo( this, if( KMessageBox::questionYesNo( this,
i18n("Found %1. Do you want K3b to mount the data part " i18n("Found %1. Do you want K3b to mount the data part "
"or show all the tracks?").tqarg( i18n("Audio CD") ), "or show all the tracks?").arg( i18n("Audio CD") ),
i18n("Audio CD"), i18n("Audio CD"),
i18n("Mount CD"), i18n("Mount CD"),
i18n("Show Audio Tracks") ) == KMessageBox::No ) { i18n("Show Audio Tracks") ) == KMessageBox::No ) {
@ -298,9 +298,9 @@ void K3bDirView::slotMountFinished( const TQString& mp )
else { else {
m_viewStack->raiseWidget( m_fileView ); m_viewStack->raiseWidget( m_fileView );
K3bPassivePopup::showPopup( i18n("<p>K3b was unable to mount medium <b>%1</b> in device <em>%2 - %3</em>") K3bPassivePopup::showPopup( i18n("<p>K3b was unable to mount medium <b>%1</b> in device <em>%2 - %3</em>")
.tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() ) .arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
.tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() ) .arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
.tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ), .arg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
i18n("Mount Failed"), i18n("Mount Failed"),
K3bPassivePopup::Warning ); K3bPassivePopup::Warning );
} }
@ -314,9 +314,9 @@ void K3bDirView::slotUnmountFinished( bool success )
} }
else { else {
K3bPassivePopup::showPopup( i18n("<p>K3b was unable to unmount medium <b>%1</b> in device <em>%2 - %3</em>") K3bPassivePopup::showPopup( i18n("<p>K3b was unable to unmount medium <b>%1</b> in device <em>%2 - %3</em>")
.tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() ) .arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
.tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() ) .arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
.tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ), .arg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
i18n("Unmount Failed"), i18n("Unmount Failed"),
K3bPassivePopup::Warning ); K3bPassivePopup::Warning );
} }

30
src/k3bdiskinfoview.cpp
Unescape View File

@ -231,7 +231,7 @@ void K3bDiskInfoView::reloadMedium()
// if we have multiple sessions we create a header item for every session // if we have multiple sessions we create a header item for every session
KListViewItem* trackItem = 0; KListViewItem* trackItem = 0;
if( medium().diskInfo().numSessions() > 1 && medium().toc()[0].session() > 0 ) { if( medium().diskInfo().numSessions() > 1 && medium().toc()[0].session() > 0 ) {
trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").tqarg(1) ); trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").arg(1) );
lastSession = 1; lastSession = 1;
} }
else else
@ -248,7 +248,7 @@ void K3bDiskInfoView::reloadMedium()
trackItem->setOpen(true); trackItem->setOpen(true);
trackItem = new HeaderViewItem( trackHeaderItem, trackItem = new HeaderViewItem( trackHeaderItem,
m_infoView->lastItem()->parent(), m_infoView->lastItem()->parent(),
i18n("Session %1").tqarg(lastSession) ); i18n("Session %1").arg(lastSession) );
} }
item = new KListViewItem( trackItem, item ); item = new KListViewItem( trackItem, item );
@ -269,21 +269,21 @@ void K3bDiskInfoView::reloadMedium()
else else
text = i18n("Data"); text = i18n("Data");
} }
item->setText( 0, i18n("%1 (%2)").tqarg( TQString::number(index).rightJustify( 2, ' ' )).tqarg(text) ); item->setText( 0, i18n("%1 (%2)").arg( TQString::number(index).rightJustify( 2, ' ' )).arg(text) );
item->setText( 1, TQString( "%1/%2" ) item->setText( 1, TQString( "%1/%2" )
.tqarg( track.copyPermitted() ? i18n("copy") : i18n("no copy") ) .arg( track.copyPermitted() ? i18n("copy") : i18n("no copy") )
.tqarg( track.type() == K3bTrack::AUDIO .arg( track.type() == K3bTrack::AUDIO
? ( track.preEmphasis() ? i18n("preemp") : i18n("no preemp") ) ? ( track.preEmphasis() ? i18n("preemp") : i18n("no preemp") )
: ( track.recordedIncremental() ? i18n("incremental") : i18n("uninterrupted") ) ) ); : ( track.recordedIncremental() ? i18n("incremental") : i18n("uninterrupted") ) ) );
item->setText( 2, item->setText( 2,
TQString("%1 - %2") TQString("%1 - %2")
.tqarg(track.firstSector().lba()) .arg(track.firstSector().lba())
.tqarg(track.lastSector().lba()) ); .arg(track.lastSector().lba()) );
item->setText( 3, TQString::number( track.length().lba() ) + " (" + track.length().toString() + ")" ); item->setText( 3, TQString::number( track.length().lba() ) + " (" + track.length().toString() + ")" );
#ifdef K3B_DEBUG #ifdef K3B_DEBUG
if( track.type() == K3bTrack::AUDIO ) if( track.type() == K3bTrack::AUDIO )
item->setText( 4, TQString( "%1 (%2)" ).tqarg(track.index0().toString()).tqarg(track.index0().lba()) ); item->setText( 4, TQString( "%1 (%2)" ).arg(track.index0().toString()).arg(track.index0().lba()) );
#endif #endif
++index; ++index;
} }
@ -355,19 +355,19 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new KListViewItem( atipItem, atipChild,
i18n("Capacity:"), i18n("Capacity:"),
i18n("%1 min").tqarg(info.capacity().toString()), i18n("%1 min").arg(info.capacity().toString()),
KIO::convertSize(info.capacity().mode1Bytes()) ); KIO::convertSize(info.capacity().mode1Bytes()) );
if( !info.empty() ) if( !info.empty() )
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new KListViewItem( atipItem, atipChild,
i18n("Used Capacity:"), i18n("Used Capacity:"),
i18n("%1 min").tqarg(info.size().toString()), i18n("%1 min").arg(info.size().toString()),
KIO::convertSize(info.size().mode1Bytes()) ); KIO::convertSize(info.size().mode1Bytes()) );
if( info.appendable() ) if( info.appendable() )
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new KListViewItem( atipItem, atipChild,
i18n("Remaining:"), i18n("Remaining:"),
i18n("%1 min").tqarg( info.remainingSize().toString() ), i18n("%1 min").arg( info.remainingSize().toString() ),
KIO::convertSize(info.remainingSize().mode1Bytes()) ); KIO::convertSize(info.remainingSize().mode1Bytes()) );
atipChild = new KListViewItem( atipItem, atipChild, atipChild = new KListViewItem( atipItem, atipChild,
@ -427,7 +427,7 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
if( info.isDvdMedia() ) if( info.isDvdMedia() )
s.append( TQString().sprintf( "%.1fx (%d KB/s)", (double)*it / 1385.0, *it ) ); s.append( TQString().sprintf( "%.1fx (%d KB/s)", (double)*it / 1385.0, *it ) );
else else
s.append( TQString( "%1x (%2 KB/s)" ).tqarg( *it/175 ).tqarg( *it ) ); s.append( TQString( "%1x (%2 KB/s)" ).arg( *it/175 ).arg( *it ) );
} }
atipChild->setText( 1, s ); atipChild->setText( 1, s );
@ -476,10 +476,10 @@ void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescr
// iso9660Child = new KListViewItem( iso9660Item, iso9660Child, // iso9660Child = new KListViewItem( iso9660Item, iso9660Child,
// i18n("Volume Size:"), // i18n("Volume Size:"),
// TQString( "%1 (%2*%3)" ) // TQString( "%1 (%2*%3)" )
// .tqarg(iso.logicalBlockSize // .arg(iso.logicalBlockSize
// *iso.volumeSpaceSize) // *iso.volumeSpaceSize)
// .tqarg(iso.logicalBlockSize) // .arg(iso.logicalBlockSize)
// .tqarg(iso.volumeSpaceSize), // .arg(iso.volumeSpaceSize),
// KIO::convertSize(iso.logicalBlockSize // KIO::convertSize(iso.logicalBlockSize
// *iso.volumeSpaceSize) ); // *iso.volumeSpaceSize) );

78
src/k3bemptydiscwaiter.cpp
Unescape View File

@ -152,11 +152,11 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
// //
if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) && if( (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD) &&
(d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) ) (d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_CD) )
d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").tqarg("<EFBFBD>"); d->wantedMediaTypeString = i18n("CD-R(W) or DVD%1R(W)").arg("<EFBFBD>");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL ) else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_SL )
d->wantedMediaTypeString = i18n("DVD%1R(W)").tqarg("<EFBFBD>"); d->wantedMediaTypeString = i18n("DVD%1R(W)").arg("<EFBFBD>");
else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL ) else if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD_DL )
d->wantedMediaTypeString = i18n("Double Layer DVD%1R").tqarg("<EFBFBD>"); d->wantedMediaTypeString = i18n("Double Layer DVD%1R").arg("<EFBFBD>");
else else
d->wantedMediaTypeString = i18n("CD-R(W)"); d->wantedMediaTypeString = i18n("CD-R(W)");
@ -164,44 +164,44 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
if( (d->wantedMediaState & K3bDevice::STATE_COMPLETE) && (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) ) if( (d->wantedMediaState & K3bDevice::STATE_COMPLETE) && (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) )
d->labelRequest->setText( i18n("Please insert a complete or appendable %4 medium " d->labelRequest->setText( i18n("Please insert a complete or appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.") "into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()) .arg(d->device->description())
.tqarg(d->device->devicename()) .arg(d->device->devicename())
.tqarg( d->wantedMediaTypeString ) ); .arg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_COMPLETE ) else if( d->wantedMediaState & K3bDevice::STATE_COMPLETE )
d->labelRequest->setText( i18n("Please insert a complete %4 medium " d->labelRequest->setText( i18n("Please insert a complete %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.") "into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()) .arg(d->device->description())
.tqarg(d->device->devicename()) .arg(d->device->devicename())
.tqarg( d->wantedMediaTypeString ) ); .arg( d->wantedMediaTypeString ) );
else if( (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) && (d->wantedMediaState & K3bDevice::STATE_EMPTY) ) else if( (d->wantedMediaState & K3bDevice::STATE_INCOMPLETE) && (d->wantedMediaState & K3bDevice::STATE_EMPTY) )
d->labelRequest->setText( i18n("Please insert an empty or appendable %4 medium " d->labelRequest->setText( i18n("Please insert an empty or appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.") "into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()) .arg(d->device->description())
.tqarg(d->device->devicename()) .arg(d->device->devicename())
.tqarg( d->wantedMediaTypeString ) ); .arg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_INCOMPLETE ) else if( d->wantedMediaState & K3bDevice::STATE_INCOMPLETE )
d->labelRequest->setText( i18n("Please insert an appendable %4 medium " d->labelRequest->setText( i18n("Please insert an appendable %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.") "into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()) .arg(d->device->description())
.tqarg(d->device->devicename()) .arg(d->device->devicename())
.tqarg( d->wantedMediaTypeString ) ); .arg( d->wantedMediaTypeString ) );
else if( d->wantedMediaState & K3bDevice::STATE_EMPTY ) else if( d->wantedMediaState & K3bDevice::STATE_EMPTY )
d->labelRequest->setText( i18n("Please insert an empty %4 medium " d->labelRequest->setText( i18n("Please insert an empty %4 medium "
"into drive<p><b>%1 %2 (%3)</b>.") "into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()) .arg(d->device->description())
.tqarg(d->device->devicename()) .arg(d->device->devicename())
.tqarg( d->wantedMediaTypeString ) ); .arg( d->wantedMediaTypeString ) );
else // fallback case (this should not happen in K3b) else // fallback case (this should not happen in K3b)
d->labelRequest->setText( i18n("Please insert a suitable medium " d->labelRequest->setText( i18n("Please insert a suitable medium "
"into drive<p><b>%1 %2 (%3)</b>.") "into drive<p><b>%1 %2 (%3)</b>.")
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()) .arg(d->device->description())
.tqarg(d->device->devicename()) ); .arg(d->device->devicename()) );
} }
else else
@ -340,10 +340,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(), KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. " i18n("Found %1 media in %2 - %3. "
"Should it be overwritten?") "Should it be overwritten?")
.tqarg("DVD+RW") .arg("DVD+RW")
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()), .arg(d->device->description()),
i18n("Found %1").tqarg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { i18n("Found %1").arg("DVD+RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
finishWaiting( K3bDevice::MEDIA_DVD_PLUS_RW ); finishWaiting( K3bDevice::MEDIA_DVD_PLUS_RW );
} }
else { else {
@ -410,10 +410,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(), KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. " i18n("Found %1 media in %2 - %3. "
"Should it be overwritten?") "Should it be overwritten?")
.tqarg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType())) .arg(K3bDevice::mediaTypeString(medium.diskInfo().mediaType()))
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()), .arg(d->device->description()),
i18n("Found %1").tqarg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) { i18n("Found %1").arg("DVD-RW"),i18n("Overwrite") ) == KMessageBox::Continue ) {
finishWaiting( K3bDevice::MEDIA_DVD_RW_OVWR ); finishWaiting( K3bDevice::MEDIA_DVD_RW_OVWR );
} }
else { else {
@ -467,10 +467,10 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
KMessageBox::warningContinueCancel( parentWidgetToUse(), KMessageBox::warningContinueCancel( parentWidgetToUse(),
i18n("Found %1 media in %2 - %3. " i18n("Found %1 media in %2 - %3. "
"Should it be formatted?") "Should it be formatted?")
.tqarg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) ) .arg( K3bDevice::mediaTypeString(medium.diskInfo().mediaType()) )
.tqarg(d->device->vendor()) .arg(d->device->vendor())
.tqarg(d->device->description()), .arg(d->device->description()),
i18n("Found %1").tqarg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) { i18n("Found %1").arg("DVD-RW"), i18n("Format") ) == KMessageBox::Continue ) {
kdDebug() << "(K3bEmptyDiscWaiter) ------ formatting DVD-RW." << endl; kdDebug() << "(K3bEmptyDiscWaiter) ------ formatting DVD-RW." << endl;
@ -542,7 +542,7 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
if( formatWithoutAsking || if( formatWithoutAsking ||
KMessageBox::questionYesNo( parentWidgetToUse(), KMessageBox::questionYesNo( parentWidgetToUse(),
i18n("Found rewritable media in %1 - %2. " i18n("Found rewritable media in %1 - %2. "
"Should it be erased?").tqarg(d->device->vendor()).tqarg(d->device->description()), "Should it be erased?").arg(d->device->vendor()).arg(d->device->description()),
i18n("Found Rewritable Disk"), i18n("Found Rewritable Disk"),
KGuiItem(i18n("&Erase"), "cdrwblank"), KGuiItem(i18n("&Erase"), "cdrwblank"),
KGuiItem(i18n("E&ject")) ) == KMessageBox::Yes ) { KGuiItem(i18n("E&ject")) ) == KMessageBox::Yes ) {

4
src/k3bfiletreecombobox.cpp
Unescape View File

@ -198,7 +198,7 @@ void K3bFileTreeComboBox::popdown()
{ {
m_fileTreeView->hide(); m_fileTreeView->hide();
d->poppedUp = false; d->poppedUp = false;
tqrepaint(); // tqrepaint the arrow repaint(); // repaint the arrow
} }
@ -318,7 +318,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e )
if ( arrowRect.contains( e->pos() ) ) { if ( arrowRect.contains( e->pos() ) ) {
popup(); popup();
tqrepaint( FALSE ); repaint( FALSE );
} }
} }

14
src/k3bfiletreeview.cpp
Unescape View File

@ -52,7 +52,7 @@
K3bDeviceBranch::K3bDeviceBranch( KFileTreeView* view, K3bDevice::Device* dev, KFileTreeViewItem* item ) K3bDeviceBranch::K3bDeviceBranch( KFileTreeView* view, K3bDevice::Device* dev, KFileTreeViewItem* item )
: KFileTreeBranch( view, : KFileTreeBranch( view,
KURL( "media:/" + dev->blockDeviceName() ), KURL( "media:/" + dev->blockDeviceName() ),
TQString("%1 - %2").tqarg(dev->vendor()).tqarg(dev->description()), TQString("%1 - %2").arg(dev->vendor()).arg(dev->description()),
( dev->burner() ( dev->burner()
? SmallIcon("cdwriter_unmount") ? SmallIcon("cdwriter_unmount")
: SmallIcon("cdrom_unmount") ), : SmallIcon("cdrom_unmount") ),
@ -99,13 +99,13 @@ void K3bDeviceBranch::updateLabel()
{ {
if( m_showBlockDeviceName ) if( m_showBlockDeviceName )
setName( TQString("%1 %2 (%3)") setName( TQString("%1 %2 (%3)")
.tqarg(m_device->vendor()) .arg(m_device->vendor())
.tqarg(m_device->description()) .arg(m_device->description())
.tqarg(m_device->blockDeviceName()) ); .arg(m_device->blockDeviceName()) );
else else
setName( TQString("%1 %2") setName( TQString("%1 %2")
.tqarg(m_device->vendor()) .arg(m_device->vendor())
.tqarg(m_device->description()) ); .arg(m_device->description()) );
if( k3bappcore->mediaCache() ) { if( k3bappcore->mediaCache() ) {
root()->setMultiLinesEnabled( true ); root()->setMultiLinesEnabled( true );
@ -182,7 +182,7 @@ K3bDeviceBranchViewItem::K3bDeviceBranchViewItem( KFileTreeView* parent,
void K3bDeviceBranchViewItem::setCurrent( bool c ) void K3bDeviceBranchViewItem::setCurrent( bool c )
{ {
m_bCurrent = c; m_bCurrent = c;
tqrepaint(); repaint();
} }

2
src/k3bflatbutton.cpp
Unescape View File

@ -158,7 +158,7 @@ void K3bFlatButton::drawContents( TQPainter* p )
// TQRect r( mapToParent( TQPoint(lineWidth(), lineWidth()) ), // TQRect r( mapToParent( TQPoint(lineWidth(), lineWidth()) ),
// mapToParent( TQPoint(width()-2*lineWidth(), height()-2*lineWidth() )) ); // mapToParent( TQPoint(width()-2*lineWidth(), height()-2*lineWidth() )) );
// parentWidget()->tqrepaint( r ); // parentWidget()->repaint( r );
// } // }
p->save(); p->save();

12
src/k3bjobprogressdialog.cpp
Unescape View File

@ -314,13 +314,13 @@ void K3bJobProgressDialog::setupConnections()
void K3bJobProgressDialog::slotProcessedSize( int processed, int size ) void K3bJobProgressDialog::slotProcessedSize( int processed, int size )
{ {
m_labelProcessedSize->setText( i18n("%1 of %2 MB").tqarg( processed ).tqarg( size ) ); m_labelProcessedSize->setText( i18n("%1 of %2 MB").arg( processed ).arg( size ) );
} }
void K3bJobProgressDialog::slotProcessedSubSize( int processedTrackSize, int trackSize ) void K3bJobProgressDialog::slotProcessedSubSize( int processedTrackSize, int trackSize )
{ {
m_labelSubProcessedSize->setText( i18n("%1 of %2 MB").tqarg(processedTrackSize).tqarg(trackSize) ); m_labelSubProcessedSize->setText( i18n("%1 of %2 MB").arg(processedTrackSize).arg(trackSize) );
} }
@ -515,10 +515,10 @@ void K3bJobProgressDialog::slotUpdateTime()
{ {
int elapsed = m_startTime.secsTo( TQTime::currentTime() ); int elapsed = m_startTime.secsTo( TQTime::currentTime() );
TQString s = i18n("Elapsed time: %1 h").tqarg( TQTime().addSecs(elapsed).toString() ); TQString s = i18n("Elapsed time: %1 h").arg( TQTime().addSecs(elapsed).toString() );
if( d->lastProgress > 0 && d->lastProgress < 100 ) { if( d->lastProgress > 0 && d->lastProgress < 100 ) {
int rem = m_startTime.secsTo( m_lastProgressUpdateTime ) * (100-d->lastProgress) / d->lastProgress; int rem = m_startTime.secsTo( m_lastProgressUpdateTime ) * (100-d->lastProgress) / d->lastProgress;
s += " / " + i18n("Remaining: %1 h").tqarg( TQTime().addSecs(rem).toString() ); s += " / " + i18n("Remaining: %1 h").arg( TQTime().addSecs(rem).toString() );
} }
m_labelElapsedTime->setText( s ); m_labelElapsedTime->setText( s );
@ -546,10 +546,10 @@ void K3bJobProgressDialog::slotProgress( int percent )
d->lastProgress = percent; d->lastProgress = percent;
m_lastProgressUpdateTime = TQTime::currentTime(); m_lastProgressUpdateTime = TQTime::currentTime();
if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) { if( KMainWindow* w = dynamic_cast<KMainWindow*>(kapp->mainWidget()) ) {
w->setPlainCaption( TQString( "(%1%) %2" ).tqarg(percent).tqarg(m_plainCaption) ); w->setPlainCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_plainCaption) );
} }
setCaption( TQString( "(%1%) %2" ).tqarg(percent).tqarg(m_job->jobDescription()) ); setCaption( TQString( "(%1%) %2" ).arg(percent).arg(m_job->jobDescription()) );
} }
} }

6
src/k3blsofwrapperdialog.cpp
Unescape View File

@ -79,9 +79,9 @@ bool K3bLsofWrapperDialog::slotCheckDevice()
"<p><em>Hint: Sometimes shutting down an application does not " "<p><em>Hint: Sometimes shutting down an application does not "
"happen instantly. In that case you might have to use the '%3' " "happen instantly. In that case you might have to use the '%3' "
"button.") "button.")
.tqarg( m_device->vendor() + " - " + m_device->description() ) .arg( m_device->vendor() + " - " + m_device->description() )
.tqarg( joinProcessNames(apps) ) .arg( joinProcessNames(apps) )
.tqarg( actionButton( User2 )->text() ) ); .arg( actionButton( User2 )->text() ) );
return true; return true;
} }
} }

12
src/k3bmediaselectioncombobox.cpp
Unescape View File

@ -350,7 +350,7 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev )
// //
// insert the modified string // insert the modified string
// //
insertItem( s + TQString(" (%1 - %2)").tqarg(dev->vendor()).tqarg(dev->description()) ); insertItem( s + TQString(" (%1 - %2)").arg(dev->vendor()).arg(dev->description()) );
// //
// change the already existing string if we did not already do so // change the already existing string if we did not already do so
@ -358,7 +358,7 @@ void K3bMediaSelectionComboBox::addMedium( K3bDevice::Device* dev )
// //
int prevIndex = d->mediaStringMap[s]; int prevIndex = d->mediaStringMap[s];
if( prevIndex >= 0 ) if( prevIndex >= 0 )
changeItem( text(prevIndex) + TQString(" (%1 - %2)").tqarg(d->devices[prevIndex]->vendor()).tqarg(d->devices[prevIndex]->description()), changeItem( text(prevIndex) + TQString(" (%1 - %2)").arg(d->devices[prevIndex]->vendor()).arg(d->devices[prevIndex]->description()),
prevIndex ); prevIndex );
// //
@ -478,11 +478,11 @@ TQString K3bMediaSelectionComboBox::noMediumMessage() const
mediumString = i18n("DVD"); mediumString = i18n("DVD");
else if( (d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD) && else if( (d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD) &&
(d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD) ) (d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD) )
mediumString = i18n("CD-R(W) or DVD%1R(W)").tqarg("±"); mediumString = i18n("CD-R(W) or DVD%1R(W)").arg("±");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_SL ) else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_SL )
mediumString = i18n("DVD%1R(W)").tqarg("±"); mediumString = i18n("DVD%1R(W)").arg("±");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_DL ) else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_DVD_DL )
mediumString = i18n("Double Layer DVD%1R").tqarg("±"); mediumString = i18n("Double Layer DVD%1R").arg("±");
else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD ) else if( d->wantedMediumType & K3bDevice::MEDIA_WRITABLE_CD )
mediumString = i18n("CD-R(W)"); mediumString = i18n("CD-R(W)");
else if( d->wantedMediumType & K3bDevice::MEDIA_DVD_ROM ) else if( d->wantedMediumType & K3bDevice::MEDIA_DVD_ROM )
@ -490,7 +490,7 @@ TQString K3bMediaSelectionComboBox::noMediumMessage() const
else else
mediumString = i18n("CD-ROM"); mediumString = i18n("CD-ROM");
return i18n("Please insert %1...").tqarg( stateString.tqarg( mediumString ) ); return i18n("Please insert %1...").arg( stateString.arg( mediumString ) );
} }

38
src/k3bmedium.cpp
Unescape View File

@ -292,7 +292,7 @@ TQString K3bMedium::shortString( bool useContent ) const
} }
else if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ) { else if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ) {
return i18n("Empty %1 medium").tqarg( mediaTypeString ); return i18n("Empty %1 medium").arg( mediaTypeString );
} }
else { else {
@ -302,39 +302,39 @@ TQString K3bMedium::shortString( bool useContent ) const
toc().contentType() == K3bDevice::MIXED ) { toc().contentType() == K3bDevice::MIXED ) {
if( !cdText().performer().isEmpty() || !cdText().title().isEmpty() ) { if( !cdText().performer().isEmpty() || !cdText().title().isEmpty() ) {
return TQString("%1 - %2 (%3)") return TQString("%1 - %2 (%3)")
.tqarg( cdText().performer() ) .arg( cdText().performer() )
.tqarg( cdText().title() ) .arg( cdText().title() )
.tqarg( toc().contentType() == K3bDevice::AUDIO ? i18n("Audio CD") : i18n("Mixed CD") ); .arg( toc().contentType() == K3bDevice::AUDIO ? i18n("Audio CD") : i18n("Mixed CD") );
} }
else if( toc().contentType() == K3bDevice::AUDIO ) { else if( toc().contentType() == K3bDevice::AUDIO ) {
return i18n("Audio CD"); return i18n("Audio CD");
} }
else { else {
return i18n("%1 (Mixed CD)").tqarg( beautifiedVolumeId() ); return i18n("%1 (Mixed CD)").arg( beautifiedVolumeId() );
} }
} }
// DATA CD and DVD // DATA CD and DVD
else if( !volumeId().isEmpty() ) { else if( !volumeId().isEmpty() ) {
if( content() & CONTENT_VIDEO_DVD ) { if( content() & CONTENT_VIDEO_DVD ) {
return TQString("%1 (%2)").tqarg( beautifiedVolumeId() ).tqarg( i18n("Video DVD") ); return TQString("%1 (%2)").arg( beautifiedVolumeId() ).arg( i18n("Video DVD") );
} }
else if( content() & CONTENT_VIDEO_CD ) { else if( content() & CONTENT_VIDEO_CD ) {
return TQString("%1 (%2)").tqarg( beautifiedVolumeId() ).tqarg( i18n("Video CD") ); return TQString("%1 (%2)").arg( beautifiedVolumeId() ).arg( i18n("Video CD") );
} }
else if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) { else if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
return i18n("%1 (Appendable Data %2)").tqarg( beautifiedVolumeId(), mediaTypeString ); return i18n("%1 (Appendable Data %2)").arg( beautifiedVolumeId(), mediaTypeString );
} }
else { else {
return i18n("%1 (Complete Data %2)").tqarg( beautifiedVolumeId(), mediaTypeString ); return i18n("%1 (Complete Data %2)").arg( beautifiedVolumeId(), mediaTypeString );
} }
} }
else { else {
if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) { if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
return i18n("Appendable Data %1").tqarg( mediaTypeString ); return i18n("Appendable Data %1").arg( mediaTypeString );
} }
else { else {
return i18n("Complete Data %1").tqarg( mediaTypeString ); return i18n("Complete Data %1").arg( mediaTypeString );
} }
} }
} }
@ -342,10 +342,10 @@ TQString K3bMedium::shortString( bool useContent ) const
// without content // without content
else { else {
if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) { if( diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
return i18n("Appendable %1 medium").tqarg( mediaTypeString ); return i18n("Appendable %1 medium").arg( mediaTypeString );
} }
else { else {
return i18n("Complete %1 medium").tqarg( mediaTypeString ); return i18n("Complete %1 medium").arg( mediaTypeString );
} }
} }
} }
@ -356,15 +356,15 @@ TQString K3bMedium::longString() const
{ {
TQString s = TQString("<p><nobr><b>%1 %2</b> (%3)</nobr>" TQString s = TQString("<p><nobr><b>%1 %2</b> (%3)</nobr>"
"<p>") "<p>")
.tqarg( d->device->vendor() ) .arg( d->device->vendor() )
.tqarg( d->device->description() ) .arg( d->device->description() )
.tqarg( d->device->blockDeviceName() ) .arg( d->device->blockDeviceName() )
+ shortString( true ); + shortString( true );
if( diskInfo().diskState() == K3bDevice::STATE_COMPLETE || if( diskInfo().diskState() == K3bDevice::STATE_COMPLETE ||
diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) { diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
s += "<br>" + i18n("%1 in %n track", "%1 in %n tracks", toc().count() ) s += "<br>" + i18n("%1 in %n track", "%1 in %n tracks", toc().count() )
.tqarg( KIO::convertSize(diskInfo().size().mode1Bytes() ) ); .arg( KIO::convertSize(diskInfo().size().mode1Bytes() ) );
if( diskInfo().numSessions() > 1 ) if( diskInfo().numSessions() > 1 )
s += i18n(" and %n session", " and %n sessions", diskInfo().numSessions() ); s += i18n(" and %n session", " and %n sessions", diskInfo().numSessions() );
} }
@ -372,11 +372,11 @@ TQString K3bMedium::longString() const
if( diskInfo().diskState() == K3bDevice::STATE_EMPTY || if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ||
diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE )
s += "<br>" + i18n("Free space: %1") s += "<br>" + i18n("Free space: %1")
.tqarg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) ); .arg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) );
if( !diskInfo().empty() && diskInfo().rewritable() ) if( !diskInfo().empty() && diskInfo().rewritable() )
s += "<br>" + i18n("Capacity: %1") s += "<br>" + i18n("Capacity: %1")
.tqarg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) ); .arg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) );
return s; return s;
} }

4
src/k3bminibutton.cpp
Unescape View File

@ -64,14 +64,14 @@ void K3bMiniButton::drawButton( TQPainter* p )
void K3bMiniButton::enterEvent( TQEvent * ) void K3bMiniButton::enterEvent( TQEvent * )
{ {
m_mouseOver = true; m_mouseOver = true;
tqrepaint(); repaint();
} }
void K3bMiniButton::leaveEvent( TQEvent * ) void K3bMiniButton::leaveEvent( TQEvent * )
{ {
m_mouseOver = false; m_mouseOver = false;
tqrepaint(); repaint();
} }
#include "k3bminibutton.moc" #include "k3bminibutton.moc"

16
src/k3bprojectmanager.cpp
Unescape View File

@ -199,49 +199,49 @@ K3bDoc* K3bProjectManager::createEmptyProject( K3bDoc::DocType type )
switch( type ) { switch( type ) {
case K3bDoc::AUDIO: { case K3bDoc::AUDIO: {
doc = new K3bAudioDoc( this ); doc = new K3bAudioDoc( this );
fileName = i18n("AudioCD%1").tqarg(d->audioUntitledCount++); fileName = i18n("AudioCD%1").arg(d->audioUntitledCount++);
break; break;
} }
case K3bDoc::DATA: { case K3bDoc::DATA: {
doc = new K3bDataDoc( this ); doc = new K3bDataDoc( this );
fileName = i18n("DataCD%1").tqarg(d->dataUntitledCount++); fileName = i18n("DataCD%1").arg(d->dataUntitledCount++);
break; break;
} }
case K3bDoc::MIXED: { case K3bDoc::MIXED: {
doc = new K3bMixedDoc( this ); doc = new K3bMixedDoc( this );
fileName=i18n("MixedCD%1").tqarg(d->mixedUntitledCount++); fileName=i18n("MixedCD%1").arg(d->mixedUntitledCount++);
break; break;
} }
case K3bDoc::VCD: { case K3bDoc::VCD: {
doc = new K3bVcdDoc( this ); doc = new K3bVcdDoc( this );
fileName=i18n("VideoCD%1").tqarg(d->vcdUntitledCount++); fileName=i18n("VideoCD%1").arg(d->vcdUntitledCount++);
break; break;
} }
case K3bDoc::MOVIX: { case K3bDoc::MOVIX: {
doc = new K3bMovixDoc( this ); doc = new K3bMovixDoc( this );
fileName=i18n("eMovixCD%1").tqarg(d->movixUntitledCount++); fileName=i18n("eMovixCD%1").arg(d->movixUntitledCount++);
break; break;
} }
case K3bDoc::MOVIX_DVD: { case K3bDoc::MOVIX_DVD: {
doc = new K3bMovixDvdDoc( this ); doc = new K3bMovixDvdDoc( this );
fileName=i18n("eMovixDVD%1").tqarg(d->movixDvdUntitledCount++); fileName=i18n("eMovixDVD%1").arg(d->movixDvdUntitledCount++);
break; break;
} }
case K3bDoc::DVD: { case K3bDoc::DVD: {
doc = new K3bDvdDoc( this ); doc = new K3bDvdDoc( this );
fileName = i18n("DataDVD%1").tqarg(d->dvdUntitledCount++); fileName = i18n("DataDVD%1").arg(d->dvdUntitledCount++);
break; break;
} }
case K3bDoc::VIDEODVD: { case K3bDoc::VIDEODVD: {
doc = new K3bVideoDvdDoc( this ); doc = new K3bVideoDvdDoc( this );
fileName = i18n("VideoDVD%1").tqarg(d->videoDvdUntitledCount++); fileName = i18n("VideoDVD%1").arg(d->videoDvdUntitledCount++);
break; break;
} }
} }

6
src/k3bsplash.cpp
Unescape View File

@ -60,7 +60,7 @@ K3bSplash::K3bSplash( TQWidget* parent, const char* name )
m_infoBox->setPaletteBackgroundColor( black ); m_infoBox->setPaletteBackgroundColor( black );
m_infoBox->setPaletteForegroundColor( white ); m_infoBox->setPaletteForegroundColor( white );
// Set tqgeometry, with support for Xinerama systems // Set geometry, with support for Xinerama systems
TQRect r; TQRect r;
r.setSize(sizeHint()); r.setSize(sizeHint());
int ps = TQApplication::desktop()->primaryScreen(); int ps = TQApplication::desktop()->primaryScreen();
@ -108,7 +108,7 @@ void K3bSplash::addInfo( const TQString& s )
// TQFontMetrics fm = p.fontMetrics(); // TQFontMetrics fm = p.fontMetrics();
// TQString line1 = TQString( "K3b version %1" ).tqarg(VERSION); // TQString line1 = TQString( "K3b version %1" ).arg(VERSION);
// TQString line2( "(c) 2001 by Sebastian Trueg" ); // TQString line2( "(c) 2001 by Sebastian Trueg" );
// TQString line3( "licenced under the GPL" ); // TQString line3( "licenced under the GPL" );
@ -122,7 +122,7 @@ void K3bSplash::addInfo( const TQString& s )
// int startX = 10; // int startX = 10;
// int startY = height() - 10 - textH; // int startY = height() - 10 - textH;
// p.drawText( startX, startY, textW, textH, 0, TQString("%1\n%2\n%3").tqarg(line1).tqarg(line2).tqarg(line3) ); // p.drawText( startX, startY, textW, textH, 0, TQString("%1\n%2\n%3").arg(line1).arg(line2).arg(line3) );
// } // }

16
src/k3bstatusbarmanager.cpp
Unescape View File

@ -66,7 +66,7 @@ K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent )
m_labelInfoMessage = new TQLabel( " ", m_mainWindow->statusBar() ); m_labelInfoMessage = new TQLabel( " ", m_mainWindow->statusBar() );
// setup version info // setup version info
m_versionBox = new TQLabel( TQString("K3b %1").tqarg(kapp->aboutData()->version()), m_mainWindow->statusBar() ); m_versionBox = new TQLabel( TQString("K3b %1").arg(kapp->aboutData()->version()), m_mainWindow->statusBar() );
m_versionBox->installEventFilter( this ); m_versionBox->installEventFilter( this );
// setup the statusbar // setup the statusbar
@ -167,7 +167,7 @@ bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
static TQString dataDocStats( K3bDataDoc* dataDoc ) static TQString dataDocStats( K3bDataDoc* dataDoc )
{ {
return i18n("1 file in %1", "%n files in %1", dataDoc->root()->numFiles() ) return i18n("1 file in %1", "%n files in %1", dataDoc->root()->numFiles() )
.tqarg( i18n("1 folder", "%n folders", dataDoc->root()->numDirs()+1 ) ); .arg( i18n("1 folder", "%n folders", dataDoc->root()->numDirs()+1 ) );
} }
@ -199,7 +199,7 @@ void K3bStatusBarManager::slotUpdateProjectStats()
case K3bDoc::DATA: { case K3bDoc::DATA: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
m_labelProjectInfo->setText( i18n("Data CD (%1)").tqarg(dataDocStats(dataDoc)) ); m_labelProjectInfo->setText( i18n("Data CD (%1)").arg(dataDocStats(dataDoc)) );
break; break;
} }
@ -207,7 +207,7 @@ void K3bStatusBarManager::slotUpdateProjectStats()
K3bAudioDoc* audioDoc = static_cast<K3bMixedDoc*>( doc )->audioDoc(); K3bAudioDoc* audioDoc = static_cast<K3bMixedDoc*>( doc )->audioDoc();
K3bDataDoc* dataDoc = static_cast<K3bMixedDoc*>( doc )->dataDoc(); K3bDataDoc* dataDoc = static_cast<K3bMixedDoc*>( doc )->dataDoc();
m_labelProjectInfo->setText( i18n("Mixed CD (1 track and %1)", "Mixed CD (%n tracks and %1)", audioDoc->numOfTracks() ) m_labelProjectInfo->setText( i18n("Mixed CD (1 track and %1)", "Mixed CD (%n tracks and %1)", audioDoc->numOfTracks() )
.tqarg( dataDocStats(dataDoc)) ); .arg( dataDocStats(dataDoc)) );
break; break;
} }
@ -219,25 +219,25 @@ void K3bStatusBarManager::slotUpdateProjectStats()
case K3bDoc::MOVIX: { case K3bDoc::MOVIX: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
m_labelProjectInfo->setText( i18n("eMovix CD (%1)").tqarg(dataDocStats(dataDoc)) ); m_labelProjectInfo->setText( i18n("eMovix CD (%1)").arg(dataDocStats(dataDoc)) );
break; break;
} }
case K3bDoc::MOVIX_DVD: { case K3bDoc::MOVIX_DVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
m_labelProjectInfo->setText( i18n("eMovix DVD (%1)").tqarg(dataDocStats(dataDoc)) ); m_labelProjectInfo->setText( i18n("eMovix DVD (%1)").arg(dataDocStats(dataDoc)) );
break; break;
} }
case K3bDoc::DVD: { case K3bDoc::DVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
m_labelProjectInfo->setText( i18n("Data DVD (%1)").tqarg(dataDocStats(dataDoc)) ); m_labelProjectInfo->setText( i18n("Data DVD (%1)").arg(dataDocStats(dataDoc)) );
break; break;
} }
case K3bDoc::VIDEODVD: { case K3bDoc::VIDEODVD: {
K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc ); K3bDataDoc* dataDoc = static_cast<K3bDataDoc*>( doc );
m_labelProjectInfo->setText( i18n("Video DVD (%1)").tqarg(dataDocStats(dataDoc)) ); m_labelProjectInfo->setText( i18n("Video DVD (%1)").arg(dataDocStats(dataDoc)) );
break; break;
} }
} }

74
src/k3bsystemproblemdialog.cpp
Unescape View File

@ -186,7 +186,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
// 1. cdrecord, cdrdao // 1. cdrecord, cdrdao
if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) { if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("Unable to find %1 executable").tqarg("cdrecord"), i18n("Unable to find %1 executable").arg("cdrecord"),
i18n("K3b uses cdrecord to actually write CDs."), i18n("K3b uses cdrecord to actually write CDs."),
i18n("Install the cdrtools package which contains " i18n("Install the cdrtools package which contains "
"cdrecord."), "cdrecord."),
@ -195,7 +195,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else { else {
if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "outdated" ) ) { if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "outdated" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
i18n("Used %1 version %2 is outdated").tqarg("cdrecord").tqarg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version), i18n("Used %1 version %2 is outdated").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject( "cdrecord" )->version),
i18n("Although K3b supports all cdrtools versions since " i18n("Although K3b supports all cdrtools versions since "
"1.10 it is highly recommended to at least use " "1.10 it is highly recommended to at least use "
"version 2.0."), "version 2.0."),
@ -217,16 +217,16 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
!k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "wodim" ) ) { !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "wodim" ) ) {
if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) ) if( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("%1 will be run with root privileges on kernel >= 2.6.8").tqarg("cdrecord <= 2.01.01a05"), i18n("%1 will be run with root privileges on kernel >= 2.6.8").arg("cdrecord <= 2.01.01a05"),
i18n("Since Linux kernel 2.6.8 %1 will not work when run suid " i18n("Since Linux kernel 2.6.8 %1 will not work when run suid "
"root for security reasons anymore.").tqarg("cdrecord <= 2.01.01a05"), "root for security reasons anymore.").arg("cdrecord <= 2.01.01a05"),
TQString(), TQString(),
true ) ); true ) );
} }
#ifdef CDRECORD_SUID_ROOT_CHECK #ifdef CDRECORD_SUID_ROOT_CHECK
else if( !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) && getuid() != 0 ) // not root else if( !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) && getuid() != 0 ) // not root
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("%1 will be run without root privileges").tqarg("cdrecord"), i18n("%1 will be run without root privileges").arg("cdrecord"),
i18n("It is highly recommended to configure cdrecord " i18n("It is highly recommended to configure cdrecord "
"to run with root privileges. Only then cdrecord " "to run with root privileges. Only then cdrecord "
"runs with high priority which increases the overall " "runs with high priority which increases the overall "
@ -242,7 +242,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
} }
if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) { if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("Unable to find %1 executable").tqarg("cdrdao"), i18n("Unable to find %1 executable").arg("cdrdao"),
i18n("K3b uses cdrdao to actually write CDs."), i18n("K3b uses cdrdao to actually write CDs."),
i18n("Install the cdrdao package."), i18n("Install the cdrdao package."),
false ) ); false ) );
@ -253,7 +253,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
#ifdef CDRECORD_SUID_ROOT_CHECK #ifdef CDRECORD_SUID_ROOT_CHECK
if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "suidroot" ) && getuid() != 0 ) if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "suidroot" ) && getuid() != 0 )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("%1 will be run without root privileges").tqarg("cdrdao"), i18n("%1 will be run without root privileges").arg("cdrdao"),
i18n("It is highly recommended to configure cdrdao " i18n("It is highly recommended to configure cdrdao "
"to run with root privileges to increase the " "to run with root privileges to increase the "
"overall stability of the burning process."), "overall stability of the burning process."),
@ -268,7 +268,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) { if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) {
if( !k3bcore->externalBinManager()->foundBin( "growisofs" ) ) { if( !k3bcore->externalBinManager()->foundBin( "growisofs" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("Unable to find %1 executable").tqarg("growisofs"), i18n("Unable to find %1 executable").arg("growisofs"),
i18n("K3b uses growisofs to actually write dvds. " i18n("K3b uses growisofs to actually write dvds. "
"Without growisofs you will not be able to write dvds. " "Without growisofs you will not be able to write dvds. "
"Make sure to install at least version 5.10."), "Make sure to install at least version 5.10."),
@ -278,34 +278,34 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else { else {
if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 10 ) ) { if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 10 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b needs at least growisofs version 5.10 to write dvds. " i18n("K3b needs at least growisofs version 5.10 to write dvds. "
"All older versions will not work and K3b will refuse to use them."), "All older versions will not work and K3b will refuse to use them."),
i18n("Install a more recent version of %1.").tqarg("growisofs"), i18n("Install a more recent version of %1.").arg("growisofs"),
false ) ); false ) );
} }
else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) { else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b will not be able to copy DVDs on-the-fly or write a DVD+RW in multiple " i18n("K3b will not be able to copy DVDs on-the-fly or write a DVD+RW in multiple "
"sessions using a growisofs " "sessions using a growisofs "
"version older than 5.12."), "version older than 5.12."),
i18n("Install a more recent version of %1.").tqarg("growisofs"), i18n("Install a more recent version of %1.").arg("growisofs"),
false ) ); false ) );
} }
else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 7, 0 ) ) { else if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 7, 0 ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("It is highly recommended to use growisofs 7.0 or higher. " i18n("It is highly recommended to use growisofs 7.0 or higher. "
"K3b won't be able to write a DVD+RW in multiple " "K3b won't be able to write a DVD+RW in multiple "
"sessions using a growisofs version older than 7.0." ), "sessions using a growisofs version older than 7.0." ),
i18n("Install a more recent version of %1.").tqarg("growisofs"), i18n("Install a more recent version of %1.").arg("growisofs"),
false ) ); false ) );
} }
// for now we ignore the suid root bit becasue of the memorylocked issue // for now we ignore the suid root bit becasue of the memorylocked issue
// else if( !k3bcore->externalBinManager()->binObject( "growisofs" )->hasFeature( "suidroot" ) ) { // else if( !k3bcore->externalBinManager()->binObject( "growisofs" )->hasFeature( "suidroot" ) ) {
// problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, // problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
// i18n("%1 will be run without root privileges").tqarg("growisofs"), // i18n("%1 will be run without root privileges").arg("growisofs"),
// i18n("It is highly recommended to configure growisofs " // i18n("It is highly recommended to configure growisofs "
// "to run with root privileges. Only then growisofs " // "to run with root privileges. Only then growisofs "
// "runs with high priority which increases the overall " // "runs with high priority which increases the overall "
@ -317,7 +317,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !k3bcore->externalBinManager()->foundBin( "dvd+rw-format" ) ) { if( !k3bcore->externalBinManager()->foundBin( "dvd+rw-format" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("Unable to find %1 executable").tqarg("dvd+rw-format"), i18n("Unable to find %1 executable").arg("dvd+rw-format"),
i18n("K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."), i18n("K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."),
i18n("Install the dvd+rw-tools package."), i18n("Install the dvd+rw-tools package."),
false ) ); false ) );
@ -330,11 +330,11 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
else if( k3bcore->externalBinManager()->binObject( "mkisofs" )->hasFeature( "outdated" ) ) { else if( k3bcore->externalBinManager()->binObject( "mkisofs" )->hasFeature( "outdated" ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("Used %1 version %2 is outdated") i18n("Used %1 version %2 is outdated")
.tqarg("mkisofs") .arg("mkisofs")
.tqarg(k3bcore->externalBinManager()->binObject( "mkisofs" )->version), .arg(k3bcore->externalBinManager()->binObject( "mkisofs" )->version),
i18n("K3b needs at least mkisofs version 1.14. Older versions may introduce problems " i18n("K3b needs at least mkisofs version 1.14. Older versions may introduce problems "
"when creating data projects."), "when creating data projects."),
i18n("Install a more recent version of %1.").tqarg("mkisofs"), i18n("Install a more recent version of %1.").arg("mkisofs"),
false ) ); false ) );
} }
@ -357,7 +357,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
it.current(); ++it ) { it.current(); ++it ) {
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
i18n("Device %1 - %2 is automounted.") i18n("Device %1 - %2 is automounted.")
.tqarg(it.current()->vendor()).tqarg(it.current()->description()), .arg(it.current()->vendor()).arg(it.current()->description()),
i18n("K3b is not able to unmount automounted devices. Thus, especially " i18n("K3b is not able to unmount automounted devices. Thus, especially "
"DVD+RW rewriting might fail. There is no need to report this as " "DVD+RW rewriting might fail. There is no need to report this as "
"a bug or feature wish; it is not possible to solve this problem " "a bug or feature wish; it is not possible to solve this problem "
@ -394,16 +394,16 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
!( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "plain-atapi" ) && !( k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "plain-atapi" ) &&
K3b::plainAtapiSupport() ) ) { K3b::plainAtapiSupport() ) ) {
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("%1 %2 does not support ATAPI").tqarg("cdrecord").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), i18n("%1 %2 does not support ATAPI").arg("cdrecord").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version),
i18n("The configured version of %1 does not " i18n("The configured version of %1 does not "
"support writing to ATAPI devices without " "support writing to ATAPI devices without "
"SCSI emulation and there is at least one writer " "SCSI emulation and there is at least one writer "
"in your system not configured to use " "in your system not configured to use "
"SCSI emulation.").tqarg("cdrecord"), "SCSI emulation.").arg("cdrecord"),
i18n("The best and recommended solution is to enable " i18n("The best and recommended solution is to enable "
"ide-scsi (SCSI emulation) for all devices. " "ide-scsi (SCSI emulation) for all devices. "
"This way you won't have any problems. Or you install " "This way you won't have any problems. Or you install "
"(or select as the default) a more recent version of %1.").tqarg("cdrtools"), "(or select as the default) a more recent version of %1.").arg("cdrtools"),
false ) ); false ) );
} }
} }
@ -415,19 +415,19 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
// FIXME: replace ">" with "&gt;" // FIXME: replace ">" with "&gt;"
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("%1 %2 does not support ATAPI") i18n("%1 %2 does not support ATAPI")
.tqarg("cdrdao").tqarg(k3bcore->externalBinManager()->binObject("cdrdao")->version), .arg("cdrdao").arg(k3bcore->externalBinManager()->binObject("cdrdao")->version),
i18n("The configured version of %1 does not " i18n("The configured version of %1 does not "
"support writing to ATAPI devices without " "support writing to ATAPI devices without "
"SCSI emulation and there is at least one writer " "SCSI emulation and there is at least one writer "
"in your system not configured to use " "in your system not configured to use "
"SCSI emulation.").tqarg("cdrdao"), "SCSI emulation.").arg("cdrdao"),
K3b::simpleKernelVersion() > K3bVersion( 2, 5, 0 ) K3b::simpleKernelVersion() > K3bVersion( 2, 5, 0 )
? i18n("Install cdrdao >= 1.1.8 which supports writing to " ? i18n("Install cdrdao >= 1.1.8 which supports writing to "
"ATAPI devices directly.") "ATAPI devices directly.")
: i18n("The best, and recommended, solution is to use " : i18n("The best, and recommended, solution is to use "
"ide-scsi (SCSI emulation) for all writer devices: " "ide-scsi (SCSI emulation) for all writer devices: "
"this way you will not have any problems; or, you can install " "this way you will not have any problems; or, you can install "
"(or select as the default) a more recent version of %1.").tqarg("cdrdao"), "(or select as the default) a more recent version of %1.").arg("cdrdao"),
false ) ); false ) );
} }
} }
@ -437,7 +437,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( dvd_r_dl && k3bcore->externalBinManager()->foundBin( "growisofs" ) ) { if( dvd_r_dl && k3bcore->externalBinManager()->foundBin( "growisofs" ) ) {
if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 6, 0 ) ) if( k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 6, 0 ) )
problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::NON_CRITICAL,
i18n("Used %1 version %2 is outdated").tqarg("growisofs").tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), i18n("Used %1 version %2 is outdated").arg("growisofs").arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version),
i18n("K3b won't be able to write DVD-R Dual Layer media using a growisofs " i18n("K3b won't be able to write DVD-R Dual Layer media using a growisofs "
"version older than 6.0."), "version older than 6.0."),
i18n("Install a more recent version of growisofs."), i18n("Install a more recent version of growisofs."),
@ -450,31 +450,31 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
if( !TQFileInfo( dev->blockDeviceName() ).isWritable() ) if( !TQFileInfo( dev->blockDeviceName() ).isWritable() )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("No write access to device %1").tqarg(dev->blockDeviceName()), i18n("No write access to device %1").arg(dev->blockDeviceName()),
i18n("K3b needs write access to all the devices to perform certain tasks. " i18n("K3b needs write access to all the devices to perform certain tasks. "
"Without it you might encounter problems with %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()), "Without it you might encounter problems with %1 - %2").arg(dev->vendor()).arg(dev->description()),
i18n("Make sure you have write access to %1. In case you are not using " i18n("Make sure you have write access to %1. In case you are not using "
"devfs or udev K3bSetup is able to do this for you.").tqarg(dev->blockDeviceName()), "devfs or udev K3bSetup is able to do this for you.").arg(dev->blockDeviceName()),
false ) ); false ) );
if( !dev->genericDevice().isEmpty() && if( !dev->genericDevice().isEmpty() &&
!TQFileInfo( dev->genericDevice() ).isWritable() ) !TQFileInfo( dev->genericDevice() ).isWritable() )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("No write access to generic SCSI device %1").tqarg(dev->genericDevice()), i18n("No write access to generic SCSI device %1").arg(dev->genericDevice()),
i18n("Without write access to the generic device you might " i18n("Without write access to the generic device you might "
"encounter problems with Audio CD ripping from %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()), "encounter problems with Audio CD ripping from %1 - %2").arg(dev->vendor()).arg(dev->description()),
i18n("Make sure you have write access to %1. In case you are not using " i18n("Make sure you have write access to %1. In case you are not using "
"devfs or udev K3bSetup is able to do this for you.").tqarg(dev->genericDevice()), "devfs or udev K3bSetup is able to do this for you.").arg(dev->genericDevice()),
false ) ); false ) );
if( dev->interfaceType() == K3bDevice::IDE && !dmaActivated( dev ) ) if( dev->interfaceType() == K3bDevice::IDE && !dmaActivated( dev ) )
problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL, problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
i18n("DMA disabled on device %1 - %2").tqarg(dev->vendor()).tqarg(dev->description()), i18n("DMA disabled on device %1 - %2").arg(dev->vendor()).arg(dev->description()),
i18n("With most modern CD/DVD devices enabling DMA highly increases " i18n("With most modern CD/DVD devices enabling DMA highly increases "
"read/write performance. If you experience very low writing speeds " "read/write performance. If you experience very low writing speeds "
"this is probably the cause."), "this is probably the cause."),
i18n("Enable DMA temporarily as root with 'hdparm -d 1 %1'.").tqarg(dev->blockDeviceName()) ) ); i18n("Enable DMA temporarily as root with 'hdparm -d 1 %1'.").arg(dev->blockDeviceName()) ) );
} }
@ -487,13 +487,13 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
const K3bExternalProgram* p = it.data(); const K3bExternalProgram* p = it.data();
if( !p->userParameters().isEmpty() ) { if( !p->userParameters().isEmpty() ) {
problems.append( K3bSystemProblem( K3bSystemProblem::WARNING, problems.append( K3bSystemProblem( K3bSystemProblem::WARNING,
i18n("User parameters specified for external program %1").tqarg(p->name()), i18n("User parameters specified for external program %1").arg(p->name()),
i18n("Sometimes it may be nessessary to specify user parameters in addition to " i18n("Sometimes it may be nessessary to specify user parameters in addition to "
"the parameters generated by K3b. This is simply a warning to make sure that " "the parameters generated by K3b. This is simply a warning to make sure that "
"these parameters are really wanted and won't be part of some bug report."), "these parameters are really wanted and won't be part of some bug report."),
i18n("To remove the user parameters for the external program %1 open the " i18n("To remove the user parameters for the external program %1 open the "
"K3b settings page 'Programs' and choose the tab 'User Parameters'.") "K3b settings page 'Programs' and choose the tab 'User Parameters'.")
.tqarg(p->name()), .arg(p->name()),
false ) ); false ) );
} }
} }

2
src/k3bwelcomewidget.cpp
Unescape View File

@ -86,7 +86,7 @@ K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* parent )
fnt.setPointSize( 16 ); fnt.setPointSize( 16 );
m_header = new TQSimpleRichText( i18n("Welcome to K3b - The CD and DVD Kreator"), fnt ); m_header = new TQSimpleRichText( i18n("Welcome to K3b - The CD and DVD Kreator"), fnt );
m_infoText = new TQSimpleRichText( TQString::fromUtf8("<qt align=\"center\">K3b %1 (c) 1999 - 2007 Sebastian Trüg") m_infoText = new TQSimpleRichText( TQString::fromUtf8("<qt align=\"center\">K3b %1 (c) 1999 - 2007 Sebastian Trüg")
.tqarg(kapp->aboutData()->version()), font() ); .arg(kapp->aboutData()->version()), font() );
// set a large width just to be sure no linebreak occurs // set a large width just to be sure no linebreak occurs
m_header->setWidth( 800 ); m_header->setWidth( 800 );

2
src/k3bwidgetshoweffect.cpp
Unescape View File

@ -96,7 +96,7 @@ void K3bWidgetShowEffect::timerEvent( TQTimerEvent* )
void K3bWidgetShowEffect::dissolveMask() void K3bWidgetShowEffect::dissolveMask()
{ {
if( m_bShow ) { if( m_bShow ) {
m_widget->tqrepaint( false ); m_widget->repaint( false );
TQPainter maskPainter(&m_mask); TQPainter maskPainter(&m_mask);
m_mask.fill(TQt::black); m_mask.fill(TQt::black);

2
src/k3bwriterselectionwidget.cpp
Unescape View File

@ -332,7 +332,7 @@ void K3bWriterSelectionWidget::insertSpeedItem( int speed )
: TQString::number( speed/1385 ) ) : TQString::number( speed/1385 ) )
+ "x" ); + "x" );
else else
m_comboSpeed->insertItem( TQString("%1x").tqarg(speed/175) ); m_comboSpeed->insertItem( TQString("%1x").arg(speed/175) );
} }
} }

2
src/misc/k3bblankingdialog.cpp
Unescape View File

@ -200,7 +200,7 @@ void K3bBlankingDialog::slotWriterChanged()
setButtonEnabled( START_BUTTON, true ); setButtonEnabled( START_BUTTON, true );
else { else {
setButtonEnabled( START_BUTTON, false ); setButtonEnabled( START_BUTTON, false );
KMessageBox::sorry( this, i18n("%1 does not support CD-RW writing.").tqarg(dev->devicename()) ); KMessageBox::sorry( this, i18n("%1 does not support CD-RW writing.").arg(dev->devicename()) );
} }
} }

4
src/misc/k3bcdcopydialog.cpp
Unescape View File

@ -295,7 +295,7 @@ void K3bCdCopyDialog::slotStartClicked()
// //
if( TQFileInfo( m_tempDirSelectionWidget->tempPath() ).isFile() ) { if( TQFileInfo( m_tempDirSelectionWidget->tempPath() ).isFile() ) {
if( KMessageBox::warningContinueCancel( this, if( KMessageBox::warningContinueCancel( this,
i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue ) != KMessageBox::Continue )
return; return;
@ -303,7 +303,7 @@ void K3bCdCopyDialog::slotStartClicked()
if( TQFileInfo( m_tempDirSelectionWidget->tempPath() + ".toc" ).isFile() ) { if( TQFileInfo( m_tempDirSelectionWidget->tempPath() + ".toc" ).isFile() ) {
if( KMessageBox::warningContinueCancel( this, if( KMessageBox::warningContinueCancel( this,
i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath() + ".toc"), i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath() + ".toc"),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue ) != KMessageBox::Continue )
return; return;

16
src/misc/k3bcdimagewritingdialog.cpp
Unescape View File

@ -718,9 +718,9 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp )
if( !cp.cdText().isEmpty() ) if( !cp.cdText().isEmpty() )
trackParent->setText( 1, trackParent->setText( 1,
TQString("%1 (%2 - %3)") TQString("%1 (%2 - %3)")
.tqarg(trackParent->text(1)) .arg(trackParent->text(1))
.tqarg(cp.cdText().performer()) .arg(cp.cdText().performer())
.tqarg(cp.cdText().title()) ); .arg(cp.cdText().title()) );
unsigned int i = 1; unsigned int i = 1;
for( K3bDevice::Toc::const_iterator it = cp.toc().begin(); for( K3bDevice::Toc::const_iterator it = cp.toc().begin();
@ -736,9 +736,9 @@ void K3bCdImageWritingDialog::createAudioCueItems( const K3bCueFileParser& cp )
if( !cp.cdText().isEmpty() && !cp.cdText()[i-1].isEmpty() ) if( !cp.cdText().isEmpty() && !cp.cdText()[i-1].isEmpty() )
trackItem->setText( 1, trackItem->setText( 1,
TQString("%1 (%2 - %3)") TQString("%1 (%2 - %3)")
.tqarg(trackItem->text(1)) .arg(trackItem->text(1))
.tqarg(cp.cdText()[i-1].performer()) .arg(cp.cdText()[i-1].performer())
.tqarg(cp.cdText()[i-1].title()) ); .arg(cp.cdText()[i-1].title()) );
++i; ++i;
} }
@ -899,10 +899,10 @@ void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, cons
this ); this );
if( ok ) { if( ok ) {
if( md5sumToCompare.lower().utf8() == d->md5Job->hexDigest().lower() ) if( md5sumToCompare.lower().utf8() == d->md5Job->hexDigest().lower() )
KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").tqarg(imagePath()), KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").arg(imagePath()),
i18n("MD5 Sums Equal") ); i18n("MD5 Sums Equal") );
else else
KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").tqarg(imagePath()), KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").arg(imagePath()),
i18n("MD5 Sums Differ") ); i18n("MD5 Sums Differ") );
} }
} }

2
src/misc/k3bdvdformattingdialog.cpp
Unescape View File

@ -41,7 +41,7 @@
K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* name, bool modal ) K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* name, bool modal )
: K3bInteractionDialog( parent, name, : K3bInteractionDialog( parent, name,
i18n("DVD Formatting"), i18n("DVD Formatting"),
i18n("DVD%1RW").tqarg("<EFBFBD>"), i18n("DVD%1RW").arg("<EFBFBD>"),
START_BUTTON|CANCEL_BUTTON, START_BUTTON|CANCEL_BUTTON,
START_BUTTON, START_BUTTON,
"DVD Formatting", // config group "DVD Formatting", // config group

4
src/misc/k3bisoimagewritingdialog.cpp
Unescape View File

@ -501,10 +501,10 @@ void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, con
this ); this );
if( ok ) { if( ok ) {
if( md5sumToCompare.lower().utf8() == m_md5Job->hexDigest().lower() ) if( md5sumToCompare.lower().utf8() == m_md5Job->hexDigest().lower() )
KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").tqarg(imagePath()), KMessageBox::information( this, i18n("The MD5 Sum of %1 equals the specified.").arg(imagePath()),
i18n("MD5 Sums Equal") ); i18n("MD5 Sums Equal") );
else else
KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").tqarg(imagePath()), KMessageBox::sorry( this, i18n("The MD5 Sum of %1 differs from the specified.").arg(imagePath()),
i18n("MD5 Sums Differ") ); i18n("MD5 Sums Differ") );
} }
} }

2
src/option/base_k3bthemeoptiontab.ui
Unescape View File

@ -135,7 +135,7 @@
<property name="text"> <property name="text">
<string>no Theme selected</string> <string>no Theme selected</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>

2
src/option/k3bburningoptiontab.cpp
Unescape View File

@ -132,7 +132,7 @@ void K3bBurningOptionTab::setupGui()
"avoid gaps in the data stream due to high system load. The default " "avoid gaps in the data stream due to high system load. The default "
"sizes used are %1 MB for CD and %2 MB for DVD burning." "sizes used are %1 MB for CD and %2 MB for DVD burning."
"<p>If this option is checked the value specified will be used for both " "<p>If this option is checked the value specified will be used for both "
"CD and DVD burning.").tqarg(4).tqarg(32) ); "CD and DVD burning.").arg(4).arg(32) );
TQWhatsThis::add( m_checkEject, i18n("<p>If this option is checked K3b will not eject the medium once the burn process " TQWhatsThis::add( m_checkEject, i18n("<p>If this option is checked K3b will not eject the medium once the burn process "
"finishes. This can be helpful in case one leaves the computer after starting the " "finishes. This can be helpful in case one leaves the computer after starting the "

4
src/option/k3bdevicewidget.cpp
Unescape View File

@ -254,7 +254,7 @@ void K3bDeviceWidget::updateDeviceListViews()
// create the read-only info items // create the read-only info items
K3bListViewItem* systemDeviceItem = new K3bListViewItem( devRoot, i18n("System device name:") ); K3bListViewItem* systemDeviceItem = new K3bListViewItem( devRoot, i18n("System device name:") );
if( dev->device->interfaceType() == K3bDevice::SCSI ) if( dev->device->interfaceType() == K3bDevice::SCSI )
systemDeviceItem->setText( 1, TQString("%1 (%2)").tqarg(dev->device->devicename()).tqarg(dev->device->busTargetLun()) ); systemDeviceItem->setText( 1, TQString("%1 (%2)").arg(dev->device->devicename()).arg(dev->device->busTargetLun()) );
else else
systemDeviceItem->setText( 1, dev->device->devicename() ); systemDeviceItem->setText( 1, dev->device->devicename() );
systemDeviceItem->setForegroundColor( 1, tqpalette().disabled().foreground() ); systemDeviceItem->setForegroundColor( 1, tqpalette().disabled().foreground() );
@ -383,7 +383,7 @@ void K3bDeviceWidget::slotNewDevice()
updateDeviceListViews(); updateDeviceListViews();
} }
else else
KMessageBox::error( this, i18n("Could not find an additional device at\n%1").tqarg(newDevicename), i18n("Error"), false ); KMessageBox::error( this, i18n("Could not find an additional device at\n%1").arg(newDevicename), i18n("Error"), false );
} }
} }

6
src/option/k3bmiscoptiontab.cpp
Unescape View File

@ -124,10 +124,10 @@ bool K3bMiscOptionTab::saveSettings()
} }
if( !fi.exists() ) { if( !fi.exists() ) {
if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").tqarg(tempDir), if( KMessageBox::questionYesNo( this, i18n("Directory (%1) does not exist. Create?").arg(tempDir),
i18n("Create Directory"), i18n("Create"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { i18n("Create Directory"), i18n("Create"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( fi.absFilePath() ) ) { if( !KStandardDirs::makeDir( fi.absFilePath() ) ) {
KMessageBox::error( this, i18n("Unable to create directory %1").tqarg(tempDir) ); KMessageBox::error( this, i18n("Unable to create directory %1").arg(tempDir) );
return false; return false;
} }
} }
@ -147,7 +147,7 @@ bool K3bMiscOptionTab::saveSettings()
// check for writing permission // check for writing permission
if( !fi.isWritable() ) { if( !fi.isWritable() ) {
KMessageBox::error( this, i18n("You do not have permission to write to %1.").tqarg(fi.absFilePath()) ); KMessageBox::error( this, i18n("You do not have permission to write to %1.").arg(fi.absFilePath()) );
return false; return false;
} }

2
src/option/k3bthemeoptiontab.cpp
Unescape View File

@ -147,7 +147,7 @@ void K3bThemeOptionTab::slotInstallTheme()
else else
sorryText = i18n("Unable to download the icon theme archive.\n" sorryText = i18n("Unable to download the icon theme archive.\n"
"Please check that address %1 is correct."); "Please check that address %1 is correct.");
KMessageBox::sorry( this, sorryText.tqarg(themeURL.prettyURL()) ); KMessageBox::sorry( this, sorryText.arg(themeURL.prettyURL()) );
return; return;
} }

2
src/projects/base_k3bdatavolumedescwidget.ui
Unescape View File

@ -134,7 +134,7 @@
<property name="text"> <property name="text">
<string>Volume set &amp;number:</string> <string>Volume set &amp;number:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
<property name="buddy" stdset="0"> <property name="buddy" stdset="0">

2
src/projects/k3baudioburndialog.cpp
Unescape View File

@ -63,7 +63,7 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, cons
setTitle( i18n("Audio Project"), setTitle( i18n("Audio Project"),
i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)", i18n("1 track (%1 minutes)", "%n tracks (%1 minutes)",
m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) ); m_doc->numOfTracks() ).arg(m_doc->length().toString()) );
TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
m_optionGroupLayout->addItem( spacer ); m_optionGroupLayout->addItem( spacer );

2
src/projects/k3baudiodatasourceviewitem.cpp
Unescape View File

@ -89,7 +89,7 @@ void K3bAudioDataSourceViewItem::setText( int col, const TQString& text )
bool K3bAudioDataSourceViewItem::animate() bool K3bAudioDataSourceViewItem::animate()
{ {
if( source()->length() == 0 && source()->isValid() ) { if( source()->length() == 0 && source()->isValid() ) {
TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter ); TQString icon = TQString( "kde%1" ).arg( m_animationCounter );
setPixmap( 4, SmallIcon( icon ) ); setPixmap( 4, SmallIcon( icon ) );
m_animationCounter++; m_animationCounter++;
if ( m_animationCounter > 6 ) if ( m_animationCounter > 6 )

26
src/projects/k3baudioeditorwidget.cpp
Unescape View File

@ -125,7 +125,7 @@ protected:
if( m ) { if( m ) {
r.setLeft( p.x() - 1 ); r.setLeft( p.x() - 1 );
r.setRight( p.x() + 1 ); r.setRight( p.x() + 1 );
tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").tqarg(m->toolTip).tqarg(m->pos.toString()) ); tip( r, m->toolTip.isEmpty() ? m->pos.toString() : TQString("%1 (%2)").arg(m->toolTip).arg(m->pos.toString()) );
} }
else { else {
Range* range = m_editorWidget->findRange( p ); Range* range = m_editorWidget->findRange( p );
@ -134,8 +134,8 @@ protected:
r.setRight( m_editorWidget->msfToPos( range->end ) ); r.setRight( m_editorWidget->msfToPos( range->end ) );
tip( r, tip( r,
range->toolTip.isEmpty() range->toolTip.isEmpty()
? TQString("%1 - %2").tqarg(range->start.toString()).tqarg(range->end.toString()) ? TQString("%1 - %2").arg(range->start.toString()).arg(range->end.toString())
: TQString("%1 (%2 - %3)").tqarg(range->toolTip).tqarg(range->start.toString()).tqarg(range->end.toString()) ); : TQString("%1 (%2 - %3)").arg(range->toolTip).arg(range->start.toString()).arg(range->end.toString()) );
} }
} }
} }
@ -263,7 +263,7 @@ bool K3bAudioEditorWidget::allowOverlappingRanges() const
void K3bAudioEditorWidget::enableRangeSelection( bool b ) void K3bAudioEditorWidget::enableRangeSelection( bool b )
{ {
d->rangeSelectionEnabled = b; d->rangeSelectionEnabled = b;
tqrepaint( false ); repaint( false );
} }
@ -283,7 +283,7 @@ void K3bAudioEditorWidget::setSelectedRange( K3bAudioEditorWidget::Range* r )
{ {
d->selectedRange = r; d->selectedRange = r;
if( rangeSelectedEnabled() ) { if( rangeSelectedEnabled() ) {
tqrepaint( false ); repaint( false );
emit selectedRangeChanged( d->selectedRange ? d->selectedRange->id : 0 ); emit selectedRangeChanged( d->selectedRange ? d->selectedRange->id : 0 );
} }
} }
@ -356,7 +356,7 @@ bool K3bAudioEditorWidget::modifyRange( int identifier, const K3b::Msf& start, c
if( !d->allowOverlappingRanges ) if( !d->allowOverlappingRanges )
fixupOverlappingRanges( range ); fixupOverlappingRanges( range );
tqrepaint( false ); repaint( false );
return true; return true;
} }
@ -372,7 +372,7 @@ bool K3bAudioEditorWidget::removeRange( int identifier )
emit rangeRemoved( identifier ); emit rangeRemoved( identifier );
// tqrepaint only the part of the range // repaint only the part of the range
TQRect rect = contentsRect(); TQRect rect = contentsRect();
rect.setLeft( msfToPos( range->start ) ); rect.setLeft( msfToPos( range->start ) );
rect.setRight( msfToPos( range->end ) ); rect.setRight( msfToPos( range->end ) );
@ -491,7 +491,7 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p )
pix.fill( colorGroup().base() ); pix.fill( colorGroup().base() );
TQPainter pixP; TQPainter pixP;
pixP.tqbegin( &pix, TQT_TQOBJECT(this) ); pixP.begin( &pix, TQT_TQOBJECT(this) );
TQRect drawRect( contentsRect() ); TQRect drawRect( contentsRect() );
drawRect.setLeft( drawRect.left() + m_margin ); drawRect.setLeft( drawRect.left() + m_margin );
@ -690,11 +690,11 @@ void K3bAudioEditorWidget::mouseReleaseEvent( TQMouseEvent* e )
// //
if( m_draggedRange ) { if( m_draggedRange ) {
fixupOverlappingRanges( m_draggedRange ); fixupOverlappingRanges( m_draggedRange );
tqrepaint( false ); repaint( false );
} }
else if( d->movedRange ) { else if( d->movedRange ) {
fixupOverlappingRanges( d->movedRange ); fixupOverlappingRanges( d->movedRange );
tqrepaint( false ); repaint( false );
} }
} }
@ -739,13 +739,13 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e )
emit rangeChanged( m_draggedRange->id, m_draggedRange->start, m_draggedRange->end ); emit rangeChanged( m_draggedRange->id, m_draggedRange->start, m_draggedRange->end );
tqrepaint( false ); repaint( false );
} }
else if( m_draggedMarker ) { else if( m_draggedMarker ) {
m_draggedMarker->pos = posToMsf( e->pos().x() ); m_draggedMarker->pos = posToMsf( e->pos().x() );
emit markerMoved( m_draggedMarker->id, m_draggedMarker->pos ); emit markerMoved( m_draggedMarker->id, m_draggedMarker->pos );
tqrepaint( false ); repaint( false );
} }
else if( d->movedRange ) { else if( d->movedRange ) {
int diff = posToMsf( e->pos().x() ).lba() - d->lastMovePosition.lba(); int diff = posToMsf( e->pos().x() ).lba() - d->lastMovePosition.lba();
@ -763,7 +763,7 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e )
emit rangeChanged( d->movedRange->id, d->movedRange->start, d->movedRange->end ); emit rangeChanged( d->movedRange->id, d->movedRange->start, d->movedRange->end );
tqrepaint( false ); repaint( false );
} }
} }
else if( findRangeEdge( e->pos() ) || findMarker( e->pos() ) ) else if( findRangeEdge( e->pos() ) || findMarker( e->pos() ) )

22
src/projects/k3baudiotrackaddingdialog.cpp
Unescape View File

@ -104,7 +104,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
dlg.m_trackAfter = afterTrack; dlg.m_trackAfter = afterTrack;
dlg.m_parentTrack = parentTrack; dlg.m_parentTrack = parentTrack;
dlg.m_sourceAfter = afterSource; dlg.m_sourceAfter = afterSource;
dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").tqarg(doc->URL().fileName()) ); dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").arg(doc->URL().fileName()) );
dlg.m_busyWidget->showBusy(true); dlg.m_busyWidget->showBusy(true);
TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) ); TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) );
@ -113,23 +113,23 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls,
TQString message; TQString message;
if( !dlg.m_unreadableFiles.isEmpty() ) if( !dlg.m_unreadableFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("Insufficient permissions to read the following files") ) .arg( i18n("Insufficient permissions to read the following files") )
.tqarg( dlg.m_unreadableFiles.join( "<br>" ) ); .arg( dlg.m_unreadableFiles.join( "<br>" ) );
if( !dlg.m_notFoundFiles.isEmpty() ) if( !dlg.m_notFoundFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("Unable to find the following files") ) .arg( i18n("Unable to find the following files") )
.tqarg( dlg.m_notFoundFiles.join( "<br>" ) ); .arg( dlg.m_notFoundFiles.join( "<br>" ) );
if( !dlg.m_nonLocalFiles.isEmpty() ) if( !dlg.m_nonLocalFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("No non-local files supported") ) .arg( i18n("No non-local files supported") )
.tqarg( dlg.m_unreadableFiles.join( "<br>" ) ); .arg( dlg.m_unreadableFiles.join( "<br>" ) );
if( !dlg.m_unsupportedFiles.isEmpty() ) if( !dlg.m_unsupportedFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br><i>%2</i><br>%3") message += TQString("<p><b>%1:</b><br><i>%2</i><br>%3")
.tqarg( i18n("Unable to handle the following files due to an unsupported format" ) ) .arg( i18n("Unable to handle the following files due to an unsupported format" ) )
.tqarg( i18n("You may manually convert these audio files to wave using another " .arg( i18n("You may manually convert these audio files to wave using another "
"application supporting the audio format and then add the wave files " "application supporting the audio format and then add the wave files "
"to the K3b project.") ) "to the K3b project.") )
.tqarg( dlg.m_unsupportedFiles.join( "<br>" ) ); .arg( dlg.m_unsupportedFiles.join( "<br>" ) );
if( !message.isEmpty() ) if( !message.isEmpty() )
KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message );
@ -162,7 +162,7 @@ void K3bAudioTrackAddingDialog::slotAddUrls()
} }
} }
m_infoLabel->setText( i18n("Analysing file '%1'...").tqarg( url.fileName() ) ); m_infoLabel->setText( i18n("Analysing file '%1'...").arg( url.fileName() ) );
if( !url.isLocalFile() ) { if( !url.isLocalFile() ) {
valid = false; valid = false;

6
src/projects/k3baudiotrackplayer.cpp
Unescape View File

@ -185,9 +185,9 @@ void K3bAudioTrackPlayer::playTrack( K3bAudioTrack* track )
// we show the currently playing track as a tooltip on the slider // we show the currently playing track as a tooltip on the slider
TQToolTip::remove( d->seekSlider ); TQToolTip::remove( d->seekSlider );
TQToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3") TQToolTip::add( d->seekSlider, i18n("Playing track %1: %2 - %3")
.tqarg(track->trackNumber()) .arg(track->trackNumber())
.tqarg(track->artist()) .arg(track->artist())
.tqarg(track->title()) ); .arg(track->title()) );
d->seekSlider->setMaxValue( track->length().totalFrames() ); d->seekSlider->setMaxValue( track->length().totalFrames() );
m_currentTrack = track; m_currentTrack = track;
d->paused = true; d->paused = true;

2
src/projects/k3baudiotracktrmlookupdialog.cpp
Unescape View File

@ -122,7 +122,7 @@ void K3bAudioTrackTRMLookupDialog::slotTrackFinished( K3bAudioTrack* track, bool
{ {
if( !success ) if( !success )
K3bPassivePopup::showPopup( i18n("Track %1 was not found in the MusicBrainz database.") K3bPassivePopup::showPopup( i18n("Track %1 was not found in the MusicBrainz database.")
.tqarg( track->trackNumber()), .arg( track->trackNumber()),
i18n("Audio Project") ); i18n("Audio Project") );
} }

2
src/projects/k3baudiotrackview.cpp
Unescape View File

@ -487,7 +487,7 @@ void K3bAudioTrackView::slotTrackChanged( K3bAudioTrack* track )
item->showSources(true); item->showSources(true);
// the length might have changed // the length might have changed
item->tqrepaint(); item->repaint();
// FIXME: only do this if the position really changed // FIXME: only do this if the position really changed
// move the item if the position has changed // move the item if the position has changed

2
src/projects/k3baudiotrackviewitem.cpp
Unescape View File

@ -194,7 +194,7 @@ bool K3bAudioTrackViewItem::animate()
item = item->nextSibling(); item = item->nextSibling();
} }
if( animate ) { if( animate ) {
TQString icon = TQString( "kde%1" ).tqarg( m_animationCounter ); TQString icon = TQString( "kde%1" ).arg( m_animationCounter );
setPixmap( 4, SmallIcon( icon ) ); setPixmap( 4, SmallIcon( icon ) );
m_animationCounter++; m_animationCounter++;
if ( m_animationCounter > 6 ) if ( m_animationCounter > 6 )

2
src/projects/k3bbootimageview.cpp
Unescape View File

@ -61,7 +61,7 @@ public:
return i18n("None"); return i18n("None");
} }
else if( col == 1 ) else if( col == 1 )
return TQString( "%1 KB" ).tqarg( m_image->size()/1024 ); return TQString( "%1 KB" ).arg( m_image->size()/1024 );
else if( col == 2 ) else if( col == 2 )
return m_image->localPath(); return m_image->localPath();
else else

8
src/projects/k3bdataadvancedimagesettingswidget.cpp
Unescape View File

@ -130,7 +130,7 @@ public:
protected: protected:
void stateChange( bool on ) { void stateChange( bool on ) {
// enable or disable all tqchildren // enable or disable all children
TQListViewItem* item = firstChild(); TQListViewItem* item = firstChild();
while( item ) { while( item ) {
if( PrivateCheckViewItem* pi = dynamic_cast<PrivateCheckViewItem*>(item) ) if( PrivateCheckViewItem* pi = dynamic_cast<PrivateCheckViewItem*>(item) )
@ -205,13 +205,13 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget
i18n("ISO Level") ); i18n("ISO Level") );
m_radioIsoLevel3 = new TQCheckListItem( m_isoLevelController, m_radioIsoLevel3 = new TQCheckListItem( m_isoLevelController,
i18n("Level %1").tqarg(3), i18n("Level %1").arg(3),
TQCheckListItem::RadioButton ); TQCheckListItem::RadioButton );
m_radioIsoLevel2 = new TQCheckListItem( m_isoLevelController, m_radioIsoLevel2 = new TQCheckListItem( m_isoLevelController,
i18n("Level %1").tqarg(2), i18n("Level %1").arg(2),
TQCheckListItem::RadioButton ); TQCheckListItem::RadioButton );
m_radioIsoLevel1 = new TQCheckListItem( m_isoLevelController, m_radioIsoLevel1 = new TQCheckListItem( m_isoLevelController,
i18n("Level %1").tqarg(1), i18n("Level %1").arg(1),
TQCheckListItem::RadioButton ); TQCheckListItem::RadioButton );
m_isoLevelController->setOpen(true); m_isoLevelController->setOpen(true);

4
src/projects/k3bdataburndialog.cpp
Unescape View File

@ -69,7 +69,7 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c
{ {
prepareGui(); prepareGui();
setTitle( i18n("Data Project"), i18n("Size: %1").tqarg( KIO::convertSize(_doc->size()) ) ); setTitle( i18n("Data Project"), i18n("Size: %1").arg( KIO::convertSize(_doc->size()) ) );
// for now we just put the verify checkbox on the main page... // for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@ -181,7 +181,7 @@ void K3bDataBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this, if( KMessageBox::warningContinueCancel( this,
i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) { == KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked

8
src/projects/k3bdatadirtreeview.cpp
Unescape View File

@ -249,7 +249,7 @@ void K3bDataDirTreeView::slotDataItemRemoved( K3bDataItem* item )
// we don't get removedInfo for the child items // we don't get removedInfo for the child items
// so we need to remove them here // so we need to remove them here
TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); TQPtrListIterator<K3bDataItem> it( dirItem->children() );
for( ; it.current(); ++it ) { for( ; it.current(); ++it ) {
if( it.current()->isDir() ) if( it.current()->isDir() )
slotDataItemRemoved( it.current() ); slotDataItemRemoved( it.current() );
@ -374,9 +374,9 @@ void K3bDataDirTreeView::slotProperties()
if( viewItem && currentItem() != root() ) { if( viewItem && currentItem() != root() ) {
K3bDataPropertiesDialog d( viewItem->dataItem(), this ); K3bDataPropertiesDialog d( viewItem->dataItem(), this );
if( d.exec() ) { if( d.exec() ) {
tqrepaint(); repaint();
if( m_fileView ) if( m_fileView )
m_fileView->tqrepaint(); m_fileView->repaint();
} }
} }
else else
@ -499,7 +499,7 @@ void K3bDataDirTreeView::slotDocChanged()
// avoid flicker // avoid flicker
if( d->lastUpdateVolumeId != m_doc->isoOptions().volumeID() ) { if( d->lastUpdateVolumeId != m_doc->isoOptions().volumeID() ) {
d->lastUpdateVolumeId = m_doc->isoOptions().volumeID(); d->lastUpdateVolumeId = m_doc->isoOptions().volumeID();
root()->tqrepaint(); root()->repaint();
} }
} }

2
src/projects/k3bdatafileview.cpp
Unescape View File

@ -165,7 +165,7 @@ void K3bDataFileView::checkForNewItems()
hideEditor(); hideEditor();
// add items that are not there yet // add items that are not there yet
for( TQPtrListIterator<K3bDataItem> it( m_currentDir->tqchildren() ); it.current(); ++it ) { for( TQPtrListIterator<K3bDataItem> it( m_currentDir->children() ); it.current(); ++it ) {
if( !m_itemMap.contains( it.current() ) ) { if( !m_itemMap.contains( it.current() ) ) {
slotItemAdded( it.current() ); slotItemAdded( it.current() );
} }

2
src/projects/k3bdataimagesettingswidget.cpp
Unescape View File

@ -268,7 +268,7 @@ void K3bDataImageSettingsWidget::slotFilesystemsChanged()
if( s.isEmpty() ) if( s.isEmpty() )
m_comboFilesystems->changeItem( i18n("Custom (ISO9660 only)"), FS_CUSTOM ); m_comboFilesystems->changeItem( i18n("Custom (ISO9660 only)"), FS_CUSTOM );
else else
m_comboFilesystems->changeItem( i18n("Custom (%1)").tqarg( s.join(", ") ), FS_CUSTOM ); m_comboFilesystems->changeItem( i18n("Custom (%1)").arg( s.join(", ") ), FS_CUSTOM );
// see if any of the presets is loaded // see if any of the presets is loaded
m_comboFilesystems->setCurrentItem( FS_CUSTOM ); m_comboFilesystems->setCurrentItem( FS_CUSTOM );

4
src/projects/k3bdatapropertiesdialog.cpp
Unescape View File

@ -94,7 +94,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) ); KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) );
labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) ); labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) );
if( fileItem->isSymLink() ) if( fileItem->isSymLink() )
m_labelType->setText( i18n("Link to %1").tqarg(kFileItem.mimeComment()) ); m_labelType->setText( i18n("Link to %1").arg(kFileItem.mimeComment()) );
else else
m_labelType->setText( kFileItem.mimeComment() ); m_labelType->setText( kFileItem.mimeComment() );
m_labelLocalName->setText( kFileItem.name() ); m_labelLocalName->setText( kFileItem.name() );
@ -136,7 +136,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
if( location.isEmpty() ) if( location.isEmpty() )
location = "/"; location = "/";
m_labelLocation->setText( location ); m_labelLocation->setText( location );
extraInfoLabel->setText( TQString( "(%1)" ).tqarg(dataItem->extraInfo()) ); extraInfoLabel->setText( TQString( "(%1)" ).arg(dataItem->extraInfo()) );
if( dataItem->extraInfo().isEmpty() ) if( dataItem->extraInfo().isEmpty() )
extraInfoLabel->hide(); extraInfoLabel->hide();

52
src/projects/k3bdataurladdingdialog.cpp
Unescape View File

@ -57,7 +57,7 @@
K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent, const char* name ) K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent, const char* name )
: KDialogBase( Plain, : KDialogBase( Plain,
i18n("Adding files to project '%1'").tqarg(doc->URL().fileName()), i18n("Adding files to project '%1'").arg(doc->URL().fileName()),
Cancel, Cancel,
Cancel, Cancel,
parent, parent,
@ -84,7 +84,7 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren
m_counterLabel = new TQLabel( page ); m_counterLabel = new TQLabel( page );
m_infoLabel = new KSqueezedTextLabel( i18n("Adding files to project '%1'") m_infoLabel = new KSqueezedTextLabel( i18n("Adding files to project '%1'")
.tqarg(doc->URL().fileName()) + "...", page ); .arg(doc->URL().fileName()) + "...", page );
m_progressWidget = new KProgress( 0, page ); m_progressWidget = new KProgress( 0, page );
grid->addWidget( m_counterLabel, 0, 1 ); grid->addWidget( m_counterLabel, 0, 1 );
@ -169,29 +169,29 @@ TQString K3bDataUrlAddingDialog::resultMessage() const
TQString message; TQString message;
if( !m_unreadableFiles.isEmpty() ) if( !m_unreadableFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("Insufficient permissions to read the following files") ) .arg( i18n("Insufficient permissions to read the following files") )
.tqarg( m_unreadableFiles.join( "<br>" ) ); .arg( m_unreadableFiles.join( "<br>" ) );
if( !m_notFoundFiles.isEmpty() ) if( !m_notFoundFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("Unable to find the following files") ) .arg( i18n("Unable to find the following files") )
.tqarg( m_notFoundFiles.join( "<br>" ) ); .arg( m_notFoundFiles.join( "<br>" ) );
if( !m_nonLocalFiles.isEmpty() ) if( !m_nonLocalFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("No non-local files supported") ) .arg( i18n("No non-local files supported") )
.tqarg( m_unreadableFiles.join( "<br>" ) ); .arg( m_unreadableFiles.join( "<br>" ) );
if( !m_tooBigFiles.isEmpty() ) if( !m_tooBigFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("It is not possible to add files bigger than %1").tqarg(KIO::convertSize(0xFFFFFFFF)) ) .arg( i18n("It is not possible to add files bigger than %1").arg(KIO::convertSize(0xFFFFFFFF)) )
.tqarg( m_tooBigFiles.join( "<br>" ) ); .arg( m_tooBigFiles.join( "<br>" ) );
if( !m_mkisofsLimitationRenamedFiles.isEmpty() ) if( !m_mkisofsLimitationRenamedFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("Some filenames had to be modified due to limitations in mkisofs") ) .arg( i18n("Some filenames had to be modified due to limitations in mkisofs") )
.tqarg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) ); .arg( m_mkisofsLimitationRenamedFiles.join( "<br>" ) );
if( !m_invalidFilenameEncodingFiles.isEmpty() ) if( !m_invalidFilenameEncodingFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2") message += TQString("<p><b>%1:</b><br>%2")
.tqarg( i18n("The following filenames have an invalid encoding. You may fix this " .arg( i18n("The following filenames have an invalid encoding. You may fix this "
"with the convmv tool") ) "with the convmv tool") )
.tqarg( m_invalidFilenameEncodingFiles.join( "<br>" ) ); .arg( m_invalidFilenameEncodingFiles.join( "<br>" ) );
return message; return message;
} }
@ -222,7 +222,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& item
return 0; return 0;
K3bDataUrlAddingDialog dlg( dir->doc(), parent ); K3bDataUrlAddingDialog dlg( dir->doc(), parent );
dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").tqarg(dir->doc()->URL().fileName()) ); dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").arg(dir->doc()->URL().fileName()) );
dlg.m_copyItems = copy; dlg.m_copyItems = copy;
for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) {
@ -283,9 +283,9 @@ void K3bDataUrlAddingDialog::slotAddUrls()
#if 0 #if 0
m_infoLabel->setText( url.path() ); m_infoLabel->setText( url.path() );
if( m_totalFiles == 0 ) if( m_totalFiles == 0 )
m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) ); m_counterLabel->setText( TQString("(%1)").arg(m_filesHandled) );
else else
m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); m_counterLabel->setText( TQString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) );
#endif #endif
// //
@ -425,8 +425,8 @@ void K3bDataUrlAddingDialog::slotAddUrls()
switch( K3bMultiChoiceDialog::choose( i18n("File already exists"), switch( K3bMultiChoiceDialog::choose( i18n("File already exists"),
i18n("<p>File <em>%1</em> already exists in " i18n("<p>File <em>%1</em> already exists in "
"project folder <em>%2</em>.") "project folder <em>%2</em>.")
.tqarg(newName) .arg(newName)
.tqarg('/' + dir->k3bPath()), .arg('/' + dir->k3bPath()),
TQMessageBox::Warning, TQMessageBox::Warning,
this, this,
0, 0,
@ -493,8 +493,8 @@ void K3bDataUrlAddingDialog::slotAddUrls()
"K3b project cannot be resolved." "K3b project cannot be resolved."
"<p><b>If you do not intend to enable the option <em>follow symbolic links</em> you may safely " "<p><b>If you do not intend to enable the option <em>follow symbolic links</em> you may safely "
"ignore this warning and choose to add the link to the project.</b>") "ignore this warning and choose to add the link to the project.</b>")
.tqarg(absFilePath) .arg(absFilePath)
.tqarg(resolved ), .arg(resolved ),
TQMessageBox::Warning, TQMessageBox::Warning,
this, this,
0, 0,
@ -603,9 +603,9 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
++m_filesHandled; ++m_filesHandled;
m_infoLabel->setText( item->k3bPath() ); m_infoLabel->setText( item->k3bPath() );
if( m_totalFiles == 0 ) if( m_totalFiles == 0 )
m_counterLabel->setText( TQString("(%1)").tqarg(m_filesHandled) ); m_counterLabel->setText( TQString("(%1)").arg(m_filesHandled) );
else else
m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); m_counterLabel->setText( TQString("(%1/%2)").arg(m_filesHandled).arg(m_totalFiles) );
if( dir == item->parent() ) { if( dir == item->parent() ) {
@ -623,7 +623,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
// reuse an existing dir: move all child items into the old dir // reuse an existing dir: move all child items into the old dir
// //
if( oldItem->isDir() && item->isDir() ) { if( oldItem->isDir() && item->isDir() ) {
const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->tqchildren(); const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children();
for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it )
m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) );
@ -661,8 +661,8 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems()
switch( K3bMultiChoiceDialog::choose( i18n("File already exists"), switch( K3bMultiChoiceDialog::choose( i18n("File already exists"),
i18n("<p>File <em>%1</em> already exists in " i18n("<p>File <em>%1</em> already exists in "
"project folder <em>%2</em>.") "project folder <em>%2</em>.")
.tqarg( item->k3bName() ) .arg( item->k3bName() )
.tqarg("/" + dir->k3bPath()), .arg("/" + dir->k3bPath()),
TQMessageBox::Warning, TQMessageBox::Warning,
this, this,
0, 0,

2
src/projects/k3bdataviewitem.cpp
Unescape View File

@ -228,7 +228,7 @@ TQString K3bDataFileViewItem::text( int index ) const
comment = m_pMimeType->name(); comment = m_pMimeType->name();
if( m_fileItem->isSymLink() ) if( m_fileItem->isSymLink() )
return i18n("Link to %1").tqarg(comment); return i18n("Link to %1").arg(comment);
else else
return comment; return comment;
} }

4
src/projects/k3bdvdburndialog.cpp
Unescape View File

@ -50,7 +50,7 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char
{ {
prepareGui(); prepareGui();
setTitle( i18n("DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) ); setTitle( i18n("DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) );
// for now we just put the verify checkbox on the main page... // for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@ -283,7 +283,7 @@ void K3bDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this, if( KMessageBox::warningContinueCancel( this,
i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) { == KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked

28
src/projects/k3bfillstatusdisplay.cpp
Unescape View File

@ -129,7 +129,7 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
TQPixmap buffer( size() ); TQPixmap buffer( size() );
buffer.fill( colorGroup().base() ); buffer.fill( colorGroup().base() );
TQPainter p; TQPainter p;
p.tqbegin( &buffer, TQT_TQOBJECT(this) ); p.begin( &buffer, TQT_TQOBJECT(this) );
p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color)
long long docSize; long long docSize;
@ -199,16 +199,16 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
TQString overSizeText; TQString overSizeText;
if( d->cdSize.mode1Bytes() >= d->doc->size() ) if( d->cdSize.mode1Bytes() >= d->doc->size() )
overSizeText = i18n("Available: %1 of %2") overSizeText = i18n("Available: %1 of %2")
.tqarg( d->showTime .arg( d->showTime
? i18n("%1 min").tqarg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false)) ? i18n("%1 min").arg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false))
: KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) ) : KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) )
.tqarg( d->showTime .arg( d->showTime
? i18n("%1 min").tqarg(K3b::Msf( cdSize*60*75 ).toString(false)) ? i18n("%1 min").arg(K3b::Msf( cdSize*60*75 ).toString(false))
: KIO::convertSizeFromKB( cdSize * 1024 ) ); : KIO::convertSizeFromKB( cdSize * 1024 ) );
else else
overSizeText = i18n("Capacity exceeded by %1") overSizeText = i18n("Capacity exceeded by %1")
.tqarg( d->showTime .arg( d->showTime
? i18n("%1 min").tqarg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false)) ? i18n("%1 min").arg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false))
: KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) ); : KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) );
// ==================================================================================== // ====================================================================================
@ -388,11 +388,11 @@ void K3bFillStatusDisplay::setupPopupMenu()
d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), d->actionAuto = new KRadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()),
d->actionCollection, "fillstatus_auto" ); d->actionCollection, "fillstatus_auto" );
d->action74Min = new KRadioAction( i18n("%1 MB").tqarg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), d->action74Min = new KRadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()),
d->actionCollection, "fillstatus_74minutes" ); d->actionCollection, "fillstatus_74minutes" );
d->action80Min = new KRadioAction( i18n("%1 MB").tqarg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), d->action80Min = new KRadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()),
d->actionCollection, "fillstatus_80minutes" ); d->actionCollection, "fillstatus_80minutes" );
d->action100Min = new KRadioAction( i18n("%1 MB").tqarg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()),
d->actionCollection, "fillstatus_100minutes" ); d->actionCollection, "fillstatus_100minutes" );
d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()),
d->actionCollection, "fillstatus_dvd_4_7gb" ); d->actionCollection, "fillstatus_dvd_4_7gb" );
@ -460,9 +460,9 @@ void K3bFillStatusDisplay::showSize()
{ {
d->actionShowMegs->setChecked( true ); d->actionShowMegs->setChecked( true );
d->action74Min->setText( i18n("%1 MB").tqarg(650) ); d->action74Min->setText( i18n("%1 MB").arg(650) );
d->action80Min->setText( i18n("%1 MB").tqarg(700) ); d->action80Min->setText( i18n("%1 MB").arg(700) );
d->action100Min->setText( i18n("%1 MB").tqarg(880) ); d->action100Min->setText( i18n("%1 MB").arg(880) );
d->showTime = false; d->showTime = false;
d->displayWidget->setShowTime(false); d->displayWidget->setShowTime(false);
@ -548,7 +548,7 @@ void K3bFillStatusDisplay::slotCustomSize()
i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, " i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, "
"and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>" "and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>"
" respectively."), " respectively."),
d->showDvdSizes ? TQString("4%14%2").tqarg(KGlobal::locale()->decimalSymbol()).tqarg(gbS) : d->showDvdSizes ? TQString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) :
(d->showTime ? TQString("74")+minS : TQString("650")+mbS), (d->showTime ? TQString("74")+minS : TQString("650")+mbS),
&ok, this, (const char*)0, &ok, this, (const char*)0,
new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) ); new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) );

2
src/projects/k3bmixedburndialog.cpp
Unescape View File

@ -66,7 +66,7 @@ K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, cons
setTitle( i18n("Mixed Project"), i18n("1 track (%1 minutes)", setTitle( i18n("Mixed Project"), i18n("1 track (%1 minutes)",
"%n tracks (%1 minutes)", "%n tracks (%1 minutes)",
m_doc->numOfTracks()).tqarg(m_doc->length().toString()) ); m_doc->numOfTracks()).arg(m_doc->length().toString()) );
m_checkOnlyCreateImage->hide(); m_checkOnlyCreateImage->hide();

4
src/projects/k3bmixeddirtreeview.cpp
Unescape View File

@ -42,7 +42,7 @@ public:
TQString text( int col ) const { TQString text( int col ) const {
if( col == 0 ) if( col == 0 )
return i18n("Audio Tracks") + TQString(" (%1)").tqarg(m_doc->audioDoc()->numOfTracks()); return i18n("Audio Tracks") + TQString(" (%1)").arg(m_doc->audioDoc()->numOfTracks());
else else
return TQString(); return TQString();
} }
@ -97,7 +97,7 @@ void K3bMixedDirTreeView::slotSelectionChanged( TQListViewItem* i )
void K3bMixedDirTreeView::slotNewAudioTracks() void K3bMixedDirTreeView::slotNewAudioTracks()
{ {
// update the tracknumber // update the tracknumber
m_audioRootItem->tqrepaint(); m_audioRootItem->repaint();
} }
#include "k3bmixeddirtreeview.moc" #include "k3bmixeddirtreeview.moc"

4
src/projects/k3bmovixburndialog.cpp
Unescape View File

@ -52,7 +52,7 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, cons
m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE );
setTitle( i18n("eMovix CD Project"), setTitle( i18n("eMovix CD Project"),
i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) ); i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) );
m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this );
addPage( m_movixOptionsWidget, i18n("eMovix") ); addPage( m_movixOptionsWidget, i18n("eMovix") );
@ -226,7 +226,7 @@ void K3bMovixBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this, if( KMessageBox::warningContinueCancel( this,
i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue ) != KMessageBox::Continue )
return; return;

4
src/projects/k3bmovixdvdburndialog.cpp
Unescape View File

@ -54,7 +54,7 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* par
m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE );
setTitle( i18n("eMovix DVD Project"), setTitle( i18n("eMovix DVD Project"),
i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) ); i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) );
m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this );
addPage( m_movixOptionsWidget, i18n("eMovix") ); addPage( m_movixOptionsWidget, i18n("eMovix") );
@ -193,7 +193,7 @@ void K3bMovixDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this, if( KMessageBox::warningContinueCancel( this,
i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
!= KMessageBox::Continue ) != KMessageBox::Continue )
return; return;

4
src/projects/k3bmovixlistview.cpp
Unescape View File

@ -84,7 +84,7 @@ TQString K3bMovixFileViewItem::text( int col ) const
case 2: case 2:
{ {
if( fileItem()->isSymLink() ) if( fileItem()->isSymLink() )
return i18n("Link to %1").tqarg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " "; return i18n("Link to %1").arg(const_cast<K3bMovixFileViewItem*>(this)->mimeComment()) + " ";
else else
return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " "; return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " ";
} }
@ -139,7 +139,7 @@ TQString K3bMovixSubTitleViewItem::text( int c ) const
case 2: case 2:
{ {
if( fileItem()->subTitleItem()->isSymLink() ) if( fileItem()->subTitleItem()->isSymLink() )
return i18n("Link to %1").tqarg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment()); return i18n("Link to %1").arg(const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment());
else else
return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment(); return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment();
} }

10
src/projects/k3bmusicbrainzjob.cpp
Unescape View File

@ -188,7 +188,7 @@ void K3bMusicBrainzJob::start()
m_trmThread->track = m_tracks.first(); m_trmThread->track = m_tracks.first();
emit infoMessage( i18n("Generating fingerprint for track %1.") emit infoMessage( i18n("Generating fingerprint for track %1.")
.tqarg(m_tracks.current()->trackNumber()), INFO ); .arg(m_tracks.current()->trackNumber()), INFO );
m_trmJob->start(); m_trmJob->start();
} }
@ -215,7 +215,7 @@ void K3bMusicBrainzJob::slotTrmJobFinished( bool success )
// now query musicbrainz // now query musicbrainz
m_mbThread->setSignature( m_trmThread->signature() ); m_mbThread->setSignature( m_trmThread->signature() );
emit infoMessage( i18n("Querying MusicBrainz for track %1.") emit infoMessage( i18n("Querying MusicBrainz for track %1.")
.tqarg(m_tracks.current()->trackNumber()), INFO ); .arg(m_tracks.current()->trackNumber()), INFO );
m_mbJob->start(); m_mbJob->start();
} }
else { else {
@ -253,8 +253,8 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success )
if( resultStringsUnique.count() > 1 ) if( resultStringsUnique.count() > 1 )
s = KInputDialog::getItem( i18n("MusicBrainz Query"), s = KInputDialog::getItem( i18n("MusicBrainz Query"),
i18n("Found multiple matches for track %1 (%2). Please select one.") i18n("Found multiple matches for track %1 (%2). Please select one.")
.tqarg(m_tracks.current()->trackNumber()) .arg(m_tracks.current()->trackNumber())
.tqarg(m_tracks.current()->firstSource()->sourceComment()), .arg(m_tracks.current()->firstSource()->sourceComment()),
resultStringsUnique, resultStringsUnique,
0, 0,
false, false,
@ -273,7 +273,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success )
// query next track // query next track
if( m_tracks.next() ) { if( m_tracks.next() ) {
emit infoMessage( i18n("Generating fingerprint for track %1.") emit infoMessage( i18n("Generating fingerprint for track %1.")
.tqarg(m_tracks.current()->trackNumber()), INFO ); .arg(m_tracks.current()->trackNumber()), INFO );
m_trmThread->track = m_tracks.current(); m_trmThread->track = m_tracks.current();
m_trmJob->start(); m_trmJob->start();
} }

4
src/projects/k3bprojectburndialog.cpp
Unescape View File

@ -199,10 +199,10 @@ void K3bProjectBurnDialog::slotStartClicked()
// //
TQString tempDir = m_tempDirSelectionWidget->tempDirectory(); TQString tempDir = m_tempDirSelectionWidget->tempDirectory();
if( !TQFile::exists( tempDir ) ) { if( !TQFile::exists( tempDir ) ) {
if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( tempDir ) ) if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( tempDir ) )
== KMessageBox::Yes ) { == KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( tempDir ) ) { if( !KStandardDirs::makeDir( tempDir ) ) {
KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( tempDir ) ); KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( tempDir ) );
return; return;
} }
} }

18
src/projects/k3bvcdburndialog.cpp
Unescape View File

@ -69,7 +69,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
} }
setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)", setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)",
m_vcdDoc->tracks() ->count() ).tqarg( KIO::convertSize( m_vcdDoc->size() ) ) ); m_vcdDoc->tracks() ->count() ).arg( KIO::convertSize( m_vcdDoc->size() ) ) );
const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" ); const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" );
if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) ) if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) )
@ -95,13 +95,13 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
// ToolTips // ToolTips
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
TQToolTip::add TQToolTip::add
( m_radioVcd11, i18n( "Select Video CD type %1" ).tqarg( "(VCD 1.1)" ) ); ( m_radioVcd11, i18n( "Select Video CD type %1" ).arg( "(VCD 1.1)" ) );
TQToolTip::add TQToolTip::add
( m_radioVcd20, i18n( "Select Video CD type %1" ).tqarg( "(VCD 2.0)" ) ); ( m_radioVcd20, i18n( "Select Video CD type %1" ).arg( "(VCD 2.0)" ) );
TQToolTip::add TQToolTip::add
( m_radioSvcd10, i18n( "Select Video CD type %1" ).tqarg( "(SVCD 1.0)" ) ); ( m_radioSvcd10, i18n( "Select Video CD type %1" ).arg( "(SVCD 1.0)" ) );
TQToolTip::add TQToolTip::add
( m_radioHqVcd10, i18n( "Select Video CD type %1" ).tqarg( "(HQ-VCD 1.0)" ) ); ( m_radioHqVcd10, i18n( "Select Video CD type %1" ).arg( "(HQ-VCD 1.0)" ) );
TQToolTip::add TQToolTip::add
( m_checkAutoDetect, i18n( "Automatic video type recognition." ) ); ( m_checkAutoDetect, i18n( "Automatic video type recognition." ) );
TQToolTip::add TQToolTip::add
@ -231,7 +231,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
( m_editCdiCfg, i18n( "<p>Configuration parameters only available for VideoCD 2.0" ( m_editCdiCfg, i18n( "<p>Configuration parameters only available for VideoCD 2.0"
"<p>The engine works perfectly well when used as-is." "<p>The engine works perfectly well when used as-is."
"<p>You have the option to configure the VCD application." "<p>You have the option to configure the VCD application."
"<p>You can adapt the color and/or the tqshape of the cursor and lots more." ) ); "<p>You can adapt the color and/or the shape of the cursor and lots more." ) );
TQWhatsThis::add TQWhatsThis::add
@ -451,7 +451,7 @@ void K3bVcdBurnDialog::setupVideoCdTab()
m_checkNonCompliant->setEnabled( false ); m_checkNonCompliant->setEnabled( false );
m_checkNonCompliant->setChecked( false ); m_checkNonCompliant->setChecked( false );
m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).tqarg( "VCD 3.0" ), m_groupOptions ); m_checkVCD30interpretation = new TQCheckBox( i18n( "Enable %1 track interpretation" ).arg( "VCD 3.0" ), m_groupOptions );
// Only available on SVCD Type // Only available on SVCD Type
m_checkVCD30interpretation->setEnabled( false ); m_checkVCD30interpretation->setEnabled( false );
m_checkVCD30interpretation->setChecked( false ); m_checkVCD30interpretation->setChecked( false );
@ -580,7 +580,7 @@ void K3bVcdBurnDialog::slotStartClicked()
{ {
if ( TQFile::exists( vcdDoc() ->vcdImage() ) ) { if ( TQFile::exists( vcdDoc() ->vcdImage() ) ) {
if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).tqarg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") ) if ( KMessageBox::warningContinueCancel( this, i18n( "Do you want to overwrite %1" ).arg( vcdDoc() ->vcdImage() ), i18n( "File Exists" ), i18n("Overwrite") )
!= KMessageBox::Continue ) != KMessageBox::Continue )
return ; return ;
} }
@ -895,7 +895,7 @@ void K3bVcdBurnDialog::saveCdiConfig()
int i = m_editCdiCfg->numLines(); int i = m_editCdiCfg->numLines();
for ( int j = 0; j < i; j++ ) for ( int j = 0; j < i; j++ )
s << TQString( "%1" ).tqarg( m_editCdiCfg->textLine( j ) ) << "\n"; s << TQString( "%1" ).arg( m_editCdiCfg->textLine( j ) ) << "\n";
cdi.close(); cdi.close();

2
src/projects/k3bvcdlistview.cpp
Unescape View File

@ -198,7 +198,7 @@ void K3bVcdListView::showPropertiesDialog()
TQPtrList<K3bVcdTrack> tracks = *m_doc->tracks(); TQPtrList<K3bVcdTrack> tracks = *m_doc->tracks();
K3bVcdTrackDialog d( m_doc, tracks, selected, this ); K3bVcdTrackDialog d( m_doc, tracks, selected, this );
if ( d.exec() ) { if ( d.exec() ) {
tqrepaint(); repaint();
} }
} else { } else {
m_view->slotProperties(); m_view->slotProperties();

10
src/projects/k3bvcdtrackdialog.cpp
Unescape View File

@ -70,7 +70,7 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& t
m_displayFileName->setText( selectedTrack->fileName() ); m_displayFileName->setText( selectedTrack->fileName() );
m_displayLength->setText( selectedTrack->duration() ); m_displayLength->setText( selectedTrack->duration() );
m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) ); m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) );
m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( selectedTrack->muxrate() ) ); m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) );
if ( selectedTrack->isSegment() ) if ( selectedTrack->isSegment() )
m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) ); m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) );
@ -93,7 +93,7 @@ void K3bVcdTrackDialog::slotOk()
void K3bVcdTrackDialog::setPbcTrack( K3bVcdTrack* selected, K3bCutComboBox* box, int which ) void K3bVcdTrackDialog::setPbcTrack( K3bVcdTrack* selected, K3bCutComboBox* box, int which )
{ {
// TODO: Unset Userdefined on default settings // TODO: Unset Userdefined on default settings
kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).tqarg( box->currentItem() ).tqarg( m_tracks.count() ) << endl; kdDebug() << TQString( "K3bVcdTrackDialog::setPbcTrack: currentItem = %1, count = %2" ).arg( box->currentItem() ).arg( m_tracks.count() ) << endl;
int count = m_tracks.count(); int count = m_tracks.count();
@ -402,7 +402,7 @@ void K3bVcdTrackDialog::prepareGui()
m_displayLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_displayLength->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" ); m_muxrate = new TQLabel( groupFileInfo, "m_muxrate" );
m_muxrate->setText( i18n( "%1 bit/s" ).tqarg( 0 ) ); m_muxrate->setText( i18n( "%1 bit/s" ).arg( 0 ) );
m_muxrate->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); m_muxrate->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
TQFrame* fileInfoLine = new TQFrame( groupFileInfo ); TQFrame* fileInfoLine = new TQFrame( groupFileInfo );
@ -744,9 +744,9 @@ TQString K3bVcdTrackDialog::displayName( K3bVcdTrack * track )
return i18n( "ItSelf" ); return i18n( "ItSelf" );
if ( track->isSegment() ) if ( track->isSegment() )
return i18n( "Segment-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() ); return i18n( "Segment-%1 - %2" ).arg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() );
return i18n( "Sequence-%1 - %2" ).tqarg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).tqarg( track->title() ); return i18n( "Sequence-%1 - %2" ).arg( TQString::number( track->index() + 1 ).rightJustify( 3, '0' ) ).arg( track->title() );
} }
void K3bVcdTrackDialog::slotPlayTimeChanged( int value ) void K3bVcdTrackDialog::slotPlayTimeChanged( int value )

4
src/projects/k3bvideodvdburndialog.cpp
Unescape View File

@ -46,7 +46,7 @@ K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *par
{ {
prepareGui(); prepareGui();
setTitle( i18n("Video DVD Project"), i18n("Size: %1").tqarg( KIO::convertSize(doc->size()) ) ); setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) );
// for now we just put the verify checkbox on the main page... // for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@ -181,7 +181,7 @@ void K3bVideoDvdBurnDialog::slotStartClicked()
if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) { if( TQFile::exists( m_tempDirSelectionWidget->tempPath() ) ) {
if( KMessageBox::warningContinueCancel( this, if( KMessageBox::warningContinueCancel( this,
i18n("Do you want to overwrite %1?").tqarg(m_tempDirSelectionWidget->tempPath()), i18n("Do you want to overwrite %1?").arg(m_tempDirSelectionWidget->tempPath()),
i18n("File Exists"), i18n("Overwrite") ) i18n("File Exists"), i18n("Overwrite") )
== KMessageBox::Continue ) { == KMessageBox::Continue ) {
// delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked // delete the file here to avoid problems with free space in K3bProjectBurnDialog::slotStartClicked

4
src/rip/base_k3baudiorippingoptionwidget.ui
Unescape View File

@ -231,7 +231,7 @@ file will contain all tracks one after the other.
<property name="text"> <property name="text">
<string>-</string> <string>-</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -250,7 +250,7 @@ file will contain all tracks one after the other.
<property name="text"> <property name="text">
<string>-</string> <string>-</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

4
src/rip/base_k3bcddbpatternwidget.ui
Unescape View File

@ -137,7 +137,7 @@
<property name="text"> <property name="text">
<string>See special strings</string> <string>See special strings</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -148,7 +148,7 @@
<property name="text"> <property name="text">
<string>About conditional inclusion</string> <string>About conditional inclusion</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

10
src/rip/k3baudiocdview.cpp
Unescape View File

@ -67,7 +67,7 @@ public:
: K3bCheckListViewItem( parent, after ) { : K3bCheckListViewItem( parent, after ) {
setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) ); setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) );
setText( 3, i18n("Track %1").tqarg(_trackNumber) ); setText( 3, i18n("Track %1").arg(_trackNumber) );
setText( 4, " " + length.toString() + " " ); setText( 4, " " + length.toString() + " " );
setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " ); setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " );
@ -335,7 +335,7 @@ void K3bAudioCdView::slotEditTrackCddb()
if( !items.isEmpty() ) { if( !items.isEmpty() ) {
AudioTrackViewItem* a = static_cast<AudioTrackViewItem*>(items.first()); AudioTrackViewItem* a = static_cast<AudioTrackViewItem*>(items.first());
KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").tqarg(a->trackNumber), KDialogBase d( this, "trackCddbDialog", true, i18n("Cddb Track %1").arg(a->trackNumber),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true); KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true);
TQWidget* w = new TQWidget( &d ); TQWidget* w = new TQWidget( &d );
@ -516,8 +516,8 @@ void K3bAudioCdView::slotSaveCddbLocally()
m_cddb->saveEntry( m_cddbInfo ); m_cddb->saveEntry( m_cddbInfo );
K3bPassivePopup::showPopup( i18n("Saved entry (%1) in category %2.") K3bPassivePopup::showPopup( i18n("Saved entry (%1) in category %2.")
.tqarg(m_cddbInfo.discid) .arg(m_cddbInfo.discid)
.tqarg(m_cddbInfo.category), .arg(m_cddbInfo.category),
i18n("CDDB") ); i18n("CDDB") );
} }
@ -569,7 +569,7 @@ void K3bAudioCdView::updateDisplay()
m_labelLength->setText( i18n("1 track (%1)", m_labelLength->setText( i18n("1 track (%1)",
"%n tracks (%1)", "%n tracks (%1)",
m_toc.count()).tqarg(K3b::Msf(m_toc.length()).toString()) ); m_toc.count()).arg(K3b::Msf(m_toc.length()).toString()) );
} }

2
src/rip/k3baudioprojectconvertingdialog.cpp
Unescape View File

@ -79,7 +79,7 @@ K3bAudioProjectConvertingDialog::K3bAudioProjectConvertingDialog( K3bAudioDoc* d
setTitle( i18n("Audio Project Conversion"), setTitle( i18n("Audio Project Conversion"),
i18n("1 track (%1)", "%n tracks (%1)", i18n("1 track (%1)", "%n tracks (%1)",
m_doc->numOfTracks()).tqarg(m_doc->length().toString()) ); m_doc->numOfTracks()).arg(m_doc->length().toString()) );
refresh(); refresh();
} }

38
src/rip/k3baudioprojectconvertingthread.cpp
Unescape View File

@ -110,7 +110,7 @@ void K3bAudioProjectConvertingThread::run()
TQString dir = filename.left( filename.findRev("/") ); TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) { if( !KStandardDirs::makeDir( dir ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
} }
@ -137,12 +137,12 @@ void K3bAudioProjectConvertingThread::run()
} }
if( !isOpen ) { if( !isOpen ) {
emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
} }
emitInfoMessage( i18n("Converting to single file '%1'.").tqarg(filename), K3bJob::INFO ); emitInfoMessage( i18n("Converting to single file '%1'.").arg(filename), K3bJob::INFO );
} }
bool success = true; bool success = true;
@ -155,7 +155,7 @@ void K3bAudioProjectConvertingThread::run()
break; break;
} }
emitInfoMessage( i18n("Successfully converted track %1.").tqarg(i+1), K3bJob::INFO ); emitInfoMessage( i18n("Successfully converted track %1.").arg(i+1), K3bJob::INFO );
track = track->next(); track = track->next();
++i; ++i;
@ -180,7 +180,7 @@ void K3bAudioProjectConvertingThread::run()
if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) { if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) { if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
TQFile::remove( m_tracks[d->currentTrackIndex].second ); TQFile::remove( m_tracks[d->currentTrackIndex].second );
emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO ); emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
} }
} }
@ -196,7 +196,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
{ {
TQString dir = filename.left( filename.findRev("/") ); TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir ) ) { if( !KStandardDirs::makeDir( dir ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
return false; return false;
} }
@ -226,7 +226,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
} }
if( !isOpen ) { if( !isOpen ) {
emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
return false; return false;
} }
} }
@ -235,11 +235,11 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
if( !m_cddbEntry.artists[d->currentTrackIndex].isEmpty() && if( !m_cddbEntry.artists[d->currentTrackIndex].isEmpty() &&
!m_cddbEntry.titles[d->currentTrackIndex].isEmpty() ) !m_cddbEntry.titles[d->currentTrackIndex].isEmpty() )
emitNewSubTask( i18n("Converting track %1 (%2 - %3)") emitNewSubTask( i18n("Converting track %1 (%2 - %3)")
.tqarg(d->currentTrackIndex+1) .arg(d->currentTrackIndex+1)
.tqarg(m_cddbEntry.artists[d->currentTrackIndex]) .arg(m_cddbEntry.artists[d->currentTrackIndex])
.tqarg(m_cddbEntry.titles[d->currentTrackIndex]) ); .arg(m_cddbEntry.titles[d->currentTrackIndex]) );
else else
emitNewSubTask( i18n("Converting track %1").tqarg(d->currentTrackIndex+1) ); emitNewSubTask( i18n("Converting track %1").arg(d->currentTrackIndex+1) );
// do the conversion // do the conversion
@ -265,7 +265,7 @@ bool K3bAudioProjectConvertingThread::convertTrack( K3bAudioTrack* track, const
if( d->encoder->encode( buffer, readLength ) < 0 ) { if( d->encoder->encode( buffer, readLength ) < 0 ) {
kdDebug() << "(K3bAudioProjectConvertingThread) error while encoding." << endl; kdDebug() << "(K3bAudioProjectConvertingThread) error while encoding." << endl;
emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR ); emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
emitInfoMessage( i18n("Error while encoding track %1.").tqarg(d->currentTrackIndex+1), K3bJob::ERROR ); emitInfoMessage( i18n("Error while encoding track %1.").arg(d->currentTrackIndex+1), K3bJob::ERROR );
return false; return false;
} }
} }
@ -304,11 +304,11 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) ); TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) { if( !KStandardDirs::makeDir( playlistDir ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
return false; return false;
} }
emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO ); emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
TQFile f( m_playlistFilename ); TQFile f( m_playlistFilename );
if( f.open( IO_WriteOnly ) ) { if( f.open( IO_WriteOnly ) ) {
@ -359,10 +359,10 @@ bool K3bAudioProjectConvertingThread::writePlaylist()
} }
} }
return ( t.tqdevice()->status() == IO_Ok ); return ( t.device()->status() == IO_Ok );
} }
else { else {
emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
kdDebug() << "(K3bAudioProjectConvertingThread) could not open file " << m_playlistFilename << " for writing." << endl; kdDebug() << "(K3bAudioProjectConvertingThread) could not open file " << m_playlistFilename << " for writing." << endl;
return false; return false;
} }
@ -409,7 +409,7 @@ bool K3bAudioProjectConvertingThread::writeCueFile()
cueFile.truncate( cueFile.findRev(".") ); cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue"; cueFile += ".cue";
emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO ); emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
return cueWriter.save( cueFile ); return cueWriter.save( cueFile );
} }
@ -444,7 +444,7 @@ TQString K3bAudioProjectConvertingThread::jobDescription() const
if( m_cddbEntry.cdTitle.isEmpty() ) if( m_cddbEntry.cdTitle.isEmpty() )
return i18n("Converting Audio Tracks"); return i18n("Converting Audio Tracks");
else else
return i18n("Converting Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle); return i18n("Converting Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
} }
TQString K3bAudioProjectConvertingThread::jobDetails() const TQString K3bAudioProjectConvertingThread::jobDetails() const
@ -452,7 +452,7 @@ TQString K3bAudioProjectConvertingThread::jobDetails() const
if( d->encoder ) if( d->encoder )
return i18n("1 track (encoding to %1)", return i18n("1 track (encoding to %1)",
"%n tracks (encoding to %1)", "%n tracks (encoding to %1)",
m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType)); m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
else else
return i18n("1 track", "%n tracks", m_doc->numOfTracks() ); return i18n("1 track", "%n tracks", m_doc->numOfTracks() );
} }

4
src/rip/k3baudiorippingdialog.cpp
Unescape View File

@ -106,7 +106,7 @@ K3bAudioRippingDialog::K3bAudioRippingDialog(const K3bDevice::Toc& toc,
} }
setTitle( i18n("CD Ripping"), setTitle( i18n("CD Ripping"),
i18n("1 track (%1)", "%n tracks (%1)", i18n("1 track (%1)", "%n tracks (%1)",
m_trackNumbers.count()).tqarg(length.toString()) ); m_trackNumbers.count()).arg(length.toString()) );
} }
@ -383,7 +383,7 @@ void K3bAudioRippingDialog::refresh()
m_patternWidget->blankReplaceString() ) + "." + extension; m_patternWidget->blankReplaceString() ) + "." + extension;
} }
else { else {
filename = i18n("Track%1").tqarg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension; filename = i18n("Track%1").arg( TQString::number( *it ).rightJustify( 2, '0' ) ) + "." + extension;
} }
filename = d->fsInfo.fixupPath( filename ); filename = d->fsInfo.fixupPath( filename );

44
src/rip/k3baudioripthread.cpp
Unescape View File

@ -150,7 +150,7 @@ void K3bAudioRipThread::run()
d->toc = m_device->readToc(); d->toc = m_device->readToc();
if( !d->paranoiaLib->initParanoia( m_device, d->toc ) ) { if( !d->paranoiaLib->initParanoia( m_device, d->toc ) ) {
emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()),
K3bJob::ERROR ); K3bJob::ERROR );
m_device->block(false); m_device->block(false);
@ -158,7 +158,7 @@ void K3bAudioRipThread::run()
if( m_device->interfaceType() == K3bDevice::SCSI && if( m_device->interfaceType() == K3bDevice::SCSI &&
!m_device->genericDevice().isEmpty() && !m_device->genericDevice().isEmpty() &&
!TQFileInfo( m_device->genericDevice() ).isWritable() ) !TQFileInfo( m_device->genericDevice() ).isWritable() )
emitInfoMessage( i18n("You need write access to %1").tqarg( m_device->genericDevice() ), K3bJob::ERROR ); emitInfoMessage( i18n("You need write access to %1").arg( m_device->genericDevice() ), K3bJob::ERROR );
emitFinished(false); emitFinished(false);
return; return;
@ -197,7 +197,7 @@ void K3bAudioRipThread::run()
TQString dir = filename.left( filename.findRev("/") ); TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) { if( !KStandardDirs::makeDir( dir, 0777 ) ) {
d->paranoiaLib->close(); d->paranoiaLib->close();
emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
m_device->block(false); m_device->block(false);
emitFinished(false); emitFinished(false);
return; return;
@ -226,13 +226,13 @@ void K3bAudioRipThread::run()
if( !isOpen ) { if( !isOpen ) {
d->paranoiaLib->close(); d->paranoiaLib->close();
emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
m_device->block(false); m_device->block(false);
emitFinished(false); emitFinished(false);
return; return;
} }
emitInfoMessage( i18n("Ripping to single file '%1'.").tqarg(filename), K3bJob::INFO ); emitInfoMessage( i18n("Ripping to single file '%1'.").arg(filename), K3bJob::INFO );
} }
emitInfoMessage( i18n("Starting digital audio extraction (ripping)."), K3bJob::INFO ); emitInfoMessage( i18n("Starting digital audio extraction (ripping)."), K3bJob::INFO );
@ -254,7 +254,7 @@ void K3bAudioRipThread::run()
if( success && !d->canceled ) { if( success && !d->canceled ) {
TQString& filename = m_tracks[0].second; TQString& filename = m_tracks[0].second;
emitInfoMessage( i18n("Successfully ripped to %2.").tqarg(filename), K3bJob::INFO ); emitInfoMessage( i18n("Successfully ripped to %2.").arg(filename), K3bJob::INFO );
} }
} }
@ -300,7 +300,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
TQString dir = filename.left( filename.findRev("/") ); TQString dir = filename.left( filename.findRev("/") );
if( !KStandardDirs::makeDir( dir, 0777 ) ) { if( !KStandardDirs::makeDir( dir, 0777 ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(dir), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to create directory %1").arg(dir), K3bJob::ERROR );
return false; return false;
} }
@ -330,16 +330,16 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
} }
if( !isOpen ) { if( !isOpen ) {
emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filename), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filename), K3bJob::ERROR );
return false; return false;
} }
} }
if( !m_cddbEntry.artists[track-1].isEmpty() && if( !m_cddbEntry.artists[track-1].isEmpty() &&
!m_cddbEntry.titles[track-1].isEmpty() ) !m_cddbEntry.titles[track-1].isEmpty() )
emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").tqarg(track).tqarg(m_cddbEntry.artists[track-1]).tqarg(m_cddbEntry.titles[track-1]) ); emitNewSubTask( i18n("Ripping track %1 (%2 - %3)").arg(track).arg(m_cddbEntry.artists[track-1]).arg(m_cddbEntry.titles[track-1]) );
else else
emitNewSubTask( i18n("Ripping track %1").tqarg(track) ); emitNewSubTask( i18n("Ripping track %1").arg(track) );
int status; int status;
while( 1 ) { while( 1 ) {
@ -352,9 +352,9 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
if( status == K3bCdparanoiaLib::S_OK ) { if( status == K3bCdparanoiaLib::S_OK ) {
if( buf == 0 ) { if( buf == 0 ) {
if( m_singleFile ) if( m_singleFile )
emitInfoMessage( i18n("Successfully ripped track %1.").tqarg(track), K3bJob::INFO ); emitInfoMessage( i18n("Successfully ripped track %1.").arg(track), K3bJob::INFO );
else else
emitInfoMessage( i18n("Successfully ripped track %1 to %2.").tqarg(track).tqarg(filename), K3bJob::INFO ); emitInfoMessage( i18n("Successfully ripped track %1 to %2.").arg(track).arg(filename), K3bJob::INFO );
if( !m_singleFile ) { if( !m_singleFile ) {
if( d->encoder ) if( d->encoder )
@ -371,7 +371,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
CD_FRAMESIZE_RAW ) < 0 ) { CD_FRAMESIZE_RAW ) < 0 ) {
kdDebug() << "(K3bAudioRipThread) error while encoding." << endl; kdDebug() << "(K3bAudioRipThread) error while encoding." << endl;
emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR ); emitInfoMessage( d->encoder->lastErrorString(), K3bJob::ERROR );
emitInfoMessage( i18n("Error while encoding track %1.").tqarg(track), K3bJob::ERROR ); emitInfoMessage( i18n("Error while encoding track %1.").arg(track), K3bJob::ERROR );
return false; return false;
} }
} }
@ -387,7 +387,7 @@ bool K3bAudioRipThread::ripTrack( int track, const TQString& filename )
} }
} }
else { else {
emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(track), K3bJob::ERROR ); emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(track), K3bJob::ERROR );
return false; return false;
} }
} }
@ -435,7 +435,7 @@ void K3bAudioRipThread::cleanupAfterCancellation()
if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) { if( d->currentTrackIndex >= 0 && d->currentTrackIndex < (int)m_tracks.count() ) {
if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) { if( TQFile::exists( m_tracks[d->currentTrackIndex].second ) ) {
TQFile::remove( m_tracks[d->currentTrackIndex].second ); TQFile::remove( m_tracks[d->currentTrackIndex].second );
emitInfoMessage( i18n("Removed partial file '%1'.").tqarg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO ); emitInfoMessage( i18n("Removed partial file '%1'.").arg(m_tracks[d->currentTrackIndex].second), K3bJob::INFO );
} }
} }
} }
@ -447,11 +447,11 @@ bool K3bAudioRipThread::writePlaylist()
TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) ); TQString playlistDir = m_playlistFilename.left( m_playlistFilename.findRev( "/" ) );
if( !KStandardDirs::makeDir( playlistDir ) ) { if( !KStandardDirs::makeDir( playlistDir ) ) {
emitInfoMessage( i18n("Unable to create directory %1").tqarg(playlistDir), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to create directory %1").arg(playlistDir), K3bJob::ERROR );
return false; return false;
} }
emitInfoMessage( i18n("Writing playlist to %1.").tqarg( m_playlistFilename ), K3bJob::INFO ); emitInfoMessage( i18n("Writing playlist to %1.").arg( m_playlistFilename ), K3bJob::INFO );
TQFile f( m_playlistFilename ); TQFile f( m_playlistFilename );
if( f.open( IO_WriteOnly ) ) { if( f.open( IO_WriteOnly ) ) {
@ -502,10 +502,10 @@ bool K3bAudioRipThread::writePlaylist()
} }
} }
return ( t.tqdevice()->status() == IO_Ok ); return ( t.device()->status() == IO_Ok );
} }
else { else {
emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_playlistFilename), K3bJob::ERROR ); emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_playlistFilename), K3bJob::ERROR );
kdDebug() << "(K3bAudioRipThread) could not open file " << m_playlistFilename << " for writing." << endl; kdDebug() << "(K3bAudioRipThread) could not open file " << m_playlistFilename << " for writing." << endl;
return false; return false;
} }
@ -551,7 +551,7 @@ bool K3bAudioRipThread::writeCueFile()
cueFile.truncate( cueFile.findRev(".") ); cueFile.truncate( cueFile.findRev(".") );
cueFile += ".cue"; cueFile += ".cue";
emitInfoMessage( i18n("Writing cue file to %1.").tqarg(cueFile), K3bJob::INFO ); emitInfoMessage( i18n("Writing cue file to %1.").arg(cueFile), K3bJob::INFO );
return cueWriter.save( cueFile ); return cueWriter.save( cueFile );
} }
@ -586,7 +586,7 @@ TQString K3bAudioRipThread::jobDescription() const
if( m_cddbEntry.cdTitle.isEmpty() ) if( m_cddbEntry.cdTitle.isEmpty() )
return i18n("Ripping Audio Tracks"); return i18n("Ripping Audio Tracks");
else else
return i18n("Ripping Audio Tracks From '%1'").tqarg(m_cddbEntry.cdTitle); return i18n("Ripping Audio Tracks From '%1'").arg(m_cddbEntry.cdTitle);
} }
TQString K3bAudioRipThread::jobDetails() const TQString K3bAudioRipThread::jobDetails() const
@ -594,7 +594,7 @@ TQString K3bAudioRipThread::jobDetails() const
if( d->encoder ) if( d->encoder )
return i18n("1 track (encoding to %1)", return i18n("1 track (encoding to %1)",
"%n tracks (encoding to %1)", "%n tracks (encoding to %1)",
m_tracks.count() ).tqarg(d->encoder->fileTypeComment(d->fileType)); m_tracks.count() ).arg(d->encoder->fileTypeComment(d->fileType));
else else
return i18n("1 track", "%n tracks", m_tracks.count() ); return i18n("1 track", "%n tracks", m_tracks.count() );
} }

2
src/rip/k3bcuefilewriter.cpp
Unescape View File

@ -87,5 +87,5 @@ bool K3bCueFileWriter::save( TQTextStream& t )
i++; i++;
} }
return ( t.tqdevice()->status() == IO_Ok ); return ( t.device()->status() == IO_Ok );
} }

4
src/rip/k3bpatternparser.cpp
Unescape View File

@ -119,7 +119,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s.replace( '*', '_' ); s.replace( '*', '_' );
s.replace( '}', '*' ); // for conditional inclusion s.replace( '}', '*' ); // for conditional inclusion
dir.append( s.isEmpty() dir.append( s.isEmpty()
? i18n("unknown") + TQString(" %1").tqarg(trackNumber) ? i18n("unknown") + TQString(" %1").arg(trackNumber)
: s ); : s );
break; break;
case TITLE: case TITLE:
@ -128,7 +128,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s.replace( '*', '_' ); s.replace( '*', '_' );
s.replace( '}', '*' ); s.replace( '}', '*' );
dir.append( s.isEmpty() dir.append( s.isEmpty()
? i18n("Track %1").tqarg(trackNumber) ? i18n("Track %1").arg(trackNumber)
: s ); : s );
break; break;
case NUMBER: case NUMBER:

2
src/rip/k3bvideocdinfo.cpp
Unescape View File

@ -177,7 +177,7 @@ void K3bVideoCdInfo::parseXmlData()
); );
} }
} else { } else {
kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).tqarg( tagName ) << endl; kdDebug() << TQString( "(K3bVideoCdInfo::parseXmlData) tagName '%1' not used" ).arg( tagName ) << endl;
} }
} }
} }

34
src/rip/k3bvideocdrip.cpp
Unescape View File

@ -97,8 +97,8 @@ void K3bVideoCdRip::vcdxRip()
if ( !bin ) { if ( !bin ) {
kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl; kdDebug() << "(K3bVideoCdRip) could not find vcdxrip executable" << endl;
emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxrip" ), K3bJob::ERROR ); emit infoMessage( i18n( "Could not find %1 executable." ).arg( "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( "To rip VideoCD's 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 ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll(); cancelAll();
jobFinished( false ); jobFinished( false );
@ -107,7 +107,7 @@ void K3bVideoCdRip::vcdxRip()
if( bin->version < K3bVersion("0.7.12") ) { if( bin->version < K3bVersion("0.7.12") ) {
kdDebug() << "(K3bVideoCdRip) vcdxrip executable too old!" << endl; kdDebug() << "(K3bVideoCdRip) vcdxrip executable too old!" << endl;
emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).tqarg( "Vcdxrip" ).tqarg( "0.7.12" ), K3bJob::ERROR ); emit infoMessage( i18n( "%1 executable too old! Need version %2 or greater" ).arg( "Vcdxrip" ).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 ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll(); cancelAll();
jobFinished( false ); jobFinished( false );
@ -115,7 +115,7 @@ void K3bVideoCdRip::vcdxRip()
} }
if ( !bin->copyright.isEmpty() ) 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 << k3bcore ->externalBinManager() ->binPath( "vcdxrip" ); *m_process << k3bcore ->externalBinManager() ->binPath( "vcdxrip" );
@ -142,10 +142,10 @@ void K3bVideoCdRip::vcdxRip()
if ( m_videooptions ->getVideoCdSector2336() ) if ( m_videooptions ->getVideoCdSector2336() )
*m_process << "--sector-2336"; *m_process << "--sector-2336";
*m_process << "-i" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() ); *m_process << "-i" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdSource() ).data() );
if ( m_videooptions ->getVideoCdExtractXml() ) if ( m_videooptions ->getVideoCdExtractXml() )
*m_process << "-o" << TQString( "%1" ).tqarg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() ); *m_process << "-o" << TQString( "%1" ).arg( TQFile::encodeName( m_videooptions ->getVideoCdDescription() + ".xml" ).data() );
else else
*m_process << "-o" << "/dev/null"; *m_process << "-o" << "/dev/null";
@ -172,11 +172,11 @@ void K3bVideoCdRip::vcdxRip()
emit newTask( i18n( "Extracting" ) ); emit newTask( i18n( "Extracting" ) );
emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO ); emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO );
emit infoMessage( i18n( "Extract files from %1 to %2." ).tqarg( m_videooptions ->getVideoCdSource() ).tqarg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO ); emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl; kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl;
emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxrip" ), K3bJob::ERROR ); emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR );
cancelAll(); cancelAll();
jobFinished( false ); jobFinished( false );
} }
@ -241,15 +241,15 @@ void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len )
if ( tel.isText() ) { if ( tel.isText() ) {
const TQString text = tel.data(); const TQString text = tel.data();
if ( level == "information" ) { if ( level == "information" ) {
kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).tqarg( text ) << endl; kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip information, %1" ).arg( text ) << endl;
parseInformation( text ); parseInformation( text );
} else { } else {
if ( level != "error" ) { if ( level != "error" ) {
kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).tqarg( text ) << endl; kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip warning, %1" ).arg( text ) << endl;
emit debuggingOutput( "vcdxrip", text ); emit debuggingOutput( "vcdxrip", text );
parseInformation( text ); parseInformation( text );
} else { } else {
kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).tqarg( text ) << endl; kdDebug() << TQString( "(K3bVideoCdRip) vcdxrip error, %1" ).arg( text ) << endl;
emit infoMessage( text, K3bJob::ERROR ); emit infoMessage( text, K3bJob::ERROR );
} }
} }
@ -269,14 +269,14 @@ void K3bVideoCdRip::slotVcdXRipFinished()
emit infoMessage( i18n( "Files successfully extracted." ), K3bJob::SUCCESS ); emit infoMessage( i18n( "Files successfully extracted." ), K3bJob::SUCCESS );
break; break;
default: default:
emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxrip" ).tqarg( m_process->exitStatus() ), K3bJob::ERROR ); emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxrip" ).arg( m_process->exitStatus() ), K3bJob::ERROR );
emit infoMessage( i18n( "Please send me an email with the last output..." ), K3bJob::ERROR ); emit infoMessage( i18n( "Please send me an email with the last output..." ), K3bJob::ERROR );
cancelAll(); cancelAll();
jobFinished( false ); jobFinished( false );
return ; return ;
} }
} else { } else {
emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxrip" ), K3bJob::ERROR ); emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxrip" ), K3bJob::ERROR );
cancelAll(); cancelAll();
jobFinished( false ); jobFinished( false );
return ; return ;
@ -290,7 +290,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
// parse warning // parse warning
if ( text.contains( "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. // 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( "%1 encountered non-form2 sector" ).arg("Vcdxrip"), K3bJob::ERROR );
emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR ); emit infoMessage( i18n( "leaving loop" ), K3bJob::ERROR );
cancelAll(); cancelAll();
jobFinished( false ); jobFinished( false );
@ -326,7 +326,7 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = 11; index = 11;
end = text.find( "(start lsn" ); end = text.find( "(start lsn" );
emit newSubTask( i18n( "Extracting %1" ).tqarg( text.mid( index, end - index ).stripWhiteSpace() ) ); emit newSubTask( i18n( "Extracting %1" ).arg( text.mid( index, end - index ).stripWhiteSpace() ) );
} }
// parse extracting files info // parse extracting files info
// extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1) // extracting CDI/CDI_IMAG.RTF to _cdi_cdi_imag.rtf (lsn 258, size 1315168, raw 1)
@ -337,14 +337,14 @@ void K3bVideoCdRip::parseInformation( TQString text )
index = text.find( " to " ); index = text.find( " to " );
end = text.find( " (lsn" ); end = text.find( " (lsn" );
TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace(); TQString toFileName = text.mid( index + 4, end - index - 4 ).stripWhiteSpace();
emit newSubTask( i18n( "Extracting %1 to %2" ).tqarg( extractFileName ).tqarg( toFileName ) ); emit newSubTask( i18n( "Extracting %1 to %2" ).arg( extractFileName ).arg( toFileName ) );
} }
} }
} }
TQString K3bVideoCdRip::jobDescription() const TQString K3bVideoCdRip::jobDescription() const
{ {
return i18n( "Extracting %1" ).tqarg( m_videooptions ->getVideoCdDescription() ); return i18n( "Extracting %1" ).arg( m_videooptions ->getVideoCdDescription() );
} }
TQString K3bVideoCdRip::jobDetails() const TQString K3bVideoCdRip::jobDetails() const

8
src/rip/k3bvideocdrippingdialog.cpp
Unescape View File

@ -132,7 +132,7 @@ void K3bVideoCdRippingDialog::setupGui()
void K3bVideoCdRippingDialog::setupContextHelp() void K3bVideoCdRippingDialog::setupContextHelp()
{ {
TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").tqarg( m_editDirectory ->url() ) ); TQToolTip::add( m_labelFreeSpace, i18n("Free space on destination directory: %1").arg( m_editDirectory ->url() ) );
TQToolTip::add( m_labelNecessarySize, i18n("Necessary space for extracted files") ); TQToolTip::add( m_labelNecessarySize, i18n("Necessary space for extracted files") );
@ -157,10 +157,10 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQDir d; TQDir d;
d.setPath( m_editDirectory ->url() ); d.setPath( m_editDirectory ->url() );
if( !d.exists() ) { if( !d.exists() ) {
if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").tqarg( m_editDirectory->url() ) ) if( KMessageBox::warningYesNo( this, i18n("Image folder '%1' does not exist. Do you want K3b to create it?").arg( m_editDirectory->url() ) )
== KMessageBox::Yes ) { == KMessageBox::Yes ) {
if( !KStandardDirs::makeDir( m_editDirectory->url() ) ) { if( !KStandardDirs::makeDir( m_editDirectory->url() ) ) {
KMessageBox::error( this, i18n("Failed to create folder '%1'.").tqarg( m_editDirectory->url() ) ); KMessageBox::error( this, i18n("Failed to create folder '%1'.").arg( m_editDirectory->url() ) );
return; return;
} }
} }
@ -170,7 +170,7 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQFileInfo* fi; TQFileInfo* fi;
while ( ( fi = it.current() ) != 0 ) { while ( ( fi = it.current() ) != 0 ) {
if ( fi ->fileName() != "." && fi ->fileName() != ".." ) if ( fi ->fileName() != "." && fi ->fileName() != ".." )
filesExists.append( TQString( "%1 (%2)" ).tqarg( TQFile::encodeName( fi ->fileName() ).data() ).tqarg( KIO::convertSize( fi ->size() ) ) ); filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( KIO::convertSize( fi ->size() ) ) );
++it; ++it;
} }

10
src/rip/k3bvideocdview.cpp
Unescape View File

@ -68,7 +68,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
const K3b::Msf& length ) const K3b::Msf& length )
: TQListViewItem( parent ) : TQListViewItem( parent )
{ {
setText( 0, TQString( "%1. %2" ).tqarg( _trackNumber ).tqarg( id ) ); setText( 0, TQString( "%1. %2" ).arg( _trackNumber ).arg( id ) );
setText( 1, name ); setText( 1, name );
if ( length > 0 ) { if ( length > 0 ) {
setText( 2, length.toString() ); setText( 2, length.toString() );
@ -83,7 +83,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
void updateData( const K3bVideoCdInfoResultEntry& resultEntry ) void updateData( const K3bVideoCdInfoResultEntry& resultEntry )
{ {
setText( 0, TQString( "%1. %2" ).tqarg( trackNumber ).tqarg( resultEntry.id ) ); setText( 0, TQString( "%1. %2" ).arg( trackNumber ).arg( resultEntry.id ) );
setText( 1, resultEntry.name ); setText( 1, resultEntry.name );
} }
@ -232,7 +232,7 @@ void K3bVideoCdView::reloadMedium()
K3b::Msf length( ( *it ).length() ); K3b::Msf length( ( *it ).length() );
sequenceSize += length; sequenceSize += length;
m_videocdmpegsize += length.mode2Form2Bytes(); m_videocdmpegsize += length.mode2Form2Bytes();
( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).tqarg( index ), "", index, length ); ( void ) new VideoTrackViewItem( ( VideoTrackViewCheckItem* ) m_contentList[ 0 ], i18n( "Sequence-%1" ).arg( index ), "", index, length );
} else { } else {
K3b::Msf length( ( *it ).length() ); K3b::Msf length( ( *it ).length() );
m_videocddatasize += length.mode2Form1Bytes(); m_videocddatasize += length.mode2Form1Bytes();
@ -314,7 +314,7 @@ void K3bVideoCdView::updateDisplay()
else else
setTitle( i18n( "Video CD" ) ); setTitle( i18n( "Video CD" ) );
m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).tqarg( K3b::Msf( m_toc.length() ).toString() ) ); m_labelLength->setText( i18n( "1 track (%1)", "%n tracks (%1)", m_toc.count() ).arg( K3b::Msf( m_toc.length() ).toString() ) );
} }
@ -416,7 +416,7 @@ void K3bVideoCdView::startRip()
if ( m_videooptions ->getVideoCdRipSequences() ) if ( m_videooptions ->getVideoCdRipSequences() )
videocdsize += m_videocdmpegsize; videocdsize += m_videocdmpegsize;
kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").tqarg( videocdsize ) << endl; kdDebug() << TQString("(K3bVideoCdView::startRip()) m_videooptions ->setVideoCdSize( %1)").arg( videocdsize ) << endl;
m_videooptions ->setVideoCdSize( videocdsize ); m_videooptions ->setVideoCdSize( videocdsize );
K3bVideoCdRippingDialog rip( m_videooptions, this ); K3bVideoCdRippingDialog rip( m_videooptions, this );
rip.exec(); rip.exec();

6
src/rip/videodvd/base_k3bvideodvdrippingwidget.ui
Unescape View File

@ -188,7 +188,7 @@
<property name="text"> <property name="text">
<string>-</string> <string>-</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -207,7 +207,7 @@
<property name="text"> <property name="text">
<string>-</string> <string>-</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>
@ -509,7 +509,7 @@
<property name="text"> <property name="text">
<string>See special strings</string> <string>See special strings</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

28
src/rip/videodvd/k3bvideodvdrippingdialog.cpp
Unescape View File

@ -172,7 +172,7 @@ K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD&
setTitle( i18n("Video DVD Ripping"), setTitle( i18n("Video DVD Ripping"),
i18n("1 title from %1", "%n titles from %1", titles.count()) i18n("1 title from %1", "%n titles from %1", titles.count())
.tqarg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) ); .arg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) );
// populate list map // populate list map
populateTitleView( titles ); populateTitleView( titles );
@ -195,13 +195,13 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
titleItem = new TQCheckListItem( m_w->m_titleView, titleItem = new TQCheckListItem( m_w->m_titleView,
titleItem, titleItem,
i18n("Title %1 (%2)") i18n("Title %1 (%2)")
.tqarg(*it) .arg(*it)
.tqarg(m_dvd[*it-1].playbackTime().toString()), .arg(m_dvd[*it-1].playbackTime().toString()),
TQCheckListItem::RadioButtonController ); TQCheckListItem::RadioButtonController );
titleItem->setText( 1, TQString("%1x%2") titleItem->setText( 1, TQString("%1x%2")
.tqarg(m_dvd[*it-1].videoStream().realPictureWidth()) .arg(m_dvd[*it-1].videoStream().realPictureWidth())
.tqarg(m_dvd[*it-1].videoStream().realPictureHeight()) ); .arg(m_dvd[*it-1].videoStream().realPictureHeight()) );
titleItem->setText( 3, TQString("%1 Title %2.avi").tqarg(m_dvd.volumeIdentifier()).tqarg(*it) ); titleItem->setText( 3, TQString("%1 Title %2.avi").arg(m_dvd.volumeIdentifier()).arg(*it) );
// now for the rip info // now for the rip info
K3bVideoDVDRippingJob::TitleRipInfo ri( *it ); K3bVideoDVDRippingJob::TitleRipInfo ri( *it );
@ -222,12 +222,12 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
TQListViewItem* asI = 0; TQListViewItem* asI = 0;
for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) { for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) {
TQString text = i18n("%1 %2Ch (%3%4)") TQString text = i18n("%1 %2Ch (%3%4)")
.tqarg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) ) .arg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) )
.tqarg( m_dvd[*it-1].audioStream(i).channels() ) .arg( m_dvd[*it-1].audioStream(i).channels() )
.tqarg( m_dvd[*it-1].audioStream(i).langCode().isEmpty() .arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
? i18n("unknown language") ? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) ) : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
.tqarg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED .arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() ) ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() )
: TQString() ); : TQString() );
@ -302,7 +302,7 @@ void K3bVideoDVDRippingDialog::slotUpdateVideoSizes()
for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin();
it != m_titleRipInfos.end(); ++it ) { it != m_titleRipInfos.end(); ++it ) {
TQSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) ); TQSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) );
it.key()->setText( 1, TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) ); it.key()->setText( 1, TQString("%1x%2").arg(s.width()).arg(s.height()) );
} }
} }
@ -456,12 +456,12 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
break; break;
case PATTERN_ORIG_VIDEO_SIZE: case PATTERN_ORIG_VIDEO_SIZE:
f.append( TQString("%1x%2") f.append( TQString("%1x%2")
.tqarg(title.videoStream().pictureWidth()) .arg(title.videoStream().pictureWidth())
.tqarg(title.videoStream().pictureHeight()) ); .arg(title.videoStream().pictureHeight()) );
break; break;
case PATTERN_VIDEO_SIZE: { case PATTERN_VIDEO_SIZE: {
TQSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) ); TQSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) );
f.append( TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) ); f.append( TQString("%1x%2").arg(s.width()).arg(s.height()) );
break; break;
} }
case PATTERN_ASPECT_RATIO: case PATTERN_ASPECT_RATIO:

16
src/rip/videodvd/k3bvideodvdrippingjob.cpp
Unescape View File

@ -115,8 +115,8 @@ TQString K3bVideoDVDRippingJob::jobDescription() const
TQString K3bVideoDVDRippingJob::jobDetails() const TQString K3bVideoDVDRippingJob::jobDetails() const
{ {
return i18n("Transcoding %n title to %1/%2", "Transcoding %n titles to %1/%2", m_titleRipInfos.count() ) return i18n("Transcoding %n title to %1/%2", "Transcoding %n titles to %1/%2", m_titleRipInfos.count() )
.tqarg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) ) .arg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) )
.tqarg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) ); .arg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) );
} }
@ -143,10 +143,10 @@ void K3bVideoDVDRippingJob::slotTranscodingJobFinished( bool success )
} }
else { else {
if( success ) if( success )
emit infoMessage( i18n("Successfully ripped title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); emit infoMessage( i18n("Successfully ripped title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
else { else {
d->failedTitles++; d->failedTitles++;
emit infoMessage( i18n("Failed to rip title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); emit infoMessage( i18n("Failed to rip title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
} }
++d->currentTitleInfoIndex ; ++d->currentTitleInfoIndex ;
@ -176,11 +176,11 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success )
m_titleRipInfos[d->currentTitleInfoIndex].clipRight = 0; m_titleRipInfos[d->currentTitleInfoIndex].clipRight = 0;
if( success ) { if( success ) {
emit infoMessage( i18n("Determined clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); emit infoMessage( i18n("Determined clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS );
emit infoMessage( i18n("Top: %1, Bottom: %2") emit infoMessage( i18n("Top: %1, Bottom: %2")
.tqarg(m_detectClippingJob->clippingTop()).tqarg(m_detectClippingJob->clippingBottom()), INFO ); .arg(m_detectClippingJob->clippingTop()).arg(m_detectClippingJob->clippingBottom()), INFO );
emit infoMessage( i18n("Left: %1, Right: %2") emit infoMessage( i18n("Left: %1, Right: %2")
.tqarg(m_detectClippingJob->clippingLeft()).tqarg(m_detectClippingJob->clippingRight()), INFO ); .arg(m_detectClippingJob->clippingLeft()).arg(m_detectClippingJob->clippingRight()), INFO );
// let's see if the clipping values make sense // let's see if the clipping values make sense
if( m_detectClippingJob->clippingTop() + m_detectClippingJob->clippingBottom() if( m_detectClippingJob->clippingTop() + m_detectClippingJob->clippingBottom()
@ -197,7 +197,7 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success )
} }
} }
else else
emit infoMessage( i18n("Failed to determine clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); emit infoMessage( i18n("Failed to determine clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR );
startTranscoding( d->currentTitleInfoIndex ); startTranscoding( d->currentTitleInfoIndex );
} }

4
src/rip/videodvd/k3bvideodvdrippingpreview.cpp
Unescape View File

@ -77,11 +77,11 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv
m_process = new KProcess(); m_process = new KProcess();
*m_process << bin->path; *m_process << bin->path;
*m_process << "-i" << dvd.device()->blockDeviceName(); *m_process << "-i" << dvd.device()->blockDeviceName();
*m_process << "-T" << TQString("%1,%2").tqarg(title).tqarg(chapter); *m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter);
*m_process << "-x" << "dvd,null"; *m_process << "-x" << "dvd,null";
*m_process << "--dvd_access_delay" << "0"; *m_process << "--dvd_access_delay" << "0";
*m_process << "-y" << "ppm,null"; *m_process << "-y" << "ppm,null";
*m_process << "-c" << TQString("%1-%2").tqarg( frame ).tqarg( frame+1 ); *m_process << "-c" << TQString("%1-%2").arg( frame ).arg( frame+1 );
*m_process << "-Z" << "x200"; *m_process << "-Z" << "x200";
*m_process << "-o" << m_tempDir->name(); *m_process << "-o" << m_tempDir->name();

32
src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
Unescape View File

@ -45,12 +45,12 @@ static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int
s += "<br>"; s += "<br>";
s += TQString::number(i+1) + ": " s += TQString::number(i+1) + ": "
+ i18n("%1 %2Ch (%3<em>%4</em>)") + i18n("%1 %2Ch (%3<em>%4</em>)")
.tqarg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) ) .arg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) )
.tqarg( title.audioStream(i).channels() ) .arg( title.audioStream(i).channels() )
.tqarg( title.audioStream(i).langCode().isEmpty() .arg( title.audioStream(i).langCode().isEmpty()
? i18n("unknown language") ? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) ) : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
.tqarg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() ) ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() )
: TQString() ); : TQString() );
} }
@ -69,13 +69,13 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne
s += "<br>"; s += "<br>";
s += TQString::number(i+1) + ": " s += TQString::number(i+1) + ": "
+ TQString("%1 (%2<em>%3</em>)") + TQString("%1 (%2<em>%3</em>)")
.tqarg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE .arg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE
? i18n("RLE") ? i18n("RLE")
: i18n("Extended") ) : i18n("Extended") )
.tqarg( title.subPictureStream(i).langCode().isEmpty() .arg( title.subPictureStream(i).langCode().isEmpty()
? i18n("unknown language") ? i18n("unknown language")
: KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) ) : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
.tqarg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() ) ? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() )
: TQString() ); : TQString() );
} }
@ -137,7 +137,7 @@ public:
m_previewSet = true; m_previewSet = true;
tqrepaint(); repaint();
} }
const TQImage& preview() const { const TQImage& preview() const {
@ -243,18 +243,18 @@ private:
// Title X + length // Title X + length
return i18n("<p><b>Title %1 (%2)</b><br>" return i18n("<p><b>Title %1 (%2)</b><br>"
"%3") "%3")
.tqarg( m_title.titleNumber(), 2 ) .arg( m_title.titleNumber(), 2 )
.tqarg( m_title.playbackTime().toString( false ) ) .arg( m_title.playbackTime().toString( false ) )
.tqarg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) ); .arg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) );
case 3: case 3:
// video stream info // video stream info
return TQString("<p>%1 %2x%3<br>%4%5") return TQString("<p>%1 %2x%3<br>%4%5")
.tqarg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") ) .arg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") )
.tqarg( m_title.videoStream().pictureWidth() ) .arg( m_title.videoStream().pictureWidth() )
.tqarg( m_title.videoStream().pictureHeight() ) .arg( m_title.videoStream().pictureHeight() )
.tqarg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" ) .arg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" )
.tqarg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"): .arg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"):
m_title.videoStream().permittedDf() == K3bVideoDVD::VIDEO_PERMITTED_DF_LETTERBOXED m_title.videoStream().permittedDf() == K3bVideoDVD::VIDEO_PERMITTED_DF_LETTERBOXED
? TQString(" - <em>") + i18n("anamorph") + TQString("</em>") : TQString() ); ? TQString(" - <em>") + i18n("anamorph") + TQString("</em>") : TQString() );

8
src/rip/videodvd/k3bvideodvdrippingwidget.cpp
Unescape View File

@ -86,7 +86,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
// //
// Example filename pattern // Example filename pattern
// //
m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).tqarg(i18n("Title") ) ); m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).arg(i18n("Title") ) );
m_comboFilenamePattern->insertItem( TQString( "%{volumeid} (%{title})" ) ); m_comboFilenamePattern->insertItem( TQString( "%{volumeid} (%{title})" ) );
@ -94,7 +94,7 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent )
// Add the Audio bitrates // Add the Audio bitrates
// //
for( int i = 0; s_mp3Bitrates[i]; ++i ) for( int i = 0; s_mp3Bitrates[i]; ++i )
m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_mp3Bitrates[i]) ); m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).arg(s_mp3Bitrates[i]) );
for( int i = 0; i < K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_NUM_ENTRIES; ++i ) { for( int i = 0; i < K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_NUM_ENTRIES; ++i ) {
@ -187,8 +187,8 @@ void K3bVideoDVDRippingWidget::setSelectedPictureSize( const TQSize& size )
else { else {
m_comboVideoSize->changeItem( i18n(s_pictureSizeNames[PICTURE_SIZE_CUSTOM]) m_comboVideoSize->changeItem( i18n(s_pictureSizeNames[PICTURE_SIZE_CUSTOM])
+ TQString(" (%1x%2)") + TQString(" (%1x%2)")
.tqarg(size.width() == 0 ? i18n("auto") : TQString::number(size.width())) .arg(size.width() == 0 ? i18n("auto") : TQString::number(size.width()))
.tqarg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())), .arg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())),
PICTURE_SIZE_CUSTOM ); PICTURE_SIZE_CUSTOM );
m_comboVideoSize->setCurrentItem( PICTURE_SIZE_CUSTOM ); m_comboVideoSize->setCurrentItem( PICTURE_SIZE_CUSTOM );
} }

Write Preview
Loading…
Cancel
Save