diff options
Diffstat (limited to 'libk3b/core/k3bjob.cpp')
-rw-r--r-- | libk3b/core/k3bjob.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp index b545107..046de06 100644 --- a/libk3b/core/k3bjob.cpp +++ b/libk3b/core/k3bjob.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <kprocess.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <kdebug.h> @@ -34,14 +34,14 @@ public: const char* K3bJob::DEFAULT_SIGNAL_CONNECTION = "K3bJobDefault"; -K3bJob::K3bJob( K3bJobHandler* handler, QObject* parent, const char* name ) - : QObject( parent, name ), +K3bJob::K3bJob( K3bJobHandler* handler, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), m_jobHandler( handler ), m_canceled(false), m_active(false) { - connect( this, SIGNAL(canceled()), - this, SLOT(slotCanceled()) ); + connect( this, TQT_SIGNAL(canceled()), + this, TQT_SLOT(slotCanceled()) ); } K3bJob::~K3bJob() @@ -97,24 +97,24 @@ void K3bJob::slotCanceled() int K3bJob::waitForMedia( K3bDevice::Device* device, int mediaState, int mediaType, - const QString& message ) + const TQString& message ) { // TODO: What about: emit newSubTask( i18n("Waiting for media") ); return m_jobHandler->waitForMedia( device, mediaState, mediaType, message ); } -bool K3bJob::questionYesNo( const QString& text, - const QString& caption, - const QString& yesText, - const QString& noText ) +bool K3bJob::questionYesNo( const TQString& text, + const TQString& caption, + const TQString& yesText, + const TQString& noText ) { return m_jobHandler->questionYesNo( text, caption, yesText, noText ); } -void K3bJob::blockingInformation( const QString& text, - const QString& caption ) +void K3bJob::blockingInformation( const TQString& text, + const TQString& caption ) { return m_jobHandler->blockingInformation( text, caption ); } @@ -128,23 +128,23 @@ void K3bJob::connectSubJob( K3bJob* subJob, const char* processedSizeSlot, const char* processedSubSizeSlot ) { - connect( subJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( subJob, SIGNAL(newSubTask(const QString&)), this, SLOT(slotNewSubTask(const QString&)) ); - connect( subJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( subJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( subJob, SIGNAL(finished(bool)), this, finishedSlot ); + connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); + connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot ); if( connectProgress ) { - connect( subJob, SIGNAL(percent(int)), - this, progressSlot != 0 ? progressSlot : SIGNAL(subPercent(int)) ); + connect( subJob, TQT_SIGNAL(percent(int)), + this, progressSlot != 0 ? progressSlot : TQT_SIGNAL(subPercent(int)) ); if( subProgressSlot ) - connect( subJob, SIGNAL(subPercent(int)), this, subProgressSlot ); - connect( subJob, SIGNAL(processedSize(int, int)), - this, processedSizeSlot != 0 ? processedSizeSlot : SIGNAL(processedSubSize(int, int)) ); + connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot ); + connect( subJob, TQT_SIGNAL(processedSize(int, int)), + this, processedSizeSlot != 0 ? processedSizeSlot : TQT_SIGNAL(processedSubSize(int, int)) ); if( processedSubSizeSlot ) - connect( subJob, SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); + connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); } } @@ -159,42 +159,42 @@ void K3bJob::connectSubJob( K3bJob* subJob, const char* processedSubSizeSlot ) { // standard connections - connect( subJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( subJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); + connect( subJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( subJob, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); // task connections if( newTaskSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); + connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); else if( newTaskSlot ) - connect( subJob, SIGNAL(newTask(const QString&)), this, newTaskSlot ); + connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, newTaskSlot ); if( newSubTaskSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(newSubTask(const QString&)), this, SLOT(slotNewSubTask(const QString&)) ); + connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); else if( newSubTaskSlot ) - connect( subJob, SIGNAL(newSubTask(const QString&)), this, newSubTaskSlot ); + connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot ); if( finishedSlot && finishedSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(finished(bool)), this, finishedSlot ); + connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot ); // progress if( progressSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(percent(int)), this, SIGNAL(subPercent(int)) ); + connect( subJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); else if( progressSlot ) - connect( subJob, SIGNAL(percent(int)), this, progressSlot ); + connect( subJob, TQT_SIGNAL(percent(int)), this, progressSlot ); if( subProgressSlot && subProgressSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(subPercent(int)), this, subProgressSlot ); + connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot ); // processed size if( processedSizeSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); + connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); else if( processedSizeSlot ) - connect( subJob, SIGNAL(processedSize(int, int)), this, processedSizeSlot ); + connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, processedSizeSlot ); if( processedSubSizeSlot && processedSubSizeSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); + connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); } @@ -204,7 +204,7 @@ unsigned int K3bJob::numRunningSubJobs() const } -void K3bJob::slotNewSubTask( const QString& str ) +void K3bJob::slotNewSubTask( const TQString& str ) { emit infoMessage( str, INFO ); } @@ -231,8 +231,8 @@ public: -K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, QObject* parent, const char* name ) - : K3bJob( handler, parent, name ), +K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* tqparent, const char* name ) + : K3bJob( handler, tqparent, name ), m_writeMethod( K3b::DEFAULT ) { d = new Private; |