diff options
Diffstat (limited to 'libk3b')
104 files changed, 651 insertions, 651 deletions
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index 416ab10..78767c2 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -187,7 +187,7 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s ) } m_httpQuery->setServer( server, port ); - m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::tqfromLatin1("/~cddb/cddb.cgi") ); + m_httpQuery->setCgiPath( m_bUseManualCgiPath ? m_cgiPath : TQString::fromLatin1("/~cddb/cddb.cgi") ); return m_httpQuery; } diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index f3b9152..45af445 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -21,7 +21,7 @@ #include <tqstringlist.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <kdebug.h> @@ -58,7 +58,7 @@ void K3bCddbHttpQuery::doMatchQuery() m_state = READ; 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 ) { 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(); return; } diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp index 1c247dd..96ce176 100644 --- a/libk3b/cddb/k3bcddblocalquery.cpp +++ b/libk3b/cddb/k3bcddblocalquery.cpp @@ -18,7 +18,7 @@ #include <tqdir.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kapplication.h> #include <klocale.h> @@ -38,7 +38,7 @@ K3bCddbLocalQuery::~K3bCddbLocalQuery() 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! TQString path = preparePath( m_cddbDir ); diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp index 3c401b1..294e413 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.cpp +++ b/libk3b/cddb/k3bcddblocalsubmit.cpp @@ -19,7 +19,7 @@ #include <tqdir.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> @@ -94,7 +94,7 @@ void K3bCddbLocalSubmit::doSubmit() else { kdDebug() << "(K3bCddbLocalSubmit) could not find directory: " << path << endl; 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 ); } } diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp index f8746b7..0e7a5bc 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp +++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp @@ -16,7 +16,7 @@ #include "k3bcddbmultientriesdialog.h" -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqlabel.h> @@ -29,13 +29,13 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const ch : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name ) { TQFrame* frame = plainPage(); - TQVBoxLayout* tqlayout = new TQVBoxLayout( frame ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( spacingHint() ); - tqlayout->setMargin( 0 ); + TQVBoxLayout* layout = new TQVBoxLayout( frame ); + layout->setAutoAdd( true ); + layout->setSpacing( spacingHint() ); + layout->setMargin( 0 ); TQLabel* infoLabel = new TQLabel( i18n("K3b found multiple inexact CDDB entries. Please select one."), frame ); - infoLabel->tqsetAlignment( WordBreak ); + infoLabel->setAlignment( WordBreak ); m_listBox = new KListBox( frame, "list_box"); diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp index bcd75be..74d318c 100644 --- a/libk3b/cddb/k3bcddbpquery.cpp +++ b/libk3b/cddb/k3bcddbpquery.cpp @@ -17,7 +17,7 @@ #include <tqstringlist.h> #include <tqsocket.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <kdebug.h> @@ -54,7 +54,7 @@ void K3bCddbpQuery::doQuery() // connect to the server 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 // 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_parsingBuffer = ""; @@ -258,16 +258,16 @@ void K3bCddbpQuery::slotError( int e ) { switch(e) { case TQSocket::ErrConnectionRefused: - kdDebug() << i18n("Connection to %1 refused").tqarg( m_server ) << endl; - emit infoMessage( i18n("Connection to %1 refused").tqarg( m_server ) ); + kdDebug() << i18n("Connection to %1 refused").arg( m_server ) << endl; + emit infoMessage( i18n("Connection to %1 refused").arg( m_server ) ); break; case TQSocket::ErrHostNotFound: - kdDebug() << i18n("Could not find host %1").tqarg( m_server ) << endl; - emit infoMessage( i18n("Could not find host %1").tqarg( m_server ) ); + kdDebug() << i18n("Could not find host %1").arg( m_server ) << endl; + emit infoMessage( i18n("Could not find host %1").arg( m_server ) ); break; case TQSocket::ErrSocketRead: - kdDebug() << i18n("Error while reading from %1").tqarg( m_server ) << endl; - emit infoMessage( i18n("Error while reading from %1").tqarg( m_server ) ); + kdDebug() << i18n("Error while reading from %1").arg( m_server ) << endl; + emit infoMessage( i18n("Error while reading from %1").arg( m_server ) ); break; } diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h index d0a12bc..2a9b87b 100644 --- a/libk3b/cddb/k3bcddbpquery.h +++ b/libk3b/cddb/k3bcddbpquery.h @@ -21,7 +21,7 @@ #include <tqstring.h> #include <tqvaluelist.h> -#include <tqtextstream.h> +#include <textstream.h> class TQSocket; diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp index e4ccc75..ffd4e20 100644 --- a/libk3b/cddb/k3bcddbquery.cpp +++ b/libk3b/cddb/k3bcddbquery.cpp @@ -25,7 +25,7 @@ #include <klocale.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <tqregexp.h> #include <tqtimer.h> @@ -226,7 +226,7 @@ TQString K3bCddbQuery::handshakeString() const if( host.isEmpty() ) 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() ); 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; } diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h index 6d75262..3d81383 100644 --- a/libk3b/cddb/k3bcddbquery.h +++ b/libk3b/cddb/k3bcddbquery.h @@ -19,7 +19,7 @@ #include <tqobject.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include "k3bcddbresult.h" diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp index 12e149d..33a256c 100644 --- a/libk3b/core/k3bdefaultexternalprograms.cpp +++ b/libk3b/core/k3bdefaultexternalprograms.cpp @@ -23,7 +23,7 @@ #include <tqfileinfo.h> #include <tqobject.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <k3bprocess.h> #include <kdebug.h> @@ -186,7 +186,7 @@ bool K3bCdrecordProgram::scan( const TQString& p ) endPos = out.output().find( "\n", pos ); // cdrecord does not use local encoding for the copyright statement but plain latin1 - bin->copyright = TQString::tqfromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace(); + bin->copyright = TQString::fromLatin1( out.output().mid( pos, endPos-pos ).local8Bit() ).stripWhiteSpace(); } else { kdDebug() << "(K3bCdrecordProgram) could not start " << path << endl; diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index be9a7a1..c01e289 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -169,7 +169,7 @@ TQString K3b::findUniqueFilePrefix( const TQString& _prefix, const TQString& pat TQString K3b::findTempFile( const TQString& ending, const TQString& d ) { - return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::tqfromLatin1(".") + ending) ); + return findUniqueFilePrefix( "k3b_", d ) + ( ending.isEmpty() ? TQString() : (TQString::fromLatin1(".") + ending) ); } @@ -387,7 +387,7 @@ TQString K3b::externalBinDeviceParameter( K3bDevice::Device* dev, const K3bExter else if( (plainAtapiSupport() && bin->hasFeature("plain-atapi") ) ) return dev->blockDeviceName(); else - return TQString("ATAPI:%1").tqarg(dev->blockDeviceName()); + return TQString("ATAPI:%1").arg(dev->blockDeviceName()); } diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h index cbb4758..a5a738f 100644 --- a/libk3b/core/k3bjob.h +++ b/libk3b/core/k3bjob.h @@ -285,7 +285,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob void setWritingApp( int w ) { m_writeMethod = w; } signals: - void buffertqStatus( int ); + void bufferStatus( int ); void deviceBuffer( int ); diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp index ca8d2e0..c46fd0a 100644 --- a/libk3b/core/k3bprocess.cpp +++ b/libk3b/core/k3bprocess.cpp @@ -192,7 +192,7 @@ TQStringList K3bProcess::splitOutput( char* data, int len, // check if line ends with a newline // if not save the last line because it is not finished TQChar c = buffer.right(1).at(0); - bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is tqunicode 46?? It is printed as a point + bool hasUnfinishedLine = ( c != '\n' && c != '\r' && c != TQChar(46) ); // What is unicode 46?? It is printed as a point if( hasUnfinishedLine ) { kdDebug() << "(K3bProcess) found unfinished line: '" << lines.last() << "'" << endl; kdDebug() << "(K3bProcess) last char: '" << buffer.right(1) << "'" << endl; diff --git a/libk3b/core/k3bprogressinfoevent.h b/libk3b/core/k3bprogressinfoevent.h index 78e17a2..3e0b67e 100644 --- a/libk3b/core/k3bprogressinfoevent.h +++ b/libk3b/core/k3bprogressinfoevent.h @@ -69,7 +69,7 @@ class K3bProgressInfoEvent : public TQCustomEvent NewTask, NewSubTask, DebuggingOutput, - BuffertqStatus, + BufferStatus, WriteSpeed, NextTrack }; diff --git a/libk3b/core/k3bversion.cpp b/libk3b/core/k3bversion.cpp index 0eb6f19..cc91dd5 100644 --- a/libk3b/core/k3bversion.cpp +++ b/libk3b/core/k3bversion.cpp @@ -157,9 +157,9 @@ TQString K3bVersion::createVersionString( int majorVersion, TQString s = TQString::number(majorVersion); if( minorVersion > -1 ) { - s.append( TQString(".%1").tqarg(minorVersion) ); + s.append( TQString(".%1").arg(minorVersion) ); if( patchlevel > -1 ) - s.append( TQString(".%1").tqarg(patchlevel) ); + s.append( TQString(".%1").arg(patchlevel) ); } if( !suffix.isNull() ) diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp index d66b529..c0c07d5 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp +++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp @@ -76,7 +76,7 @@ K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObjec connect( m_audioJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_audioJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_audioJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) ); - connect( m_audioJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_audioJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_audioJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); @@ -252,19 +252,19 @@ void K3bAudioCueFileWritingJob::importCueInProject() // now analyze the source 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 m_analyserThread->setDecoder( m_decoder ); m_analyserJob->start(); } 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); } } 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); } } diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp index 1946415..f85e138 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.cpp +++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp @@ -93,7 +93,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() toc = device->readToc(); 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 ); emitFinished(false); return; @@ -154,7 +154,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() } 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; break; } @@ -188,7 +188,7 @@ void K3bAudioSessionReadingJob::WorkThread::run() device->block( false ); 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); return; } diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp index 2fd0b60..50bac83 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.cpp +++ b/libk3b/jobs/k3bbinimagewritingjob.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> @@ -148,7 +148,7 @@ bool K3bBinImageWritingJob::prepareWriter() connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(copyPercent(int)) ); connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(copySubPercent(int)) ); connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(writerFinished(bool)) ); @@ -207,7 +207,7 @@ void K3bBinImageWritingJob::writerFinished(bool ok) 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) ); } diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index 5781b2b..aeab621 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -131,9 +131,9 @@ void K3bBlankingJob::slotStartErasing() K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE, K3bDevice::MEDIA_CD_RW, i18n("Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>.") - .tqarg(m_device->vendor()) - .tqarg(m_device->description()) - .tqarg(m_device->devicename()) ) < 0 ) { + .arg(m_device->vendor()) + .arg(m_device->description()) + .arg(m_device->devicename()) ) < 0 ) { emit canceled(); jobFinished(false); return; diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index 9a266bf..308da22 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -46,7 +46,7 @@ #include <tqstringlist.h> #include <tqfile.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqcstring.h> #include <tqfileinfo.h> #include <tqdir.h> @@ -313,7 +313,7 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) unsigned long avail, size; TQString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) ); 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; canCopy = false; } @@ -379,7 +379,7 @@ void K3bCdCopyJob::slotCdTextReady( K3bDevice::DeviceHandler* dh ) if( dh->success() ) { if( K3bDevice::CdText::checkCrc( 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->cdTextRaw = dh->cdTextRaw(); } @@ -429,7 +429,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error ) d->cddbInfo = d->cddb->result(); 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 KConfig* c = k3bcore->config(); @@ -441,7 +441,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error ) emit infoMessage( i18n("No Cddb entry found."), WARNING ); } else { - emit infoMessage( i18n("Cddb error (%1).").tqarg(d->cddb->errorString()), ERROR ); + emit infoMessage( i18n("Cddb error (%1).").arg(d->cddb->errorString()), ERROR ); } startCopy(); @@ -524,24 +524,24 @@ bool K3bCdCopyJob::prepareImageFiles() m_tempPath = K3b::findUniqueFilePrefix( "k3bCdCopy", m_tempPath ); kdDebug() << "(K3bCdCopyJob) creating temp dir: " << m_tempPath << endl; 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; } d->deleteTempDir = true; } 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 int i = 1; for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) { if( (*it).type() == K3bDevice::Track::AUDIO ) { - d->imageNames.append( m_tempPath + TQString("Track%1.wav").tqarg(TQString::number(i).rightJustify(2, '0')) ); - d->infNames.append( m_tempPath + TQString("Track%1.inf").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").arg(TQString::number(i).rightJustify(2, '0')) ); } 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; } @@ -554,7 +554,7 @@ bool K3bCdCopyJob::prepareImageFiles() else { // we only need a single image file 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") ) ) { if( fi.isDir() ) m_tempPath = K3b::findTempFile( "iso", m_tempPath ); @@ -564,7 +564,7 @@ bool K3bCdCopyJob::prepareImageFiles() } // 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 return false; @@ -580,12 +580,12 @@ void K3bCdCopyJob::readNextSession() { if( !m_onTheFly || m_onlyCreateImages ) { if( d->numSessions > 1 ) - emit newTask( i18n("Reading Session %1").tqarg(d->currentReadSession) ); + emit newTask( i18n("Reading Session %1").arg(d->currentReadSession) ); else emit newTask( i18n("Reading Source Medium") ); 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: @@ -677,17 +677,17 @@ bool K3bCdCopyJob::writeNextSession() // we emit our own task since the cdrecord task is way too simple if( d->numSessions > 1 ) { 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 ) - 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 - emit newTask( i18n("Writing Copy (Session %2)").tqarg(d->currentWrittenSession) ); + emit newTask( i18n("Writing Copy (Session %2)").arg(d->currentWrittenSession) ); } else { if( m_simulate ) emit newTask( i18n("Simulating") ); 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 emit newTask( i18n("Writing Copy") ); } @@ -713,7 +713,7 @@ bool K3bCdCopyJob::writeNextSession() connect( d->cdrecordWriter, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWritingNextTrack(int, int)) ); - connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( d->cdrecordWriter, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); @@ -923,7 +923,7 @@ bool K3bCdCopyJob::writeNextSession() trackLen = trackLen * 2056; // see k3bdatatrackreader.h else 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 ) d->cdrecordWriter->addArgument( d->imageNames[d->toc.count()-1] ); @@ -953,7 +953,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success ) if( success ) { 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 emit infoMessage( i18n("Successfully read source disk."), SUCCESS ); @@ -987,7 +987,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success ) } else { 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 ) d->cdrecordWriter->setSourceUnreadable(true); } @@ -1137,14 +1137,14 @@ void K3bCdCopyJob::slotWritingNextTrack( int t, int tt ) { if( d->toc.contentType() == K3bDevice::MIXED ) { 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 - 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 ) - 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 - 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 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()) ); } } diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp index 5202fc4..cab71b9 100644 --- a/libk3b/jobs/k3bcdda2wavreader.cpp +++ b/libk3b/jobs/k3bcdda2wavreader.cpp @@ -95,7 +95,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) d->cdda2wavBin = k3bcore->externalBinManager()->binObject( "cdda2wav" ); 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); d->running = false; return; @@ -115,7 +115,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) *d->process << d->cdda2wavBin->path; *d->process << "-vall" << ( d->cdda2wavBin->hasFeature( "gui" ) ? "-gui" : "-g" ); 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 *d->process << "-D" << K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin); *d->process << ( d->cdda2wavBin->hasFeature( "bulk" ) ? "-bulk" : "-B" ); @@ -134,7 +134,7 @@ void K3bCdda2wavReader::start( bool onlyInfo ) // something went wrong when starting the program // it "should" be the executable 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; jobFinished(false); } @@ -240,12 +240,12 @@ void K3bCdda2wavReader::slotProcessExited( KProcess* p ) } else { emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .tqarg("Cdda2wav").tqarg(p->exitStatus()), ERROR ); + .arg("Cdda2wav").arg(p->exitStatus()), ERROR ); jobFinished( false ); } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Cdda2wav"), + emit infoMessage( i18n("%1 did not exit cleanly.").arg("Cdda2wav"), ERROR ); jobFinished( false ); } diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp index f8ce4f7..d11ebaa 100644 --- a/libk3b/jobs/k3bclonejob.cpp +++ b/libk3b/jobs/k3bclonejob.cpp @@ -85,13 +85,13 @@ void K3bCloneJob::start() // const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" ); 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); m_running = false; return; } 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); m_running = false; return; @@ -109,8 +109,8 @@ void K3bCloneJob::start() if( !writer()->supportsWritingMode( K3bDevice::RAW_R96R ) && !writer()->supportsWritingMode( K3bDevice::RAW_R16 ) ) { emit infoMessage( i18n("CD writer %1 does not support cloning.") - .tqarg(writer()->vendor()) - .tqarg(writer()->description()), ERROR ); + .arg(writer()->vendor()) + .arg(writer()->description()), ERROR ); m_running = false; jobFinished(false); return; @@ -180,7 +180,7 @@ void K3bCloneJob::prepareWriter() connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); @@ -222,7 +222,7 @@ void K3bCloneJob::slotWriterPercent( int p ) 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 ) { 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 ) { K3bDevice::eject( writer() ); @@ -330,7 +330,7 @@ void K3bCloneJob::startWriting() if( m_simulate ) emit newTask( i18n("Simulating clone copy") ); 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(); } diff --git a/libk3b/jobs/k3bclonetocreader.cpp b/libk3b/jobs/k3bclonetocreader.cpp index 2122937..529e49f 100644 --- a/libk3b/jobs/k3bclonetocreader.cpp +++ b/libk3b/jobs/k3bclonetocreader.cpp @@ -22,7 +22,7 @@ #include <k3bglobals.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp index 9ff5dd5..873a1b8 100644 --- a/libk3b/jobs/k3bdatatrackreader.cpp +++ b/libk3b/jobs/k3bdatatrackreader.cpp @@ -109,7 +109,7 @@ void K3bDataTrackReader::WorkThread::run() emitStarted(); 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); return; } @@ -142,7 +142,7 @@ void K3bDataTrackReader::WorkThread::run() } 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); 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", TQString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.") - .tqarg( m_firstSector.lba() ) - .tqarg( m_lastSector.lba() ) - .tqarg( m_usedSectorSize ) - .tqarg( m_lastSector.lba() - m_firstSector.lba() + 1 ) - .tqarg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) ); + .arg( m_firstSector.lba() ) + .arg( m_lastSector.lba() ) + .arg( m_usedSectorSize ) + .arg( m_lastSector.lba() - m_firstSector.lba() + 1 ) + .arg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) ); TQFile file; if( m_fd == -1 ) { @@ -199,7 +199,7 @@ void K3bDataTrackReader::WorkThread::run() m_device->close(); if( m_useLibdvdcss ) 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 ); return; } @@ -231,7 +231,7 @@ void K3bDataTrackReader::WorkThread::run() // s_bufferSizeSectors = K3bDevice::determineMaxReadingBufferSize( m_device, m_firstSector ); 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); m_device->block( false ); k3bcore->unblockDevice( m_device ); @@ -239,7 +239,7 @@ void K3bDataTrackReader::WorkThread::run() } 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 K3b::Msf currentSector = m_firstSector; @@ -279,7 +279,7 @@ void K3bDataTrackReader::WorkThread::run() << " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl; emitDebuggingOutput( "K3bDataTrackReader", 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; break; } @@ -290,7 +290,7 @@ void K3bDataTrackReader::WorkThread::run() << " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl; emitDebuggingOutput( "K3bDataTrackReader", 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; break; } @@ -331,8 +331,8 @@ void K3bDataTrackReader::WorkThread::run() emitDebuggingOutput( "K3bDataTrackReader", TQString("Read a total of %1 sectors (%2 bytes)") - .tqarg(totalReadSectors.lba()) - .tqarg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) ); + .arg(totalReadSectors.lba()) + .arg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) ); if( m_canceled ) 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 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) ); - emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").tqarg(startSector), K3bJob::WARNING ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").arg(startSector) ); + emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").arg(startSector), K3bJob::WARNING ); int sectorsRead = -1; bool success = true; @@ -403,16 +403,16 @@ bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned if( !success ) { if( m_ignoreReadErrors ) { - emitInfoMessage( i18n("Ignoring read error in sector %1.").tqarg(sector), K3bJob::ERROR ); - emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").tqarg(sector) ); + emitInfoMessage( i18n("Ignoring read error in sector %1.").arg(sector), K3bJob::ERROR ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").arg(sector) ); ++m_errorSectorCount; // ::memset( &buffer[i], 0, 1 ); success = true; } else { - emitInfoMessage( i18n("Error while reading sector %1.").tqarg(sector), K3bJob::ERROR ); - emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").tqarg(sector) ); + emitInfoMessage( i18n("Error while reading sector %1.").arg(sector), K3bJob::ERROR ); + emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").arg(sector) ); break; } } diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index b123e24..d5382a3 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -122,7 +122,7 @@ void K3bDvdCopyJob::start() k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) { m_onTheFly = false; 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 ); } @@ -295,7 +295,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // TQFileInfo fi( m_imagePath ); 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") ) ) { if( fi.isDir() ) 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 - 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.") ); } @@ -316,7 +316,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) unsigned long avail, size; TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) ); 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); d->running = false; return; @@ -332,7 +332,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) d->imageFile.setName( m_imagePath ); 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 ); d->running = false; return; @@ -353,7 +353,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) if( m_simulate ) emit newTask( i18n("Simulating DVD copy") ); 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 emit newTask( i18n("Writing DVD copy") ); @@ -434,7 +434,7 @@ void K3bDvdCopyJob::prepareWriter() connect( d->writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) ); connect( d->writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); connect( d->writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( d->writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( d->writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( d->writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); @@ -548,7 +548,7 @@ void K3bDvdCopyJob::slotReaderFinished( bool success ) if( waitForDvd() ) { prepareWriter(); 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 emit newTask( i18n("Writing DVD copy") ); @@ -597,7 +597,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool 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->verificationJob ) { @@ -620,7 +620,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success ) d->verificationJob->addTrack( 1, d->inPipe.checksum(), d->lastSector+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 emit newTask( i18n("Verifying DVD copy") ); @@ -637,7 +637,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success ) if( waitForDvd() ) { 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); @@ -686,7 +686,7 @@ void K3bDvdCopyJob::slotVerificationFinished( bool success ) if( waitForDvd() ) { 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); @@ -790,8 +790,8 @@ bool K3bDvdCopyJob::waitForDvd() 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 " "for real.") - .tqarg(m_writerDevice->vendor()) - .tqarg(m_writerDevice->description()), + .arg(m_writerDevice->vendor()) + .arg(m_writerDevice->description()), i18n("No Simulation with DVD-R(W)") ) ) { cancel(); return false; @@ -839,11 +839,11 @@ bool K3bDvdCopyJob::waitForDvd() if( m_writingMode == K3b::DAO ) { // ( m_writingMode == K3b::WRITING_MODE_AUTO && // ( 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; } 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; } } @@ -859,7 +859,7 @@ void K3bDvdCopyJob::removeImageFiles() { if( TQFile::exists( m_imagePath ) ) { 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 ); } } diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp index 46c8563..21858e4 100644 --- a/libk3b/jobs/k3bdvdformattingjob.cpp +++ b/libk3b/jobs/k3bdvdformattingjob.cpp @@ -142,7 +142,7 @@ void K3bDvdFormattingJob::start() K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY, K3bDevice::MEDIA_WRITABLE_DVD, 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(); d->running = false; jobFinished(false); @@ -267,7 +267,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p ) d->success = true; } 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 ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -275,7 +275,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p ) } } 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 ); d->success = false; } @@ -362,7 +362,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) 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 ); // mode is ignored @@ -375,7 +375,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) } else { 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 ); if( d->force ) { @@ -401,11 +401,11 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) // 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 ); 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 && d->mode != K3b::WRITING_MODE_INCR_SEQ ) { 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 ); if( d->force ) @@ -448,7 +448,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) } 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_OVWR )) ); } @@ -472,14 +472,14 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" ); 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; jobFinished(false); return; } 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; @@ -517,7 +517,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) // something went wrong when starting the program // it "should" be the executable 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; jobFinished(false); } diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp index cf63da4..bc24d81 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.cpp +++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp @@ -37,7 +37,7 @@ #include <kio/global.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <tqapplication.h> @@ -86,7 +86,7 @@ void K3bIso9660ImageWritingJob::start() emit newTask( i18n("Preparing data") ); 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 ); return; } @@ -133,7 +133,7 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success ) if( m_copies == 1 ) emit newTask( i18n("Verifying written data") ); 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(); } @@ -200,7 +200,7 @@ void K3bIso9660ImageWritingJob::slotNextTrack( int, int ) if( m_copies == 1 ) emit newSubTask( i18n("Writing image") ); 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"); // 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; } @@ -424,7 +424,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType ) connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) ); connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) ); connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) ); @@ -451,7 +451,7 @@ TQString K3bIso9660ImageWritingJob::jobDescription() 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)))); } diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index fb2a7bd..b8b2b0a 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -104,7 +104,7 @@ void K3bReadcdReader::start() // the first thing to do is to check for readcd d->readcdBinObject = k3bcore->externalBinManager()->binObject( "readcd" ); 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); return; } @@ -120,7 +120,7 @@ void K3bReadcdReader::start() for( TQPtrListIterator<K3bExternalBin> it( readcdBins ); it.current(); ++it ) { if( it.current()->hasFeature( "clone" ) ) { 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; break; } @@ -148,10 +148,10 @@ void K3bReadcdReader::start() *d->process << "-v"; // 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)); if( m_speed > 0 ) - *d->process << TQString("speed=%1").tqarg(m_speed); + *d->process << TQString("speed=%1").arg(m_speed); // output @@ -160,8 +160,8 @@ void K3bReadcdReader::start() d->process->dupStdout( d->fdToWriteTo ); } else { - emit newTask( i18n("Writing image to %1.").tqarg(m_imagePath) ); - emit infoMessage( i18n("Writing image to %1.").tqarg(m_imagePath), INFO ); + emit newTask( i18n("Writing image to %1.").arg(m_imagePath) ); + emit infoMessage( i18n("Writing image to %1.").arg(m_imagePath), INFO ); *d->process << "f=" + m_imagePath; } @@ -177,11 +177,11 @@ void K3bReadcdReader::start() if( m_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 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 *d->process << "ts=128k"; @@ -276,7 +276,7 @@ void K3bReadcdReader::slotStdLine( const TQString& line ) kdError() << "(K3bReadcdReader) problemSector parsing error in line: " << 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 ) { @@ -291,10 +291,10 @@ void K3bReadcdReader::slotStdLine( const TQString& line ) } 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 { - 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 ); } 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 ); } } diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index 5b8cc62..e5333fe 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -203,7 +203,7 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) if( (int)d->toc.count() < (*it).trackNumber ) { if ( d->mediumHasBeenReloaded ) { 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 ); return; } @@ -236,7 +236,7 @@ void K3bVerificationJob::readTrack( int trackIndex ) 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(); @@ -304,7 +304,7 @@ void K3bVerificationJob::slotMd5JobFinished( bool success ) if( success && !d->canceled && d->readSuccessful ) { // compare the two sums 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); } else { diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp index cf30eed..96d9619 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp @@ -88,15 +88,15 @@ void K3bVideoDVDTitleDetectClippingJob::start() d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode"); 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 ); return; } if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){ emit infoMessage( i18n("%1 version %2 is too old.") - .tqarg("transcode") - .tqarg(d->usedTranscodeBin->version), ERROR ); + .arg("transcode") + .arg(d->usedTranscodeBin->version), ERROR ); jobFinished( false ); return; } @@ -105,11 +105,11 @@ void K3bVideoDVDTitleDetectClippingJob::start() if( !d->usedTranscodeBin->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .tqarg(d->usedTranscodeBin->name()) - .tqarg(d->usedTranscodeBin->version) - .tqarg(d->usedTranscodeBin->copyright), INFO ); + .arg(d->usedTranscodeBin->name()) + .arg(d->usedTranscodeBin->version) + .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 ); } @@ -151,16 +151,16 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) *d->process << "-i" << m_dvd.device()->blockDeviceName(); // 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 *d->process << "-y" << "null,null" << "-o" << "/dev/null"; // 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 - *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 const TQStringList& params = d->usedTranscodeBin->userParameters(); @@ -181,11 +181,11 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // 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); } 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 ); } } @@ -279,7 +279,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p ) } else { 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 ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); } diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index 96d670b..fd115ff 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -87,15 +87,15 @@ void K3bVideoDVDTitleTranscodingJob::start() d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode"); 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 ); return; } if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){ emit infoMessage( i18n("%1 version %2 is too old.") - .tqarg("transcode") - .tqarg(d->usedTranscodeBin->version), ERROR ); + .arg("transcode") + .arg(d->usedTranscodeBin->version), ERROR ); jobFinished( false ); return; } @@ -104,9 +104,9 @@ void K3bVideoDVDTitleTranscodingJob::start() if( !d->usedTranscodeBin->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .tqarg(d->usedTranscodeBin->name()) - .tqarg(d->usedTranscodeBin->version) - .tqarg(d->usedTranscodeBin->copyright), INFO ); + .arg(d->usedTranscodeBin->name()) + .arg(d->usedTranscodeBin->version) + .arg(d->usedTranscodeBin->copyright), INFO ); // // Let's take a look at the filename @@ -119,11 +119,11 @@ void K3bVideoDVDTitleTranscodingJob::start() TQFileInfo fileInfo( m_filename ); TQFileInfo dirInfo( fileInfo.dirPath() ); 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; } 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 ); return; } @@ -134,7 +134,7 @@ void K3bVideoDVDTitleTranscodingJob::start() // 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 @@ -159,7 +159,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) break; 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 ); return; } @@ -182,7 +182,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) break; 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 ); return; } @@ -218,7 +218,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) *d->process << "-x" << "dvd"; // 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 if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 ) @@ -226,14 +226,14 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) // clipping *d->process << "-j" << TQString("%1,%2,%3,%4") - .tqarg(m_clippingTop) - .tqarg(m_clippingLeft) - .tqarg(m_clippingBottom) - .tqarg(m_clippingRight); + .arg(m_clippingTop) + .arg(m_clippingLeft) + .arg(m_clippingBottom) + .arg(m_clippingRight); // select the encoding type (single pass or two-pass) and the log file for two-pass encoding // 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 if( pass != 1 ) { @@ -249,7 +249,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) } else { // 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 if( m_resampleAudio ) @@ -261,7 +261,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) } else { // 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 *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 if( pass < 2 ) - emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").tqarg(m_titleNumber).tqarg(usedWidth).tqarg(usedHeight), INFO ); - *d->process << "-Z" << TQString("%1x%2").tqarg(usedWidth).tqarg(usedHeight); + 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").arg(usedWidth).arg(usedHeight); // additional user parameters from config const TQStringList& params = d->usedTranscodeBin->userParameters(); @@ -339,7 +339,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // 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); } else { @@ -372,7 +372,7 @@ void K3bVideoDVDTitleTranscodingJob::cleanup( bool success ) } 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 ); } } @@ -440,7 +440,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p ) // FIXME: error handling 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 ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -450,7 +450,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p ) } else { 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 ); jobFinished( false ); } @@ -566,7 +566,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi bin = k3bcore->externalBinManager()->binObject("transcode"); if( !bin ) return false; - return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) ); + return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) ); } @@ -577,7 +577,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi bin = k3bcore->externalBinManager()->binObject("transcode"); if( !bin ) return false; - return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) ); + return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) ); } #include "k3bvideodvdtitletranscodingjob.moc" diff --git a/libk3b/k3bimage.xsd b/libk3b/k3bimage.xsd index 607bd95..ab7f36c 100644 --- a/libk3b/k3bimage.xsd +++ b/libk3b/k3bimage.xsd @@ -1,9 +1,9 @@ <!-- - This document describes the tqlayout of the toc.xml file in a K3b image archive. - A K3b image archive is a TAR archive with a simple tqlayout as follows. + This document describes the layout of the toc.xml file in a K3b image archive. + A K3b image archive is a TAR archive with a simple layout as follows. Every K3b image archive contains the toc.xml file as described in this document - which describes the tqlayout of the CD or DVD saved in the K3b image archive. + which describes the layout of the CD or DVD saved in the K3b image archive. Additionally the K3b image archive contains an arbitrary number of files which contain the CD/DVD sector data. These files are referenced in the elements of type "file". diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp index 197a042..4bda25b 100644 --- a/libk3b/plugin/k3baudioserver.cpp +++ b/libk3b/plugin/k3baudioserver.cpp @@ -153,8 +153,8 @@ void K3bAudioServer::attachClient( K3bAudioClient* c ) if( m_usedOutputPlugin && !m_pluginInitialized ) { if( !m_usedOutputPlugin->init() ) { emit error( i18n("Could not initialize Audio Output plugin %1 (%2)") - .tqarg(m_usedOutputPlugin->pluginInfo().name()) - .tqarg(m_usedOutputPlugin->lastErrorMessage()) ); + .arg(m_usedOutputPlugin->pluginInfo().name()) + .arg(m_usedOutputPlugin->lastErrorMessage()) ); } else m_pluginInitialized = true; diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index 3274ef6..bf6d914 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -168,7 +168,7 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, con KDialogBase dlg( parent, name, true, - i18n("Configure plugin %1").tqarg( plugin->pluginInfo().name() ) ); + i18n("Configure plugin %1").arg( plugin->pluginInfo().name() ) ); K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg ); if( configWidget ) { @@ -181,7 +181,7 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, con return r; } 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; } } diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp index f8a5b71..610f9b7 100644 --- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp +++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp @@ -70,7 +70,7 @@ bool K3bAudioCdTrackDrag::decode( const TQMimeSource* e, K3bDevice::Toc& toc, TQValueList<int>& trackNumbers, K3bCddbResultEntry& cddb, K3bDevice::Device** dev ) { - TQByteArray data = e->tqencodedData( "k3b/audio_track_drag" ); + TQByteArray data = e->encodedData( "k3b/audio_track_drag" ); TQDataStream s( data, IO_ReadOnly ); diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp index 6319086..6ca0cd5 100644 --- a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp +++ b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp @@ -99,8 +99,8 @@ bool K3bAudioCdTrackSource::initParanoia() if( !m_lastUsedDevice ) { // could not find the CD, so ask for it TQString s = i18n("Please insert Audio CD %1%2") - .tqarg(m_discId, 0, 16) - .tqarg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty() + .arg(m_discId, 0, 16) + .arg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty() ? TQString() : " (" + m_cddbEntry.cdArtist + " - " + m_cddbEntry.cdTitle + ")"); @@ -252,7 +252,7 @@ TQString K3bAudioCdTrackSource::type() 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); } diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index 625f5bf..b4b3489 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -37,7 +37,7 @@ #include <tqdir.h> #include <tqdom.h> #include <tqdatetime.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqsemaphore.h> // KDE-includes @@ -263,7 +263,7 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) TQTextStream t( &f ); char buf[7]; t.readRawBytes( buf, 7 ); - if( TQString::tqfromLatin1( buf, 7 ) != "#EXTM3U" ) + if( TQString::fromLatin1( buf, 7 ) != "#EXTM3U" ) return false; // skip the first line diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h index 70f8826..71e5e69 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.h +++ b/libk3b/projects/audiocd/k3baudiodoc.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqdatetime.h> -#include <tqtextstream.h> +#include <textstream.h> #include "k3b_export.h" #include <kurl.h> diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp index ba0692f..6917fe6 100644 --- a/libk3b/projects/audiocd/k3baudioimager.cpp +++ b/libk3b/projects/audiocd/k3baudioimager.cpp @@ -85,7 +85,7 @@ void K3bAudioImager::WorkThread::run() // Seek to the beginning of the track // 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); return; } @@ -101,7 +101,7 @@ void K3bAudioImager::WorkThread::run() // if( m_fd == -1 ) { 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); return; } @@ -142,7 +142,7 @@ void K3bAudioImager::WorkThread::run() } 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 << " at pos " << K3b::Msf(trackRead/2352) << endl; lastError = K3bAudioImager::ERROR_DECODING_TRACK; diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp index a03a218..2415962 100644 --- a/libk3b/projects/audiocd/k3baudiojob.cpp +++ b/libk3b/projects/audiocd/k3baudiojob.cpp @@ -297,7 +297,7 @@ void K3bAudioJob::start() d->useCdText ) { if( !cdrecordCdText ) { 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; } else if( m_usedWritingMode == K3b::TAO ) { @@ -346,7 +346,7 @@ void K3bAudioJob::start() } else { 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") ); m_tempData->prepareTempFileNames( doc()->tempDir() ); TQStringList filenames; @@ -480,9 +480,9 @@ void K3bAudioJob::slotAudioDecoderNextTrack( int t, int tt ) if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) { K3bAudioTrack* track = m_doc->getTrack(t); emit newSubTask( i18n("Decoding audio track %1 of %2%3") - .tqarg(t) - .tqarg(tt) - .tqarg( track->title().isEmpty() || track->artist().isEmpty() + .arg(t) + .arg(tt) + .arg( track->title().isEmpty() || track->artist().isEmpty() ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } @@ -568,7 +568,7 @@ bool K3bAudioJob::prepareWriter() connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); @@ -588,9 +588,9 @@ void K3bAudioJob::slotWriterNextTrack( int t, int tt ) if( m_doc->hideFirstTrack() ) track = m_doc->getTrack(t+1); emit newSubTask( i18n("Writing track %1 of %2%3") - .tqarg(t) - .tqarg(tt) - .tqarg( track->title().isEmpty() || track->artist().isEmpty() + .arg(t) + .arg(tt) + .arg( track->title().isEmpty() || track->artist().isEmpty() ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } @@ -650,7 +650,7 @@ bool K3bAudioJob::startWriting() if( m_doc->dummy() ) emit newTask( i18n("Simulating") ); 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 emit newTask( i18n("Writing") ); @@ -847,7 +847,7 @@ TQString K3bAudioJob::jobDescription() const return i18n("Writing Audio CD") + ( m_doc->title().isEmpty() ? 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)", "%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() ? i18n(" - %n copy", " - %n copies", m_doc->copies()) : TQString() ) ); diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp index abbf753..697a9f5 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp @@ -22,7 +22,7 @@ #include <k3bcore.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvaluevector.h> #include <kdebug.h> diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index 52afb5e..d78862e 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -61,7 +61,7 @@ void K3bAudioNormalizeJob::start() } 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 *m_process << bin; @@ -104,7 +104,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line ) { // 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 ); @@ -123,13 +123,13 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line ) else if( line.contains( "already normalized" ) ) { // 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++; } else if( line.contains( "--% done") ) { 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 " << m_currentTrack << " " @@ -137,7 +137,7 @@ void K3bAudioNormalizeJob::slotStdLine( const TQString& line ) << endl; } 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 " << m_currentTrack << " " @@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p ) break; default: 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 ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Error while normalizing tracks."), ERROR ); @@ -197,7 +197,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p ) } } 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 ); } } diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index 2c4fa51..b4e4ec8 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -38,7 +38,7 @@ #include <tqstring.h> #include <tqfileinfo.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <tqdom.h> #include <tqptrlist.h> @@ -92,8 +92,8 @@ bool K3bDataDoc::newDocument() m_bExistingItemsReplaceAll = m_bExistingItemsIgnoreAll = false; if( m_root ) { - while( m_root->tqchildren().getFirst() ) - removeItem( m_root->tqchildren().getFirst() ); + while( m_root->children().getFirst() ) + removeItem( m_root->children().getFirst() ); } else m_root = new K3bRootItem( this ); @@ -164,7 +164,7 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) ok = true; TQString name( k3bname ); if( cnt > 0 ) - name += TQString("_%1").tqarg(cnt); + name += TQString("_%1").arg(cnt); if( K3bDataItem* oldItem = dir->find( name ) ) { if( f.isDir() && oldItem->isDir() ) { // ok, just reuse the dir @@ -182,7 +182,7 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) } } if( cnt > 0 ) - k3bname += TQString("_%1").tqarg(cnt); + k3bname += TQString("_%1").arg(cnt); // TQFileInfo::exists and TQFileInfo::isReadable return false for broken symlinks :( if( f.isDir() && !f.isSymLink() ) { @@ -263,7 +263,7 @@ K3b::Msf K3bDataDoc::burningLength() const TQString K3bDataDoc::typeString() const { - return TQString::tqfromLatin1("data"); + return TQString::fromLatin1("data"); } @@ -624,7 +624,7 @@ bool K3bDataDoc::saveDocumentData( TQDomElement* docElem ) // ---------------------------------------------------------------------- TQDomElement topElem = doc.createElement( "files" ); - TQPtrListIterator<K3bDataItem> it( root()->tqchildren() ); + TQPtrListIterator<K3bDataItem> it( root()->children() ); for( ; it.current(); ++it ) { saveDataItem( it.current(), &doc, &topElem ); } @@ -883,7 +883,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme if( item->sortWeight() != 0 ) topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) ); - TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); + TQPtrListIterator<K3bDataItem> it( dirItem->children() ); for( ; it.current(); ++it ) { saveDataItem( it.current(), doc, &topElem ); } @@ -1065,7 +1065,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) return; TQPtrList<K3bDataItem> sortedChildren; - TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); + TQPtrListIterator<K3bDataItem> it( dir->children() ); for( it.toLast(); it.current(); --it ) { K3bDataItem* item = it.current(); @@ -1277,7 +1277,7 @@ void K3bDataDoc::clearImportedSession() delete dir; } 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()) ) { m_oldSession.remove(); // now the dir becomes a totally normal dir @@ -1343,7 +1343,7 @@ K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir ) int i = 0; while( dir->alreadyInDirectory( "boot.catalog" ) ) { ++i; - newName = TQString( "boot%1.catalog" ).tqarg(i); + newName = TQString( "boot%1.catalog" ).arg(i); } K3bSpecialDataItem* b = new K3bSpecialDataItem( this, 0, dir, newName ); diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index 0295e27..442b035 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -196,7 +196,7 @@ void K3bDataJob::slotMsInfoFetched(bool success) prepareData(); 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 m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo(), d->doc->burner() ); @@ -226,7 +226,7 @@ void K3bDataJob::writeImage() emit newTask( i18n("Creating image file") ); 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->start(); @@ -324,7 +324,7 @@ void K3bDataJob::slotIsoImagerFinished( bool success ) d->doc->onlyCreateImages() ) { 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; if( d->doc->onlyCreateImages() ) { @@ -370,7 +370,7 @@ bool K3bDataJob::startWriterJob() if( d->doc->dummy() ) emit newTask( i18n("Simulating") ); 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 emit newTask( i18n("Writing") ); @@ -408,7 +408,7 @@ void K3bDataJob::slotWriterJobPercent( int p ) 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) ); } @@ -547,7 +547,7 @@ void K3bDataJob::setWriterJob( K3bAbstractWriter* writer ) connect( m_writerJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( m_writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) ); @@ -632,7 +632,7 @@ bool K3bDataJob::prepareWriterJob() 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 ); } @@ -915,13 +915,13 @@ TQString K3bDataJob::jobDescription() const return i18n("Writing Data CD") + ( d->doc->isoOptions().volumeID().isEmpty() ? TQString() - : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) ); + : TQString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) ); } else { return i18n("Writing Multisession CD") + ( d->doc->isoOptions().volumeID().isEmpty() ? 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", "ISO9660 Filesystem (Size: %1) - %n copies", d->doc->copies() ) - .tqarg(KIO::convertSize( d->doc->size() )); + .arg(KIO::convertSize( d->doc->size() )); else 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( TQFile::exists( d->doc->tempDir() ) ) { 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 ); } } diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp index e562541..26a2b5b 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp +++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp @@ -77,8 +77,8 @@ void K3bDataPreparationJob::Private::run() ++it, --maxlines ) { K3bDataItem* item = *it; listOfRenamedItems += i18n("<em>%1</em> renamed to <em>%2</em>") - .tqarg( KStringHandler::csqueeze( item->k3bName(), 30 ) ) - .tqarg( KStringHandler::csqueeze( item->writtenName(), 30 ) ); + .arg( KStringHandler::csqueeze( item->k3bName(), 30 ) ) + .arg( KStringHandler::csqueeze( item->writtenName(), 30 ) ); listOfRenamedItems += "<br>"; } 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 " "do not have to be shortened but long filenames will not be available on " "Windows systems.") - .tqarg( d->doc->isoOptions().jolietLong() ? 103 : 64 ) + .arg( d->doc->isoOptions().jolietLong() ? 103 : 64 ) + "<p>" + d->listOfRenamedItems, i18n("Warning"), i18n("Shorten Filenames"), @@ -207,7 +207,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success ) "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 " "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("Cut volume descriptor in the Joliet tree"), i18n("Cancel and go back") ) ) { diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp index 72af70b..f43f1d5 100644 --- a/libk3b/projects/datacd/k3bdiritem.cpp +++ b/libk3b/projects/datacd/k3bdiritem.cpp @@ -52,26 +52,26 @@ K3bDirItem::K3bDirItem( const K3bDirItem& item ) m_dirs(0), m_localPath( item.m_localPath ) { - for( TQPtrListIterator<K3bDataItem> it( item.tqchildren() ); *it; ++it ) + for( TQPtrListIterator<K3bDataItem> it( item.children() ); *it; ++it ) addDataItem( (*it)->copy() ); } K3bDirItem::~K3bDirItem() { - // delete all tqchildren + // delete all children // doing this by hand is much saver than using the // auto-delete feature since some of the items' destructors // may change the list - K3bDataItem* i = m_tqchildren.first(); + K3bDataItem* i = m_children.first(); while( i ) { // it is important to use takeDataItem here to be sure // the size gets updated properly takeDataItem(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 // and all it's files' sizes have already been substracted 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() ) { // do we replace an old item? TQString name = item->k3bName(); @@ -126,7 +126,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) item->setK3bName( name ); } - m_tqchildren.append( item->take() ); + m_children.append( item->take() ); updateSize( item, false ); if( item->isDir() ) updateFiles( ((K3bDirItem*)item)->numFiles(), ((K3bDirItem*)item)->numDirs()+1 ); @@ -146,9 +146,9 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item ) { - int x = m_tqchildren.findRef( item ); + int x = m_children.findRef( item ); if( x > -1 ) { - K3bDataItem* item = m_tqchildren.take(); + K3bDataItem* item = m_children.take(); updateSize( item, true ); if( item->isDir() ) updateFiles( -1*((K3bDirItem*)item)->numFiles(), -1*((K3bDirItem*)item)->numDirs()-1 ); @@ -176,8 +176,8 @@ K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item ) K3bDataItem* K3bDirItem::nextSibling() const { - if( !m_tqchildren.isEmpty() ) - return m_tqchildren.getFirst(); + if( !m_children.isEmpty() ) + return m_children.getFirst(); else return K3bDataItem::nextSibling(); } @@ -185,12 +185,12 @@ K3bDataItem* K3bDirItem::nextSibling() const K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const { - // search for prev in tqchildren - if( m_tqchildren.findRef( prev ) < 0 ) { + // search for prev in children + if( m_children.findRef( prev ) < 0 ) { return 0; } 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 { - for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) { if( it.current()->k3bName() == filename ) return it.current(); } @@ -323,7 +323,7 @@ bool K3bDirItem::isRemoveable() const if( !K3bDataItem::isRemoveable() ) return false; - for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) { if( !it.current()->isRemoveable() ) return false; } @@ -364,7 +364,7 @@ void K3bDirItem::updateFiles( long files, long dirs ) 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() ) return true; } @@ -375,7 +375,7 @@ bool K3bDirItem::isFromOldSession() const bool K3bDirItem::writeToCd() const { // 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() ) return true; } diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index 304cf1a..a624529 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -37,8 +37,8 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 ); /** - * Default copy constructor. Copies the dir including all tqchildren. However, none of the - * tqchildren will have set a doc and the copy dir will not have set a parent dir. + * Default copy constructor. Copies the dir including all children. However, none of the + * children will have set a doc and the copy dir will not have set a parent dir. */ K3bDirItem( const K3bDirItem& ); @@ -48,7 +48,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem K3bDirItem* getDirItem() const; - const TQPtrList<K3bDataItem>& tqchildren() const { return m_tqchildren; } + const TQPtrList<K3bDataItem>& children() const { return m_children; } K3bDirItem* addDataItem( K3bDataItem* item ); K3bDataItem* takeDataItem( K3bDataItem* item ); @@ -121,7 +121,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem */ void updateFiles( long files, long dirs ); - mutable TQPtrList<K3bDataItem> m_tqchildren; + mutable TQPtrList<K3bDataItem> m_children; // size of the items simply added KIO::filesize_t m_size; diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index 1db1997..d83581c 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -165,14 +165,14 @@ void K3bIsoImager::slotProcessExited( KProcess* p ) emit debuggingOutput( "K3bIsoImager", 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() ) { d->imageFile.close(); if( m_canceled || p->exitStatus() != 0 ) { 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: 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 ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); } @@ -220,7 +220,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p ) } } 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 ); } } @@ -356,7 +356,7 @@ void K3bIsoImager::startSizeCalculation() m_mkisofsPrintSizeResult = 0; 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(); jobFinished( false ); @@ -410,8 +410,8 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished() emit debuggingOutput( "K3bIsoImager", TQString("mkisofs print size result: %1 (%2 bytes)") - .tqarg(m_mkisofsPrintSizeResult) - .tqarg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) ); + .arg(m_mkisofsPrintSizeResult) + .arg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) ); cleanup(); @@ -496,7 +496,7 @@ void K3bIsoImager::start() if( m_fdToWriteTo == -1 ) { d->imageFile.setName( d->imagePath ); 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(); jobFinished(false); return; @@ -532,7 +532,7 @@ void K3bIsoImager::start() // something went wrong when starting the program // it "should" be the executable 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 ); cleanup(); } @@ -814,7 +814,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream // now create the graft points 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(); bool writeItem = item->writeToCd(); @@ -828,14 +828,14 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream TQFileInfo f( K3b::resolveLink( item->localPath() ) ); if( !f.exists() ) { emit infoMessage( i18n("Could not follow link %1 to non-existing file %2. Skipping...") - .tqarg(item->k3bName()) - .tqarg(f.filePath()), WARNING ); + .arg(item->k3bName()) + .arg(f.filePath()), WARNING ); writeItem = false; } else if( f.isDir() ) { emit infoMessage( i18n("Ignoring link %1 to folder %2. K3b is unable to follow links to folders.") - .tqarg(item->k3bName()) - .tqarg(f.filePath()), WARNING ); + .arg(item->k3bName()) + .arg(f.filePath()), WARNING ); writeItem = false; } } @@ -843,11 +843,11 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream else if( item->isFile() ) { TQFileInfo f( item->localPath() ); 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; } 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; } } @@ -895,7 +895,7 @@ void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream temp.unlink(); 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; } diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp index 99c76bb..7b3270c 100644 --- a/libk3b/projects/datacd/k3bmkisofshandler.cpp +++ b/libk3b/projects/datacd/k3bmkisofshandler.cpp @@ -61,7 +61,7 @@ const K3bExternalBin* K3bMkisofsHandler::initMkisofs() if( d->mkisofsBin ) { if( !d->mkisofsBin->copyright.isEmpty() ) 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 ); d->firstProgressValue = -1; @@ -83,7 +83,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line ) // error or warning TQString errorLine = line.mid( d->mkisofsBin->path.length() + 2 ); 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 ); d->readError = true; } @@ -103,7 +103,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line ) } else if( line.startsWith( "Incorrectly encoded string" ) ) { 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("You may use convmv (http://j3e.de/linux/convmv/) to fix the filename encoding."), K3bJob::ERROR ); d->readError = true; diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index e6d07e8..3aa90b3 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -53,7 +53,7 @@ void K3bMsInfoFetcher::start() if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) { 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); return; } @@ -89,7 +89,7 @@ void K3bMsInfoFetcher::getMsInfo() bin = k3bcore->externalBinManager()->binObject( "cdrecord" ); 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); return; } @@ -97,7 +97,7 @@ void K3bMsInfoFetcher::getMsInfo() *m_process << bin->path; // 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"; @@ -128,7 +128,7 @@ void K3bMsInfoFetcher::getMsInfo() m_canceled = false; 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); } } @@ -161,7 +161,7 @@ void K3bMsInfoFetcher::slotMediaDetectionFinished( K3bDevice::DeviceHandler* h ) } else { 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 ); } } diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp index 2526b28..358bfde 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp @@ -118,7 +118,7 @@ void K3bDvdBooktypeJob::start() K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY, 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>.") - .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(); jobFinished(false); d->running = false; @@ -189,7 +189,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) d->success = true; } 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 ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -197,7 +197,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) } } 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 ); d->success = false; } @@ -285,7 +285,7 @@ void K3bDvdBooktypeJob::startBooktypeChange() d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" ); 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; jobFinished(false); return; @@ -338,7 +338,7 @@ void K3bDvdBooktypeJob::startBooktypeChange() if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // 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; jobFinished(false); } diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp index 4a4adcb..dda717d 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.cpp +++ b/libk3b/projects/datadvd/k3bdvdjob.cpp @@ -243,8 +243,8 @@ bool K3bDvdJob::waitForMedium() 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 " "for real.") - .tqarg(m_doc->burner()->vendor()) - .tqarg(m_doc->burner()->description()), + .arg(m_doc->burner()->vendor()) + .arg(m_doc->burner()->description()), i18n("No Simulation with DVD-R(W)") ) ) { return false; } @@ -271,7 +271,7 @@ bool K3bDvdJob::waitForMedium() if( m_doc->writingMode() == K3b::DAO ) // || ( m_doc->writingMode() == K3b::WRITING_MODE_AUTO && // 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 { // 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( !questionYesNo( i18n("Your writer (%1 %2) does not support Incremental Streaming with %3 " "media. Multisession will not be possible. Continue anyway?") - .tqarg(m_doc->burner()->vendor()) - .tqarg(m_doc->burner()->description()) - .tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), + .arg(m_doc->burner()->vendor()) + .arg(m_doc->burner()->description()) + .arg( K3bDevice::mediaTypeString(foundMedium, true) ), i18n("No Incremental Streaming") ) ) { return false; } 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 { @@ -294,7 +294,7 @@ bool K3bDvdJob::waitForMedium() m_doc->writingMode() == K3b::WRITING_MODE_RES_OVWR ) 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") + ( m_doc->isoOptions().volumeID().isEmpty() ? TQString() - : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); + : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) ); } else { return i18n("Writing Multisession DVD") + ( m_doc->isoOptions().volumeID().isEmpty() ? 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", "ISO9660 Filesystem (Size: %1) - %n copies", m_doc->copies()) - .tqarg(KIO::convertSize( m_doc->size() )); + .arg(KIO::convertSize( m_doc->size() )); else return i18n("ISO9660 Filesystem (Size: %1)") - .tqarg(KIO::convertSize( m_doc->size() )); + .arg(KIO::convertSize( m_doc->size() )); } #include "k3bdvdjob.moc" diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index 4494859..2ac9559 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -253,7 +253,7 @@ void K3bCdrdaoWriter::setWriteArguments() { *m_process << "--driver"; if( burnDevice()->cdTextCapable() == 1 ) - *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() ); + *m_process << TQString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() ); else *m_process << burnDevice()->cdrdaoDriver(); } @@ -264,7 +264,7 @@ void K3bCdrdaoWriter::setWriteArguments() // burn speed if( d->usedSpeed != 0 ) - *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed); + *m_process << "--speed" << TQString("%1").arg(d->usedSpeed); //simulate if( simulate() ) @@ -283,7 +283,7 @@ void K3bCdrdaoWriter::setWriteArguments() if( m_cdrdaoBinObject->hasFeature( "disable-burnproof" ) ) *m_process << "--buffer-under-run-protection" << "0"; 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() ) { @@ -307,7 +307,7 @@ void K3bCdrdaoWriter::setWriteArguments() if( m_cdrdaoBinObject->hasFeature("overburn") ) *m_process << "--overburn"; 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 if ( m_taoSourceAdjust != -1 ) *m_process << "--tao-source-adjust" - << TQString("%1").tqarg(m_taoSourceAdjust); + << TQString("%1").arg(m_taoSourceAdjust); // paranoia Mode if ( m_paranoiaMode != -1 ) *m_process << "--paranoia-mode" - << TQString("%1").tqarg(m_paranoiaMode); + << TQString("%1").arg(m_paranoiaMode); // session if ( m_session != -1 ) *m_process << "--session" - << TQString("%1").tqarg(m_session); + << TQString("%1").arg(m_session); // fast TOC if ( m_fastToc ) @@ -386,7 +386,7 @@ void K3bCdrdaoWriter::setBlankArguments() { *m_process << "--driver"; if( burnDevice()->cdTextCapable() == 1 ) - *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() ); + *m_process << TQString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() ); else *m_process << burnDevice()->cdrdaoDriver(); } @@ -397,7 +397,7 @@ void K3bCdrdaoWriter::setBlankArguments() // burn speed if( d->usedSpeed != 0 ) - *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed); + *m_process << "--speed" << TQString("%1").arg(d->usedSpeed); // blank-mode *m_process << "--blank-mode"; @@ -432,7 +432,7 @@ void K3bCdrdaoWriter::setCommonArguments() *m_process << "--eject"; // remote - *m_process << "--remote" << TQString("%1").tqarg(m_cdrdaoComm[0]); + *m_process << "--remote" << TQString("%1").arg(m_cdrdaoComm[0]); // data File if ( ! m_dataFile.isEmpty() ) @@ -475,7 +475,7 @@ void K3bCdrdaoWriter::start() m_cdrdaoBinObject = k3bcore->externalBinManager()->binObject("cdrdao"); 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); return; } @@ -483,7 +483,7 @@ void K3bCdrdaoWriter::start() emit debuggingOutput( "Used versions", "cdrdao: " + m_cdrdaoBinObject->version ); 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) @@ -582,7 +582,7 @@ void K3bCdrdaoWriter::start() // something went wrong when starting the program // it "should" be the executable 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); } else @@ -592,13 +592,13 @@ void K3bCdrdaoWriter::start() case WRITE: 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 ); emit newTask( i18n("Simulating") ); } 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") ); } break; @@ -609,12 +609,12 @@ void K3bCdrdaoWriter::start() case COPY: 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") ); } 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") ); } break; @@ -676,8 +676,8 @@ bool K3bCdrdaoWriter::cueSheet() line = line.mid( pos, endPos-pos ); TQFileInfo fi( TQFileInfo( m_tocFile ).dirPath() + "/" + TQFileInfo( line ).fileName() ); TQString binpath = fi.filePath(); - kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").tqarg( line ) << endl; - kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").tqarg( binpath ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").arg( line ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").arg( binpath ) << endl; if ( !fi.exists() ) return false; @@ -691,8 +691,8 @@ bool K3bCdrdaoWriter::cueSheet() if ( symlink(TQFile::encodeName( m_tocFile ), TQFile::encodeName( tempFile + ".cue") ) == -1 ) return false; - kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").tqarg( tempFile ) << endl; - kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").tqarg( tempFile ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").arg( tempFile ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").arg( tempFile ) << endl; m_binFileLnk = tempFile + ".bin"; m_cueFileLnk = tempFile + ".cue"; return true; @@ -733,7 +733,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) { 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. " - "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) ) { @@ -775,7 +775,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) if( m_command == WRITE || m_command == COPY ) { 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 ); @@ -783,7 +783,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) default: 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 ); emit infoMessage( i18n("Please include the debugging output in your problem report."), K3bJob::ERROR ); } @@ -794,7 +794,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) } 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 ); } } @@ -810,8 +810,8 @@ void K3bCdrdaoWriter::unknownCdrdaoLine( const TQString& line ) int speed = line.mid( pos+9, po2-pos-9 ).toInt(); 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("Switching down burn speed to %1x").tqarg(speed), 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").arg(speed), K3bJob::WARNING ); } } } @@ -870,7 +870,7 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const TQString& str ) } 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 unknownCdrdaoLine(str); @@ -903,7 +903,7 @@ void K3bCdrdaoWriter::parseCdrdaoError( const TQString& line ) } else if( (pos = line.find( "Illegal option" )) > 0 ) { // 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 ); m_knownError = true; } diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp index 53fed8b..78ffb6a 100644 --- a/libk3b/projects/k3bcdrecordwriter.cpp +++ b/libk3b/projects/k3bcdrecordwriter.cpp @@ -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?) // 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(); if( d->usedSpeed == 0 ) { @@ -174,7 +174,7 @@ void K3bCdrecordWriter::prepareProcess() } d->usedSpeed /= 175; 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( burnDevice()->dao() ) @@ -227,7 +227,7 @@ void K3bCdrecordWriter::prepareProcess() if( m_cue ) { 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 ) @@ -249,7 +249,7 @@ void K3bCdrecordWriter::prepareProcess() bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); 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(); @@ -257,7 +257,7 @@ void K3bCdrecordWriter::prepareProcess() if( m_cdrecordBinObject->hasFeature("overburn") ) *m_process << "-overburn"; 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 const TQStringList& params = m_cdrecordBinObject->userParameters(); @@ -293,7 +293,7 @@ void K3bCdrecordWriter::start() prepareProcess(); 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); return; } @@ -302,9 +302,9 @@ void K3bCdrecordWriter::start() if( !m_cdrecordBinObject->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .tqarg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" ) - .tqarg(m_cdrecordBinObject->version) - .tqarg(m_cdrecordBinObject->copyright), INFO ); + .arg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" ) + .arg(m_cdrecordBinObject->version) + .arg(m_cdrecordBinObject->copyright), INFO ); kdDebug() << "***** " << m_cdrecordBinObject->name() << " parameters:\n"; @@ -343,22 +343,22 @@ void K3bCdrecordWriter::start() // something went wrong when starting the program // it "should" be the executable 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); } else { if( simulate() ) { emit newTask( i18n("Simulating") ); emit infoMessage( i18n("Starting %1 simulation at %2x speed...") - .tqarg(K3b::writingModeString(m_writingMode)) - .tqarg(d->usedSpeed), + .arg(K3b::writingModeString(m_writingMode)) + .arg(d->usedSpeed), K3bJob::INFO ); } else { emit newTask( i18n("Writing") ); emit infoMessage( i18n("Starting %1 writing at %2x speed...") - .tqarg(K3b::writingModeString(m_writingMode)) - .tqarg(d->usedSpeed), + .arg(K3b::writingModeString(m_writingMode)) + .arg(d->usedSpeed), K3bJob::INFO ); } } @@ -510,7 +510,7 @@ void K3bCdrecordWriter::slotStdLine( const TQString& line ) // parse option int pos = line.find( "Bad Option" ) + 13; 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 ); } 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 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 ) { - 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 ) - 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 - 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" ) ) { @@ -682,7 +682,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) emit infoMessage( i18n("Writing successfully completed"), K3bJob::SUCCESS ); 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 ); } @@ -709,14 +709,14 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) // error message has already been emited earlier since we needed the actual line break; 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 ); break; case OPC_FAILED: emit infoMessage( i18n("OPC failed. Probably the writer does not like the medium."), ERROR ); break; 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 ); break; case CANNOT_SEND_CUE_SHEET: @@ -734,7 +734,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) emit infoMessage( i18n("Try DAO writing mode."), ERROR ); break; 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 emit infoMessage( i18n("You may use K3bsetup2 to solve this problem."), ERROR ); #endif @@ -776,7 +776,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) } else if( !wasSourceUnreadable() ) { 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 ); if( p->exitStatus() >= 254 && m_writingMode == K3b::DAO ) { @@ -795,7 +795,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) } } 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 ); jobFinished( false ); } diff --git a/libk3b/projects/k3bcuefileparser.cpp b/libk3b/projects/k3bcuefileparser.cpp index 6c54c57..ad666b6 100644 --- a/libk3b/projects/k3bcuefileparser.cpp +++ b/libk3b/projects/k3bcuefileparser.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqregexp.h> #include <tqdir.h> diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp index 5e0f996..052315b 100644 --- a/libk3b/projects/k3bdvdrecordwriter.cpp +++ b/libk3b/projects/k3bdvdrecordwriter.cpp @@ -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?) // Again we assume the device to be set! - *m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); - *m_process << TQString("speed=%1").tqarg(burnSpeed()); + *m_process << TQString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); + *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 // make much sense here) @@ -95,7 +95,7 @@ void K3bDvdrecordWriter::prepareProcess() bool manualBufferSize = k3bcore->globalSettings()->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(); @@ -103,7 +103,7 @@ void K3bDvdrecordWriter::prepareProcess() if( m_cdrecordBinObject->hasFeature("overburn") ) *m_process << "-overburn"; 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 const TQStringList& params = m_cdrecordBinObject->userParameters(); diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp index fabaaed..d38e0d2 100644 --- a/libk3b/projects/k3bgrowisofshandler.cpp +++ b/libk3b/projects/k3bgrowisofshandler.cpp @@ -65,7 +65,7 @@ void K3bGrowisofsHandler::reset( K3bDevice::Device* dev, bool dao ) void K3bGrowisofsHandler::handleStart() { -// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBuffertqStatus()) ); +// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBufferStatus()) ); } @@ -177,8 +177,8 @@ void K3bGrowisofsHandler::handleLine( const TQString& line ) double speed = line.mid( pos, endPos-pos ).toDouble(&ok); if( ok ) emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)") - .tqarg((int)(speed*1385.0)) - .tqarg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); + .arg((int)(speed*1385.0)) + .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); else 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 // in the future when I know more about what kinds of errors may occur // 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 ); } 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 ); } 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 ); } } @@ -295,7 +295,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode ) } -void K3bGrowisofsHandler::slotCheckBuffertqStatus() +void K3bGrowisofsHandler::slotCheckBufferStatus() { connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::BUFFER_CAPACITY, m_device ), TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), @@ -308,7 +308,7 @@ void K3bGrowisofsHandler::slotCheckBufferStatusDone( K3bDevice::DeviceHandler* d { if( dh->success() && dh->bufferCapacity() > 0 ) { emit deviceBuffer( 100 * (dh->bufferCapacity() - dh->availableBufferCapacity() ) / dh->bufferCapacity() ); - TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBuffertqStatus()) ); + TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBufferStatus()) ); } else { kdDebug() << "(K3bGrowisofsHandler) stopping buffer check." << endl; diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h index 7150fce..e07548b 100644 --- a/libk3b/projects/k3bgrowisofshandler.h +++ b/libk3b/projects/k3bgrowisofshandler.h @@ -73,7 +73,7 @@ class K3bGrowisofsHandler : public TQObject void flushingCache(); private slots: - void slotCheckBuffertqStatus(); + void slotCheckBufferStatus(); void slotCheckBufferStatusDone( K3bDevice::DeviceHandler* ); private: diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp index 2881036..b17f9b8 100644 --- a/libk3b/projects/k3bgrowisofswriter.cpp +++ b/libk3b/projects/k3bgrowisofswriter.cpp @@ -155,13 +155,13 @@ bool K3bGrowisofsWriter::prepareProcess() { d->growisofsBin = k3bcore->externalBinManager()->binObject( "growisofs" ); 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; } if( d->growisofsBin->version < K3bVersion( 5, 10 ) ) { 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 ); return false; } @@ -169,8 +169,8 @@ bool K3bGrowisofsWriter::prepareProcess() emit debuggingOutput( "Used versions", "growisofs: " + d->growisofsBin->version ); if( !d->growisofsBin->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg("growisofs") - .tqarg(d->growisofsBin->version).tqarg(d->growisofsBin->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg("growisofs") + .arg(d->growisofsBin->version).arg(d->growisofsBin->copyright), INFO ); // @@ -234,7 +234,7 @@ bool K3bGrowisofsWriter::prepareProcess() d->inputFile.setName( d->image ); d->trackSize = (K3b::filesize( d->image ) + 1024) / 2048; 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; } } @@ -299,7 +299,7 @@ bool K3bGrowisofsWriter::prepareProcess() // speed may be a float number. example: DVD+R(W): 2.4x 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( speed/1385 ) ); } @@ -310,7 +310,7 @@ bool K3bGrowisofsWriter::prepareProcess() if( !d->usingRingBuffer && d->growisofsBin->version >= K3bVersion( 6, 0 ) ) { bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); 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 @@ -374,7 +374,7 @@ void K3bGrowisofsWriter::start() // something went wrong when starting the program // it "should" be the executable 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); } else { @@ -551,7 +551,7 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p ) int s = d->speedEst->average(); if( s > 0 ) 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() ) emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS ); diff --git a/libk3b/projects/k3bimagefilereader.cpp b/libk3b/projects/k3bimagefilereader.cpp index 76d8e92..bb2ee95 100644 --- a/libk3b/projects/k3bimagefilereader.cpp +++ b/libk3b/projects/k3bimagefilereader.cpp @@ -16,7 +16,7 @@ #include "k3bimagefilereader.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> diff --git a/libk3b/projects/k3binffilewriter.cpp b/libk3b/projects/k3binffilewriter.cpp index ecfb912..a652179 100644 --- a/libk3b/projects/k3binffilewriter.cpp +++ b/libk3b/projects/k3binffilewriter.cpp @@ -22,7 +22,7 @@ #include <k3bversion.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdatetime.h> @@ -60,7 +60,7 @@ bool K3bInfFileWriter::save( TQTextStream& s ) // ---------------------- // header s << "# Cdrecord-Inf-File written by K3b " << k3bcore->version() - << ", " << TQDateTime::tqcurrentDateTime().toString() << endl + << ", " << TQDateTime::currentDateTime().toString() << endl << "#" << endl; s << "ISRC=\t\t" << m_isrc << endl; @@ -130,7 +130,7 @@ bool K3bInfFileWriter::save( TQTextStream& s ) s << "Index0=\t\t" << m_index0 << endl; - return ( s.tqdevice()->status() == IO_Ok ); + return ( s.device()->status() == IO_Ok ); } diff --git a/libk3b/projects/k3binffilewriter.h b/libk3b/projects/k3binffilewriter.h index 93164ed..1ad3c48 100644 --- a/libk3b/projects/k3binffilewriter.h +++ b/libk3b/projects/k3binffilewriter.h @@ -17,7 +17,7 @@ #define _K3B_INF_FILE_WRITER_H_ #include <tqvaluevector.h> -#include <tqtextstream.h> +#include <textstream.h> #include <k3bmsf.h> diff --git a/libk3b/projects/k3btocfilewriter.cpp b/libk3b/projects/k3btocfilewriter.cpp index 249ef84..d7f00c5 100644 --- a/libk3b/projects/k3btocfilewriter.cpp +++ b/libk3b/projects/k3btocfilewriter.cpp @@ -21,7 +21,7 @@ #include <k3bversion.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdatetime.h> @@ -149,7 +149,7 @@ bool K3bTocFileWriter::save( TQTextStream& t ) trackIndex++; } - return ( t.tqdevice()->status() == IO_Ok ); + return ( t.device()->status() == IO_Ok ); } @@ -157,7 +157,7 @@ void K3bTocFileWriter::writeHeader( TQTextStream& t ) { // little comment t << "// TOC-file to use with cdrdao created by K3b " << k3bcore->version() - << ", " << TQDateTime::tqcurrentDateTime().toString() << endl << endl; + << ", " << TQDateTime::currentDateTime().toString() << endl << endl; t << "// " << m_toc.count() << " tracks" << endl; if( m_toc.back().session() > 0 ) { diff --git a/libk3b/projects/k3btocfilewriter.h b/libk3b/projects/k3btocfilewriter.h index 3127fca..8f2dabb 100644 --- a/libk3b/projects/k3btocfilewriter.h +++ b/libk3b/projects/k3btocfilewriter.h @@ -16,7 +16,7 @@ #ifndef _K3B_TOC_FILE_WRITER_H_ #define _K3B_TOC_FILE_WRITER_H_ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <k3btoc.h> diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index e99a1f9..556e606 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -271,7 +271,7 @@ void K3bMixedJob::startFirstCopy() else { 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_doc->audioDoc()->title() @@ -375,8 +375,8 @@ void K3bMixedJob::slotMsInfoFetched( bool success ) m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo() ); else // 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) ); + .arg(m_msInfoFetcher->lastSessionStart()) + .arg(m_msInfoFetcher->nextSessionStart()+150) ); if( m_doc->onTheFly() ) { m_currentAction = PREPARING_DATA; @@ -611,9 +611,9 @@ void K3bMixedJob::slotAudioDecoderNextTrack( int t, int tt ) if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) { K3bAudioTrack* track = m_doc->audioDoc()->getTrack(t); emit newSubTask( i18n("Decoding audio track %1 of %2%3") - .tqarg(t) - .tqarg(tt) - .tqarg( track->title().isEmpty() || track->artist().isEmpty() + .arg(t) + .arg(tt) + .arg( track->title().isEmpty() || track->artist().isEmpty() ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } @@ -696,7 +696,7 @@ bool K3bMixedJob::prepareWriter() connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); @@ -850,7 +850,7 @@ void K3bMixedJob::addDataTrack( K3bCdrecordWriter* writer ) writer->addArgument( "-data" ); 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 writer->addArgument( m_isoImageFilePath ); } @@ -875,13 +875,13 @@ void K3bMixedJob::slotWriterNextTrack( int t, int ) if( track ) emit newSubTask( i18n("Writing track %1 of %2%3") - .tqarg(t) - .tqarg(m_doc->numOfTracks()) - .tqarg( track->title().isEmpty() || track->artist().isEmpty() + .arg(t) + .arg(m_doc->numOfTracks()) + .arg( track->title().isEmpty() || track->artist().isEmpty() ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); 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() ) emit newTask( i18n("Simulating second session") ); 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 emit newTask( i18n("Writing second session") ); } @@ -997,7 +997,7 @@ bool K3bMixedJob::startWriting() if( m_doc->dummy() ) emit newTask( i18n("Simulating first session") ); 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 emit newTask( i18n("Writing first session") ); } @@ -1005,7 +1005,7 @@ bool K3bMixedJob::startWriting() else if( m_doc->dummy() ) emit newTask( i18n("Simulating") ); 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 @@ -1070,8 +1070,8 @@ void K3bMixedJob::createIsoImage() if( !m_doc->onTheFly() ) emit newTask( i18n("Creating ISO image file") ); - emit newSubTask( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath) ); - emit infoMessage( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath), INFO ); + emit newSubTask( i18n("Creating ISO image in %1").arg(m_isoImageFilePath) ); + emit infoMessage( i18n("Creating ISO image in %1").arg(m_isoImageFilePath), INFO ); m_isoImager->writeToImageFile( m_isoImageFilePath ); m_isoImager->start(); @@ -1102,7 +1102,7 @@ void K3bMixedJob::removeBufferFiles() if( TQFile::exists( 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 m_tempData->cleanup(); @@ -1213,7 +1213,7 @@ void K3bMixedJob::determineWritingMode() if( m_doc->audioDoc()->cdText() ) { if( !cdrecordCdText ) { 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 ) { 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") + ( m_doc->audioDoc()->title().isEmpty() ? TQString() - : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) ); + : TQString( " (%1)" ).arg(m_doc->audioDoc()->title()) ); else return i18n("Writing Mixed Mode CD") + ( m_doc->audioDoc()->title().isEmpty() ? TQString() - : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) ); + : TQString( " (%1)" ).arg(m_doc->audioDoc()->title()) ); } TQString K3bMixedJob::jobDetails() const { return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)") - .tqarg(m_doc->numOfTracks()) - .tqarg(m_doc->audioDoc()->length().toString()) - .tqarg(KIO::convertSize(m_doc->dataDoc()->size())) + .arg(m_doc->numOfTracks()) + .arg(m_doc->audioDoc()->length().toString()) + .arg(KIO::convertSize(m_doc->dataDoc()->size())) + ( m_doc->copies() > 1 && !m_doc->dummy() ? i18n(" - %n copy", " - %n copies", m_doc->copies()) : TQString() ) ); diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index cedf255..06b1d31 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -417,7 +417,7 @@ void K3bMovixDoc::addSubTitleItem( K3bMovixFileItem* item, const KURL& url ) TQString name = K3bMovixFileItem::subTitleFileName( item->k3bName() ); 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; } diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 79c70b3..b09f55d 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -31,7 +31,7 @@ #include <ktempfile.h> #include <kio/global.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdir.h> @@ -190,7 +190,7 @@ bool K3bMovixDocPreparer::writePlaylistFile() return true; } 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; } } @@ -229,7 +229,7 @@ bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const TQString& originalPath return false; } 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; } } @@ -263,7 +263,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile() return true; } 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; } } diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp index 8edcaae..eb8b276 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.cpp +++ b/libk3b/projects/movixcd/k3bmovixjob.cpp @@ -39,7 +39,7 @@ K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* parent connect( m_dataJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( m_dataJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_dataJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_dataJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_dataJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_dataJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); connect( m_dataJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_dataJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); @@ -115,7 +115,7 @@ TQString K3bMovixJob::jobDescription() const if( m_doc->isoOptions().volumeID().isEmpty() ) return i18n("Writing eMovix CD"); 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", "%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 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) : TQString() ) ); diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp index 4c609db..6f01d69 100644 --- a/libk3b/projects/movixcd/k3bmovixprogram.cpp +++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp @@ -23,7 +23,7 @@ #include <tqdir.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> K3bMovixProgram::K3bMovixProgram() diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp index 362511f..097d004 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp @@ -39,7 +39,7 @@ K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject connect( m_dvdJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); connect( m_dvdJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); connect( m_dvdJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_dvdJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) ); + connect( m_dvdJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) ); connect( m_dvdJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); connect( m_dvdJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); connect( m_dvdJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); @@ -114,7 +114,7 @@ TQString K3bMovixDvdJob::jobDescription() const if( m_doc->isoOptions().volumeID().isEmpty() ) return i18n("Writing eMovix DVD"); 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", "%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 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) : TQString() ) ); diff --git a/libk3b/projects/videocd/cdi/cdi_vcd.app b/libk3b/projects/videocd/cdi/cdi_vcd.app Binary files differindex 31a7527..ceb31fc 100644 --- a/libk3b/projects/videocd/cdi/cdi_vcd.app +++ b/libk3b/projects/videocd/cdi/cdi_vcd.app diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index a361d5d..272591a 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -21,7 +21,7 @@ #include <tqdom.h> #include <tqdatetime.h> #include <tqtimer.h> -#include <tqtextstream.h> +#include <textstream.h> // KDE-includes #include <kprocess.h> @@ -211,8 +211,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) i18n( "K3b will create a %1 image from the given MPEG " "files, but these files must already be in %2 " "format. K3b does not yet resample MPEG files." ) - .tqarg( i18n( "VCD" ) ) - .tqarg( i18n( "VCD" ) ), + .arg( i18n( "VCD" ) ) + .arg( i18n( "VCD" ) ), i18n( "Information" ) ); m_urlAddingTimer->start( 0 ); } else if ( vcdType() == NONE ) { @@ -223,8 +223,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) i18n( "K3b will create a %1 image from the given MPEG " "files, but these files must already be in %2 " "format. K3b does not yet resample MPEG files." ) - .tqarg( i18n( "SVCD" ) ) - .tqarg( i18n( "SVCD" ) ) + .arg( i18n( "SVCD" ) ) + .arg( i18n( "SVCD" ) ) + "\n\n" + i18n( "Note: Forcing MPEG2 as VCD is not supported by " "some standalone DVD players." ), @@ -448,7 +448,7 @@ void K3bVcdDoc::setPbcTracks() if ( m_tracks ) { int count = m_tracks->count(); - kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).tqarg( count ) << endl; + kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).arg( count ) << endl; TQPtrListIterator<K3bVcdTrack> iterTrack( *m_tracks ); K3bVcdTrack* track; @@ -574,7 +574,7 @@ bool K3bVcdDoc::loadDocumentData( TQDomElement* root ) TQDomNode item = vcdNodes.item( i ); TQString name = item.nodeName(); - kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).tqarg( name ) << endl; + kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).arg( name ) << endl; if ( name == "volumeId" ) vcdOptions() ->setVolumeId( item.toElement().text() ); diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h index 1878c31..1e92fc9 100644 --- a/libk3b/projects/videocd/k3bvcddoc.h +++ b/libk3b/projects/videocd/k3bvcddoc.h @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqdatetime.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqimage.h> // Kde Includes diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index 662145c..18c5678 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -106,7 +106,7 @@ void K3bVcdJob::cancelAll() // remove bin-file if it is unfinished or the user selected to remove image if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS ); + emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS ); TQFile::remove ( m_doc->vcdImage() ); m_doc->setVcdImage( "" ); @@ -116,7 +116,7 @@ void K3bVcdJob::cancelAll() // remove cue-file if it is unfinished or the user selected to remove image if ( TQFile::exists( m_cueFile ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS ); + emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS ); TQFile::remove ( m_cueFile ); m_cueFile = ""; @@ -184,8 +184,8 @@ void K3bVcdJob::vcdxBuild() const K3bExternalBin* bin = k3bcore ->externalBinManager() ->binObject( "vcdxbuild" ); if ( !bin ) { kdDebug() << "(K3bVcdJob) could not find vcdxbuild executable" << endl; - emit infoMessage( i18n( "Could not find %1 executable." ).tqarg( "vcdxbuild" ), K3bJob::ERROR ); - emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO ); + emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).arg( ">= 0.7.12" ), K3bJob::INFO ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -194,7 +194,7 @@ void K3bVcdJob::vcdxBuild() if ( bin->version < K3bVersion( "0.7.12" ) ) { kdDebug() << "(K3bVcdJob) vcdxbuild executable too old!" << endl; - emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).tqarg( "Vcdxbuild" ).tqarg( "0.7.12" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).arg( "Vcdxbuild" ).arg( "0.7.12" ), K3bJob::ERROR ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -202,7 +202,7 @@ void K3bVcdJob::vcdxBuild() } if ( !bin->copyright.isEmpty() ) - emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO ); + emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO ); *m_process << bin; @@ -219,11 +219,11 @@ void K3bVcdJob::vcdxBuild() *m_process << "--progress" << "--gui"; - *m_process << TQString( "--cue-file=%1" ).tqarg( m_cueFile ); + *m_process << TQString( "--cue-file=%1" ).arg( m_cueFile ); - *m_process << TQString( "--bin-file=%1" ).tqarg( m_doc->vcdImage() ); + *m_process << TQString( "--bin-file=%1" ).arg( m_doc->vcdImage() ); - *m_process << TQString( "%1" ).tqarg( TQFile::encodeName( m_xmlFile ).data() ); + *m_process << TQString( "%1" ).arg( TQFile::encodeName( m_xmlFile ).data() ); connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); @@ -245,7 +245,7 @@ void K3bVcdJob::vcdxBuild() if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { kdDebug() << "(K3bVcdJob) could not start vcdxbuild" << endl; - emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxbuild" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); } @@ -290,7 +290,7 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) const uint index = el.attribute( "id" ).replace( TQRegExp( "sequence-" ), "" ).toUInt(); m_currentWrittenTrack = m_doc->at( m_currentWrittenTrackNumber ); - emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).tqarg( index + 1 ).tqarg( doc() ->numOfTracks() ).tqarg( m_currentWrittenTrack->fileName() ) ); + emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).arg( index + 1 ).arg( doc() ->numOfTracks() ).arg( m_currentWrittenTrack->fileName() ) ); m_bytesFinished = 0; if ( !firstTrack ) { @@ -324,15 +324,15 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) if ( tel.isText() ) { const TQString text = tel.data(); if ( m_stage == stageWrite && level == "information" ) - kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).tqarg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).arg( text ) << endl; if ( ( text ).startsWith( "writing track" ) ) - emit newSubTask( i18n( "Creating Image for track %1" ).tqarg( ( text ).mid( 14 ) ) ); + emit newSubTask( i18n( "Creating Image for track %1" ).arg( ( text ).mid( 14 ) ) ); else { if ( level != "error" ) { - kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).tqarg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).arg( text ) << endl; parseInformation( text ); } else { - kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).tqarg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).arg( text ) << endl; emit infoMessage( text, K3bJob::ERROR ); } } @@ -353,7 +353,7 @@ void K3bVcdJob::slotVcdxBuildFinished() m_imageFinished = true; break; default: - emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxbuild" ).tqarg( m_process->exitStatus() ), + emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxbuild" ).arg( m_process->exitStatus() ), K3bJob::ERROR ); emit infoMessage( i18n( "Please send me an email with the last output." ), K3bJob::ERROR ); cancelAll(); @@ -361,7 +361,7 @@ void K3bVcdJob::slotVcdxBuildFinished() return ; } } else { - emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxbuild" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); return ; @@ -372,7 +372,7 @@ void K3bVcdJob::slotVcdxBuildFinished() TQFile::remove ( m_xmlFile ); - kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).tqarg( vcdDoc() ->onlyCreateImages() ) << endl; + kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).arg( vcdDoc() ->onlyCreateImages() ) << endl; if ( !vcdDoc() ->onlyCreateImages() ) startWriterjob(); else @@ -381,7 +381,7 @@ void K3bVcdJob::slotVcdxBuildFinished() void K3bVcdJob::startWriterjob() { - kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) << endl; + kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) << endl; if ( prepareWriterJob() ) { if ( waitForMedia( m_doc->burner() ) < 0 ) { cancel(); @@ -392,7 +392,7 @@ void K3bVcdJob::startWriterjob() return ; if ( m_doc->copies() > 1 ) - emit newTask( i18n( "Writing Copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) ); + emit newTask( i18n( "Writing Copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) ); emit burning( true ); m_writerJob->start(); @@ -438,7 +438,7 @@ bool K3bVcdJob::prepareWriterJob() connect( m_writerJob, TQT_SIGNAL( subPercent( int ) ), this, TQT_SIGNAL( subPercent( int ) ) ); connect( m_writerJob, TQT_SIGNAL( processedSubSize( int, int ) ), this, TQT_SIGNAL( processedSubSize( int, int ) ) ); connect( m_writerJob, TQT_SIGNAL( nextTrack( int, int ) ), this, TQT_SLOT( slotWriterNextTrack( int, int ) ) ); - connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( buffertqStatus( int ) ) ); + connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( bufferStatus( int ) ) ); connect( m_writerJob, TQT_SIGNAL( deviceBuffer( int ) ), this, TQT_SIGNAL( deviceBuffer( int ) ) ); connect( m_writerJob, TQT_SIGNAL( writeSpeed( int, int ) ), this, TQT_SIGNAL( writeSpeed( int, int ) ) ); connect( m_writerJob, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotWriterJobFinished( bool ) ) ); @@ -461,7 +461,7 @@ void K3bVcdJob::slotProcessedSize( int cs, int ts ) void K3bVcdJob::slotWriterNextTrack( int t, int tt ) { - emit newSubTask( i18n( "Writing Track %1 of %2" ).tqarg( t ).tqarg( tt ) ); + emit newSubTask( i18n( "Writing Track %1 of %2" ).arg( t ).arg( tt ) ); } void K3bVcdJob::slotWriterJobFinished( bool success ) @@ -473,7 +473,7 @@ void K3bVcdJob::slotWriterJobFinished( bool success ) // remove bin-file if it is unfinished or the user selected to remove image if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS ); + emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS ); TQFile::remove ( m_doc->vcdImage() ); m_doc->setVcdImage( "" ); @@ -483,7 +483,7 @@ void K3bVcdJob::slotWriterJobFinished( bool success ) // remove cue-file if it is unfinished or the user selected to remove image if ( TQFile::exists( m_cueFile ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS ); + emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS ); TQFile::remove ( m_cueFile ); m_cueFile = ""; @@ -512,7 +512,7 @@ void K3bVcdJob::parseInformation( const TQString &text ) if ( text.contains( "mpeg user scan data: one or more BCD fields out of range for" ) ) { int index = text.find( " for" ); - emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).tqarg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).arg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING ); } else if ( text.contains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) { emit infoMessage( i18n( "From now on, scan information data errors will not be reported anymore" ), K3bJob::INFO ); @@ -523,7 +523,7 @@ void K3bVcdJob::parseInformation( const TQString &text ) int index2 = text.find( ", last seen pts" ); int index3 = text.find( ") -- ignoring this aps" ); - emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).tqarg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).arg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).arg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING ); emit infoMessage( i18n( "Ignoring this aps" ), K3bJob::INFO ); } else if ( text.contains( "bad packet at packet" ) ) { @@ -532,8 +532,8 @@ void K3bVcdJob::parseInformation( const TQString &text ) int index3 = text.find( ") -- remaining " ); int index4 = text.find( "bytes of stream will be ignored" ); - emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).tqarg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING ); - emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).tqarg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).arg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).arg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).arg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING ); } } @@ -558,7 +558,7 @@ TQString K3bVcdJob::jobDetails() const { return ( i18n( "1 MPEG (%1)", "%n MPEGs (%1)", - m_doc->tracks() ->count() ).tqarg( KIO::convertSize( m_doc->size() ) ) + m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) ) + ( m_doc->copies() > 1 ? i18n( " - %n copy", " - %n copies", m_doc->copies() ) : TQString() ) ); diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index 854919f..9b80a8d 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -37,7 +37,7 @@ K3bVcdOptions::K3bVcdOptions() m_volumeID( "VIDEOCD" ), m_albumID( "" ), m_volumeSetId( "" ), - m_publisher( TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ) ), + m_publisher( TQString( "K3b - Version %1" ).arg( k3bcore->version() ) ), m_applicationId( "CDI/CDI_VCD.APP;1" ), m_systemId( "CD-RTOS CD-BRIDGE" ), m_vcdclass( "vcd" ), diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index b008476..3ed27f9 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -159,7 +159,7 @@ const TQString K3bVcdTrack::resolution() if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { - return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ i ].hsize ).tqarg( mpeg_info->video[ i ].vsize ); + return TQString( "%1 x %2" ).arg( mpeg_info->video[ i ].hsize ).arg( mpeg_info->video[ i ].vsize ); } } } @@ -171,7 +171,7 @@ const TQString K3bVcdTrack::highresolution() { if ( mpeg_info->has_video ) { if ( mpeg_info->video[ 2 ].seen ) { - return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ 2 ].hsize ).tqarg( mpeg_info->video[ 2 ].vsize ); + return TQString( "%1 x %2" ).arg( mpeg_info->video[ 2 ].hsize ).arg( mpeg_info->video[ 2 ].vsize ); } } return i18n( "n/a" ); @@ -195,7 +195,7 @@ const TQString K3bVcdTrack::video_bitrate() if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { - return i18n( "%1 bit/s" ).tqarg( mpeg_info->video[ i ].bitrate ) ; + return i18n( "%1 bit/s" ).arg( mpeg_info->video[ i ].bitrate ) ; } } } @@ -284,7 +284,7 @@ const TQString K3bVcdTrack::audio_bitrate() if ( mpeg_info->has_audio ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->audio[ i ].seen ) { - return i18n( "%1 bit/s" ).tqarg( mpeg_info->audio[ i ].bitrate ) ; + return i18n( "%1 bit/s" ).arg( mpeg_info->audio[ i ].bitrate ) ; } } } @@ -297,7 +297,7 @@ const TQString K3bVcdTrack::audio_sampfreq() if ( mpeg_info->has_audio ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->audio[ i ].seen ) { - return i18n( "%1 Hz" ).tqarg( mpeg_info->audio[ i ].sampfreq ) ; + return i18n( "%1 Hz" ).arg( mpeg_info->audio[ i ].sampfreq ) ; } } } @@ -337,16 +337,16 @@ const TQString K3bVcdTrack::mpegTypeS( bool audio ) for ( int i = 0; i < 3; i++ ) if ( mpeg_info->video[ i ].seen ) { if ( i == 0 ) { - return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Motion Picture" ); + return TQString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Motion Picture" ); } else { - return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Still Picture" ); + return TQString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Still Picture" ); } } } if ( mpeg_info->has_audio && audio ) { for ( int i = 0; i < 3; i++ ) if ( mpeg_info->audio[ i ].seen ) { - return TQString( "MPEG%1 " ).tqarg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).tqarg( mpeg_info->audio[ i ].layer ); + return TQString( "MPEG%1 " ).arg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).arg( mpeg_info->audio[ i ].layer ); } } @@ -423,10 +423,10 @@ TQString K3bVcdTrack::SecsToHMS( double duration ) byte mins = ( byte ) ( ( duration / 60 ) - ( hours * 60 ) ); float secs = duration - 60 * mins - 3600 * hours; if ( hours != 0 ) { - return TQString( "%1:" ).tqarg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 ); + return TQString( "%1:" ).arg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 ); } if ( mins != 0 ) { - return TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 ); + return TQString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 ); } return TQString::number( secs, 'f', 2 ); } diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp index 203f54f..6881946 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.cpp +++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp @@ -131,7 +131,7 @@ bool K3bVcdXmlView::write( const TQString& fname ) addSubElement( xmlDoc, elemPvd, "volume-id", m_doc->vcdOptions() ->volumeId().upper() ); addSubElement( xmlDoc, elemPvd, "system-id", m_doc->vcdOptions() ->systemId() ); addSubElement( xmlDoc, elemPvd, "application-id", m_doc->vcdOptions() ->applicationId() ); - addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ).upper() ); + addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).arg( k3bcore->version() ).upper() ); addSubElement( xmlDoc, elemPvd, "publisher-id", m_doc->vcdOptions() ->publisher().upper() ); @@ -180,7 +180,7 @@ bool K3bVcdXmlView::write( const TQString& fname ) filename = locate( "data", "k3b/extra/k3bphotosvcd.mpg" ); elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" ); - elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( filename ).data() ) ); + elemsequenceItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( filename ).data() ) ); elemsequenceItem.setAttribute( "id", "sequence-000" ); // default entry TQDomElement elemdefaultEntry; @@ -199,19 +199,19 @@ bool K3bVcdXmlView::write( const TQString& fname ) TQString seqId = TQString::number( it.current() ->index() ).rightJustify( 3, '0' ); elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" ); - elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); - elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).tqarg( seqId ) ); + elemsequenceItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); + elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).arg( seqId ) ); // default entry TQDomElement elemdefaultEntry; elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" ); - elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).tqarg( seqId ) ); + elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).arg( seqId ) ); } else { // sequence-items element needs at least one segment to fit the XML elemsegmentItem = addSubElement( xmlDoc, elemsegmentItems, "segment-item" ); - elemsegmentItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); - elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).tqarg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) ); + elemsegmentItem.setAttribute( "src", TQString( "%1" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); + elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).arg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) ); } } @@ -232,7 +232,7 @@ bool K3bVcdXmlView::write( const TQString& fname ) } m_xmlstring = xmlDoc.toString(); - kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).tqarg( fname ) << endl; + kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).arg( fname ) << endl; TQFile xmlFile( fname ); if ( xmlFile.open( IO_WriteOnly ) ) { @@ -267,7 +267,7 @@ TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& par TQDomElement element = doc.createElement( name ); parent.appendChild( element ); if ( value >= -1 ) { - TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) ); + TQDomText t = doc.createTextNode( TQString( "%1" ).arg( value ) ); element.appendChild( t ); } return element; @@ -284,7 +284,7 @@ TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement& void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& parent, const TQString& src, const TQString& name, bool mixed ) { TQDomElement elemFile = addSubElement( doc, parent, "file" ); - elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) ); + elemFile.setAttribute( "src", TQString( "%1" ).arg( src ) ); if ( mixed ) elemFile.setAttribute( "format", "mixed" ); @@ -296,7 +296,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack TQString ref = ( track->isSegment() ) ? "segment" : "sequence"; TQDomElement elemSelection = addSubElement( doc, parent, "selection" ); - elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); + elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); setNumkeyBSN( doc, elemSelection, track ); @@ -310,24 +310,24 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack switch ( i ) { case K3bVcdTrack::PREVIOUS: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "prev" ); - elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::NEXT: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "next" ); - elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::RETURN: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "return" ); - elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::DEFAULT: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "default" ); - elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::AFTERTIMEOUT: if ( track->getWaitTime() >= 0 ) { elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "timeout" ); - elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) ); } break; } @@ -369,7 +369,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack else loop.setAttribute( "jump-timing", "immediate" ); - addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); + addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); setNumkeySEL( doc, elemSelection, track ); } @@ -410,30 +410,30 @@ void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& parent, K3bV for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) { - kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl; + kdDebug() << TQString( "trackIt key: %1 none: %2" ).arg( trackIt.key() ).arg( none ) << endl; while ( none < trackIt.key() ) { elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); - addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); + addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).arg( none ).arg( TQFile::encodeName( track->absPath() ).data() ) ); none++; } if ( trackIt.data() ) { TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence"; elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) ); - addComment( doc, parent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) ); + addComment( doc, parent, TQString( "key %1 -> %2" ).arg( trackIt.key() ).arg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) ); } else { elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" ); - addComment( doc, parent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) ); + addComment( doc, parent, TQString( "key %1 -> end" ).arg( trackIt.key() ) ); } none++; } } else { // default reference to itSelf elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); } } } diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp index 089f22d..6192024 100644 --- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp +++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp @@ -41,19 +41,19 @@ K3bMpegInfo::K3bMpegInfo( const char* filename ) m_mpegfile = fopen( filename, "rb" ); if ( m_mpegfile == 0 ) { - kdDebug() << TQString( "Unable to open %1" ).tqarg( m_filename ) << endl; + kdDebug() << TQString( "Unable to open %1" ).arg( m_filename ) << endl; return ; } if ( fseeko( m_mpegfile, 0, SEEK_END ) ) { - kdDebug() << TQString( "Unable to seek in file %1" ).tqarg( m_filename ) << endl; + kdDebug() << TQString( "Unable to seek in file %1" ).arg( m_filename ) << endl; return ; } llong lof = ftello( m_mpegfile ); if ( lof == -1 ) { - kdDebug() << TQString( "Seeking to end of input file %1 failed." ).tqarg( m_filename ) << endl; + kdDebug() << TQString( "Seeking to end of input file %1 failed." ).arg( m_filename ) << endl; //give up.. return ; } else @@ -61,8 +61,8 @@ K3bMpegInfo::K3bMpegInfo( const char* filename ) // nothing to do on an empty file if ( !m_filesize ) { - kdDebug() << TQString( "File %1 is empty." ).tqarg( m_filename ) << endl; - m_error_string = i18n( "File %1 is empty." ).tqarg( m_filename ); + kdDebug() << TQString( "File %1 is empty." ).arg( m_filename ) << endl; + m_error_string = i18n( "File %1 is empty." ).arg( m_filename ); return ; } @@ -90,7 +90,7 @@ bool K3bMpegInfo::MpegParsePacket () if ( !EnsureMPEG( 0, MPEG_PACK_HEADER_CODE ) ) { llong code = GetNBytes( 0, 4 ); - kdDebug() << TQString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).tqarg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).tqarg( code, 0, 16 ) << endl; + kdDebug() << TQString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).arg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).arg( code, 0, 16 ) << endl; if ( code == 0x00000100 + MPEG_SEQUENCE_CODE ) { kdDebug() << "...this looks like a elementary video stream but a multiplexed program stream was required." << endl; @@ -120,7 +120,7 @@ bool K3bMpegInfo::MpegParsePacket () if ( offset != 0 ) { // we actually skipped some zeroes - kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).tqarg( offset ) << endl; + kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).arg( offset ) << endl; } // here while schleife @@ -190,7 +190,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) int bits; case MPEG_PACK_HEADER_CODE: - // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).tqarg( offset ) << endl; + // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).arg( offset ) << endl; offset += 4; @@ -214,7 +214,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) if ( m_initial_TS == 0.0 ) { m_initial_TS = ReadTS( offset ); - kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl; + kdDebug() << TQString( "Initial TS = %1" ).arg( m_initial_TS ) << endl; } } else if ( bits >> 2 == 0x1 ) /* %01xx ISO13818-1 */ @@ -231,11 +231,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) if ( m_initial_TS == 0.0 ) { m_initial_TS = ReadTSMpeg2( offset ); - kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl; + kdDebug() << TQString( "Initial TS = %1" ).arg( m_initial_TS ) << endl; } } else { - kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).tqarg( bits ) << endl; + kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).arg( bits ) << endl; mpeg_info->version = MPEG_VERS_INVALID; return -1; } @@ -254,11 +254,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) offset += 4; size = GetSize( offset ); offset += 2; - // kdDebug() << TQString( "offset = %1, size = %2" ).tqarg( offset ).tqarg( size ) << endl; + // kdDebug() << TQString( "offset = %1, size = %2" ).arg( offset ).arg( size ) << endl; switch ( mark ) { case MPEG_SYSTEM_HEADER_CODE: - // kdDebug() << TQString( "Systemheader: %1" ).tqarg( m_code, 0, 16 ) << endl; + // kdDebug() << TQString( "Systemheader: %1" ).arg( m_code, 0, 16 ) << endl; break; case MPEG_VIDEO_E0_CODE: @@ -296,18 +296,18 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) break; case MPEG_PRIVATE_1_CODE: - kdDebug() << TQString( "PrivateCode: %1" ).tqarg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "PrivateCode: %1" ).arg( mark, 0, 16 ) << endl; break; } break; case MPEG_PROGRAM_END_CODE: - kdDebug() << TQString( "ProgramEndCode: %1" ).tqarg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "ProgramEndCode: %1" ).arg( mark, 0, 16 ) << endl; offset += 4; break; case MPEG_PICTURE_CODE: - kdDebug() << TQString( "PictureCode: %1" ).tqarg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "PictureCode: %1" ).arg( mark, 0, 16 ) << endl; offset += 3; break; @@ -325,7 +325,7 @@ byte K3bMpegInfo::GetByte( llong offset ) if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { if ( fseeko( m_mpegfile, offset, SEEK_SET ) ) { - kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; + kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; return 0x11; } nread = fread( m_buffer, 1, BUFFERSIZE, m_mpegfile ); @@ -333,7 +333,7 @@ byte K3bMpegInfo::GetByte( llong offset ) m_buffend = offset + nread; if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { // weird - kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; + kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; return 0x11; } } @@ -355,7 +355,7 @@ byte K3bMpegInfo::bdGetByte( llong offset ) m_buffend = start + nread; if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { // weird - kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; + kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; return 0x11; } diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp index f175779..859ed89 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <klocale.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdir.h> #include <tqfile.h> #include <tqptrlist.h> @@ -108,26 +108,26 @@ int K3bVideoDvdImager::writePathSpec() d->tempPath = K3b::findUniqueFilePrefix( "k3bVideoDvd", dir.path() ); kdDebug() << "(K3bVideoDvdImager) creating temp dir: " << d->tempPath << endl; 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; } dir.cd( d->tempPath ); 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; } - for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) { + for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it ) { 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; } // convert to upper case names if( ::symlink( TQFile::encodeName( (*it)->localPath() ), 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; } } @@ -148,7 +148,7 @@ int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& s } 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(); num++; @@ -195,7 +195,7 @@ void K3bVideoDvdImager::cleanup() if( TQFile::exists( d->tempPath ) ) { TQDir dir( d->tempPath ); 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.cdUp(); dir.rmdir( "VIDEO_TS" ); diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index 194dff7..9b6a178 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -85,14 +85,14 @@ TQString K3bVideoDvdJob::jobDescription() const return i18n("Writing Video DVD") + ( m_doc->isoOptions().volumeID().isEmpty() ? TQString() - : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); + : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) ); } } 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 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) : TQString() ) ); diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp index a5f81e3..34615e3 100644 --- a/libk3b/tools/k3bbusywidget.cpp +++ b/libk3b/tools/k3bbusywidget.cpp @@ -68,13 +68,13 @@ void K3bBusyWidget::animateBusy() } -TQSize K3bBusyWidget::tqsizeHint() const +TQSize K3bBusyWidget::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize K3bBusyWidget::tqminimumSizeHint() const +TQSize K3bBusyWidget::minimumSizeHint() const { return TQSize( 2*frameWidth() + 62, 10 ); } diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h index 7eb927e..bbaddc0 100644 --- a/libk3b/tools/k3bbusywidget.h +++ b/libk3b/tools/k3bbusywidget.h @@ -35,8 +35,8 @@ class LIBK3B_EXPORT K3bBusyWidget : public TQFrame void showBusy( bool b ); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: void drawContents( TQPainter* p ); diff --git a/libk3b/tools/k3bcdparanoialib.h b/libk3b/tools/k3bcdparanoialib.h index bbeb19e..ff4a09a 100644 --- a/libk3b/tools/k3bcdparanoialib.h +++ b/libk3b/tools/k3bcdparanoialib.h @@ -122,7 +122,7 @@ class LIBK3B_EXPORT K3bCdparanoiaLib */ int status() const; - enum tqStatus { + enum Status { S_OK, S_ERROR // to be extended with Jitter and stuff... diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp index 3536c24..089e27e 100644 --- a/libk3b/tools/k3bcutcombobox.cpp +++ b/libk3b/tools/k3bcutcombobox.cpp @@ -45,7 +45,7 @@ K3bCutComboBox::K3bCutComboBox( TQWidget* parent, const char* name ) : KComboBox( parent, name ) { d = new Private(); - // tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() ); + // setSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() ); } @@ -70,9 +70,9 @@ void K3bCutComboBox::setMethod( int m ) } -TQSize K3bCutComboBox::tqsizeHint() const +TQSize K3bCutComboBox::sizeHint() const { -// TQSize s(KComboBox::tqsizeHint()); +// TQSize s(KComboBox::sizeHint()); // for( int i = 0; i < count(); i++ ) { // int w = fontMetrics().width(d->originalItems[i]) + @@ -81,12 +81,12 @@ TQSize K3bCutComboBox::tqsizeHint() const // s.setWidth( w ); // } - return KComboBox::tqsizeHint(); + return KComboBox::sizeHint(); } -TQSize K3bCutComboBox::tqminimumSizeHint() const +TQSize K3bCutComboBox::minimumSizeHint() const { - return KComboBox::tqminimumSizeHint(); + return KComboBox::minimumSizeHint(); } @@ -205,7 +205,7 @@ void K3bCutComboBox::resizeEvent( TQResizeEvent* e ) void K3bCutComboBox::cutText() { - d->width = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this, + d->width = TQStyle::visualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField), this ).width(); for( int i = 0; i < (int)d->originalItems.count(); ++i ) { diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h index 7bc8f70..6fdf18e 100644 --- a/libk3b/tools/k3bcutcombobox.h +++ b/libk3b/tools/k3bcutcombobox.h @@ -54,10 +54,10 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox void setMethod( int ); /** reimplemeted */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** reimplemeted */ - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; /** reimplemeted */ virtual void setCurrentText( const TQString& ); diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp index 0c6c3f4..0c8a3b3 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.cpp +++ b/libk3b/tools/k3bdeviceselectiondialog.cpp @@ -22,7 +22,7 @@ #include <k3bdevicemanager.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqstring.h> #include <tqframe.h> diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index fb3be4b..f59ca38 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -33,7 +33,7 @@ #include <tqevent.h> #include <tqvalidator.h> #include <tqfont.h> -#include <tqpalette.h> +#include <palette.h> #include <tqstyle.h> #include <tqapplication.h> #include <tqprogressbar.h> @@ -272,7 +272,7 @@ void K3bListViewItem::setBackgroundColor( int col, const TQColor& c ) ColumnInfo* info = getColumnInfo( col ); info->backgroundColorSet = true; info->backgroundColor = c; - tqrepaint(); + repaint(); } @@ -281,7 +281,7 @@ void K3bListViewItem::setForegroundColor( int col, const TQColor& c ) ColumnInfo* info = getColumnInfo( col ); info->foregroundColorSet = true; info->foregroundColor = c; - tqrepaint(); + repaint(); } @@ -299,7 +299,7 @@ void K3bListViewItem::setProgress( int col, int p ) setDisplayProgressBar( col, true ); if( info->progressValue != p ) { info->progressValue = p; - tqrepaint(); + repaint(); } } @@ -309,7 +309,7 @@ void K3bListViewItem::setTotalSteps( int col, int steps ) ColumnInfo* info = getColumnInfo( col ); info->totalProgressSteps = steps; - tqrepaint(); + repaint(); } @@ -318,14 +318,14 @@ void K3bListViewItem::setMarginHorizontal( int col, int margin ) ColumnInfo* info = getColumnInfo( col ); info->margin = margin; - tqrepaint(); + repaint(); } void K3bListViewItem::setMarginVertical( int margin ) { m_vMargin = margin; - tqrepaint(); + repaint(); } @@ -364,7 +364,7 @@ void K3bListViewItem::paintCell( TQPainter* p, const TQColorGroup& cg, int col, if( info->backgroundColorSet ) 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() && (col == 0 || listView()->allColumnsShowFocus()) && info->margin > 0 ) { @@ -445,11 +445,11 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i s_dummyProgressBar->setTotalSteps( info->totalProgressSteps ); s_dummyProgressBar->setProgress( info->progressValue ); - // some styles use the widget's tqgeometry + // some styles use the widget's geometry s_dummyProgressBar->setGeometry( r ); - listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); - listView()->tqstyle().tqdrawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags ); + listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarContents, &dbPainter, s_dummyProgressBar, r, cgh, flags ); + listView()->tqstyle().drawControl(TQStyle::CE_ProgressBarLabel, &dbPainter, s_dummyProgressBar, r, cgh, flags ); // now we really paint the progress in the listview p->drawPixmap( 0, 0, *doubleBuffer ); @@ -498,7 +498,7 @@ bool K3bCheckListViewItem::isChecked() const void K3bCheckListViewItem::setChecked( bool checked ) { m_checked = checked; - tqrepaint(); + repaint(); } @@ -508,7 +508,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i if( col == 0 ) { if( m_checked ) { - TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() ); + TQRect r( 0, marginVertical(), width, /*listView()->tqstyle().pixelMetric( TQStyle::PM_CheckListButtonSize )*/height()-2*marginVertical() ); TQStyle::SFlags flags = TQStyle::Style_Default; if( listView()->isEnabled() ) @@ -666,7 +666,7 @@ void K3bListView::showEditor( K3bListViewItem* item, int col ) void K3bListView::placeEditor( K3bListViewItem* item, int col ) { ensureItemVisible( item ); - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); r.setX( contentsToViewport( TQPoint(header()->sectionPos( col ), 0) ).x() ); r.setWidth( header()->sectionSize( col ) - 1 ); @@ -699,7 +699,7 @@ void K3bListView::placeEditor( K3bListViewItem* item, int col ) if( TQWidget* editor = prepareEditor( item, col ) ) { editor->resize( r.size() ); - // editor->resize( TQSize( r.width(), editor->tqminimumSizeHint().height() ) ); + // editor->resize( TQSize( r.width(), editor->minimumSizeHint().height() ) ); moveChild( editor, r.x(), r.y() ); } } @@ -1142,8 +1142,8 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) 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(m_editorComboBox) ) { - // make sure we did not lose the focus to one of the edit widgets' tqchildren - if( !tqApp->tqfocusWidget() || TQT_BASE_OBJECT(tqApp->tqfocusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) { + // 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) ) { doRename(); hideEditor(); } @@ -1170,7 +1170,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e ) TQPixmap bgPix( size ); // FIXME: let the user specify the color - bgPix.fill( tqcolorGroup().base() ); + bgPix.fill( colorGroup().base() ); if( bgPix.width() < m_backgroundPixmap.width() || bgPix.height() < m_backgroundPixmap.height() ) { @@ -1227,7 +1227,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items ) int width = header()->width(); int height = 0; for( TQPtrListIterator<TQListViewItem> it( items ); *it; ++it ) { - TQRect r = tqitemRect( *it ); + TQRect r = itemRect( *it ); if( r.isValid() ) { height += ( *it )->height(); @@ -1256,13 +1256,13 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items ) // FIXME: items on other than the top level have a smaller first column // the same goes for all items if root is decorated bool alreadyDrawing = false; - TQRect r = tqitemRect( item ); + TQRect r = itemRect( item ); if( r.isValid() ) { if( items.containsRef( item ) ) { // paint all columns int x = 0; for( int i = 0; i < columns(); ++i ) { - item->paintCell( &p, tqcolorGroup(), i, columnWidth( i ), columnAlignment( i ) ); + item->paintCell( &p, colorGroup(), i, columnWidth( i ), columnAlignment( i ) ); p.translate( columnWidth( i ), 0 ); x += columnWidth( i ); } @@ -1274,7 +1274,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList<TQListViewItem>& items ) else if( alreadyDrawing ) p.translate( 0, item->height() ); - if( p.tqworldMatrix().dy() >= pix.height() ) + if( p.worldMatrix().dy() >= pix.height() ) break; } } diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp index eef276e..8bb5f69 100644 --- a/libk3b/tools/k3blistviewitemanimator.cpp +++ b/libk3b/tools/k3blistviewitemanimator.cpp @@ -80,7 +80,7 @@ void K3bListViewItemAnimator::setItem( TQListViewItem* item, int col ) m_item = item; m_column = col; m_pixmap = *item->pixmap(col); - m_fadeColor = item->listView()->tqcolorGroup().base(); + m_fadeColor = item->listView()->colorGroup().base(); start(); } diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index a04c9a0..7c20a05 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -97,14 +97,14 @@ void K3bMd5Job::start() } else if( !d->filename.isEmpty() ) { 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); return; } d->file.setName( d->filename ); 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); return; } @@ -204,7 +204,7 @@ void K3bMd5Job::slotUpdate() if( readSize <= 0 ) { // 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(); emit percent( 100 ); jobFinished(true); @@ -252,13 +252,13 @@ void K3bMd5Job::slotUpdate() } 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(); jobFinished(false); } else if( read == 0 ) { // 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(); emit percent( 100 ); jobFinished(true); @@ -303,7 +303,7 @@ TQCString K3bMd5Job::base64Digest() 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(); jobFinished( true ); } diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index 2266be8..e3d3a70 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -50,16 +50,16 @@ K3bMsfEdit::~K3bMsfEdit() {} -TQSize K3bMsfEdit::tqsizeHint() const +TQSize K3bMsfEdit::sizeHint() const { // more or less copied from TQSpinBox constPolish(); - TQSize sz = editor()->tqsizeHint(); + TQSize sz = editor()->sizeHint(); int h = sz.height(); TQFontMetrics fm( font() ); int w = fm.width( "00:00:00" ); int wx = fm.width( ' ' )*2; - int frame = tqstyle().tqpixelMetric( TQStyle::PM_SpinBoxFrameWidth ); + int frame = tqstyle().pixelMetric( TQStyle::PM_SpinBoxFrameWidth ); return tqstyle().tqsizeFromContents(TQStyle::CT_SpinBox, this, TQSize( w + wx + downRect().width() + frame*2, h + frame*2). diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h index d3e75ec..347b6ad 100644 --- a/libk3b/tools/k3bmsfedit.h +++ b/libk3b/tools/k3bmsfedit.h @@ -41,7 +41,7 @@ class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox K3bMsfEdit( TQWidget* parent = 0, const char* name = 0 ); ~K3bMsfEdit(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setFrameStyle( int style ); void setLineWidth(int); diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp index 01f64cd..af73154 100644 --- a/libk3b/tools/k3bmultichoicedialog.cpp +++ b/libk3b/tools/k3bmultichoicedialog.cpp @@ -21,7 +21,7 @@ #include <kapplication.h> #include <kiconloader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsignalmapper.h> #include <tqptrlist.h> #include <tqlabel.h> diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp index fe7b2af..b0e39a8 100644 --- a/libk3b/tools/k3bprogressdialog.cpp +++ b/libk3b/tools/k3bprogressdialog.cpp @@ -19,7 +19,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqwidgetstack.h> diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index a4c58bd..69c6ed5 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -125,10 +125,10 @@ void K3bPushButton::slotDelayedPopup() if( isDown() ) { // popup the menu. // this has been taken from the TQPushButton code - if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->tqsizeHint().height() <= tqApp->desktop()->height() ) + if( mapToGlobal( TQPoint( 0, rect().bottom() ) ).y() + popup()->sizeHint().height() <= tqApp->desktop()->height() ) popup()->exec( mapToGlobal( rect().bottomLeft() ) ); else - popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->tqsizeHint().height() ) ) ); + popup()->exec( mapToGlobal( rect().topLeft() - TQPoint( 0, popup()->sizeHint().height() ) ) ); setDown( false ); } } diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp index 02878c2..92d5877 100644 --- a/libk3b/tools/k3brichtextlabel.cpp +++ b/libk3b/tools/k3brichtextlabel.cpp @@ -16,7 +16,7 @@ #include "k3brichtextlabel.h" #include <tqtooltip.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqsimplerichtext.h> #include <kglobalsettings.h> @@ -38,14 +38,14 @@ static TQString qrichtextify( const TQString& text ) K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); setText(text); } K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); } void K3bRichTextLabel::setDefaultWidth(int defaultWidth) @@ -59,7 +59,7 @@ TQSizePolicy K3bRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize K3bRichTextLabel::tqminimumSizeHint() const +TQSize K3bRichTextLabel::minimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -94,9 +94,9 @@ TQSize K3bRichTextLabel::tqminimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize K3bRichTextLabel::tqsizeHint() const +TQSize K3bRichTextLabel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void K3bRichTextLabel::setText( const TQString &text ) { diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index cf1bc79..d2c7250 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -21,7 +21,7 @@ #include <k3b_export.h> /** - * @short A replacement for TQLabel that supports richtext and proper tqlayout management + * @short A replacement for TQLabel that supports richtext and proper layout management * * @author Waldo Bastian <bastian@kde.org> */ @@ -43,8 +43,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; TQSizePolicy sizePolicy() const; public slots: diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp index c8fee1b..3b33a18 100644 --- a/libk3b/tools/k3bstdguiitems.cpp +++ b/libk3b/tools/k3bstdguiitems.cpp @@ -20,7 +20,7 @@ #include <tqwhatsthis.h> #include <tqcombobox.h> #include <tqframe.h> -#include <tqpalette.h> +#include <palette.h> #include <klocale.h> diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp index 21476b0..0d4f37b 100644 --- a/libk3b/tools/k3btitlelabel.cpp +++ b/libk3b/tools/k3btitlelabel.cpp @@ -30,7 +30,7 @@ public: Private() { titleLength = subTitleLength = 0; margin = 2; - tqalignment = TQt::AlignLeft; + alignment = TQt::AlignLeft; cachedMinimumWidth = 0; titleBaseLine = 0; } @@ -41,7 +41,7 @@ public: TQString displayTitle; TQString displaySubTitle; - int tqalignment; + int alignment; int titleLength; int subTitleLength; @@ -71,9 +71,9 @@ public: neededWidth += m_label->d->displaySubTitleLength + 5; 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; - else if( m_label->d->tqalignment & TQt::AlignRight ) + else if( m_label->d->alignment & TQt::AlignRight ) startPos = r.right() - m_label->d->margin - neededWidth; else startPos = r.left() + m_label->d->margin; @@ -126,19 +126,19 @@ void K3bTitleLabel::setSubTitle( const TQString& subTitle ) } -void K3bTitleLabel::tqsetAlignment( int align ) +void K3bTitleLabel::setAlignment( int align ) { - d->tqalignment = align; + d->alignment = align; update(); } -TQSize K3bTitleLabel::tqsizeHint() const +TQSize K3bTitleLabel::sizeHint() const { return TQSize( d->titleLength + d->subTitleLength + 2*d->margin, d->titleBaseLine ); } -TQSize K3bTitleLabel::tqminimumSizeHint() const +TQSize K3bTitleLabel::minimumSizeHint() const { return TQSize( d->cachedMinimumWidth, d->titleBaseLine ); } @@ -168,9 +168,9 @@ void K3bTitleLabel::drawContents( TQPainter* p ) neededWidth += d->displaySubTitleLength + 5; int startPos = 0; - if( d->tqalignment & TQt::AlignHCenter ) + if( d->alignment & TQt::AlignHCenter ) 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; else startPos = r.left() + d->margin; diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h index b850b12..5e99e59 100644 --- a/libk3b/tools/k3btitlelabel.h +++ b/libk3b/tools/k3btitlelabel.h @@ -32,8 +32,8 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame K3bTitleLabel( TQWidget* parent = 0, const char* name = 0 ); ~K3bTitleLabel(); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; public slots: /** @@ -47,10 +47,10 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame /** * The title label only supports alignments left, hcenter, and right * - * Default tqalignment is left. + * Default alignment is left. */ // FIXME: honor right-to-left languages - void tqsetAlignment( int align ); + void setAlignment( int align ); protected: void resizeEvent( TQResizeEvent* ); diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index cf72a3b..216e681 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -22,7 +22,7 @@ #include <tqtoolbutton.h> #include <tqsizepolicy.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <tqtooltip.h> #include <tqlabel.h> @@ -44,7 +44,7 @@ class K3bToolBoxSeparator : public TQWidget public: K3bToolBoxSeparator( K3bToolBox* parent ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void paintEvent( TQPaintEvent * ); @@ -54,13 +54,13 @@ class K3bToolBoxSeparator : public TQWidget K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent ) : TQWidget( parent ) { - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); } -TQSize K3bToolBoxSeparator::tqsizeHint() const +TQSize K3bToolBoxSeparator::sizeHint() const { - int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, + int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); return TQSize( extent, 0 ); } @@ -72,7 +72,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal; tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), - tqcolorGroup(), flags ); + colorGroup(), flags ); } @@ -81,7 +81,7 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent ) : TQToolButton( parent ), m_popupMenu(0) { - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) ); setAutoRaise( true ); setIconSet( action->iconSet() ); @@ -127,7 +127,7 @@ K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon, : TQToolButton( parent ), m_popupMenu(0) { - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, sizePolicy().verData()) ); setAutoRaise( true ); setTextLabel( text ); @@ -171,7 +171,7 @@ void K3bToolBoxButton::resizeEvent( TQResizeEvent* e ) K3bToolBox::K3bToolBox( TQWidget* parent, const char* name ) : TQFrame( parent, name ) { - tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) ); + setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) ); m_mainLayout = new TQGridLayout( this ); m_mainLayout->setMargin( 1 ); @@ -243,7 +243,7 @@ void K3bToolBox::addStretch() void K3bToolBox::addLabel( const TQString& text ) { TQLabel* label = new TQLabel( text, this ); - label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); + label->setSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); addWidget( label ); } @@ -257,7 +257,7 @@ void K3bToolBox::addWidget( TQWidget* w ) m_mainLayout->addWidget( w, 0, m_mainLayout->numCols()-1 ); - if( w->tqsizePolicy().horData() == TQSizePolicy::Fixed || w->tqsizePolicy().horData() == TQSizePolicy::Maximum ) + if( w->sizePolicy().horData() == TQSizePolicy::Fixed || w->sizePolicy().horData() == TQSizePolicy::Maximum ) m_mainLayout->setColStretch( m_mainLayout->numCols(), 1 ); else { m_mainLayout->setColStretch( m_mainLayout->numCols()-1, 1 ); diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index 8f2a20e..5b80907 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -69,7 +69,7 @@ void K3bToolButton::drawButton( TQPainter* p ) arrowFlags |= TQStyle::Style_Enabled; tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, - TQRect(width()-7, height()-7, 7, 7), tqcolorGroup(), + TQRect(width()-7, height()-7, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } } diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp index fd806ba..1ef08ad 100644 --- a/libk3b/tools/kcutlabel.cpp +++ b/libk3b/tools/kcutlabel.cpp @@ -27,7 +27,7 @@ KCutLabel::KCutLabel( const TQString &text , TQWidget *parent, const char *name : TQLabel ( parent, name ), m_minChars(1) { TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - tqsetSizePolicy(myLabelSizePolicy); + setSizePolicy(myLabelSizePolicy); m_fullText = text; cutTextToLabel(); } @@ -36,12 +36,12 @@ KCutLabel::KCutLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ), m_minChars(1) { TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - tqsetSizePolicy(myLabelSizePolicy); + setSizePolicy(myLabelSizePolicy); } -TQSize KCutLabel::tqminimumSizeHint() const +TQSize KCutLabel::minimumSizeHint() const { - TQSize sh = TQLabel::tqminimumSizeHint(); + TQSize sh = TQLabel::minimumSizeHint(); if( m_minChars == 0 ) sh.setWidth(-1); else if( m_minChars < (int)m_fullText.length() ) diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h index 7b96fe2..86c226e 100644 --- a/libk3b/tools/kcutlabel.h +++ b/libk3b/tools/kcutlabel.h @@ -36,7 +36,7 @@ class LIBK3B_EXPORT KCutLabel : public TQLabel KCutLabel( TQWidget *parent = 0, const char *name = 0); KCutLabel( const TQString &text, TQWidget *parent = 0, const char *name = 0 ); - virtual TQSize tqminimumSizeHint() const; + virtual TQSize minimumSizeHint() const; /** * \return the full text while text() returns the cut text diff --git a/libk3b/videodvd/k3bvideodvd.cpp b/libk3b/videodvd/k3bvideodvd.cpp index 47de0d0..f435393 100644 --- a/libk3b/videodvd/k3bvideodvd.cpp +++ b/libk3b/videodvd/k3bvideodvd.cpp @@ -77,7 +77,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev ) DVDClose( dvdReaderT ); return false; } - m_volumeIdentifier = TQString::tqfromLatin1( v, 32 ); + m_volumeIdentifier = TQString::fromLatin1( v, 32 ); // // Open the VMG info @@ -305,13 +305,13 @@ TQString K3bVideoDVD::subPictureCodeExtensionString( int ext ) case SUBPIC_CODE_EXT_CAPTION_BIGGER_SIZE: return i18n("Caption with bigger size character"); 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: return i18n("Closed caption with normal size character"); case SUBPIC_CODE_EXT_CLOSED_CAPTION_BIGGER_SIZE: return i18n("Closed caption with bigger size character"); 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: return i18n("Forced caption"); 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: return i18n("Director's comments with bigger size characters"); case SUBPIC_CODE_EXT_DIR_COMMENTS_FOR_CHILDREN: - return i18n("Director's comments for tqchildren"); + return i18n("Director's comments for children"); default: return i18n("unknown code extension"); } |