summaryrefslogtreecommitdiffstats
path: root/libk3b/jobs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:29:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:29:52 -0600
commitef5831dd5c8811c94c9b1bc1377a90174d17c82c (patch)
tree32b4c7307b74026be725950a33d6ec56d0561b3f /libk3b/jobs
parentdb733144770616f45d2d6e89bd3c424538a9fd92 (diff)
downloadk3b-ef5831dd5c8811c94c9b1bc1377a90174d17c82c.tar.gz
k3b-ef5831dd5c8811c94c9b1bc1377a90174d17c82c.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'libk3b/jobs')
-rw-r--r--libk3b/jobs/k3baudiocuefilewritingjob.cpp8
-rw-r--r--libk3b/jobs/k3baudiosessionreadingjob.cpp6
-rw-r--r--libk3b/jobs/k3bbinimagewritingjob.cpp6
-rw-r--r--libk3b/jobs/k3bblankingjob.cpp6
-rw-r--r--libk3b/jobs/k3bcdcopyjob.cpp54
-rw-r--r--libk3b/jobs/k3bcdda2wavreader.cpp10
-rw-r--r--libk3b/jobs/k3bclonejob.cpp16
-rw-r--r--libk3b/jobs/k3bclonetocreader.cpp2
-rw-r--r--libk3b/jobs/k3bdatatrackreader.cpp42
-rw-r--r--libk3b/jobs/k3bdvdcopyjob.cpp34
-rw-r--r--libk3b/jobs/k3bdvdformattingjob.cpp24
-rw-r--r--libk3b/jobs/k3biso9660imagewritingjob.cpp14
-rw-r--r--libk3b/jobs/k3breadcdreader.cpp24
-rw-r--r--libk3b/jobs/k3bverificationjob.cpp6
-rw-r--r--libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp26
-rw-r--r--libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp54
16 files changed, 166 insertions, 166 deletions
diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
index d66b529..c0c07d5 100644
--- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp
+++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
@@ -76,7 +76,7 @@ K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObjec
connect( m_audioJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_audioJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( m_audioJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) );
- connect( m_audioJob, TQT_SIGNAL(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_audioJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_audioJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_audioJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
@@ -252,19 +252,19 @@ void K3bAudioCueFileWritingJob::importCueInProject()
// now analyze the source
emit newTask( i18n("Analysing the audio file") );
- emit newSubTask( i18n("Analysing %1").tqarg( parser.imageFilename() ) );
+ emit newSubTask( i18n("Analysing %1").arg( parser.imageFilename() ) );
// start the analyser thread
m_analyserThread->setDecoder( m_decoder );
m_analyserJob->start();
}
else {
- emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").tqarg( m_cueFile ), ERROR );
+ emit infoMessage( i18n("Unable to handle '%1' due to an unsupported format.").arg( m_cueFile ), ERROR );
jobFinished(false);
}
}
else {
- emit infoMessage( i18n("No valid audio cue file: '%1'").tqarg( m_cueFile ), ERROR );
+ emit infoMessage( i18n("No valid audio cue file: '%1'").arg( m_cueFile ), ERROR );
jobFinished(false);
}
}
diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp
index 1946415..f85e138 100644
--- a/libk3b/jobs/k3baudiosessionreadingjob.cpp
+++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp
@@ -93,7 +93,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
toc = device->readToc();
if( !paranoia->initParanoia( device, toc ) ) {
- emitInfoMessage( i18n("Could not open device %1").tqarg(device->blockDeviceName()),
+ emitInfoMessage( i18n("Could not open device %1").arg(device->blockDeviceName()),
K3bJob::ERROR );
emitFinished(false);
return;
@@ -154,7 +154,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
}
if( !waveFileWriter->open( filenames[currentTrack-1] ) ) {
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(filenames[currentTrack-1]), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(filenames[currentTrack-1]), K3bJob::ERROR );
writeError = true;
break;
}
@@ -188,7 +188,7 @@ void K3bAudioSessionReadingJob::WorkThread::run()
device->block( false );
if( status != K3bCdparanoiaLib::S_OK ) {
- emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").tqarg(trackNum), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unrecoverable error while ripping track %1.").arg(trackNum), K3bJob::ERROR );
emitFinished(false);
return;
}
diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp
index 2fd0b60..50bac83 100644
--- a/libk3b/jobs/k3bbinimagewritingjob.cpp
+++ b/libk3b/jobs/k3bbinimagewritingjob.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
@@ -148,7 +148,7 @@ bool K3bBinImageWritingJob::prepareWriter()
connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(copyPercent(int)) );
connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(copySubPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
- connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(writerFinished(bool)) );
@@ -207,7 +207,7 @@ void K3bBinImageWritingJob::writerFinished(bool ok)
void K3bBinImageWritingJob::slotNextTrack( int t, int tt )
{
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) );
}
diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp
index 5781b2b..aeab621 100644
--- a/libk3b/jobs/k3bblankingjob.cpp
+++ b/libk3b/jobs/k3bblankingjob.cpp
@@ -131,9 +131,9 @@ void K3bBlankingJob::slotStartErasing()
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
K3bDevice::MEDIA_CD_RW,
i18n("Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(m_device->vendor())
- .tqarg(m_device->description())
- .tqarg(m_device->devicename()) ) < 0 ) {
+ .arg(m_device->vendor())
+ .arg(m_device->description())
+ .arg(m_device->devicename()) ) < 0 ) {
emit canceled();
jobFinished(false);
return;
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index 9a266bf..308da22 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -46,7 +46,7 @@
#include <tqstringlist.h>
#include <tqfile.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcstring.h>
#include <tqfileinfo.h>
#include <tqdir.h>
@@ -313,7 +313,7 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
unsigned long avail, size;
TQString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR );
+ emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
d->error = true;
canCopy = false;
}
@@ -379,7 +379,7 @@ void K3bCdCopyJob::slotCdTextReady( K3bDevice::DeviceHandler* dh )
if( dh->success() ) {
if( K3bDevice::CdText::checkCrc( dh->cdTextRaw() ) ) {
K3bDevice::CdText cdt( dh->cdTextRaw() );
- emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").tqarg(cdt.performer()).tqarg(cdt.title()), SUCCESS );
+ emit infoMessage( i18n("Found CD-TEXT (%1 - %2).").arg(cdt.performer()).arg(cdt.title()), SUCCESS );
d->haveCdText = true;
d->cdTextRaw = dh->cdTextRaw();
}
@@ -429,7 +429,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error )
d->cddbInfo = d->cddb->result();
d->haveCddb = true;
- emit infoMessage( i18n("Found Cddb entry (%1 - %2).").tqarg(d->cddbInfo.cdArtist).tqarg(d->cddbInfo.cdTitle), SUCCESS );
+ emit infoMessage( i18n("Found Cddb entry (%1 - %2).").arg(d->cddbInfo.cdArtist).arg(d->cddbInfo.cdTitle), SUCCESS );
// save the entry locally
KConfig* c = k3bcore->config();
@@ -441,7 +441,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error )
emit infoMessage( i18n("No Cddb entry found."), WARNING );
}
else {
- emit infoMessage( i18n("Cddb error (%1).").tqarg(d->cddb->errorString()), ERROR );
+ emit infoMessage( i18n("Cddb error (%1).").arg(d->cddb->errorString()), ERROR );
}
startCopy();
@@ -524,24 +524,24 @@ bool K3bCdCopyJob::prepareImageFiles()
m_tempPath = K3b::findUniqueFilePrefix( "k3bCdCopy", m_tempPath );
kdDebug() << "(K3bCdCopyJob) creating temp dir: " << m_tempPath << endl;
if( !dir.mkdir( m_tempPath, true ) ) {
- emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(m_tempPath), ERROR );
+ emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(m_tempPath), ERROR );
return false;
}
d->deleteTempDir = true;
}
m_tempPath = K3b::prepareDir( m_tempPath );
- emit infoMessage( i18n("Using temporary directory %1.").tqarg(m_tempPath), INFO );
+ emit infoMessage( i18n("Using temporary directory %1.").arg(m_tempPath), INFO );
// create temp filenames
int i = 1;
for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) {
if( (*it).type() == K3bDevice::Track::AUDIO ) {
- d->imageNames.append( m_tempPath + TQString("Track%1.wav").tqarg(TQString::number(i).rightJustify(2, '0')) );
- d->infNames.append( m_tempPath + TQString("Track%1.inf").tqarg(TQString::number(i).rightJustify(2, '0')) );
+ d->imageNames.append( m_tempPath + TQString("Track%1.wav").arg(TQString::number(i).rightJustify(2, '0')) );
+ d->infNames.append( m_tempPath + TQString("Track%1.inf").arg(TQString::number(i).rightJustify(2, '0')) );
}
else
- d->imageNames.append( m_tempPath + TQString("Track%1.iso").tqarg(TQString::number(i).rightJustify(2, '0')) );
+ d->imageNames.append( m_tempPath + TQString("Track%1.iso").arg(TQString::number(i).rightJustify(2, '0')) );
++i;
}
@@ -554,7 +554,7 @@ bool K3bCdCopyJob::prepareImageFiles()
else {
// we only need a single image file
if( !fi.isFile() ||
- questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_tempPath),
+ questionYesNo( i18n("Do you want to overwrite %1?").arg(m_tempPath),
i18n("File Exists") ) ) {
if( fi.isDir() )
m_tempPath = K3b::findTempFile( "iso", m_tempPath );
@@ -564,7 +564,7 @@ bool K3bCdCopyJob::prepareImageFiles()
}
// else the user specified a file in an existing dir
- emit infoMessage( i18n("Writing image file to %1.").tqarg(m_tempPath), INFO );
+ emit infoMessage( i18n("Writing image file to %1.").arg(m_tempPath), INFO );
}
else
return false;
@@ -580,12 +580,12 @@ void K3bCdCopyJob::readNextSession()
{
if( !m_onTheFly || m_onlyCreateImages ) {
if( d->numSessions > 1 )
- emit newTask( i18n("Reading Session %1").tqarg(d->currentReadSession) );
+ emit newTask( i18n("Reading Session %1").arg(d->currentReadSession) );
else
emit newTask( i18n("Reading Source Medium") );
if( d->currentReadSession == 1 )
- emit newSubTask( i18n("Reading track %1 of %2").tqarg(1).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Reading track %1 of %2").arg(1).arg(d->toc.count()) );
}
// there is only one situation where we need the audiosessionreader:
@@ -677,17 +677,17 @@ bool K3bCdCopyJob::writeNextSession()
// we emit our own task since the cdrecord task is way too simple
if( d->numSessions > 1 ) {
if( m_simulate )
- emit newTask( i18n("Simulating Session %1").tqarg(d->currentWrittenSession) );
+ emit newTask( i18n("Simulating Session %1").arg(d->currentWrittenSession) );
else if( m_copies > 1 )
- emit newTask( i18n("Writing Copy %1 (Session %2)").tqarg(d->doneCopies+1).tqarg(d->currentWrittenSession) );
+ emit newTask( i18n("Writing Copy %1 (Session %2)").arg(d->doneCopies+1).arg(d->currentWrittenSession) );
else
- emit newTask( i18n("Writing Copy (Session %2)").tqarg(d->currentWrittenSession) );
+ emit newTask( i18n("Writing Copy (Session %2)").arg(d->currentWrittenSession) );
}
else {
if( m_simulate )
emit newTask( i18n("Simulating") );
else if( m_copies > 1 )
- emit newTask( i18n("Writing Copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing Copy %1").arg(d->doneCopies+1) );
else
emit newTask( i18n("Writing Copy") );
}
@@ -713,7 +713,7 @@ bool K3bCdCopyJob::writeNextSession()
connect( d->cdrecordWriter, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWritingNextTrack(int, int)) );
- connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( d->cdrecordWriter, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( d->cdrecordWriter, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -923,7 +923,7 @@ bool K3bCdCopyJob::writeNextSession()
trackLen = trackLen * 2056; // see k3bdatatrackreader.h
else
trackLen = trackLen * 2332; // see k3bdatatrackreader.h
- d->cdrecordWriter->addArgument( TQString("-tsize=%1").tqarg(trackLen) )->addArgument("-");
+ d->cdrecordWriter->addArgument( TQString("-tsize=%1").arg(trackLen) )->addArgument("-");
}
else if( d->toc.contentType() == K3bDevice::MIXED )
d->cdrecordWriter->addArgument( d->imageNames[d->toc.count()-1] );
@@ -953,7 +953,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success )
if( success ) {
if( d->numSessions > 1 )
- emit infoMessage( i18n("Successfully read session %1.").tqarg(d->currentReadSession), SUCCESS );
+ emit infoMessage( i18n("Successfully read session %1.").arg(d->currentReadSession), SUCCESS );
else
emit infoMessage( i18n("Successfully read source disk."), SUCCESS );
@@ -987,7 +987,7 @@ void K3bCdCopyJob::slotSessionReaderFinished( bool success )
}
else {
if( !d->canceled ) {
- emit infoMessage( i18n("Error while reading session %1.").tqarg(d->currentReadSession), ERROR );
+ emit infoMessage( i18n("Error while reading session %1.").arg(d->currentReadSession), ERROR );
if( m_onTheFly )
d->cdrecordWriter->setSourceUnreadable(true);
}
@@ -1137,14 +1137,14 @@ void K3bCdCopyJob::slotWritingNextTrack( int t, int tt )
{
if( d->toc.contentType() == K3bDevice::MIXED ) {
if( d->currentWrittenSession == 1 )
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(d->toc.count()) );
else
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->toc.count()).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(d->toc.count()).arg(d->toc.count()) );
}
else if( d->numSessions > 1 )
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(d->currentWrittenSession).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(d->currentWrittenSession).arg(d->toc.count()) );
else
- emit newSubTask( i18n("Writing track %1 of %2").tqarg(t).tqarg(tt) );
+ emit newSubTask( i18n("Writing track %1 of %2").arg(t).arg(tt) );
}
@@ -1159,7 +1159,7 @@ void K3bCdCopyJob::slotReadingNextTrack( int t, int )
else
track = d->currentReadSession;
- emit newSubTask( i18n("Reading track %1 of %2").tqarg(track).tqarg(d->toc.count()) );
+ emit newSubTask( i18n("Reading track %1 of %2").arg(track).arg(d->toc.count()) );
}
}
diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp
index 5202fc4..cab71b9 100644
--- a/libk3b/jobs/k3bcdda2wavreader.cpp
+++ b/libk3b/jobs/k3bcdda2wavreader.cpp
@@ -95,7 +95,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
d->cdda2wavBin = k3bcore->externalBinManager()->binObject( "cdda2wav" );
if( !d->cdda2wavBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdda2wav"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("cdda2wav"), ERROR );
jobFinished(false);
d->running = false;
return;
@@ -115,7 +115,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
*d->process << d->cdda2wavBin->path;
*d->process << "-vall" << ( d->cdda2wavBin->hasFeature( "gui" ) ? "-gui" : "-g" );
if( d->cdda2wavBin->hasFeature( "dev" ) )
- *d->process << TQString("dev=%1").tqarg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin));
+ *d->process << TQString("dev=%1").arg(K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin));
else
*d->process << "-D" << K3bDevice::externalBinDeviceParameter(m_device, d->cdda2wavBin);
*d->process << ( d->cdda2wavBin->hasFeature( "bulk" ) ? "-bulk" : "-B" );
@@ -134,7 +134,7 @@ void K3bCdda2wavReader::start( bool onlyInfo )
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bCdda2wavReader) could not start cdda2wav" << endl;
- emit infoMessage( i18n("Could not start %1.").tqarg("cdda2wav"), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg("cdda2wav"), K3bJob::ERROR );
d->running = false;
jobFinished(false);
}
@@ -240,12 +240,12 @@ void K3bCdda2wavReader::slotProcessExited( KProcess* p )
}
else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .tqarg("Cdda2wav").tqarg(p->exitStatus()), ERROR );
+ .arg("Cdda2wav").arg(p->exitStatus()), ERROR );
jobFinished( false );
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Cdda2wav"),
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg("Cdda2wav"),
ERROR );
jobFinished( false );
}
diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp
index f8ce4f7..d11ebaa 100644
--- a/libk3b/jobs/k3bclonejob.cpp
+++ b/libk3b/jobs/k3bclonejob.cpp
@@ -85,13 +85,13 @@ void K3bCloneJob::start()
//
const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager()->binObject( "cdrecord" );
if( !cdrecordBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("cdrecord"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR );
jobFinished(false);
m_running = false;
return;
}
else if( !cdrecordBin->hasFeature( "clone" ) ) {
- emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").tqarg(cdrecordBin->version), ERROR );
+ emit infoMessage( i18n("Cdrecord version %1 does not have cloning support.").arg(cdrecordBin->version), ERROR );
jobFinished(false);
m_running = false;
return;
@@ -109,8 +109,8 @@ void K3bCloneJob::start()
if( !writer()->supportsWritingMode( K3bDevice::RAW_R96R ) &&
!writer()->supportsWritingMode( K3bDevice::RAW_R16 ) ) {
emit infoMessage( i18n("CD writer %1 does not support cloning.")
- .tqarg(writer()->vendor())
- .tqarg(writer()->description()), ERROR );
+ .arg(writer()->vendor())
+ .arg(writer()->description()), ERROR );
m_running = false;
jobFinished(false);
return;
@@ -180,7 +180,7 @@ void K3bCloneJob::prepareWriter()
connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) );
connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) );
connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
- connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -222,7 +222,7 @@ void K3bCloneJob::slotWriterPercent( int p )
void K3bCloneJob::slotWriterNextTrack( int t, int tt )
{
- emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(tt) );
+ emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) );
}
@@ -239,7 +239,7 @@ void K3bCloneJob::slotWriterFinished( bool success )
if( success ) {
d->doneCopies++;
- emit infoMessage( i18n("Successfully written clone copy %1.").tqarg(d->doneCopies), INFO );
+ emit infoMessage( i18n("Successfully written clone copy %1.").arg(d->doneCopies), INFO );
if( d->doneCopies < m_copies ) {
K3bDevice::eject( writer() );
@@ -330,7 +330,7 @@ void K3bCloneJob::startWriting()
if( m_simulate )
emit newTask( i18n("Simulating clone copy") );
else
- emit newTask( i18n("Writing clone copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing clone copy %1").arg(d->doneCopies+1) );
m_writerJob->start();
}
diff --git a/libk3b/jobs/k3bclonetocreader.cpp b/libk3b/jobs/k3bclonetocreader.cpp
index 2122937..529e49f 100644
--- a/libk3b/jobs/k3bclonetocreader.cpp
+++ b/libk3b/jobs/k3bclonetocreader.cpp
@@ -22,7 +22,7 @@
#include <k3bglobals.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp
index 9ff5dd5..873a1b8 100644
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@ -109,7 +109,7 @@ void K3bDataTrackReader::WorkThread::run()
emitStarted();
if( !m_device->open() ) {
- emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -142,7 +142,7 @@ void K3bDataTrackReader::WorkThread::run()
}
if( !m_libcss->open(m_device) ) {
- emitInfoMessage( i18n("Could not open device %1").tqarg(m_device->blockDeviceName()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Could not open device %1").arg(m_device->blockDeviceName()), K3bJob::ERROR );
emitFinished(false);
return;
}
@@ -183,14 +183,14 @@ void K3bDataTrackReader::WorkThread::run()
}
}
- emitInfoMessage( i18n("Reading with sector size %1.").tqarg(m_usedSectorSize), K3bJob::INFO );
+ emitInfoMessage( i18n("Reading with sector size %1.").arg(m_usedSectorSize), K3bJob::INFO );
emitDebuggingOutput( "K3bDataTrackReader",
TQString("reading sectors %1 to %2 with sector size %3. Length: %4 sectors, %5 bytes.")
- .tqarg( m_firstSector.lba() )
- .tqarg( m_lastSector.lba() )
- .tqarg( m_usedSectorSize )
- .tqarg( m_lastSector.lba() - m_firstSector.lba() + 1 )
- .tqarg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) );
+ .arg( m_firstSector.lba() )
+ .arg( m_lastSector.lba() )
+ .arg( m_usedSectorSize )
+ .arg( m_lastSector.lba() - m_firstSector.lba() + 1 )
+ .arg( TQ_UINT64(m_usedSectorSize) * (TQ_UINT64)(m_lastSector.lba() - m_firstSector.lba() + 1) ) );
TQFile file;
if( m_fd == -1 ) {
@@ -199,7 +199,7 @@ void K3bDataTrackReader::WorkThread::run()
m_device->close();
if( m_useLibdvdcss )
m_libcss->close();
- emitInfoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), K3bJob::ERROR );
+ emitInfoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), K3bJob::ERROR );
emitFinished( false );
return;
}
@@ -231,7 +231,7 @@ void K3bDataTrackReader::WorkThread::run()
// s_bufferSizeSectors = K3bDevice::determineMaxReadingBufferSize( m_device, m_firstSector );
if( s_bufferSizeSectors <= 0 ) {
- emitInfoMessage( i18n("Error while reading sector %1.").tqarg(m_firstSector.lba()), K3bJob::ERROR );
+ emitInfoMessage( i18n("Error while reading sector %1.").arg(m_firstSector.lba()), K3bJob::ERROR );
emitFinished(false);
m_device->block( false );
k3bcore->unblockDevice( m_device );
@@ -239,7 +239,7 @@ void K3bDataTrackReader::WorkThread::run()
}
kdDebug() << "(K3bDataTrackReader) using buffer size of " << s_bufferSizeSectors << " blocks." << endl;
- emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").tqarg( s_bufferSizeSectors ) );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString("using buffer size of %1 blocks.").arg( s_bufferSizeSectors ) );
// 2. get it on
K3b::Msf currentSector = m_firstSector;
@@ -279,7 +279,7 @@ void K3bDataTrackReader::WorkThread::run()
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Error while writing to fd %1. Current sector is %2.")
- .tqarg(m_fd).tqarg(currentSector.lba()-m_firstSector.lba()) );
+ .arg(m_fd).arg(currentSector.lba()-m_firstSector.lba()) );
writeError = true;
break;
}
@@ -290,7 +290,7 @@ void K3bDataTrackReader::WorkThread::run()
<< " current sector: " << (currentSector.lba()-m_firstSector.lba()) << endl;
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Error while writing to file %1. Current sector is %2.")
- .tqarg(m_imagePath).tqarg(currentSector.lba()-m_firstSector.lba()) );
+ .arg(m_imagePath).arg(currentSector.lba()-m_firstSector.lba()) );
writeError = true;
break;
}
@@ -331,8 +331,8 @@ void K3bDataTrackReader::WorkThread::run()
emitDebuggingOutput( "K3bDataTrackReader",
TQString("Read a total of %1 sectors (%2 bytes)")
- .tqarg(totalReadSectors.lba())
- .tqarg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) );
+ .arg(totalReadSectors.lba())
+ .arg((TQ_UINT64)totalReadSectors.lba()*(TQ_UINT64)m_usedSectorSize) );
if( m_canceled )
emitCanceled();
@@ -386,8 +386,8 @@ int K3bDataTrackReader::WorkThread::read( unsigned char* buffer, unsigned long s
// here we read every single sector for itself to find the troubleing ones
bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned long startSector, unsigned int len )
{
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").tqarg(startSector) );
- emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").tqarg(startSector), K3bJob::WARNING );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Problem while reading. Retrying from sector %1.").arg(startSector) );
+ emitInfoMessage( i18n("Problem while reading. Retrying from sector %1.").arg(startSector), K3bJob::WARNING );
int sectorsRead = -1;
bool success = true;
@@ -403,16 +403,16 @@ bool K3bDataTrackReader::WorkThread::retryRead( unsigned char* buffer, unsigned
if( !success ) {
if( m_ignoreReadErrors ) {
- emitInfoMessage( i18n("Ignoring read error in sector %1.").tqarg(sector), K3bJob::ERROR );
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").tqarg(sector) );
+ emitInfoMessage( i18n("Ignoring read error in sector %1.").arg(sector), K3bJob::ERROR );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Ignoring read error in sector %1.").arg(sector) );
++m_errorSectorCount;
// ::memset( &buffer[i], 0, 1 );
success = true;
}
else {
- emitInfoMessage( i18n("Error while reading sector %1.").tqarg(sector), K3bJob::ERROR );
- emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").tqarg(sector) );
+ emitInfoMessage( i18n("Error while reading sector %1.").arg(sector), K3bJob::ERROR );
+ emitDebuggingOutput( "K3bDataTrackReader", TQString( "Read error in sector %1.").arg(sector) );
break;
}
}
diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp
index b123e24..d5382a3 100644
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
@@ -122,7 +122,7 @@ void K3bDvdCopyJob::start()
k3bcore->externalBinManager()->binObject( "growisofs" )->version < K3bVersion( 5, 12 ) ) {
m_onTheFly = false;
emit infoMessage( i18n("K3b does not support writing on-the-fly with growisofs %1.")
- .tqarg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR );
+ .arg(k3bcore->externalBinManager()->binObject( "growisofs" )->version), ERROR );
emit infoMessage( i18n("Disabling on-the-fly writing."), INFO );
}
@@ -295,7 +295,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
//
TQFileInfo fi( m_imagePath );
if( !fi.isFile() ||
- questionYesNo( i18n("Do you want to overwrite %1?").tqarg(m_imagePath),
+ questionYesNo( i18n("Do you want to overwrite %1?").arg(m_imagePath),
i18n("File Exists") ) ) {
if( fi.isDir() )
m_imagePath = K3b::findTempFile( "iso", m_imagePath );
@@ -305,7 +305,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
}
// else the user specified a file in an existing dir
- emit infoMessage( i18n("Writing image file to %1.").tqarg(m_imagePath), INFO );
+ emit infoMessage( i18n("Writing image file to %1.").arg(m_imagePath), INFO );
emit newSubTask( i18n("Reading source medium.") );
}
@@ -316,7 +316,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
unsigned long avail, size;
TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").tqarg(pathToTest), ERROR );
+ emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
jobFinished(false);
d->running = false;
return;
@@ -332,7 +332,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
d->imageFile.setName( m_imagePath );
if( !d->imageFile.open( IO_WriteOnly ) ) {
- emit infoMessage( i18n("Unable to open '%1' for writing.").tqarg(m_imagePath), ERROR );
+ emit infoMessage( i18n("Unable to open '%1' for writing.").arg(m_imagePath), ERROR );
jobFinished( false );
d->running = false;
return;
@@ -353,7 +353,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
if( m_simulate )
emit newTask( i18n("Simulating DVD copy") );
else if( m_copies > 1 )
- emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
else
emit newTask( i18n("Writing DVD copy") );
@@ -434,7 +434,7 @@ void K3bDvdCopyJob::prepareWriter()
connect( d->writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) );
connect( d->writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
connect( d->writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) );
- connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( d->writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( d->writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( d->writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( d->writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) );
@@ -548,7 +548,7 @@ void K3bDvdCopyJob::slotReaderFinished( bool success )
if( waitForDvd() ) {
prepareWriter();
if( m_copies > 1 )
- emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
else
emit newTask( i18n("Writing DVD copy") );
@@ -597,7 +597,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
}
if( success ) {
- emit infoMessage( i18n("Successfully written DVD copy %1.").tqarg(d->doneCopies+1), INFO );
+ emit infoMessage( i18n("Successfully written DVD copy %1.").arg(d->doneCopies+1), INFO );
if( d->verifyData && !m_simulate ) {
if( !d->verificationJob ) {
@@ -620,7 +620,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
d->verificationJob->addTrack( 1, d->inPipe.checksum(), d->lastSector+1 );
if( m_copies > 1 )
- emit newTask( i18n("Verifying DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Verifying DVD copy %1").arg(d->doneCopies+1) );
else
emit newTask( i18n("Verifying DVD copy") );
@@ -637,7 +637,7 @@ void K3bDvdCopyJob::slotWriterFinished( bool success )
if( waitForDvd() ) {
prepareWriter();
- emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
emit burning(true);
@@ -686,7 +686,7 @@ void K3bDvdCopyJob::slotVerificationFinished( bool success )
if( waitForDvd() ) {
prepareWriter();
- emit newTask( i18n("Writing DVD copy %1").tqarg(d->doneCopies+1) );
+ emit newTask( i18n("Writing DVD copy %1").arg(d->doneCopies+1) );
emit burning(true);
@@ -790,8 +790,8 @@ bool K3bDvdCopyJob::waitForDvd()
if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. "
"Do you really want to continue? The media will be written "
"for real.")
- .tqarg(m_writerDevice->vendor())
- .tqarg(m_writerDevice->description()),
+ .arg(m_writerDevice->vendor())
+ .arg(m_writerDevice->description()),
i18n("No Simulation with DVD-R(W)") ) ) {
cancel();
return false;
@@ -839,11 +839,11 @@ bool K3bDvdCopyJob::waitForDvd()
if( m_writingMode == K3b::DAO ) {
// ( m_writingMode == K3b::WRITING_MODE_AUTO &&
// ( sizeWithDao || !m_onTheFly ) ) ) {
- emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO );
d->usedWritingMode = K3b::DAO;
}
else {
- emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(m, true) ), INFO );
+ emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(m, true) ), INFO );
d->usedWritingMode = K3b::WRITING_MODE_INCR_SEQ;
}
}
@@ -859,7 +859,7 @@ void K3bDvdCopyJob::removeImageFiles()
{
if( TQFile::exists( m_imagePath ) ) {
d->imageFile.remove();
- emit infoMessage( i18n("Removed image file %1").tqarg(m_imagePath), K3bJob::SUCCESS );
+ emit infoMessage( i18n("Removed image file %1").arg(m_imagePath), K3bJob::SUCCESS );
}
}
diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp
index 46c8563..21858e4 100644
--- a/libk3b/jobs/k3bdvdformattingjob.cpp
+++ b/libk3b/jobs/k3bdvdformattingjob.cpp
@@ -142,7 +142,7 @@ void K3bDvdFormattingJob::start()
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY,
K3bDevice::MEDIA_WRITABLE_DVD,
i18n("Please insert a rewritable DVD medium into drive<p><b>%1 %2 (%3)</b>.")
- .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) {
+ .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) {
emit canceled();
d->running = false;
jobFinished(false);
@@ -267,7 +267,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
d->success = true;
}
else {
- emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdFormatBin->name()).tqarg(p->exitStatus()),
+ emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdFormatBin->name()).arg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
@@ -275,7 +275,7 @@ void K3bDvdFormattingJob::slotProcessFinished( KProcess* p )
}
}
else {
- emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdFormatBin->name()),
+ emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdFormatBin->name()),
ERROR );
d->success = false;
}
@@ -362,7 +362,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
if( diskInfo.mediaType() == K3bDevice::MEDIA_DVD_PLUS_RW ) {
- emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)),
+ emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)),
INFO );
// mode is ignored
@@ -375,7 +375,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
}
else {
emit infoMessage( i18n("No need to format %1 media more than once.")
- .tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO );
+ .arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_PLUS_RW)), INFO );
emit infoMessage( i18n("It may simply be overwritten."), INFO );
if( d->force ) {
@@ -401,11 +401,11 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
//
else { // MEDIA_DVD_RW
- emit infoMessage( i18n("Found %1 media.").tqarg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)),
+ emit infoMessage( i18n("Found %1 media.").arg(K3bDevice::mediaTypeString(K3bDevice::MEDIA_DVD_RW)),
INFO );
if( diskInfo.currentProfile() != K3bDevice::MEDIA_UNKNOWN ) {
- emit infoMessage( i18n("Formatted in %1 mode.").tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
+ emit infoMessage( i18n("Formatted in %1 mode.").arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
//
@@ -428,7 +428,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
else if( diskInfo.currentProfile() == K3bDevice::MEDIA_DVD_RW_OVWR &&
d->mode != K3b::WRITING_MODE_INCR_SEQ ) {
emit infoMessage( i18n("No need to format %1 media more than once.")
- .tqarg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
+ .arg(K3bDevice::mediaTypeString(diskInfo.currentProfile())), INFO );
emit infoMessage( i18n("It may simply be overwritten."), INFO );
if( d->force )
@@ -448,7 +448,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
}
emit newSubTask( i18n("Formatting"
- " DVD-RW in %1 mode.").tqarg(K3bDevice::mediaTypeString( blank ?
+ " DVD-RW in %1 mode.").arg(K3bDevice::mediaTypeString( blank ?
K3bDevice::MEDIA_DVD_RW_SEQ :
K3bDevice::MEDIA_DVD_RW_OVWR )) );
}
@@ -472,14 +472,14 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" );
if( !d->dvdFormatBin ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("dvd+rw-format"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-format"), ERROR );
d->running = false;
jobFinished(false);
return;
}
if( !d->dvdFormatBin->copyright.isEmpty() )
- emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(d->dvdFormatBin->name()).tqarg(d->dvdFormatBin->version).tqarg(d->dvdFormatBin->copyright), INFO );
+ emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(d->dvdFormatBin->name()).arg(d->dvdFormatBin->version).arg(d->dvdFormatBin->copyright), INFO );
*d->process << d->dvdFormatBin;
@@ -517,7 +517,7 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo )
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bDvdFormattingJob) could not start " << d->dvdFormatBin->path << endl;
- emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdFormatBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(d->dvdFormatBin->name()), K3bJob::ERROR );
d->running = false;
jobFinished(false);
}
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp
index cf63da4..bc24d81 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.cpp
+++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp
@@ -37,7 +37,7 @@
#include <kio/global.h>
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <tqapplication.h>
@@ -86,7 +86,7 @@ void K3bIso9660ImageWritingJob::start()
emit newTask( i18n("Preparing data") );
if( !TQFile::exists( m_imagePath ) ) {
- emit infoMessage( i18n("Could not find image %1").tqarg(m_imagePath), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not find image %1").arg(m_imagePath), K3bJob::ERROR );
jobFinished( false );
return;
}
@@ -133,7 +133,7 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success )
if( m_copies == 1 )
emit newTask( i18n("Verifying written data") );
else
- emit newTask( i18n("Verifying written copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) );
+ emit newTask( i18n("Verifying written copy %1 of %2").arg(m_currentCopy).arg(m_copies) );
m_verifyJob->start();
}
@@ -200,7 +200,7 @@ void K3bIso9660ImageWritingJob::slotNextTrack( int, int )
if( m_copies == 1 )
emit newSubTask( i18n("Writing image") );
else
- emit newSubTask( i18n("Writing copy %1 of %2").tqarg(m_currentCopy).tqarg(m_copies) );
+ emit newSubTask( i18n("Writing copy %1 of %2").arg(m_currentCopy).arg(m_copies) );
}
@@ -350,7 +350,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
writer->addArgument("-data");
// read from stdin
- writer->addArgument( TQString("-tsize=%1s").tqarg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" );
+ writer->addArgument( TQString("-tsize=%1s").arg( K3b::imageFilesize( m_imagePath )/2048 ) )->addArgument( "-" );
m_writer = writer;
}
@@ -424,7 +424,7 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType )
connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) );
connect( m_writer, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) );
connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) );
- connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(buffertqStatus(int)) );
+ connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) );
connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) );
connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) );
connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) );
@@ -451,7 +451,7 @@ TQString K3bIso9660ImageWritingJob::jobDescription() const
TQString K3bIso9660ImageWritingJob::jobDetails() const
{
- return m_imagePath.section("/", -1) + TQString( " (%1)" ).tqarg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
+ return m_imagePath.section("/", -1) + TQString( " (%1)" ).arg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath))));
}
diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp
index fb2a7bd..b8b2b0a 100644
--- a/libk3b/jobs/k3breadcdreader.cpp
+++ b/libk3b/jobs/k3breadcdreader.cpp
@@ -104,7 +104,7 @@ void K3bReadcdReader::start()
// the first thing to do is to check for readcd
d->readcdBinObject = k3bcore->externalBinManager()->binObject( "readcd" );
if( !d->readcdBinObject ) {
- emit infoMessage( i18n("Could not find %1 executable.").tqarg("readcd"), ERROR );
+ emit infoMessage( i18n("Could not find %1 executable.").arg("readcd"), ERROR );
jobFinished(false);
return;
}
@@ -120,7 +120,7 @@ void K3bReadcdReader::start()
for( TQPtrListIterator<K3bExternalBin> it( readcdBins ); it.current(); ++it ) {
if( it.current()->hasFeature( "clone" ) ) {
d->readcdBinObject = it.current();
- emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").tqarg(d->readcdBinObject->version), INFO );
+ emit infoMessage( i18n("Using readcd %1 instead of default version for clone support.").arg(d->readcdBinObject->version), INFO );
foundCloneSupport = true;
break;
}
@@ -148,10 +148,10 @@ void K3bReadcdReader::start()
*d->process << "-v";
// Again we assume the device to be set!
- *d->process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(m_readDevice,
+ *d->process << TQString("dev=%1").arg(K3b::externalBinDeviceParameter(m_readDevice,
d->readcdBinObject));
if( m_speed > 0 )
- *d->process << TQString("speed=%1").tqarg(m_speed);
+ *d->process << TQString("speed=%1").arg(m_speed);
// output
@@ -160,8 +160,8 @@ void K3bReadcdReader::start()
d->process->dupStdout( d->fdToWriteTo );
}
else {
- emit newTask( i18n("Writing image to %1.").tqarg(m_imagePath) );
- emit infoMessage( i18n("Writing image to %1.").tqarg(m_imagePath), INFO );
+ emit newTask( i18n("Writing image to %1.").arg(m_imagePath) );
+ emit infoMessage( i18n("Writing image to %1.").arg(m_imagePath), INFO );
*d->process << "f=" + m_imagePath;
}
@@ -177,11 +177,11 @@ void K3bReadcdReader::start()
if( m_c2Scan )
*d->process << "-c2scan";
- *d->process << TQString("retries=%1").tqarg(m_retries);
+ *d->process << TQString("retries=%1").arg(m_retries);
// readcd does not read the last sector specified
if( d->firstSector < d->lastSector )
- *d->process << TQString("sectors=%1-%2").tqarg(d->firstSector.lba()).tqarg(d->lastSector.lba()+1);
+ *d->process << TQString("sectors=%1-%2").arg(d->firstSector.lba()).arg(d->lastSector.lba()+1);
// Joerg sais it is a Linux kernel bug, anyway, with the default value it does not work
*d->process << "ts=128k";
@@ -276,7 +276,7 @@ void K3bReadcdReader::slotStdLine( const TQString& line )
kdError() << "(K3bReadcdReader) problemSector parsing error in line: "
<< line.mid( pos, line.find( TQRegExp("\\D"), pos )-pos ) << endl;
}
- emit infoMessage( i18n("Retrying from sector %1.").tqarg(problemSector), INFO );
+ emit infoMessage( i18n("Retrying from sector %1.").arg(problemSector), INFO );
}
else if( (pos = line.find("Error on sector")) >= 0 ) {
@@ -291,10 +291,10 @@ void K3bReadcdReader::slotStdLine( const TQString& line )
}
if( line.contains( "not corrected") ) {
- emit infoMessage( i18n("Uncorrected error in sector %1").tqarg(problemSector), ERROR );
+ emit infoMessage( i18n("Uncorrected error in sector %1").arg(problemSector), ERROR );
}
else {
- emit infoMessage( i18n("Corrected error in sector %1").tqarg(problemSector), ERROR );
+ emit infoMessage( i18n("Corrected error in sector %1").arg(problemSector), ERROR );
}
}
@@ -314,7 +314,7 @@ void K3bReadcdReader::slotProcessExited( KProcess* p )
jobFinished( true );
}
else {
- emit infoMessage( i18n("%1 returned error: %2").tqarg("Readcd").tqarg(p->exitStatus()), ERROR );
+ emit infoMessage( i18n("%1 returned error: %2").arg("Readcd").arg(p->exitStatus()), ERROR );
jobFinished( false );
}
}
diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp
index 5b8cc62..e5333fe 100644
--- a/libk3b/jobs/k3bverificationjob.cpp
+++ b/libk3b/jobs/k3bverificationjob.cpp
@@ -203,7 +203,7 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh )
if( (int)d->toc.count() < (*it).trackNumber ) {
if ( d->mediumHasBeenReloaded ) {
emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)")
- .tqarg( "Specified track number not found on medium" ), ERROR );
+ .arg( "Specified track number not found on medium" ), ERROR );
jobFinished( false );
return;
}
@@ -236,7 +236,7 @@ void K3bVerificationJob::readTrack( int trackIndex )
return;
}
- emit newTask( i18n("Verifying track %1").tqarg( d->tracks[trackIndex].trackNumber ) );
+ emit newTask( i18n("Verifying track %1").arg( d->tracks[trackIndex].trackNumber ) );
d->pipe.open();
@@ -304,7 +304,7 @@ void K3bVerificationJob::slotMd5JobFinished( bool success )
if( success && !d->canceled && d->readSuccessful ) {
// compare the two sums
if( d->tracks[d->currentTrackIndex].checksum != d->md5Job->hexDigest() ) {
- emit infoMessage( i18n("Written data in track %1 differs from original.").tqarg(d->tracks[d->currentTrackIndex].trackNumber), ERROR );
+ emit infoMessage( i18n("Written data in track %1 differs from original.").arg(d->tracks[d->currentTrackIndex].trackNumber), ERROR );
jobFinished(false);
}
else {
diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
index cf30eed..96d9619 100644
--- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp
@@ -88,15 +88,15 @@ void K3bVideoDVDTitleDetectClippingJob::start()
d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode");
if( !d->usedTranscodeBin ) {
- emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR );
+ emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR );
jobFinished( false );
return;
}
if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){
emit infoMessage( i18n("%1 version %2 is too old.")
- .tqarg("transcode")
- .tqarg(d->usedTranscodeBin->version), ERROR );
+ .arg("transcode")
+ .arg(d->usedTranscodeBin->version), ERROR );
jobFinished( false );
return;
}
@@ -105,11 +105,11 @@ void K3bVideoDVDTitleDetectClippingJob::start()
if( !d->usedTranscodeBin->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
- .tqarg(d->usedTranscodeBin->name())
- .tqarg(d->usedTranscodeBin->version)
- .tqarg(d->usedTranscodeBin->copyright), INFO );
+ .arg(d->usedTranscodeBin->name())
+ .arg(d->usedTranscodeBin->version)
+ .arg(d->usedTranscodeBin->copyright), INFO );
- emit newTask( i18n("Analysing Title %1 of Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) );
+ emit newTask( i18n("Analysing Title %1 of Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) );
startTranscode( 1 );
}
@@ -151,16 +151,16 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
*d->process << "-i" << m_dvd.device()->blockDeviceName();
// select the title number and chapter
- *d->process << "-T" << TQString("%1,%2").tqarg(m_titleNumber).tqarg(chapter);
+ *d->process << "-T" << TQString("%1,%2").arg(m_titleNumber).arg(chapter);
// null output
*d->process << "-y" << "null,null" << "-o" << "/dev/null";
// analyze the first 200 frames
- *d->process << "-J" << TQString("detectclipping=range=0-%1/5").tqarg(d->currentFrames);
+ *d->process << "-J" << TQString("detectclipping=range=0-%1/5").arg(d->currentFrames);
// also only decode the first 200 frames
- *d->process << "-c" << TQString("0-%1").tqarg(d->currentFrames+1);
+ *d->process << "-c" << TQString("0-%1").arg(d->currentFrames+1);
// additional user parameters from config
const TQStringList& params = d->usedTranscodeBin->userParameters();
@@ -181,11 +181,11 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter )
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
- emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
- emit newSubTask( i18n("Analysing Chapter %1 of %2").tqarg(chapter).tqarg(m_dvd[m_titleNumber-1].numPTTs()) );
+ emit newSubTask( i18n("Analysing Chapter %1 of %2").arg(chapter).arg(m_dvd[m_titleNumber-1].numPTTs()) );
emit subPercent( 0 );
}
}
@@ -279,7 +279,7 @@ void K3bVideoDVDTitleDetectClippingJob::slotTranscodeExited( KProcess* p )
}
else {
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()),
+ .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
}
diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
index 96d670b..fd115ff 100644
--- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -87,15 +87,15 @@ void K3bVideoDVDTitleTranscodingJob::start()
d->usedTranscodeBin = k3bcore->externalBinManager()->binObject("transcode");
if( !d->usedTranscodeBin ) {
- emit infoMessage( i18n("%1 executable could not be found.").tqarg("transcode"), ERROR );
+ emit infoMessage( i18n("%1 executable could not be found.").arg("transcode"), ERROR );
jobFinished( false );
return;
}
if( d->usedTranscodeBin->version < K3bVersion( 1, 0, 0 ) ){
emit infoMessage( i18n("%1 version %2 is too old.")
- .tqarg("transcode")
- .tqarg(d->usedTranscodeBin->version), ERROR );
+ .arg("transcode")
+ .arg(d->usedTranscodeBin->version), ERROR );
jobFinished( false );
return;
}
@@ -104,9 +104,9 @@ void K3bVideoDVDTitleTranscodingJob::start()
if( !d->usedTranscodeBin->copyright.isEmpty() )
emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3")
- .tqarg(d->usedTranscodeBin->name())
- .tqarg(d->usedTranscodeBin->version)
- .tqarg(d->usedTranscodeBin->copyright), INFO );
+ .arg(d->usedTranscodeBin->name())
+ .arg(d->usedTranscodeBin->version)
+ .arg(d->usedTranscodeBin->copyright), INFO );
//
// Let's take a look at the filename
@@ -119,11 +119,11 @@ void K3bVideoDVDTitleTranscodingJob::start()
TQFileInfo fileInfo( m_filename );
TQFileInfo dirInfo( fileInfo.dirPath() );
if( !dirInfo.exists() && !KStandardDirs::makeDir( dirInfo.absFilePath() ) ) {
- emit infoMessage( i18n("Unable to create folder '%1'").tqarg(dirInfo.filePath()), ERROR );
+ emit infoMessage( i18n("Unable to create folder '%1'").arg(dirInfo.filePath()), ERROR );
return;
}
else if( !dirInfo.isDir() || !dirInfo.isWritable() ) {
- emit infoMessage( i18n("Invalid filename: '%1'").tqarg(m_filename), ERROR );
+ emit infoMessage( i18n("Invalid filename: '%1'").arg(m_filename), ERROR );
jobFinished( false );
return;
}
@@ -134,7 +134,7 @@ void K3bVideoDVDTitleTranscodingJob::start()
//
d->twoPassEncodingLogFile = K3b::findTempFile( "log" );
- emit newTask( i18n("Transcoding title %1 from Video DVD %2").tqarg(m_titleNumber).tqarg(m_dvd.volumeIdentifier()) );
+ emit newTask( i18n("Transcoding title %1 from Video DVD %2").arg(m_titleNumber).arg(m_dvd.volumeIdentifier()) );
//
// Ok then, let's begin
@@ -159,7 +159,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
break;
default:
- emit infoMessage( i18n("Invalid Video codec set: %1").tqarg(m_videoCodec), ERROR );
+ emit infoMessage( i18n("Invalid Video codec set: %1").arg(m_videoCodec), ERROR );
jobFinished( false );
return;
}
@@ -182,7 +182,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
break;
default:
- emit infoMessage( i18n("Invalid Audio codec set: %1").tqarg(m_audioCodec), ERROR );
+ emit infoMessage( i18n("Invalid Audio codec set: %1").arg(m_audioCodec), ERROR );
jobFinished( false );
return;
}
@@ -218,7 +218,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
*d->process << "-x" << "dvd";
// select the title number
- *d->process << "-T" << TQString("%1,-1,1").tqarg( m_titleNumber );
+ *d->process << "-T" << TQString("%1,-1,1").arg( m_titleNumber );
// select the audio stream to extract
if ( m_dvd[m_titleNumber-1].numAudioStreams() > 0 )
@@ -226,14 +226,14 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
// clipping
*d->process << "-j" << TQString("%1,%2,%3,%4")
- .tqarg(m_clippingTop)
- .tqarg(m_clippingLeft)
- .tqarg(m_clippingBottom)
- .tqarg(m_clippingRight);
+ .arg(m_clippingTop)
+ .arg(m_clippingLeft)
+ .arg(m_clippingBottom)
+ .arg(m_clippingRight);
// select the encoding type (single pass or two-pass) and the log file for two-pass encoding
// the latter is unused for pass = 0
- *d->process << "-R" << TQString("%1,%2").tqarg( pass ).tqarg( d->twoPassEncodingLogFile );
+ *d->process << "-R" << TQString("%1,%2").arg( pass ).arg( d->twoPassEncodingLogFile );
// depending on the pass we use different options
if( pass != 1 ) {
@@ -249,7 +249,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
}
else {
// audio quality settings
- *d->process << "-b" << TQString("%1,%2").tqarg(m_audioBitrate).tqarg(m_audioVBR ? 1 : 0);
+ *d->process << "-b" << TQString("%1,%2").arg(m_audioBitrate).arg(m_audioVBR ? 1 : 0);
// resample audio stream to 44.1 khz
if( m_resampleAudio )
@@ -261,7 +261,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
}
else {
// gather information about the video stream, ignore audio
- *d->process << "-y" << TQString("%1,null").tqarg( videoCodecString );
+ *d->process << "-y" << TQString("%1,null").arg( videoCodecString );
// we ignore the output from the first pass
*d->process << "-o" << "/dev/null";
@@ -317,8 +317,8 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
// we only give information about the resizing of the video once
if( pass < 2 )
- emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").tqarg(m_titleNumber).tqarg(usedWidth).tqarg(usedHeight), INFO );
- *d->process << "-Z" << TQString("%1x%2").tqarg(usedWidth).tqarg(usedHeight);
+ emit infoMessage( i18n("Resizing picture of title %1 to %2x%3").arg(m_titleNumber).arg(usedWidth).arg(usedHeight), INFO );
+ *d->process << "-Z" << TQString("%1x%2").arg(usedWidth).arg(usedHeight);
// additional user parameters from config
const TQStringList& params = d->usedTranscodeBin->userParameters();
@@ -339,7 +339,7 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass )
if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
// something went wrong when starting the program
// it "should" be the executable
- emit infoMessage( i18n("Could not start %1.").tqarg(d->usedTranscodeBin->name()), K3bJob::ERROR );
+ emit infoMessage( i18n("Could not start %1.").arg(d->usedTranscodeBin->name()), K3bJob::ERROR );
jobFinished(false);
}
else {
@@ -372,7 +372,7 @@ void K3bVideoDVDTitleTranscodingJob::cleanup( bool success )
}
if( !success && TQFile::exists( m_filename ) ) {
- emit infoMessage( i18n("Removing incomplete video file '%1'").tqarg(m_filename), INFO );
+ emit infoMessage( i18n("Removing incomplete video file '%1'").arg(m_filename), INFO );
TQFile::remove( m_filename );
}
}
@@ -440,7 +440,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p )
// FIXME: error handling
emit infoMessage( i18n("%1 returned an unknown error (code %2).")
- .tqarg(d->usedTranscodeBin->name()).tqarg(p->exitStatus()),
+ .arg(d->usedTranscodeBin->name()).arg(p->exitStatus()),
K3bJob::ERROR );
emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
@@ -450,7 +450,7 @@ void K3bVideoDVDTitleTranscodingJob::slotTranscodeExited( KProcess* p )
}
else {
cleanup( false );
- emit infoMessage( i18n("Execution of %1 failed.").tqarg("transcode"), ERROR );
+ emit infoMessage( i18n("Execution of %1 failed.").arg("transcode"), ERROR );
emit infoMessage( i18n("Please consult the debugging output for details."), ERROR );
jobFinished( false );
}
@@ -566,7 +566,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
return false;
- return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) );
+ return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) );
}
@@ -577,7 +577,7 @@ bool K3bVideoDVDTitleTranscodingJob::transcodeBinaryHasSupportFor( K3bVideoDVDTi
bin = k3bcore->externalBinManager()->binObject("transcode");
if( !bin )
return false;
- return bin->hasFeature( TQString::tqfromLatin1( s_codecFeatures[(int)codec] ) );
+ return bin->hasFeature( TQString::fromLatin1( s_codecFeatures[(int)codec] ) );
}
#include "k3bvideodvdtitletranscodingjob.moc"