diff options
Diffstat (limited to 'libk3b/jobs')
27 files changed, 188 insertions, 188 deletions
diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp index 62860d8..440ae84 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp +++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp @@ -56,29 +56,29 @@ K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObjec { m_analyserThread = new AnalyserThread(); m_analyserJob = new K3bThreadJob( m_analyserThread, this, this ); - connect( m_analyserJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAnalyserThreadFinished(bool)) ); + connect( m_analyserJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotAnalyserThreadFinished(bool)) ); m_audioDoc = new K3bAudioDoc( this ); m_audioDoc->newDocument(); m_audioJob = new K3bAudioJob( m_audioDoc, this, this ); // just loop all through - connect( m_audioJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); - connect( m_audioJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_audioJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); - connect( m_audioJob, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_audioJob, TQT_SIGNAL(finished(bool)), this, TQT_SIGNAL(finished(bool)) ); - connect( m_audioJob, TQT_SIGNAL(canceled()), this, TQT_SIGNAL(canceled()) ); - connect( m_audioJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) ); - connect( m_audioJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); - 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(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)) ); + connect( m_audioJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newTask(const TQString&)) ); + connect( m_audioJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_audioJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_audioJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_audioJob, TQ_SIGNAL(finished(bool)), this, TQ_SIGNAL(finished(bool)) ); + connect( m_audioJob, TQ_SIGNAL(canceled()), this, TQ_SIGNAL(canceled()) ); + connect( m_audioJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(percent(int)) ); + connect( m_audioJob, TQ_SIGNAL(subPercent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_audioJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_audioJob, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_audioJob, TQ_SIGNAL(burning(bool)), this, TQ_SIGNAL(burning(bool)) ); + connect( m_audioJob, TQ_SIGNAL(bufferStatus(int)), this, TQ_SIGNAL(bufferStatus(int)) ); + connect( m_audioJob, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SIGNAL(deviceBuffer(int)) ); + connect( m_audioJob, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) ); m_canceled = false; m_audioJobRunning = false; diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.h b/libk3b/jobs/k3baudiocuefilewritingjob.h index 8da5d2b..1117fdd 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.h +++ b/libk3b/jobs/k3baudiocuefilewritingjob.h @@ -29,7 +29,7 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bAudioCueFileWritingJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3baudiosessionreadingjob.h b/libk3b/jobs/k3baudiosessionreadingjob.h index 91cf455..a53a599 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.h +++ b/libk3b/jobs/k3baudiosessionreadingjob.h @@ -29,7 +29,7 @@ namespace K3bDevice { class K3bAudioSessionReadingJob : public K3bThreadJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp index 4f9f103..b6790fa 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.cpp +++ b/libk3b/jobs/k3bbinimagewritingjob.cpp @@ -144,18 +144,18 @@ bool K3bBinImageWritingJob::prepareWriter() m_writer = writer; } - connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - 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(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)) ); - connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); - connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) ); - connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_writer, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writer, TQ_SIGNAL(percent(int)), this, TQ_SLOT(copyPercent(int)) ); + connect( m_writer, TQ_SIGNAL(subPercent(int)), this, TQ_SLOT(copySubPercent(int)) ); + connect( m_writer, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( m_writer, TQ_SIGNAL(buffer(int)), this, TQ_SIGNAL(bufferStatus(int)) ); + connect( m_writer, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SIGNAL(deviceBuffer(int)) ); + connect( m_writer, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) ); + connect( m_writer, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(writerFinished(bool)) ); + connect( m_writer, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newTask(const TQString&)) ); + connect( m_writer, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writer, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotNextTrack(int, int)) ); + connect( m_writer, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); return true; } diff --git a/libk3b/jobs/k3bbinimagewritingjob.h b/libk3b/jobs/k3bbinimagewritingjob.h index c6a33db..d2a287c 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.h +++ b/libk3b/jobs/k3bbinimagewritingjob.h @@ -29,7 +29,7 @@ namespace K3bDevice { */ class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index 4d8212e..10d5329 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -121,11 +121,11 @@ void K3bBlankingJob::slotStartErasing() writer->setForceNoEject( m_forceNoEject ); } - connect(m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotFinished(bool))); - connect(m_writerJob, TQT_SIGNAL(infoMessage( const TQString&, int)), - this,TQT_SIGNAL(infoMessage( const TQString&, int))); - connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect(m_writerJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotFinished(bool))); + connect(m_writerJob, TQ_SIGNAL(infoMessage( const TQString&, int)), + this,TQ_SIGNAL(infoMessage( const TQString&, int))); + connect( m_writerJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); if( waitForMedia( m_device, K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE, diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h index 4555238..631d10f 100644 --- a/libk3b/jobs/k3bblankingjob.h +++ b/libk3b/jobs/k3bblankingjob.h @@ -28,7 +28,7 @@ class K3bAbstractWriter; class LIBK3B_EXPORT K3bBlankingJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index d60228f..be54407 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -34,7 +34,7 @@ #include <k3binffilewriter.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <tdetempfile.h> @@ -173,8 +173,8 @@ void K3bCdCopyJob::start() // FIXME: read ISRCs and MCN - connect( K3bDevice::diskInfo( m_readerDevice ), TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), - this, TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); + connect( K3bDevice::diskInfo( m_readerDevice ), TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), + this, TQ_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); } @@ -368,9 +368,9 @@ void K3bCdCopyJob::searchCdText() emit newSubTask( i18n("Searching CD-TEXT") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::CD_TEXT_RAW, m_readerDevice ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotCdTextReady(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotCdTextReady(K3bDevice::DeviceHandler*)) ); } @@ -411,8 +411,8 @@ void K3bCdCopyJob::queryCddb() if( !d->cddb ) { d->cddb = new K3bCddb( this ); - connect( d->cddb, TQT_SIGNAL(queryFinished(int)), - this, TQT_SLOT(slotCddbQueryFinished(int)) ); + connect( d->cddb, TQ_SIGNAL(queryFinished(int)), + this, TQ_SLOT(slotCddbQueryFinished(int)) ); } TDEConfig* c = k3bcore->config(); @@ -594,13 +594,13 @@ void K3bCdCopyJob::readNextSession() if( d->currentReadSession == 1 && d->toc[0].type() == K3bDevice::Track::AUDIO ) { if( !d->audioSessionReader ) { d->audioSessionReader = new K3bAudioSessionReadingJob( this, this ); - connect( d->audioSessionReader, TQT_SIGNAL(nextTrack(int, int)), - this, TQT_SLOT(slotReadingNextTrack(int, int)) ); + connect( d->audioSessionReader, TQ_SIGNAL(nextTrack(int, int)), + this, TQ_SLOT(slotReadingNextTrack(int, int)) ); connectSubJob( d->audioSessionReader, - TQT_SLOT(slotSessionReaderFinished(bool)), + TQ_SLOT(slotSessionReaderFinished(bool)), true, - TQT_SLOT(slotReaderProgress(int)), - TQT_SLOT(slotReaderSubProgress(int)) ); + TQ_SLOT(slotReaderProgress(int)), + TQ_SLOT(slotReaderSubProgress(int)) ); } d->audioSessionReader->setDevice( m_readerDevice ); @@ -619,12 +619,12 @@ void K3bCdCopyJob::readNextSession() else { if( !d->dataTrackReader ) { d->dataTrackReader = new K3bDataTrackReader( this, this ); - connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) ); - connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) ); - connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotSessionReaderFinished(bool)) ); - connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( d->dataTrackReader, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotReaderProgress(int)) ); + connect( d->dataTrackReader, TQ_SIGNAL(processedSize(int, int)), this, TQ_SLOT(slotReaderProcessedSize(int, int)) ); + connect( d->dataTrackReader, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotSessionReaderFinished(bool)) ); + connect( d->dataTrackReader, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->dataTrackReader, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->dataTrackReader->setDevice( m_readerDevice ); @@ -707,20 +707,20 @@ bool K3bCdCopyJob::writeNextSession() if( !d->cdrecordWriter ) { d->cdrecordWriter = new K3bCdrecordWriter( m_writerDevice, this, this ); - connect( d->cdrecordWriter, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( d->cdrecordWriter, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterProgress(int)) ); - connect( d->cdrecordWriter, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - 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(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)) ); - // connect( d->cdrecordWriter, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); - connect( d->cdrecordWriter, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( d->cdrecordWriter, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotWriterProgress(int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(subPercent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotWritingNextTrack(int, int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(buffer(int)), this, TQ_SIGNAL(bufferStatus(int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SIGNAL(deviceBuffer(int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotWriterFinished(bool)) ); + // connect( d->cdrecordWriter, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newTask(const TQString&)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( d->cdrecordWriter, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->cdrecordWriter->setBurnDevice( m_writerDevice ); @@ -1015,8 +1015,8 @@ void K3bCdCopyJob::slotWriterFinished( bool success ) // reload the media emit newSubTask( i18n("Reloading the medium") ); - connect( K3bDevice::reload( m_writerDevice ), TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), - this, TQT_SLOT(slotMediaReloadedForNextSession(K3bDevice::DeviceHandler*)) ); + connect( K3bDevice::reload( m_writerDevice ), TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), + this, TQ_SLOT(slotMediaReloadedForNextSession(K3bDevice::DeviceHandler*)) ); } else { d->doneCopies++; diff --git a/libk3b/jobs/k3bcdcopyjob.h b/libk3b/jobs/k3bcdcopyjob.h index 013100e..7d2c3c6 100644 --- a/libk3b/jobs/k3bcdcopyjob.h +++ b/libk3b/jobs/k3bcdcopyjob.h @@ -31,7 +31,7 @@ namespace K3bDevice { */ class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp index 393a13c..3b01bd6 100644 --- a/libk3b/jobs/k3bcdda2wavreader.cpp +++ b/libk3b/jobs/k3bcdda2wavreader.cpp @@ -107,9 +107,9 @@ void K3bCdda2wavReader::start( bool onlyInfo ) d->process->setSplitStdout(true); d->process->setSuppressEmptyLines(true); d->process->setWorkingDirectory( m_imagePath ); - connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) ); - connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotProcessLine(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( d->process, TQ_SIGNAL(stdoutLine(const TQString&)), this, TQ_SLOT(slotProcessLine(const TQString&)) ); + connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotProcessLine(const TQString&)) ); + connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); // create the command line *d->process << d->cdda2wavBin->path; diff --git a/libk3b/jobs/k3bcdda2wavreader.h b/libk3b/jobs/k3bcdda2wavreader.h index 24a2246..0abe3ae 100644 --- a/libk3b/jobs/k3bcdda2wavreader.h +++ b/libk3b/jobs/k3bcdda2wavreader.h @@ -31,7 +31,7 @@ namespace K3bDevice { */ class K3bCdda2wavReader : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp index aa3230e..b25d5ad 100644 --- a/libk3b/jobs/k3bclonejob.cpp +++ b/libk3b/jobs/k3bclonejob.cpp @@ -152,14 +152,14 @@ void K3bCloneJob::prepareReader() { if( !m_readcdReader ) { m_readcdReader = new K3bReadcdReader( this, this ); - connect( m_readcdReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReadingPercent(int)) ); - connect( m_readcdReader, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); - connect( m_readcdReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( m_readcdReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReadingFinished(bool)) ); - connect( m_readcdReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_readcdReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_readcdReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_readcdReader, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotReadingPercent(int)) ); + connect( m_readcdReader, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_readcdReader, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_readcdReader, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotReadingFinished(bool)) ); + connect( m_readcdReader, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_readcdReader, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_readcdReader, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } m_readcdReader->setReadDevice( readingDevice() ); @@ -175,19 +175,19 @@ void K3bCloneJob::prepareWriter() { if( !m_writerJob ) { m_writerJob = new K3bCdrecordWriter( writer(), this, this ); - connect( m_writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_writerJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotWriterPercent(int)) ); - 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(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)) ); - // connect( m_writerJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); - connect( m_writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_writerJob, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writerJob, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotWriterPercent(int)) ); + connect( m_writerJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_writerJob, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotWriterNextTrack(int, int)) ); + connect( m_writerJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_writerJob, TQ_SIGNAL(buffer(int)), this, TQ_SIGNAL(bufferStatus(int)) ); + connect( m_writerJob, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SIGNAL(deviceBuffer(int)) ); + connect( m_writerJob, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) ); + connect( m_writerJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotWriterFinished(bool)) ); + // connect( m_writerJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newTask(const TQString&)) ); + connect( m_writerJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writerJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } m_writerJob->clearArguments(); diff --git a/libk3b/jobs/k3bclonejob.h b/libk3b/jobs/k3bclonejob.h index 6de1794..c18374a 100644 --- a/libk3b/jobs/k3bclonejob.h +++ b/libk3b/jobs/k3bclonejob.h @@ -30,7 +30,7 @@ class K3bReadcdReader; class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index 69eb8d5..2c2c02f 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -141,9 +141,9 @@ void K3bDvdCopyJob::start() emit newSubTask( i18n("Checking source medium") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, m_readerDevice ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); } @@ -399,13 +399,13 @@ void K3bDvdCopyJob::prepareReader() { if( !d->dataTrackReader ) { d->dataTrackReader = new K3bDataTrackReader( this ); - connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) ); - connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) ); - connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReaderFinished(bool)) ); - connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( d->dataTrackReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( d->dataTrackReader, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotReaderProgress(int)) ); + connect( d->dataTrackReader, TQ_SIGNAL(processedSize(int, int)), this, TQ_SLOT(slotReaderProcessedSize(int, int)) ); + connect( d->dataTrackReader, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotReaderFinished(bool)) ); + connect( d->dataTrackReader, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->dataTrackReader, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( d->dataTrackReader, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->dataTrackReader->setDevice( m_readerDevice ); @@ -430,18 +430,18 @@ void K3bDvdCopyJob::prepareWriter() d->writerJob = new K3bGrowisofsWriter( m_writerDevice, this ); - connect( d->writerJob, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - 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(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)) ); - // connect( d->writerJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); - connect( d->writerJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( d->writerJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( d->writerJob, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->writerJob, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotWriterProgress(int)) ); + connect( d->writerJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( d->writerJob, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( d->writerJob, TQ_SIGNAL(buffer(int)), this, TQ_SIGNAL(bufferStatus(int)) ); + connect( d->writerJob, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SIGNAL(deviceBuffer(int)) ); + connect( d->writerJob, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) ); + connect( d->writerJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotWriterFinished(bool)) ); + // connect( d->writerJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newTask(const TQString&)) ); + connect( d->writerJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( d->writerJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); // these do only make sense with DVD-R(W) d->writerJob->setSimulate( m_simulate ); @@ -602,18 +602,18 @@ void K3bDvdCopyJob::slotWriterFinished( bool success ) if( d->verifyData && !m_simulate ) { if( !d->verificationJob ) { d->verificationJob = new K3bVerificationJob( this, this ); - connect( d->verificationJob, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( d->verificationJob, TQT_SIGNAL(newTask(const TQString&)), - this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( d->verificationJob, TQT_SIGNAL(percent(int)), - this, TQT_SLOT(slotVerificationProgress(int)) ); - connect( d->verificationJob, TQT_SIGNAL(percent(int)), - this, TQT_SIGNAL(subPercent(int)) ); - connect( d->verificationJob, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotVerificationFinished(bool)) ); - connect( d->verificationJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( d->verificationJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->verificationJob, TQ_SIGNAL(newTask(const TQString&)), + this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( d->verificationJob, TQ_SIGNAL(percent(int)), + this, TQ_SLOT(slotVerificationProgress(int)) ); + connect( d->verificationJob, TQ_SIGNAL(percent(int)), + this, TQ_SIGNAL(subPercent(int)) ); + connect( d->verificationJob, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotVerificationFinished(bool)) ); + connect( d->verificationJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->verificationJob->setDevice( m_writerDevice ); diff --git a/libk3b/jobs/k3bdvdcopyjob.h b/libk3b/jobs/k3bdvdcopyjob.h index 6b5e4c0..ae32115 100644 --- a/libk3b/jobs/k3bdvdcopyjob.h +++ b/libk3b/jobs/k3bdvdcopyjob.h @@ -29,7 +29,7 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp index 29a17ee..cd2d3ea 100644 --- a/libk3b/jobs/k3bdvdformattingjob.cpp +++ b/libk3b/jobs/k3bdvdformattingjob.cpp @@ -153,9 +153,9 @@ void K3bDvdFormattingJob::start() emit newTask( i18n("Checking media") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->device ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) ); } @@ -288,9 +288,9 @@ void K3bDvdFormattingJob::slotProcessFinished( TDEProcess* p ) else { emit infoMessage( i18n("Ejecting DVD..."), INFO ); connect( K3bDevice::eject( d->device ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); } } @@ -467,8 +467,8 @@ void K3bDvdFormattingJob::startFormatting( const K3bDevice::DiskInfo& diskInfo ) d->process = new K3bProcess(); d->process->setRunPrivileged(true); // d->process->setSuppressEmptyLines(false); - connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStderrLine(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessFinished(TDEProcess*)) ); + connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotStderrLine(const TQString&)) ); + connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessFinished(TDEProcess*)) ); d->dvdFormatBin = k3bcore->externalBinManager()->binObject( "dvd+rw-format" ); if( !d->dvdFormatBin ) { diff --git a/libk3b/jobs/k3bdvdformattingjob.h b/libk3b/jobs/k3bdvdformattingjob.h index 49481d0..b660dfd 100644 --- a/libk3b/jobs/k3bdvdformattingjob.h +++ b/libk3b/jobs/k3bdvdformattingjob.h @@ -29,7 +29,7 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp index 5d3ef9b..e11a6e1 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.cpp +++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp @@ -121,10 +121,10 @@ void K3bIso9660ImageWritingJob::slotWriterJobFinished( bool success ) if( !m_verifyJob ) { m_verifyJob = new K3bVerificationJob( this ); connectSubJob( m_verifyJob, - TQT_SLOT(slotVerificationFinished(bool)), + TQ_SLOT(slotVerificationFinished(bool)), true, - TQT_SLOT(slotVerificationProgress(int)), - TQT_SIGNAL(subPercent(int)) ); + TQ_SLOT(slotVerificationProgress(int)), + TQ_SIGNAL(subPercent(int)) ); } m_verifyJob->setDevice( m_device ); m_verifyJob->clear(); @@ -164,8 +164,8 @@ void K3bIso9660ImageWritingJob::slotVerificationFinished( bool success ) if( success && m_currentCopy < m_copies ) { m_currentCopy++; - connect( K3bDevice::eject( m_device ), TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(startWriting()) ); + connect( K3bDevice::eject( m_device ), TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(startWriting()) ); return; } @@ -420,18 +420,18 @@ bool K3bIso9660ImageWritingJob::prepareWriter( int mediaType ) m_writer = writer; } - connect( m_writer, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - 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(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)) ); - connect( m_writer, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); - connect( m_writer, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_writer, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_writer, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_writer, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotNextTrack(int, int)) ); + connect( m_writer, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotWriterPercent(int)) ); + connect( m_writer, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( m_writer, TQ_SIGNAL(buffer(int)), this, TQ_SIGNAL(bufferStatus(int)) ); + connect( m_writer, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SIGNAL(deviceBuffer(int)) ); + connect( m_writer, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) ); + connect( m_writer, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotWriterJobFinished(bool)) ); + connect( m_writer, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newTask(const TQString&)) ); + connect( m_writer, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_writer, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); return true; } diff --git a/libk3b/jobs/k3biso9660imagewritingjob.h b/libk3b/jobs/k3biso9660imagewritingjob.h index 83d92d4..2c5903b 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.h +++ b/libk3b/jobs/k3biso9660imagewritingjob.h @@ -33,7 +33,7 @@ class K3bVerificationJob; */ class LIBK3B_EXPORT K3bIso9660ImageWritingJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index 8f7ef80..08f0b2d 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -138,8 +138,8 @@ void K3bReadcdReader::start() // create the commandline delete d->process; d->process = new K3bProcess(); - connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotStdLine(const TQString&)) ); + connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); *d->process << d->readcdBinObject; diff --git a/libk3b/jobs/k3breadcdreader.h b/libk3b/jobs/k3breadcdreader.h index b2b7135..7a243a1 100644 --- a/libk3b/jobs/k3breadcdreader.h +++ b/libk3b/jobs/k3breadcdreader.h @@ -33,7 +33,7 @@ namespace K3b { class K3bReadcdReader : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index 3555692..2cb43a5 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -95,10 +95,10 @@ K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, TQObject* parent, co d = new Private(); d->md5Job = new K3bMd5Job( this ); - connect( d->md5Job, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( d->md5Job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMd5JobFinished(bool)) ); - connect( d->md5Job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( d->md5Job, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->md5Job, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotMd5JobFinished(bool)) ); + connect( d->md5Job, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } @@ -155,9 +155,9 @@ void K3bVerificationJob::start() d->mediumHasBeenReloaded = false; connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); } @@ -174,9 +174,9 @@ void K3bVerificationJob::slotMediaReloaded( bool /*success*/ ) emit newTask( i18n("Checking medium") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) ); } @@ -211,9 +211,9 @@ void K3bVerificationJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // many drives need to reload the medium to return to a proper state emit newTask( i18n("Reloading the medium") ); connect( K3bDevice::reload( d->device ), - TQT_SIGNAL(finished(bool)), + TQ_SIGNAL(finished(bool)), this, - TQT_SLOT(slotMediaReloaded(bool)) ); + TQ_SLOT(slotMediaReloaded(bool)) ); return; } } @@ -243,13 +243,13 @@ void K3bVerificationJob::readTrack( int trackIndex ) if( d->toc[d->tracks[trackIndex].trackNumber-1].type() == K3bDevice::Track::DATA ) { if( !d->dataTrackReader ) { d->dataTrackReader = new K3bDataTrackReader( this ); - connect( d->dataTrackReader, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotReaderProgress(int)) ); - // connect( d->dataTrackReader, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotReaderProcessedSize(int, int)) ); - connect( d->dataTrackReader, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotReaderFinished(bool)) ); - connect( d->dataTrackReader, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( d->dataTrackReader, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( d->dataTrackReader, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( d->dataTrackReader, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotReaderProgress(int)) ); + // connect( d->dataTrackReader, TQ_SIGNAL(processedSize(int, int)), this, TQ_SLOT(slotReaderProcessedSize(int, int)) ); + connect( d->dataTrackReader, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotReaderFinished(bool)) ); + connect( d->dataTrackReader, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->dataTrackReader, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( d->dataTrackReader, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } d->dataTrackReader->setDevice( d->device ); diff --git a/libk3b/jobs/k3bverificationjob.h b/libk3b/jobs/k3bverificationjob.h index fad49eb..bc2a3cf 100644 --- a/libk3b/jobs/k3bverificationjob.h +++ b/libk3b/jobs/k3bverificationjob.h @@ -46,7 +46,7 @@ namespace K3bDevice { */ class K3bVerificationJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp index ddefaca..b54cb65 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp @@ -136,9 +136,9 @@ void K3bVideoDVDTitleDetectClippingJob::startTranscode( int chapter ) d->process = new K3bProcess(); d->process->setSuppressEmptyLines(true); d->process->setSplitStdout(true); - // connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); - connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTranscodeExited(TDEProcess*)) ); + // connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotTranscodeStderr(const TQString&)) ); + connect( d->process, TQ_SIGNAL(stdoutLine(const TQString&)), this, TQ_SLOT(slotTranscodeStderr(const TQString&)) ); + connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotTranscodeExited(TDEProcess*)) ); // the executable *d->process << d->usedTranscodeBin; diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h index 9118e6e..65bc351 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h @@ -27,7 +27,7 @@ class TDEProcess; */ class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index 15151ac..c482d47 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -22,7 +22,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -194,9 +194,9 @@ void K3bVideoDVDTitleTranscodingJob::startTranscode( int pass ) d->process = new K3bProcess(); d->process->setSuppressEmptyLines(true); d->process->setSplitStdout(true); - connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); - connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotTranscodeStderr(const TQString&)) ); - connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTranscodeExited(TDEProcess*)) ); + connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotTranscodeStderr(const TQString&)) ); + connect( d->process, TQ_SIGNAL(stdoutLine(const TQString&)), this, TQ_SLOT(slotTranscodeStderr(const TQString&)) ); + connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotTranscodeExited(TDEProcess*)) ); // the executable *d->process << d->usedTranscodeBin; diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h index b618a41..6c05d73 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h @@ -32,7 +32,7 @@ class K3bExternalBin; */ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: |