summaryrefslogtreecommitdiffstats
path: root/libk3b/projects
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:55:47 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:55:47 -0600
commit650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a (patch)
treebb4714865b78e327620ce86a37241ed22df43afa /libk3b/projects
parentef5831dd5c8811c94c9b1bc1377a90174d17c82c (diff)
downloadk3b-650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a.tar.gz
k3b-650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit ef5831dd5c8811c94c9b1bc1377a90174d17c82c.
Diffstat (limited to 'libk3b/projects')
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudiocdtracksource.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.cpp4
-rw-r--r--libk3b/projects/audiocd/k3baudiodoc.h2
-rw-r--r--libk3b/projects/audiocd/k3baudioimager.cpp6
-rw-r--r--libk3b/projects/audiocd/k3baudiojob.cpp24
-rw-r--r--libk3b/projects/audiocd/k3baudiojobtempdata.cpp2
-rw-r--r--libk3b/projects/audiocd/k3baudionormalizejob.cpp14
-rw-r--r--libk3b/projects/datacd/k3bdatadoc.cpp22
-rw-r--r--libk3b/projects/datacd/k3bdatajob.cpp24
-rw-r--r--libk3b/projects/datacd/k3bdatapreparationjob.cpp8
-rw-r--r--libk3b/projects/datacd/k3bdiritem.cpp36
-rw-r--r--libk3b/projects/datacd/k3bdiritem.h8
-rw-r--r--libk3b/projects/datacd/k3bisoimager.cpp34
-rw-r--r--libk3b/projects/datacd/k3bmkisofshandler.cpp6
-rw-r--r--libk3b/projects/datacd/k3bmsinfofetcher.cpp10
-rw-r--r--libk3b/projects/datadvd/k3bdvdbooktypejob.cpp10
-rw-r--r--libk3b/projects/datadvd/k3bdvdjob.cpp24
-rw-r--r--libk3b/projects/k3bcdrdaowriter.cpp58
-rw-r--r--libk3b/projects/k3bcdrecordwriter.cpp48
-rw-r--r--libk3b/projects/k3bcuefileparser.cpp2
-rw-r--r--libk3b/projects/k3bdvdrecordwriter.cpp8
-rw-r--r--libk3b/projects/k3bgrowisofshandler.cpp14
-rw-r--r--libk3b/projects/k3bgrowisofshandler.h2
-rw-r--r--libk3b/projects/k3bgrowisofswriter.cpp18
-rw-r--r--libk3b/projects/k3bimagefilereader.cpp2
-rw-r--r--libk3b/projects/k3binffilewriter.cpp6
-rw-r--r--libk3b/projects/k3binffilewriter.h2
-rw-r--r--libk3b/projects/k3btocfilewriter.cpp6
-rw-r--r--libk3b/projects/k3btocfilewriter.h2
-rw-r--r--libk3b/projects/mixedcd/k3bmixedjob.cpp48
-rw-r--r--libk3b/projects/movixcd/k3bmovixdoc.cpp2
-rw-r--r--libk3b/projects/movixcd/k3bmovixdocpreparer.cpp8
-rw-r--r--libk3b/projects/movixcd/k3bmovixjob.cpp6
-rw-r--r--libk3b/projects/movixcd/k3bmovixprogram.cpp2
-rw-r--r--libk3b/projects/movixdvd/k3bmovixdvdjob.cpp6
-rw-r--r--libk3b/projects/videocd/cdi/cdi_vcd.appbin102400 -> 102402 bytes
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.cpp14
-rw-r--r--libk3b/projects/videocd/k3bvcddoc.h2
-rw-r--r--libk3b/projects/videocd/k3bvcdjob.cpp58
-rw-r--r--libk3b/projects/videocd/k3bvcdoptions.cpp2
-rw-r--r--libk3b/projects/videocd/k3bvcdtrack.cpp20
-rw-r--r--libk3b/projects/videocd/k3bvcdxmlview.cpp48
-rw-r--r--libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp38
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdimager.cpp16
-rw-r--r--libk3b/projects/videodvd/k3bvideodvdjob.cpp4
46 files changed, 342 insertions, 342 deletions
diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp
index 610f9b7..f8a5b71 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->encodedData( "k3b/audio_track_drag" );
+ TQByteArray data = e->tqencodedData( "k3b/audio_track_drag" );
TQDataStream s( data, IO_ReadOnly );
diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp
index 6ca0cd5..6319086 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")
- .arg(m_discId, 0, 16)
- .arg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty()
+ .tqarg(m_discId, 0, 16)
+ .tqarg(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").arg(m_cdTrackNumber).arg(m_discId,0,16);
+ return i18n("Track %1 from Audio CD %2").tqarg(m_cdTrackNumber).tqarg(m_discId,0,16);
}
diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp
index b4b3489..625f5bf 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 <textstream.h>
+#include <tqtextstream.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::fromLatin1( buf, 7 ) != "#EXTM3U" )
+ if( TQString::tqfromLatin1( buf, 7 ) != "#EXTM3U" )
return false;
// skip the first line
diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h
index 71e5e69..70f8826 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 <textstream.h>
+#include <tqtextstream.h>
#include "k3b_export.h"
#include <kurl.h>
diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp
index 6917fe6..ba0692f 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.").arg(trackNumber), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to seek in track %1.").tqarg(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").arg(*imageFileIt), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open %1 for writing").tqarg(*imageFileIt), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -142,7 +142,7 @@ void K3bAudioImager::WorkThread::run()
}
if( read < 0 ) {
- emitInfoMessage( i18n("Error while decoding track %1.").arg(trackNumber), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while decoding track %1.").tqarg(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 2415962..a03a218 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.")
- .arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
+ .tqarg(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").arg(m_doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating image files in %1").tqarg(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")
- .arg(t)
- .arg(tt)
- .arg( track->title().isEmpty() || track->artist().isEmpty()
+ .tqarg(t)
+ .tqarg(tt)
+ .tqarg( 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(bufferStatus(int)) );
+ connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(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")
- .arg(t)
- .arg(tt)
- .arg( track->title().isEmpty() || track->artist().isEmpty()
+ .tqarg(t)
+ .tqarg(tt)
+ .tqarg( 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").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").tqarg(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)" ).arg(m_doc->title()) );
+ : TQString( " (%1)" ).tqarg(m_doc->title()) );
}
@@ -855,7 +855,7 @@ TQString K3bAudioJob::jobDetails() const
{
return ( i18n( "1 track (%1 minutes)",
"%n tracks (%1 minutes)",
- m_doc->numOfTracks() ).arg(m_doc->length().toString())
+ m_doc->numOfTracks() ).tqarg(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 697a9f5..abbf753 100644
--- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
+++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
@@ -22,7 +22,7 @@
#include <k3bcore.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqvaluevector.h>
#include <kdebug.h>
diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
index d78862e..52afb5e 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").arg(bin->name()).arg(bin->version).arg(bin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(bin->name()).tqarg(bin->version).tqarg(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)").arg(t).arg(tt).arg(m_files.at(t-1)) );
+ // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").tqarg(t).tqarg(tt).tqarg(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.").arg(m_currentTrack), INFO );
+ emit infoMessage( i18n("Track %1 is already normalized.").tqarg(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").arg(m_currentTrack).arg(m_files.count()) );
+ emit newTask( i18n("Adjusting volume level for track %1 of %2").tqarg(m_currentTrack).tqarg(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").arg(m_currentTrack).arg(m_files.count()) );
+ emit newTask( i18n("Computing level for track %1 of %2").tqarg(m_currentTrack).tqarg(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).").arg("normalize-audio").arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("normalize-audio").tqarg(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.").arg("Normalize"), K3bJob::ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Normalize"), K3bJob::ERROR );
jobFinished( false );
}
}
diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp
index b4e4ec8..2c4fa51 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 <textstream.h>
+#include <tqtextstream.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->children().getFirst() )
- removeItem( m_root->children().getFirst() );
+ while( m_root->tqchildren().getFirst() )
+ removeItem( m_root->tqchildren().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").arg(cnt);
+ name += TQString("_%1").tqarg(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").arg(cnt);
+ k3bname += TQString("_%1").tqarg(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::fromLatin1("data");
+ return TQString::tqfromLatin1("data");
}
@@ -624,7 +624,7 @@ bool K3bDataDoc::saveDocumentData( TQDomElement* docElem )
// ----------------------------------------------------------------------
TQDomElement topElem = doc.createElement( "files" );
- TQPtrListIterator<K3bDataItem> it( root()->children() );
+ TQPtrListIterator<K3bDataItem> it( root()->tqchildren() );
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->children() );
+ TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() );
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->children() );
+ TQPtrListIterator<K3bDataItem> it( dir->tqchildren() );
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->children() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); 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" ).arg(i);
+ newName = TQString( "boot%1.catalog" ).tqarg(i);
}
K3bSpecialDataItem* b = new K3bSpecialDataItem( this, 0, dir, newName );
diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp
index 442b035..0295e27 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").arg(m_msInfoFetcher->lastSessionStart()).arg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() );
+ m_isoImager->setMultiSessionInfo( TQString("%1,%2").tqarg(m_msInfoFetcher->lastSessionStart()).tqarg(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").arg(d->doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating image file in %1").tqarg(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").arg(d->doc->tempDir()), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Image successfully created in %1").tqarg(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").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").tqarg(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").arg(t).arg(tt) );
+ emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(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(bufferStatus(int)) );
+ connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(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").arg(m_isoImager->size()) )->addArgument("-");
+ writer->addArgument( TQString("-tsize=%1s").tqarg(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)" ).arg(d->doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) );
}
else {
return i18n("Writing Multisession CD")
+ ( d->doc->isoOptions().volumeID().isEmpty()
? TQString()
- : TQString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).tqarg(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() )
- .arg(KIO::convertSize( d->doc->size() ));
+ .tqarg(KIO::convertSize( d->doc->size() ));
else
return i18n("ISO9660 Filesystem (Size: %1)")
- .arg(KIO::convertSize( d->doc->size() ));
+ .tqarg(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").arg(d->doc->tempDir()), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Removed image file %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS );
}
}
diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp
index 26a2b5b..e562541 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>")
- .arg( KStringHandler::csqueeze( item->k3bName(), 30 ) )
- .arg( KStringHandler::csqueeze( item->writtenName(), 30 ) );
+ .tqarg( KStringHandler::csqueeze( item->k3bName(), 30 ) )
+ .tqarg( 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.")
- .arg( d->doc->isoOptions().jolietLong() ? 103 : 64 )
+ .tqarg( 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?")
- .arg( 16 ).arg( d->doc->isoOptions().volumeID() ),
+ .tqarg( 16 ).tqarg( 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 f43f1d5..72af70b 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.children() ); *it; ++it )
+ for( TQPtrListIterator<K3bDataItem> it( item.tqchildren() ); *it; ++it )
addDataItem( (*it)->copy() );
}
K3bDirItem::~K3bDirItem()
{
- // delete all children
+ // delete all tqchildren
// 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_children.first();
+ K3bDataItem* i = m_tqchildren.first();
while( i ) {
// it is important to use takeDataItem here to be sure
// the size gets updated properly
takeDataItem(i);
delete i;
- i = m_children.first();
+ i = m_tqchildren.first();
}
- // this has to be done after deleting the children
+ // this has to be done after deleting the tqchildren
// 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_children.findRef( item ) == -1 ) {
+ if( m_tqchildren.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_children.append( item->take() );
+ m_tqchildren.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_children.findRef( item );
+ int x = m_tqchildren.findRef( item );
if( x > -1 ) {
- K3bDataItem* item = m_children.take();
+ K3bDataItem* item = m_tqchildren.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_children.isEmpty() )
- return m_children.getFirst();
+ if( !m_tqchildren.isEmpty() )
+ return m_tqchildren.getFirst();
else
return K3bDataItem::nextSibling();
}
@@ -185,12 +185,12 @@ K3bDataItem* K3bDirItem::nextSibling() const
K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const
{
- // search for prev in children
- if( m_children.findRef( prev ) < 0 ) {
+ // search for prev in tqchildren
+ if( m_tqchildren.findRef( prev ) < 0 ) {
return 0;
}
else
- return m_children.next();
+ return m_tqchildren.next();
}
@@ -202,7 +202,7 @@ bool K3bDirItem::alreadyInDirectory( const TQString& filename ) const
K3bDataItem* K3bDirItem::find( const TQString& filename ) const
{
- for( TQPtrListIterator<K3bDataItem> it( m_children ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); 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_children ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); 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_children ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); 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_children ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( m_tqchildren ); it.current(); ++it ) {
if( (*it)->writeToCd() )
return true;
}
diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h
index a624529..304cf1a 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 children. However, none of the
- * children will have set a doc and the copy dir will not have set a parent dir.
+ * 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.
*/
K3bDirItem( const K3bDirItem& );
@@ -48,7 +48,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem
K3bDirItem* getDirItem() const;
- const TQPtrList<K3bDataItem>& children() const { return m_children; }
+ const TQPtrList<K3bDataItem>& tqchildren() const { return m_tqchildren; }
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_children;
+ mutable TQPtrList<K3bDataItem> m_tqchildren;
// 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 d83581c..1db1997 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.")
- .arg(d->pipe->bytesRead()).arg(d->pipe->bytesWritten()) );
+ .tqarg(d->pipe->bytesRead()).tqarg(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.").arg(d->imageFile.name()), WARNING );
+ emit infoMessage( i18n("Removed incomplete image file %1.").tqarg(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).").arg("mkisofs").arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("mkisofs").tqarg(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.").arg("mkisofs"), ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("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.").arg("mkisofs"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR );
cleanup();
jobFinished( false );
@@ -410,8 +410,8 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished()
emit debuggingOutput( "K3bIsoImager",
TQString("mkisofs print size result: %1 (%2 bytes)")
- .arg(m_mkisofsPrintSizeResult)
- .arg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) );
+ .tqarg(m_mkisofsPrintSizeResult)
+ .tqarg(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").arg(d->imagePath), ERROR );
+ emit infoMessage( i18n("Could not open %1 for writing").tqarg(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.").arg("mkisofs"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg("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->children() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); 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...")
- .arg(item->k3bName())
- .arg(f.filePath()), WARNING );
+ .tqarg(item->k3bName())
+ .tqarg(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.")
- .arg(item->k3bName())
- .arg(f.filePath()), WARNING );
+ .tqarg(item->k3bName())
+ .tqarg(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...").arg(item->localPath()), WARNING );
+ emit infoMessage( i18n("Could not find file %1. Skipping...").tqarg(item->localPath()), WARNING );
writeItem = false;
}
else if( !f.isReadable() ) {
- emit infoMessage( i18n("Could not read file %1. Skipping...").arg(item->localPath()), WARNING );
+ emit infoMessage( i18n("Could not read file %1. Skipping...").tqarg(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").arg(item->localPath()), ERROR );
+ emit infoMessage( i18n("Failed to backup boot image file %1").tqarg(item->localPath()), ERROR );
return;
}
diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp
index 7b3270c..99c76bb 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")
- .arg("mkisofs").arg(d->mkisofsBin->version).arg(d->mkisofsBin->copyright),
+ .tqarg("mkisofs").tqarg(d->mkisofsBin->version).tqarg(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'").arg( errorLine.mid( 38, errorLine.length()-40 ) ),
+ handleMkisofsInfoMessage( i18n("Read error from file '%1'").tqarg( 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'")
- .arg(line.section( TQRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR );
+ .tqarg(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 3aa90b3..e6d07e8 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.").arg("cdrecord"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").tqarg("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.").arg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").tqarg( 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").arg( K3b::externalBinDeviceParameter(m_device, bin) );
+ *m_process << TQString("dev=%1").tqarg( 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.").arg(bin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(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.")
- .arg( m_device->vendor() + " " + m_device->description() ), ERROR );
+ .tqarg( m_device->vendor() + " " + m_device->description() ), ERROR );
jobFinished( false );
}
}
diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp
index 358bfde..2526b28 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>.")
- .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) {
+ .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(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).").arg(d->dvdBooktypeBin->name()).arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdBooktypeBin->name()).tqarg(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.").arg(d->dvdBooktypeBin->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(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.").arg("dvd+rw-booktype"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").tqarg("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.").arg(d->dvdBooktypeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(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 dda717d..4a4adcb 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.")
- .arg(m_doc->burner()->vendor())
- .arg(m_doc->burner()->description()),
+ .tqarg(m_doc->burner()->vendor())
+ .tqarg(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.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( 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?")
- .arg(m_doc->burner()->vendor())
- .arg(m_doc->burner()->description())
- .arg( K3bDevice::mediaTypeString(foundMedium, true) ),
+ .tqarg(m_doc->burner()->vendor())
+ .tqarg(m_doc->burner()->description())
+ .tqarg( K3bDevice::mediaTypeString(foundMedium, true) ),
i18n("No Incremental Streaming") ) ) {
return false;
}
else {
- emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( 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.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( 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)" ).arg(m_doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) );
}
else {
return i18n("Writing Multisession DVD")
+ ( m_doc->isoOptions().volumeID().isEmpty()
? TQString()
- : TQString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).tqarg(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())
- .arg(KIO::convertSize( m_doc->size() ));
+ .tqarg(KIO::convertSize( m_doc->size() ));
else
return i18n("ISO9660 Filesystem (Size: %1)")
- .arg(KIO::convertSize( m_doc->size() ));
+ .tqarg(KIO::convertSize( m_doc->size() ));
}
#include "k3bdvdjob.moc"
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index 2ac9559..4494859 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").arg( burnDevice()->cdrdaoDriver() );
+ *m_process << TQString("%1:0x00000010").tqarg( 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").arg(d->usedSpeed);
+ *m_process << "--speed" << TQString("%1").tqarg(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.").arg(m_cdrdaoBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").tqarg(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.").arg(m_cdrdaoBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrdao %1 does not support overburning.").tqarg(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").arg(m_taoSourceAdjust);
+ << TQString("%1").tqarg(m_taoSourceAdjust);
// paranoia Mode
if ( m_paranoiaMode != -1 )
*m_process << "--paranoia-mode"
- << TQString("%1").arg(m_paranoiaMode);
+ << TQString("%1").tqarg(m_paranoiaMode);
// session
if ( m_session != -1 )
*m_process << "--session"
- << TQString("%1").arg(m_session);
+ << TQString("%1").tqarg(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").arg( burnDevice()->cdrdaoDriver() );
+ *m_process << TQString("%1:0x00000010").tqarg( 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").arg(d->usedSpeed);
+ *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed);
// blank-mode
*m_process << "--blank-mode";
@@ -432,7 +432,7 @@ void K3bCdrdaoWriter::setCommonArguments()
*m_process << "--eject";
// remote
- *m_process << "--remote" << TQString("%1").arg(m_cdrdaoComm[0]);
+ *m_process << "--remote" << TQString("%1").tqarg(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.").arg("cdrdao"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").tqarg("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").arg(m_cdrdaoBinObject->name()).arg(m_cdrdaoBinObject->version).arg(m_cdrdaoBinObject->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(m_cdrdaoBinObject->name()).tqarg(m_cdrdaoBinObject->version).tqarg(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.").arg("cdrdao"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg("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...").arg(d->usedSpeed),
+ emit infoMessage(i18n("Starting DAO simulation at %1x speed...").tqarg(d->usedSpeed),
K3bJob::INFO );
emit newTask( i18n("Simulating") );
}
else
{
- emit infoMessage( i18n("Starting DAO writing at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage( i18n("Starting DAO writing at %1x speed...").tqarg(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...").arg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage(i18n("Starting simulation copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO );
emit newTask( i18n("Simulating") );
}
else
{
- emit infoMessage( i18n("Starting copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO );
+ emit infoMessage( i18n("Starting copy at %1x speed...").tqarg(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").arg( line ) << endl;
- kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").arg( binpath ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").tqarg( line ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").tqarg( 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").arg( tempFile ) << endl;
- kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").arg( tempFile ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").tqarg( tempFile ) << endl;
+ kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").tqarg( 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.").arg(m_tocFile).arg(m_backupTocFile), ERROR );
+ "K3b was unable to restore it from the backup %2.").tqarg(m_tocFile).tqarg(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)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
+ emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(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).").arg(m_cdrdaoBinObject->name()).arg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(m_cdrdaoBinObject->name()).tqarg(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.").arg("cdrdao"), K3bJob::ERROR );
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("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").arg(d->usedSpeed), K3bJob::WARNING );
- emit infoMessage( i18n("Switching down burn speed to %1x").arg(speed), K3bJob::WARNING );
+ 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 );
}
}
}
@@ -870,7 +870,7 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const TQString& str )
}
else if( str.startsWith( "Found pre-gap" ) )
{
- emit infoMessage( i18n("Found pregap: %1").arg( str.mid(str.find(":")+1) ), K3bJob::INFO );
+ emit infoMessage( i18n("Found pregap: %1").tqarg( 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").arg(m_cdrdaoBinObject->name()).arg(line.mid(pos+16)),
+ emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrdaoBinObject->name()).tqarg(line.mid(pos+16)),
ERROR );
m_knownError = true;
}
diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp
index 78ffb6a..53fed8b 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").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
+ *m_process << TQString("dev=%1").tqarg(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").arg(d->usedSpeed);
+ *m_process << TQString("speed=%1").tqarg(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").arg( m_cueFile );
+ *m_process << TQString("cuefile=%1").tqarg( m_cueFile );
}
if( m_clone )
@@ -249,7 +249,7 @@ void K3bCdrecordWriter::prepareProcess()
bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
if( manualBufferSize ) {
- *m_process << TQString("fs=%1m").arg( k3bcore->globalSettings()->bufferSize() );
+ *m_process << TQString("fs=%1m").tqarg( 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.").arg(m_cdrecordBinObject->version), WARNING );
+ emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(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.").arg("cdrecord"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").tqarg("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")
- .arg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" )
- .arg(m_cdrecordBinObject->version)
- .arg(m_cdrecordBinObject->copyright), INFO );
+ .tqarg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" )
+ .tqarg(m_cdrecordBinObject->version)
+ .tqarg(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.").arg(m_cdrecordBinObject->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(m_cdrecordBinObject->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
if( simulate() ) {
emit newTask( i18n("Simulating") );
emit infoMessage( i18n("Starting %1 simulation at %2x speed...")
- .arg(K3b::writingModeString(m_writingMode))
- .arg(d->usedSpeed),
+ .tqarg(K3b::writingModeString(m_writingMode))
+ .tqarg(d->usedSpeed),
K3bJob::INFO );
}
else {
emit newTask( i18n("Writing") );
emit infoMessage( i18n("Starting %1 writing at %2x speed...")
- .arg(K3b::writingModeString(m_writingMode))
- .arg(d->usedSpeed),
+ .tqarg(K3b::writingModeString(m_writingMode))
+ .tqarg(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").arg(m_cdrecordBinObject->name()).arg(line.mid(pos, len)),
+ emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrecordBinObject->name()).tqarg(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").arg(d->usedSpeed), K3bJob::WARNING );
+ emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING );
if( speed > d->usedSpeed )
- emit infoMessage( i18n("Switching burn speed up to %1x").arg(speed), K3bJob::WARNING );
+ emit infoMessage( i18n("Switching burn speed up to %1x").tqarg(speed), K3bJob::WARNING );
else
- emit infoMessage( i18n("Switching burn speed down to %1x").arg(speed), K3bJob::WARNING );
+ emit infoMessage( i18n("Switching burn speed down to %1x").tqarg(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)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO );
+ emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(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.").arg(m_cdrecordBinObject->name()), ERROR );
+ emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").tqarg(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.").arg(d->usedSpeed), ERROR );
+ emit infoMessage( i18n("Unable to set write speed to %1.").tqarg(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.").arg("Cdrecord"), ERROR );
+ emit infoMessage( i18n("%1 has no permission to open the device.").tqarg("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).")
- .arg(m_cdrecordBinObject->name()).arg(p->exitStatus()),
+ .tqarg(m_cdrecordBinObject->name()).tqarg(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.").arg(m_cdrecordBinObject->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(m_cdrecordBinObject->name()),
ERROR );
jobFinished( false );
}
diff --git a/libk3b/projects/k3bcuefileparser.cpp b/libk3b/projects/k3bcuefileparser.cpp
index ad666b6..6c54c57 100644
--- a/libk3b/projects/k3bcuefileparser.cpp
+++ b/libk3b/projects/k3bcuefileparser.cpp
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqregexp.h>
#include <tqdir.h>
diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp
index 052315b..5e0f996 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").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
- *m_process << TQString("speed=%1").arg(burnSpeed());
+ *m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject));
+ *m_process << TQString("speed=%1").tqarg(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").arg( k3bcore->globalSettings()->writingBuffer() );
+ *m_process << TQString("fs=%1m").tqarg( 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.").arg(m_cdrecordBinObject->version), INFO );
+ emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(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 d38e0d2..fabaaed 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(slotCheckBufferStatus()) );
+// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBuffertqStatus()) );
}
@@ -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)")
- .arg((int)(speed*1385.0))
- .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO );
+ .tqarg((int)(speed*1385.0))
+ .tqarg(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").arg(strerror(exitCode-128)),
+ emit infoMessage( i18n("Fatal error at startup: %1").tqarg(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").arg(strerror(exitCode)),
+ emit infoMessage( i18n("Fatal error during recording: %1").tqarg(strerror(exitCode)),
K3bJob::ERROR );
}
}
@@ -295,7 +295,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode )
}
-void K3bGrowisofsHandler::slotCheckBufferStatus()
+void K3bGrowisofsHandler::slotCheckBuffertqStatus()
{
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(slotCheckBufferStatus()) );
+ TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBuffertqStatus()) );
}
else {
kdDebug() << "(K3bGrowisofsHandler) stopping buffer check." << endl;
diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h
index e07548b..7150fce 100644
--- a/libk3b/projects/k3bgrowisofshandler.h
+++ b/libk3b/projects/k3bgrowisofshandler.h
@@ -73,7 +73,7 @@ class K3bGrowisofsHandler : public TQObject
void flushingCache();
private slots:
- void slotCheckBufferStatus();
+ void slotCheckBuffertqStatus();
void slotCheckBufferStatusDone( K3bDevice::DeviceHandler* );
private:
diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp
index b17f9b8..2881036 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.").arg("growisofs"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").tqarg("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.").arg(d->growisofsBin->version),
+ "K3b needs at least version 5.10.").tqarg(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").arg("growisofs")
- .arg(d->growisofsBin->version).arg(d->growisofsBin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg("growisofs")
+ .tqarg(d->growisofsBin->version).tqarg(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.").arg(d->image), ERROR );
+ emit infoMessage( i18n("Could not open file %1.").tqarg(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").arg( speed%1385 > 0
+ *d->process << TQString("-speed=%1").tqarg( 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").arg(bufSize);
+ *d->process << TQString("-use-the-force-luke=bufsize:%1m").tqarg(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.").arg(d->growisofsBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").tqarg(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)")
- .arg(s).arg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO );
+ .tqarg(s).tqarg(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 bb2ee95..76d8e92 100644
--- a/libk3b/projects/k3bimagefilereader.cpp
+++ b/libk3b/projects/k3bimagefilereader.cpp
@@ -16,7 +16,7 @@
#include "k3bimagefilereader.h"
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
diff --git a/libk3b/projects/k3binffilewriter.cpp b/libk3b/projects/k3binffilewriter.cpp
index a652179..ecfb912 100644
--- a/libk3b/projects/k3binffilewriter.cpp
+++ b/libk3b/projects/k3binffilewriter.cpp
@@ -22,7 +22,7 @@
#include <k3bversion.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdatetime.h>
@@ -60,7 +60,7 @@ bool K3bInfFileWriter::save( TQTextStream& s )
// ----------------------
// header
s << "# Cdrecord-Inf-File written by K3b " << k3bcore->version()
- << ", " << TQDateTime::currentDateTime().toString() << endl
+ << ", " << TQDateTime::tqcurrentDateTime().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.device()->status() == IO_Ok );
+ return ( s.tqdevice()->status() == IO_Ok );
}
diff --git a/libk3b/projects/k3binffilewriter.h b/libk3b/projects/k3binffilewriter.h
index 1ad3c48..93164ed 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 <textstream.h>
+#include <tqtextstream.h>
#include <k3bmsf.h>
diff --git a/libk3b/projects/k3btocfilewriter.cpp b/libk3b/projects/k3btocfilewriter.cpp
index d7f00c5..249ef84 100644
--- a/libk3b/projects/k3btocfilewriter.cpp
+++ b/libk3b/projects/k3btocfilewriter.cpp
@@ -21,7 +21,7 @@
#include <k3bversion.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqdatetime.h>
@@ -149,7 +149,7 @@ bool K3bTocFileWriter::save( TQTextStream& t )
trackIndex++;
}
- return ( t.device()->status() == IO_Ok );
+ return ( t.tqdevice()->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::currentDateTime().toString() << endl << endl;
+ << ", " << TQDateTime::tqcurrentDateTime().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 8f2dabb..3127fca 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 <textstream.h>
+#include <tqtextstream.h>
#include <tqstringlist.h>
#include <k3btoc.h>
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp
index 556e606..e99a1f9 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").arg(m_doc->tempDir()), INFO );
+ emit infoMessage( i18n("Creating audio image files in %1").tqarg(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")
- .arg(m_msInfoFetcher->lastSessionStart())
- .arg(m_msInfoFetcher->nextSessionStart()+150) );
+ .tqarg(m_msInfoFetcher->lastSessionStart())
+ .tqarg(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")
- .arg(t)
- .arg(tt)
- .arg( track->title().isEmpty() || track->artist().isEmpty()
+ .tqarg(t)
+ .tqarg(tt)
+ .tqarg( 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(bufferStatus(int)) );
+ connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(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").arg(m_isoImager->size()) )->addArgument("-");
+ writer->addArgument( TQString("-tsize=%1s").tqarg(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")
- .arg(t)
- .arg(m_doc->numOfTracks())
- .arg( track->title().isEmpty() || track->artist().isEmpty()
+ .tqarg(t)
+ .tqarg(m_doc->numOfTracks())
+ .tqarg( track->title().isEmpty() || track->artist().isEmpty()
? TQString()
: " (" + track->artist() + " - " + track->title() + ")" ) );
else
- emit newSubTask( i18n("Writing track %1 of %2 (%3)").arg(t).arg(m_doc->numOfTracks()).arg(i18n("ISO9660 data")) );
+ emit newSubTask( i18n("Writing track %1 of %2 (%3)").tqarg(t).tqarg(m_doc->numOfTracks()).tqarg(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").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing second session of copy %1").tqarg(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").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing first session of copy %1").tqarg(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").arg(d->copiesDone+1) );
+ emit newTask( i18n("Writing Copy %1").tqarg(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").arg(m_isoImageFilePath) );
- emit infoMessage( i18n("Creating ISO image in %1").arg(m_isoImageFilePath), INFO );
+ emit newSubTask( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath) );
+ emit infoMessage( i18n("Creating ISO image in %1").tqarg(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.").arg(m_isoImageFilePath), ERROR );
+ emit infoMessage( i18n("Could not delete file %1.").tqarg(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.").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR );
+ emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").tqarg(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)" ).arg(m_doc->audioDoc()->title()) );
+ : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) );
else
return i18n("Writing Mixed Mode CD")
+ ( m_doc->audioDoc()->title().isEmpty()
? TQString()
- : TQString( " (%1)" ).arg(m_doc->audioDoc()->title()) );
+ : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) );
}
TQString K3bMixedJob::jobDetails() const
{
return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)")
- .arg(m_doc->numOfTracks())
- .arg(m_doc->audioDoc()->length().toString())
- .arg(KIO::convertSize(m_doc->dataDoc()->size()))
+ .tqarg(m_doc->numOfTracks())
+ .tqarg(m_doc->audioDoc()->length().toString())
+ .tqarg(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 06b1d31..cedf255 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.").arg(name) );
+ KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").tqarg(name) );
return;
}
diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
index b09f55d..79c70b3 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 <textstream.h>
+#include <tqtextstream.h>
#include <tqdir.h>
@@ -190,7 +190,7 @@ bool K3bMovixDocPreparer::writePlaylistFile()
return true;
}
else {
- emit infoMessage( i18n("Could not write to temporary file %1").arg(d->playlistFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").tqarg(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").arg(d->isolinuxConfigFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").tqarg(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").arg(d->movixRcFile->name()), ERROR );
+ emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->movixRcFile->name()), ERROR );
return false;
}
}
diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp
index eb8b276..8edcaae 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(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) );
+ connect( m_dataJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(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)").arg(m_doc->isoOptions().volumeID());
+ return i18n("Writing eMovix CD (%1)").tqarg(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()).arg(KIO::convertSize(m_doc->size()))
+ m_doc->movixFileItems().count()).tqarg(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 6f01d69..4c609db 100644
--- a/libk3b/projects/movixcd/k3bmovixprogram.cpp
+++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp
@@ -23,7 +23,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
K3bMovixProgram::K3bMovixProgram()
diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp
index 097d004..362511f 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(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) );
+ connect( m_dvdJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(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)").arg(m_doc->isoOptions().volumeID());
+ return i18n("Writing eMovix DVD (%1)").tqarg(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()).arg(KIO::convertSize(m_doc->size()))
+ m_doc->movixFileItems().count()).tqarg(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
index ceb31fc..31a7527 100644
--- a/libk3b/projects/videocd/cdi/cdi_vcd.app
+++ b/libk3b/projects/videocd/cdi/cdi_vcd.app
Binary files differ
diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp
index 272591a..a361d5d 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 <textstream.h>
+#include <tqtextstream.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." )
- .arg( i18n( "VCD" ) )
- .arg( i18n( "VCD" ) ),
+ .tqarg( i18n( "VCD" ) )
+ .tqarg( 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." )
- .arg( i18n( "SVCD" ) )
- .arg( i18n( "SVCD" ) )
+ .tqarg( i18n( "SVCD" ) )
+ .tqarg( 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." ).arg( count ) << endl;
+ kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).tqarg( 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'" ).arg( name ) << endl;
+ kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).tqarg( 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 1e92fc9..1878c31 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 <textstream.h>
+#include <tqtextstream.h>
#include <tqimage.h>
// Kde Includes
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp
index 18c5678..662145c 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" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS );
+ emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( 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" ).arg( m_cueFile ), K3bJob::SUCCESS );
+ emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( 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." ).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( "Could not find %1 executable." ).tqarg( "vcdxbuild" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO );
emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO );
cancelAll();
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." ).arg( "Vcdxbuild" ).arg( "0.7.12" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).tqarg( "Vcdxbuild" ).tqarg( "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" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO );
+ emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO );
*m_process << bin;
@@ -219,11 +219,11 @@ void K3bVcdJob::vcdxBuild()
*m_process << "--progress" << "--gui";
- *m_process << TQString( "--cue-file=%1" ).arg( m_cueFile );
+ *m_process << TQString( "--cue-file=%1" ).tqarg( m_cueFile );
- *m_process << TQString( "--bin-file=%1" ).arg( m_doc->vcdImage() );
+ *m_process << TQString( "--bin-file=%1" ).tqarg( m_doc->vcdImage() );
- *m_process << TQString( "%1" ).arg( TQFile::encodeName( m_xmlFile ).data() );
+ *m_process << TQString( "%1" ).tqarg( 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." ).arg( "vcdxbuild" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "Could not start %1." ).tqarg( "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)" ).arg( index + 1 ).arg( doc() ->numOfTracks() ).arg( m_currentWrittenTrack->fileName() ) );
+ emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).tqarg( index + 1 ).tqarg( doc() ->numOfTracks() ).tqarg( 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" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).tqarg( text ) << endl;
if ( ( text ).startsWith( "writing track" ) )
- emit newSubTask( i18n( "Creating Image for track %1" ).arg( ( text ).mid( 14 ) ) );
+ emit newSubTask( i18n( "Creating Image for track %1" ).tqarg( ( text ).mid( 14 ) ) );
else {
if ( level != "error" ) {
- kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).tqarg( text ) << endl;
parseInformation( text );
} else {
- kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).arg( text ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).tqarg( 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)." ).arg( "vcdxbuild" ).arg( m_process->exitStatus() ),
+ emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxbuild" ).tqarg( 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." ).arg( "Vcdxbuild" ), K3bJob::ERROR );
+ emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "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" ).arg( vcdDoc() ->onlyCreateImages() ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).tqarg( 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" ).arg( m_currentcopy ).arg( m_doc->copies() ) << endl;
+ kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( 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" ).arg( m_currentcopy ).arg( m_doc->copies() ) );
+ emit newTask( i18n( "Writing Copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( 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( bufferStatus( int ) ) );
+ connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( buffertqStatus( 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" ).arg( t ).arg( tt ) );
+ emit newSubTask( i18n( "Writing Track %1 of %2" ).tqarg( t ).tqarg( 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" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS );
+ emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( 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" ).arg( m_cueFile ), K3bJob::SUCCESS );
+ emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( 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" ).arg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING );
+ emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).tqarg( 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)" ).arg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).arg( 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)" ).tqarg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING );
emit infoMessage( i18n( "Ignoring this aps" ), K3bJob::INFO );
} else if ( text.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)" ).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 );
+ 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 );
}
}
@@ -558,7 +558,7 @@ TQString K3bVcdJob::jobDetails() const
{
return ( i18n( "1 MPEG (%1)",
"%n MPEGs (%1)",
- m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) )
+ m_doc->tracks() ->count() ).tqarg( 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 9b80a8d..854919f 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" ).arg( k3bcore->version() ) ),
+ m_publisher( TQString( "K3b - Version %1" ).tqarg( 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 3ed27f9..b008476 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" ).arg( mpeg_info->video[ i ].hsize ).arg( mpeg_info->video[ i ].vsize );
+ return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ i ].hsize ).tqarg( 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" ).arg( mpeg_info->video[ 2 ].hsize ).arg( mpeg_info->video[ 2 ].vsize );
+ return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ 2 ].hsize ).tqarg( 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" ).arg( mpeg_info->video[ i ].bitrate ) ;
+ return i18n( "%1 bit/s" ).tqarg( 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" ).arg( mpeg_info->audio[ i ].bitrate ) ;
+ return i18n( "%1 bit/s" ).tqarg( 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" ).arg( mpeg_info->audio[ i ].sampfreq ) ;
+ return i18n( "%1 Hz" ).tqarg( 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 " ).arg( mpeg_info->version ) + i18n( "Motion Picture" );
+ return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Motion Picture" );
} else {
- return TQString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Still Picture" );
+ return TQString( "MPEG%1 " ).tqarg( 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 " ).arg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).arg( mpeg_info->audio[ i ].layer );
+ return TQString( "MPEG%1 " ).tqarg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).tqarg( 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:" ).arg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
+ return TQString( "%1:" ).tqarg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
}
if ( mins != 0 ) {
- return TQString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 );
+ return TQString( "%1:" ).tqarg( 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 6881946..203f54f 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" ).arg( k3bcore->version() ).upper() );
+ addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).tqarg( 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" ).arg( TQFile::encodeName( filename ).data() ) );
+ elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( 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" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
- elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).arg( seqId ) );
+ elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
+ elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).tqarg( seqId ) );
// default entry
TQDomElement elemdefaultEntry;
elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" );
- elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).arg( seqId ) );
+ elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).tqarg( 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" ).arg( TQFile::encodeName( it.current() ->absPath() ).data() ) );
- elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).arg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) );
+ 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' ) ) );
}
}
@@ -232,7 +232,7 @@ bool K3bVcdXmlView::write( const TQString& fname )
}
m_xmlstring = xmlDoc.toString();
- kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).arg( fname ) << endl;
+ kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).tqarg( 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" ).arg( value ) );
+ TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( 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" ).arg( src ) );
+ elemFile.setAttribute( "src", TQString( "%1" ).tqarg( 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" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( 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" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::NEXT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "next" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::RETURN:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "return" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) );
break;
case K3bVcdTrack::DEFAULT:
elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "default" );
- elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( 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" ).arg( ref ).arg( TQString::number( index ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( 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" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).tqarg( ref ).tqarg( 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" ).arg( trackIt.key() ).arg( none ) << endl;
+ kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl;
while ( none < trackIt.key() ) {
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- 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() ) );
+ 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() ) );
none++;
}
if ( trackIt.data() ) {
TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence";
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- 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() ) );
+ 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() ) );
} else {
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" );
- addComment( doc, parent, TQString( "key %1 -> end" ).arg( trackIt.key() ) );
+ addComment( doc, parent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) );
}
none++;
}
} else {
// default reference to itSelf
elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" );
- elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).arg( ref ).arg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
+ elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) );
}
}
}
diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp
index 6192024..089f22d 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" ).arg( m_filename ) << endl;
+ kdDebug() << TQString( "Unable to open %1" ).tqarg( m_filename ) << endl;
return ;
}
if ( fseeko( m_mpegfile, 0, SEEK_END ) ) {
- kdDebug() << TQString( "Unable to seek in file %1" ).arg( m_filename ) << endl;
+ kdDebug() << TQString( "Unable to seek in file %1" ).tqarg( m_filename ) << endl;
return ;
}
llong lof = ftello( m_mpegfile );
if ( lof == -1 ) {
- kdDebug() << TQString( "Seeking to end of input file %1 failed." ).arg( m_filename ) << endl;
+ kdDebug() << TQString( "Seeking to end of input file %1 failed." ).tqarg( 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." ).arg( m_filename ) << endl;
- m_error_string = i18n( "File %1 is empty." ).arg( m_filename );
+ kdDebug() << TQString( "File %1 is empty." ).tqarg( m_filename ) << endl;
+ m_error_string = i18n( "File %1 is empty." ).tqarg( 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" ).arg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).arg( code, 0, 16 ) << endl;
+ 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;
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" ).arg( offset ) << endl;
+ kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).tqarg( 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" ).arg( offset ) << endl;
+ // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).tqarg( 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" ).arg( m_initial_TS ) << endl;
+ kdDebug() << TQString( "Initial TS = %1" ).tqarg( 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" ).arg( m_initial_TS ) << endl;
+ kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl;
}
} else {
- kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).arg( bits ) << endl;
+ kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).tqarg( 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" ).arg( offset ).arg( size ) << endl;
+ // kdDebug() << TQString( "offset = %1, size = %2" ).tqarg( offset ).tqarg( size ) << endl;
switch ( mark ) {
case MPEG_SYSTEM_HEADER_CODE:
- // kdDebug() << TQString( "Systemheader: %1" ).arg( m_code, 0, 16 ) << endl;
+ // kdDebug() << TQString( "Systemheader: %1" ).tqarg( 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" ).arg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "PrivateCode: %1" ).tqarg( mark, 0, 16 ) << endl;
break;
}
break;
case MPEG_PROGRAM_END_CODE:
- kdDebug() << TQString( "ProgramEndCode: %1" ).arg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "ProgramEndCode: %1" ).tqarg( mark, 0, 16 ) << endl;
offset += 4;
break;
case MPEG_PICTURE_CODE:
- kdDebug() << TQString( "PictureCode: %1" ).arg( mark, 0, 16 ) << endl;
+ kdDebug() << TQString( "PictureCode: %1" ).tqarg( 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)" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).tqarg( offset ).tqarg( m_filename ).tqarg( 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]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( 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]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl;
+ kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl;
return 0x11;
}
diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
index 859ed89..f175779 100644
--- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp
+++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <textstream.h>
+#include <tqtextstream.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'.").arg(d->tempPath), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath), ERROR );
return -1;
}
dir.cd( d->tempPath );
if( !dir.mkdir( "VIDEO_TS" ) ) {
- emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath + "/VIDEO_TS"), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath + "/VIDEO_TS"), ERROR );
return -1;
}
- for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->children() ); *it; ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) {
if( (*it)->isDir() ) {
- emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").arg((*it)->k3bName()), ERROR );
+ emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").tqarg((*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.").arg( d->tempPath ), ERROR );
+ emit infoMessage( i18n("Unable to link temporary file in folder %1.").tqarg( d->tempPath ), ERROR );
return -1;
}
}
@@ -148,7 +148,7 @@ int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& s
}
int num = 0;
- for( TQPtrListIterator<K3bDataItem> it( dirItem->children() ); it.current(); ++it ) {
+ for( TQPtrListIterator<K3bDataItem> it( dirItem->tqchildren() ); 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()->children() ); *it; ++it )
+ for( TQPtrListIterator<K3bDataItem> it( d->doc->videoTsDir()->tqchildren() ); *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 9b6a178..194dff7 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)" ).arg(m_doc->isoOptions().volumeID()) );
+ : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) );
}
}
TQString K3bVideoDvdJob::jobDetails() const
{
- return ( i18n("ISO9660/Udf Filesystem (Size: %1)").arg(KIO::convertSize( doc()->size() ))
+ return ( i18n("ISO9660/Udf Filesystem (Size: %1)").tqarg(KIO::convertSize( doc()->size() ))
+ ( m_doc->copies() > 1
? i18n(" - %n copy", " - %n copies", m_doc->copies())
: TQString() ) );