diff options
Diffstat (limited to 'libk3b')
155 files changed, 692 insertions, 705 deletions
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index a97b9aa..6b01866 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -98,14 +98,14 @@ void K3bCddb::query( const K3bDevice::Toc& toc ) if( m_bLocalCddbQuery ) { m_iCurrentQueriedLocalDir = 0; - TQTimer::singleShot( 0, this, TQT_SLOT(localQuery()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(localQuery()) ); } else if( m_bRemoteCddbQuery ) { m_iCurrentQueriedServer = 0; - TQTimer::singleShot( 0, this, TQT_SLOT(remoteQuery()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(remoteQuery()) ); } else { - TQTimer::singleShot( 0, this, TQT_SLOT(slotNoEntry()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotNoEntry()) ); } } @@ -178,12 +178,12 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s ) if( s.startsWith("Http") ) { if( !m_httpQuery ) { m_httpQuery = new K3bCddbHttpQuery( this ); - connect( m_httpQuery, TQT_SIGNAL(infoMessage(const TQString&)), - this, TQT_SIGNAL(infoMessage(const TQString&)) ); - connect( m_httpQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)), - this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) ); - connect( m_httpQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)), - this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); + connect( m_httpQuery, TQ_SIGNAL(infoMessage(const TQString&)), + this, TQ_SIGNAL(infoMessage(const TQString&)) ); + connect( m_httpQuery, TQ_SIGNAL(queryFinished(K3bCddbQuery*)), + this, TQ_SLOT(slotQueryFinished(K3bCddbQuery*)) ); + connect( m_httpQuery, TQ_SIGNAL(inexactMatches(K3bCddbQuery*)), + this, TQ_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); } m_httpQuery->setServer( server, port ); @@ -194,12 +194,12 @@ K3bCddbQuery* K3bCddb::getQuery( const TQString& s ) else { if( !m_cddbpQuery ) { m_cddbpQuery = new K3bCddbpQuery( this ); - connect( m_cddbpQuery, TQT_SIGNAL(infoMessage(const TQString&)), - this, TQT_SIGNAL(infoMessage(const TQString&)) ); - connect( m_cddbpQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)), - this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) ); - connect( m_cddbpQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)), - this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); + connect( m_cddbpQuery, TQ_SIGNAL(infoMessage(const TQString&)), + this, TQ_SIGNAL(infoMessage(const TQString&)) ); + connect( m_cddbpQuery, TQ_SIGNAL(queryFinished(K3bCddbQuery*)), + this, TQ_SLOT(slotQueryFinished(K3bCddbQuery*)) ); + connect( m_cddbpQuery, TQ_SIGNAL(inexactMatches(K3bCddbQuery*)), + this, TQ_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); } m_cddbpQuery->setServer( server, port ); @@ -213,12 +213,12 @@ void K3bCddb::localQuery() { if( !m_localQuery ) { m_localQuery = new K3bCddbLocalQuery( this ); - connect( m_localQuery, TQT_SIGNAL(infoMessage(const TQString&)), - this, TQT_SIGNAL(infoMessage(const TQString&)) ); - connect( m_localQuery, TQT_SIGNAL(queryFinished(K3bCddbQuery*)), - this, TQT_SLOT(slotQueryFinished(K3bCddbQuery*)) ); - connect( m_localQuery, TQT_SIGNAL(inexactMatches(K3bCddbQuery*)), - this, TQT_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); + connect( m_localQuery, TQ_SIGNAL(infoMessage(const TQString&)), + this, TQ_SIGNAL(infoMessage(const TQString&)) ); + connect( m_localQuery, TQ_SIGNAL(queryFinished(K3bCddbQuery*)), + this, TQ_SLOT(slotQueryFinished(K3bCddbQuery*)) ); + connect( m_localQuery, TQ_SIGNAL(inexactMatches(K3bCddbQuery*)), + this, TQ_SLOT(slotMultibleMatches(K3bCddbQuery*)) ); } m_localQuery->setCddbDir( m_localCddbDirs[m_iCurrentQueriedLocalDir] ); @@ -261,8 +261,8 @@ void K3bCddb::saveEntry( const K3bCddbResultEntry& entry ) { if( !m_localSubmit ) { m_localSubmit = new K3bCddbLocalSubmit( this ); - connect( m_localSubmit, TQT_SIGNAL(submitFinished(K3bCddbSubmit*)), - this, TQT_SLOT(slotSubmitFinished(K3bCddbSubmit*)) ); + connect( m_localSubmit, TQ_SIGNAL(submitFinished(K3bCddbSubmit*)), + this, TQ_SLOT(slotSubmitFinished(K3bCddbSubmit*)) ); } m_localSubmit->setCddbDir( m_localCddbDirs[0] ); diff --git a/libk3b/cddb/k3bcddb.h b/libk3b/cddb/k3bcddb.h index bd6fff1..3095e2f 100644 --- a/libk3b/cddb/k3bcddb.h +++ b/libk3b/cddb/k3bcddb.h @@ -37,7 +37,7 @@ class K3bCddbLocalSubmit; class LIBK3B_EXPORT K3bCddb : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index 1808584..b86797f 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -87,10 +87,10 @@ void K3bCddbHttpQuery::performCommand( const TQString& cmd ) return; } - connect( job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotResult(TDEIO::Job*)) ); } diff --git a/libk3b/cddb/k3bcddbhttpquery.h b/libk3b/cddb/k3bcddbhttpquery.h index de86aad..51b27ec 100644 --- a/libk3b/cddb/k3bcddbhttpquery.h +++ b/libk3b/cddb/k3bcddbhttpquery.h @@ -28,7 +28,7 @@ namespace TDEIO { class K3bCddbHttpQuery : public K3bCddbQuery { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/cddb/k3bcddblocalquery.h b/libk3b/cddb/k3bcddblocalquery.h index 8f67824..a78ce13 100644 --- a/libk3b/cddb/k3bcddblocalquery.h +++ b/libk3b/cddb/k3bcddblocalquery.h @@ -26,7 +26,7 @@ class K3bCddbLocalQuery : public K3bCddbQuery { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/cddb/k3bcddblocalsubmit.h b/libk3b/cddb/k3bcddblocalsubmit.h index 3efe69a..05eadd4 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.h +++ b/libk3b/cddb/k3bcddblocalsubmit.h @@ -24,7 +24,7 @@ class K3bCddbLocalSubmit : public K3bCddbSubmit { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.h b/libk3b/cddb/k3bcddbmultientriesdialog.h index ee8a274..53141cb 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.h +++ b/libk3b/cddb/k3bcddbmultientriesdialog.h @@ -31,7 +31,7 @@ class TDEListBox; */ class K3bCddbMultiEntriesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp index ed3a8f9..35a7a9b 100644 --- a/libk3b/cddb/k3bcddbpquery.cpp +++ b/libk3b/cddb/k3bcddbpquery.cpp @@ -32,11 +32,11 @@ K3bCddbpQuery::K3bCddbpQuery( TQObject* parent, const char* name ) m_stream.setDevice( m_socket ); m_stream.setEncoding( TQTextStream::UnicodeUTF8 ); - connect( m_socket, TQT_SIGNAL(connected()), this, TQT_SLOT(slotConnected()) ); - connect( m_socket, TQT_SIGNAL(hostFound()), this, TQT_SLOT(slotHostFound()) ); - connect( m_socket, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotConnectionClosed()) ); - connect( m_socket, TQT_SIGNAL(error(int)), this, TQT_SLOT(slotError(int)) ); - connect( m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()) ); + connect( m_socket, TQ_SIGNAL(connected()), this, TQ_SLOT(slotConnected()) ); + connect( m_socket, TQ_SIGNAL(hostFound()), this, TQ_SLOT(slotHostFound()) ); + connect( m_socket, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotConnectionClosed()) ); + connect( m_socket, TQ_SIGNAL(error(int)), this, TQ_SLOT(slotError(int)) ); + connect( m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead()) ); } diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h index b8d2174..56c9527 100644 --- a/libk3b/cddb/k3bcddbpquery.h +++ b/libk3b/cddb/k3bcddbpquery.h @@ -27,7 +27,7 @@ class TQSocket; class K3bCddbpQuery : public K3bCddbQuery { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp index d6d65d1..facf224 100644 --- a/libk3b/cddb/k3bcddbquery.cpp +++ b/libk3b/cddb/k3bcddbquery.cpp @@ -53,7 +53,7 @@ void K3bCddbQuery::query( const K3bDevice::Toc& toc ) m_toc = toc; m_inexactMatches.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT(doQuery()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(doQuery()) ); } @@ -64,7 +64,7 @@ void K3bCddbQuery::queryMatch( const K3bCddbResultHeader& header ) m_result.category = header.category; m_result.discid = header.discid; - TQTimer::singleShot( 0, this, TQT_SLOT(doMatchQuery()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(doMatchQuery()) ); } diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h index c2680cb..19d9126 100644 --- a/libk3b/cddb/k3bcddbquery.h +++ b/libk3b/cddb/k3bcddbquery.h @@ -29,7 +29,7 @@ class LIBK3B_EXPORT K3bCddbQuery : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/cddb/k3bcddbsubmit.cpp b/libk3b/cddb/k3bcddbsubmit.cpp index 06e123f..45abc06 100644 --- a/libk3b/cddb/k3bcddbsubmit.cpp +++ b/libk3b/cddb/k3bcddbsubmit.cpp @@ -37,7 +37,7 @@ void K3bCddbSubmit::submit( const K3bCddbResultEntry& entry ) if( m_resultEntry.rawData.isEmpty() ) createDataStream( m_resultEntry ); - TQTimer::singleShot( 0, this, TQT_SLOT(doSubmit()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(doSubmit()) ); } diff --git a/libk3b/cddb/k3bcddbsubmit.h b/libk3b/cddb/k3bcddbsubmit.h index f13d043..60dc40e 100644 --- a/libk3b/cddb/k3bcddbsubmit.h +++ b/libk3b/cddb/k3bcddbsubmit.h @@ -26,7 +26,7 @@ class K3bCddbSubmit : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index 293d74f..a17225c 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -202,10 +202,10 @@ void K3bCore::init() externalBinManager()->search(); - connect( K3bDevice::Connection::instance(), TQT_SIGNAL(deviceAdded(const TQString&)), - deviceManager(), TQT_SLOT(addDevice(const TQString&)) ); - connect( K3bDevice::Connection::instance(), TQT_SIGNAL(deviceRemoved(const TQString&)), - deviceManager(), TQT_SLOT(removeDevice(const TQString&)) ); + connect( K3bDevice::Connection::instance(), TQ_SIGNAL(deviceAdded(const TQString&)), + deviceManager(), TQ_SLOT(addDevice(const TQString&)) ); + connect( K3bDevice::Connection::instance(), TQ_SIGNAL(deviceRemoved(const TQString&)), + deviceManager(), TQ_SLOT(removeDevice(const TQString&)) ); TQStringList devList = K3bDevice::Connection::instance()->devices(); if( devList.isEmpty() ) deviceManager()->scanBus(); diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h index 8e40adc..3b8fce7 100644 --- a/libk3b/core/k3bcore.h +++ b/libk3b/core/k3bcore.h @@ -54,7 +54,7 @@ namespace K3bDevice { */ class LIBK3B_EXPORT K3bCore : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h index 18b601b..06f7791 100644 --- a/libk3b/core/k3bexternalbinmanager.h +++ b/libk3b/core/k3bexternalbinmanager.h @@ -113,7 +113,7 @@ class LIBK3B_EXPORT K3bExternalProgram class LIBK3B_EXPORT K3bExternalBinManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp index 0e169b1..1f6bbaa 100644 --- a/libk3b/core/k3bjob.cpp +++ b/libk3b/core/k3bjob.cpp @@ -40,8 +40,8 @@ K3bJob::K3bJob( K3bJobHandler* handler, TQObject* parent, const char* name ) m_canceled(false), m_active(false) { - connect( this, TQT_SIGNAL(canceled()), - this, TQT_SLOT(slotCanceled()) ); + connect( this, TQ_SIGNAL(canceled()), + this, TQ_SLOT(slotCanceled()) ); } K3bJob::~K3bJob() @@ -128,23 +128,23 @@ void K3bJob::connectSubJob( K3bJob* subJob, const char* processedSizeSlot, const char* processedSubSizeSlot ) { - 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 ); + connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SLOT(slotNewSubTask(const TQString&)) ); + connect( subJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( subJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( subJob, TQ_SIGNAL(finished(bool)), this, finishedSlot ); if( connectProgress ) { - connect( subJob, TQT_SIGNAL(percent(int)), - this, progressSlot != 0 ? progressSlot : TQT_SIGNAL(subPercent(int)) ); + connect( subJob, TQ_SIGNAL(percent(int)), + this, progressSlot != 0 ? progressSlot : TQ_SIGNAL(subPercent(int)) ); if( subProgressSlot ) - connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot ); - connect( subJob, TQT_SIGNAL(processedSize(int, int)), - this, processedSizeSlot != 0 ? processedSizeSlot : TQT_SIGNAL(processedSubSize(int, int)) ); + connect( subJob, TQ_SIGNAL(subPercent(int)), this, subProgressSlot ); + connect( subJob, TQ_SIGNAL(processedSize(int, int)), + this, processedSizeSlot != 0 ? processedSizeSlot : TQ_SIGNAL(processedSubSize(int, int)) ); if( processedSubSizeSlot ) - connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); + connect( subJob, TQ_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); } } @@ -159,42 +159,42 @@ void K3bJob::connectSubJob( K3bJob* subJob, const char* processedSubSizeSlot ) { // standard connections - 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, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( subJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); // task connections if( newTaskSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); + connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); else if( newTaskSlot ) - connect( subJob, TQT_SIGNAL(newTask(const TQString&)), this, newTaskSlot ); + connect( subJob, TQ_SIGNAL(newTask(const TQString&)), this, newTaskSlot ); if( newSubTaskSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); + connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SLOT(slotNewSubTask(const TQString&)) ); else if( newSubTaskSlot ) - connect( subJob, TQT_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot ); + connect( subJob, TQ_SIGNAL(newSubTask(const TQString&)), this, newSubTaskSlot ); if( finishedSlot && finishedSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, TQT_SIGNAL(finished(bool)), this, finishedSlot ); + connect( subJob, TQ_SIGNAL(finished(bool)), this, finishedSlot ); // progress if( progressSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); + connect( subJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(subPercent(int)) ); else if( progressSlot ) - connect( subJob, TQT_SIGNAL(percent(int)), this, progressSlot ); + connect( subJob, TQ_SIGNAL(percent(int)), this, progressSlot ); if( subProgressSlot && subProgressSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, TQT_SIGNAL(subPercent(int)), this, subProgressSlot ); + connect( subJob, TQ_SIGNAL(subPercent(int)), this, subProgressSlot ); // processed size if( processedSizeSlot == DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); + connect( subJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); else if( processedSizeSlot ) - connect( subJob, TQT_SIGNAL(processedSize(int, int)), this, processedSizeSlot ); + connect( subJob, TQ_SIGNAL(processedSize(int, int)), this, processedSizeSlot ); if( processedSubSizeSlot && processedSubSizeSlot != DEFAULT_SIGNAL_CONNECTION ) - connect( subJob, TQT_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); + connect( subJob, TQ_SIGNAL(processedSubSize(int, int)), this, processedSubSizeSlot ); } diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h index a4a7564..95af192 100644 --- a/libk3b/core/k3bjob.h +++ b/libk3b/core/k3bjob.h @@ -42,7 +42,7 @@ namespace K3bDevice { */ class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler { - Q_OBJECT + TQ_OBJECT public: @@ -256,7 +256,7 @@ class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler */ class LIBK3B_EXPORT K3bBurnJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/core/k3bprocess.cpp b/libk3b/core/k3bprocess.cpp index 304c0f5..31ca4ae 100644 --- a/libk3b/core/k3bprocess.cpp +++ b/libk3b/core/k3bprocess.cpp @@ -104,12 +104,12 @@ K3bProcess& K3bProcess::operator<<( const TQStringList& args ) bool K3bProcess::start( RunMode run, Communication com ) { if( com & Stderr ) { - connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotSplitStderr(TDEProcess*, char*, int)) ); + connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotSplitStderr(TDEProcess*, char*, int)) ); } if( com & Stdout ) { - connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotSplitStdout(TDEProcess*, char*, int)) ); + connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotSplitStdout(TDEProcess*, char*, int)) ); } return TDEProcess::start( run, com ); @@ -425,10 +425,10 @@ void K3bProcessOutputCollector::setProcess( TDEProcess* p ) m_process = p; if( p ) { - connect( p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotGatherStdout(TDEProcess*, char*, int)) ); - connect( p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotGatherStderr(TDEProcess*, char*, int)) ); + connect( p, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotGatherStdout(TDEProcess*, char*, int)) ); + connect( p, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotGatherStderr(TDEProcess*, char*, int)) ); } m_gatheredOutput.truncate( 0 ); diff --git a/libk3b/core/k3bprocess.h b/libk3b/core/k3bprocess.h index 19fb024..1cc99ed 100644 --- a/libk3b/core/k3bprocess.h +++ b/libk3b/core/k3bprocess.h @@ -37,7 +37,7 @@ class K3bExternalBin; */ class LIBK3B_EXPORT K3bProcess : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: @@ -180,7 +180,7 @@ class LIBK3B_EXPORT K3bProcess : public TDEProcess class LIBK3B_EXPORT K3bProcessOutputCollector: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/core/k3bsimplejobhandler.h b/libk3b/core/k3bsimplejobhandler.h index 37582d0..4c1c839 100644 --- a/libk3b/core/k3bsimplejobhandler.h +++ b/libk3b/core/k3bsimplejobhandler.h @@ -30,7 +30,7 @@ */ class LIBK3B_EXPORT K3bSimpleJobHandler : public TQObject, public K3bJobHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/core/k3bthreadjob.h b/libk3b/core/k3bthreadjob.h index 4ef88bf..7f6b037 100644 --- a/libk3b/core/k3bthreadjob.h +++ b/libk3b/core/k3bthreadjob.h @@ -39,7 +39,7 @@ class K3bThread; */ class LIBK3B_EXPORT K3bThreadJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: 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..8aa03f3 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -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..f293020 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -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: diff --git a/libk3b/plugin/k3baudiodecoder.h b/libk3b/plugin/k3baudiodecoder.h index 9a81ffa..9cb963b 100644 --- a/libk3b/plugin/k3baudiodecoder.h +++ b/libk3b/plugin/k3baudiodecoder.h @@ -33,7 +33,7 @@ **/ class LIBK3B_EXPORT K3bAudioDecoder : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -209,7 +209,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public TQObject */ class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h index 392e662..84714d0 100644 --- a/libk3b/plugin/k3baudioencoder.h +++ b/libk3b/plugin/k3baudioencoder.h @@ -32,7 +32,7 @@ */ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/plugin/k3baudioserver.h b/libk3b/plugin/k3baudioserver.h index f620b07..66a1d71 100644 --- a/libk3b/plugin/k3baudioserver.h +++ b/libk3b/plugin/k3baudioserver.h @@ -28,7 +28,7 @@ class K3bAudioClient; */ class LIBK3B_EXPORT K3bAudioServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/plugin/k3bplugin.h b/libk3b/plugin/k3bplugin.h index 152aa15..f225af6 100644 --- a/libk3b/plugin/k3bplugin.h +++ b/libk3b/plugin/k3bplugin.h @@ -79,7 +79,7 @@ class K3bPluginInfo */ class LIBK3B_EXPORT K3bPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT friend class K3bPluginManager; diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h index 48a91ff..e88337e 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.h +++ b/libk3b/plugin/k3bpluginconfigwidget.h @@ -22,7 +22,7 @@ class LIBK3B_EXPORT K3bPluginConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index a461f51..44dfe37 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -173,8 +173,8 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, con K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg ); if( configWidget ) { dlg.setMainWidget( configWidget ); - connect( &dlg, TQT_SIGNAL(applyClicked()), configWidget, TQT_SLOT(saveConfig()) ); - connect( &dlg, TQT_SIGNAL(okClicked()), configWidget, TQT_SLOT(saveConfig()) ); + connect( &dlg, TQ_SIGNAL(applyClicked()), configWidget, TQ_SLOT(saveConfig()) ); + connect( &dlg, TQ_SIGNAL(okClicked()), configWidget, TQ_SLOT(saveConfig()) ); configWidget->loadConfig(); int r = dlg.exec(); delete configWidget; diff --git a/libk3b/plugin/k3bpluginmanager.h b/libk3b/plugin/k3bpluginmanager.h index 367c84e..b87e455 100644 --- a/libk3b/plugin/k3bpluginmanager.h +++ b/libk3b/plugin/k3bpluginmanager.h @@ -34,7 +34,7 @@ class TQWidget; */ class LIBK3B_EXPORT K3bPluginManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h index 59997af..28960b7 100644 --- a/libk3b/plugin/k3bprojectplugin.h +++ b/libk3b/plugin/k3bprojectplugin.h @@ -67,7 +67,7 @@ class K3bProjectPluginGUIBase */ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index c639574..b9f812a 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -28,7 +28,7 @@ #include <k3baudiodecoder.h> -// QT-includes +// TQt includes #include <tqstring.h> #include <tqstringlist.h> #include <tqfile.h> @@ -929,7 +929,7 @@ void K3bAudioDoc::informAboutNotFoundFiles() for( KURL::List::const_iterator it = m_notFoundFiles.begin(); it != m_notFoundFiles.end(); ++it ) l.append( (*it).path() ); - KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), + KMessageBox::informationList( tqApp->activeWindow(), i18n("Could not find the following files:"), l, i18n("Not Found") ); @@ -941,7 +941,7 @@ void K3bAudioDoc::informAboutNotFoundFiles() for( KURL::List::const_iterator it = m_unknownFileFormatFiles.begin(); it != m_unknownFileFormatFiles.end(); ++it ) l.append( (*it).path() ); - KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), + KMessageBox::informationList( tqApp->activeWindow(), i18n("<p>Unable to handle the following files due to an unsupported format:" "<p>You may manually convert these audio files to wave using another " "application supporting the audio format and then add the wave files " diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h index e40a53e..5dd5625 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.h +++ b/libk3b/projects/audiocd/k3baudiodoc.h @@ -49,7 +49,7 @@ class K3bAudioFile; class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc { - Q_OBJECT + TQ_OBJECT friend class K3bMixedDoc; diff --git a/libk3b/projects/audiocd/k3baudioimager.h b/libk3b/projects/audiocd/k3baudioimager.h index cd9aa1c..4ea2da2 100644 --- a/libk3b/projects/audiocd/k3baudioimager.h +++ b/libk3b/projects/audiocd/k3baudioimager.h @@ -22,7 +22,7 @@ class K3bAudioDoc; class K3bAudioImager : public K3bThreadJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp index 8f59744..3f4026e 100644 --- a/libk3b/projects/audiocd/k3baudiojob.cpp +++ b/libk3b/projects/audiocd/k3baudiojob.cpp @@ -101,16 +101,16 @@ K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, TQObject* parent d = new Private; m_audioImager = new K3bAudioImager( m_doc, this, this ); - connect( m_audioImager, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_audioImager, TQT_SIGNAL(percent(int)), - this, TQT_SLOT(slotAudioDecoderPercent(int)) ); - connect( m_audioImager, TQT_SIGNAL(subPercent(int)), - this, TQT_SLOT(slotAudioDecoderSubPercent(int)) ); - connect( m_audioImager, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotAudioDecoderFinished(bool)) ); - connect( m_audioImager, TQT_SIGNAL(nextTrack(int, int)), - this, TQT_SLOT(slotAudioDecoderNextTrack(int, int)) ); + connect( m_audioImager, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_audioImager, TQ_SIGNAL(percent(int)), + this, TQ_SLOT(slotAudioDecoderPercent(int)) ); + connect( m_audioImager, TQ_SIGNAL(subPercent(int)), + this, TQ_SLOT(slotAudioDecoderSubPercent(int)) ); + connect( m_audioImager, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotAudioDecoderFinished(bool)) ); + connect( m_audioImager, TQ_SIGNAL(nextTrack(int, int)), + this, TQ_SLOT(slotAudioDecoderNextTrack(int, int)) ); m_writer = 0; m_tempData = new K3bAudioJobTempData( m_doc, this ); @@ -314,10 +314,10 @@ void K3bAudioJob::start() emit newSubTask( i18n("Determining maximum writing speed") ); if( !m_maxSpeedJob ) { m_maxSpeedJob = new K3bAudioMaxSpeedJob( m_doc, this, this ); - connect( m_maxSpeedJob, TQT_SIGNAL(percent(int)), - this, TQT_SIGNAL(subPercent(int)) ); - connect( m_maxSpeedJob, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotMaxSpeedJobFinished(bool)) ); + connect( m_maxSpeedJob, TQ_SIGNAL(percent(int)), + this, TQ_SIGNAL(subPercent(int)) ); + connect( m_maxSpeedJob, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotMaxSpeedJobFinished(bool)) ); } m_maxSpeedJob->start(); return; @@ -562,20 +562,20 @@ bool K3bAudioJob::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(slotWriterJobPercent(int)) ); - connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); - connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); - connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); - connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); - connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); - // 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(percent(int)), this, TQ_SLOT(slotWriterJobPercent(int)) ); + connect( m_writer, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( m_writer, TQ_SIGNAL(subPercent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_writer, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_writer, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotWriterNextTrack(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(slotWriterFinished(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; } @@ -706,14 +706,14 @@ void K3bAudioJob::normalizeFiles() if( !m_normalizeJob ) { m_normalizeJob = new K3bAudioNormalizeJob( this, this ); - connect( m_normalizeJob, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_normalizeJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotNormalizeProgress(int)) ); - connect( m_normalizeJob, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotNormalizeSubProgress(int)) ); - connect( m_normalizeJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotNormalizeJobFinished(bool)) ); - connect( m_normalizeJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_normalizeJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_normalizeJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_normalizeJob, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotNormalizeProgress(int)) ); + connect( m_normalizeJob, TQ_SIGNAL(subPercent(int)), this, TQ_SLOT(slotNormalizeSubProgress(int)) ); + connect( m_normalizeJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotNormalizeJobFinished(bool)) ); + connect( m_normalizeJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_normalizeJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } // add all the files diff --git a/libk3b/projects/audiocd/k3baudiojob.h b/libk3b/projects/audiocd/k3baudiojob.h index 4dd2602..fa3f481 100644 --- a/libk3b/projects/audiocd/k3baudiojob.h +++ b/libk3b/projects/audiocd/k3baudiojob.h @@ -39,7 +39,7 @@ class K3bAudioMaxSpeedJob; */ class K3bAudioJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.h b/libk3b/projects/audiocd/k3baudiojobtempdata.h index c05b163..5529e63 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.h +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.h @@ -27,7 +27,7 @@ class TQTextStream; class K3bAudioJobTempData : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h index f854234..9bd02b0 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h @@ -23,7 +23,7 @@ class K3bAudioDoc; class K3bAudioMaxSpeedJob : public K3bThreadJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index 0416f38..85fd698 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -49,8 +49,8 @@ void K3bAudioNormalizeJob::start() delete m_process; m_process = new K3bProcess(); - connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" ); diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h index f4340b1..be97002 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.h +++ b/libk3b/projects/audiocd/k3baudionormalizejob.h @@ -28,7 +28,7 @@ class TDEProcess; class K3bAudioNormalizeJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index d25e342..7f99ce6 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -1118,13 +1118,13 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) void K3bDataDoc::informAboutNotFoundFiles() { if( !m_notFoundFiles.isEmpty() ) { - KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("Could not find the following files:"), + KMessageBox::informationList( tqApp->activeWindow(), i18n("Could not find the following files:"), m_notFoundFiles, i18n("Not Found") ); m_notFoundFiles.clear(); } if( !m_noPermissionFiles.isEmpty() ) { - KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("No permission to read the following files:"), + KMessageBox::informationList( tqApp->activeWindow(), i18n("No permission to read the following files:"), m_noPermissionFiles, i18n("No Read Permission") ); m_noPermissionFiles.clear(); diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h index 4d9b58e..bdcb91c 100644 --- a/libk3b/projects/datacd/k3bdatadoc.h +++ b/libk3b/projects/datacd/k3bdatadoc.h @@ -60,7 +60,7 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDataDoc : public K3bDoc { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index 356ab17..dcb5224 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -95,10 +95,10 @@ K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ) m_isoImager = 0; m_msInfoFetcher = new K3bMsInfoFetcher( this, this ); - connect( m_msInfoFetcher, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMsInfoFetched(bool)) ); - connect( m_msInfoFetcher, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_msInfoFetcher, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_msInfoFetcher, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotMsInfoFetched(bool)) ); + connect( m_msInfoFetcher, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_msInfoFetcher, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); d->imageFinished = true; } @@ -432,20 +432,20 @@ void K3bDataJob::slotWriterJobFinished( bool success ) if( d->doc->verifyData() ) { 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(newSubTask(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(newSubTask(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->clear(); @@ -541,19 +541,19 @@ void K3bDataJob::setWriterJob( K3bAbstractWriter* writer ) { // FIXME: progressedsize for multiple copies m_writerJob = writer; - 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(slotWriterJobPercent(int)) ); - connect( m_writerJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_writerJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); - connect( m_writerJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( m_writerJob, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writerJob, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); - connect( m_writerJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); - connect( m_writerJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); - connect( m_writerJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterJobFinished(bool)) ); - 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(slotWriterJobPercent(int)) ); + connect( m_writerJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( m_writerJob, TQ_SIGNAL(subPercent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_writerJob, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_writerJob, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotWriterNextTrack(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(slotWriterJobFinished(bool)) ); + 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&)) ); } @@ -572,11 +572,11 @@ void K3bDataJob::setImager( K3bIsoImager* imager ) void K3bDataJob::connectImager() { m_isoImager->disconnect( this ); - connect( m_isoImager, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_isoImager, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotIsoImagerPercent(int)) ); - connect( m_isoImager, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotIsoImagerFinished(bool)) ); - connect( m_isoImager, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_isoImager, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_isoImager, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotIsoImagerPercent(int)) ); + connect( m_isoImager, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotIsoImagerFinished(bool)) ); + connect( m_isoImager, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } @@ -790,9 +790,9 @@ void K3bDataJob::determineMultiSessionMode() else { // now we need to determine the media's size connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->doc->burner() ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); } } else { diff --git a/libk3b/projects/datacd/k3bdatajob.h b/libk3b/projects/datacd/k3bdatajob.h index c36713f..589ced3 100644 --- a/libk3b/projects/datacd/k3bdatajob.h +++ b/libk3b/projects/datacd/k3bdatajob.h @@ -39,7 +39,7 @@ namespace K3bDevice { */ class K3bDataJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp index a6b9e88..1598c3e 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp +++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp @@ -154,7 +154,7 @@ K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hd { d = new Private( doc ); d->threadJob = new K3bThreadJob( d, this, this ); - connectSubJob( d->threadJob, TQT_SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION ); + connectSubJob( d->threadJob, TQ_SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION ); } diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.h b/libk3b/projects/datacd/k3bdatapreparationjob.h index c63a88e..d0b968c 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.h +++ b/libk3b/projects/datacd/k3bdatapreparationjob.h @@ -28,7 +28,7 @@ class K3bJobHandler; */ class K3bDataPreparationJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp index 3e20982..8474aeb 100644 --- a/libk3b/projects/datacd/k3bfileitem.cpp +++ b/libk3b/projects/datacd/k3bfileitem.cpp @@ -68,7 +68,7 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem* m_k3bName = k3bName; // we determine the size here to avoid problems with removed or renamed files - // we need to use lstat here since for symlinks both KDE and QT return the size of the file pointed to + // we need to use lstat here since for symlinks both TDE and TQt return the size of the file pointed to // instead the size of the link. k3b_struct_stat statBuf; if( k3b_lstat( TQFile::encodeName(filePath), &statBuf ) ) { diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index 2f750c5..f424e07 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -103,7 +103,7 @@ K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* paren d = new Private(); d->dataPreparationJob = new K3bDataPreparationJob( doc, this, this ); connectSubJob( d->dataPreparationJob, - TQT_SLOT(slotDataPreparationDone(bool)), + TQ_SLOT(slotDataPreparationDone(bool)), DEFAULT_SIGNAL_CONNECTION ); } @@ -340,16 +340,16 @@ void K3bIsoImager::startSizeCalculation() // TODO: use K3bProcess::OutputCollector instead iof our own two slots. - connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int)) ); - connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), - this, TQT_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotMkisofsPrintSizeFinished()) ); + connect( m_process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int)) ); + connect( m_process, TQ_SIGNAL(stdoutLine(const TQString&)), + this, TQ_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotMkisofsPrintSizeFinished()) ); // we also want error messages - connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )), - this, TQT_SLOT(slotReceivedStderr( const TQString& )) ); + connect( m_process, TQ_SIGNAL(stderrLine( const TQString& )), + this, TQ_SLOT(slotReceivedStderr( const TQString& )) ); m_collectedMkisofsPrintSizeStdout = TQString(); m_collectedMkisofsPrintSizeStderr = TQString(); @@ -485,11 +485,11 @@ void K3bIsoImager::start() return; } - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); - connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )), - this, TQT_SLOT(slotReceivedStderr( const TQString& )) ); + connect( m_process, TQ_SIGNAL(stderrLine( const TQString& )), + this, TQ_SLOT(slotReceivedStderr( const TQString& )) ); // // Check the image file diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h index 0c3535e..1cf21c0 100644 --- a/libk3b/projects/datacd/k3bisoimager.h +++ b/libk3b/projects/datacd/k3bisoimager.h @@ -37,7 +37,7 @@ class KTempFile; class K3bIsoImager : public K3bJob, public K3bMkisofsHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index cfbe58b..ce4b756 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -70,9 +70,9 @@ void K3bMsInfoFetcher::start() // connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_device ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) ); } @@ -116,12 +116,12 @@ void K3bMsInfoFetcher::getMsInfo() emit debuggingOutput( "msinfo command:", s ); - // connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - // this, TQT_SLOT(slotCollectOutput(TDEProcess*, char*, int)) ); - connect( m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotCollectOutput(TDEProcess*, char*, int)) ); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited()) ); + // connect( m_process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + // this, TQ_SLOT(slotCollectOutput(TDEProcess*, char*, int)) ); + connect( m_process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotCollectOutput(TDEProcess*, char*, int)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited()) ); m_msInfo = TQString(); m_collectedOutput = TQString(); diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h index 88a174f..85be4ca 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.h +++ b/libk3b/projects/datacd/k3bmsinfofetcher.h @@ -26,7 +26,7 @@ class TDEProcess; class K3bMsInfoFetcher : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp index 058e195..eb0631a 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp @@ -129,9 +129,9 @@ void K3bDvdBooktypeJob::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*)) ); } else { // change writer defaults @@ -216,9 +216,9 @@ void K3bDvdBooktypeJob::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*)) ); } } else { @@ -280,8 +280,8 @@ void K3bDvdBooktypeJob::startBooktypeChange() d->process = new K3bProcess(); d->process->setRunPrivileged(true); d->process->setSuppressEmptyLines(true); - 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->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" ); if( !d->dvdBooktypeBin ) { diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h index 165c29b..e3ea1e7 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h @@ -33,7 +33,7 @@ namespace K3bDevice { */ class K3bDvdBooktypeJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp index c8cec08..38cdbe3 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.cpp +++ b/libk3b/projects/datadvd/k3bdvdjob.cpp @@ -105,9 +105,9 @@ void K3bDvdJob::determineMultiSessionMode() } else { connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_doc->burner() ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); } } diff --git a/libk3b/projects/datadvd/k3bdvdjob.h b/libk3b/projects/datadvd/k3bdvdjob.h index 85aed2a..043f91b 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.h +++ b/libk3b/projects/datadvd/k3bdvdjob.h @@ -27,7 +27,7 @@ class K3bGrowisofsWriter; class K3bDvdJob : public K3bDataJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/datadvd/k3bdvdview.h b/libk3b/projects/datadvd/k3bdvdview.h index 8e5804c..9fb5c6f 100644 --- a/libk3b/projects/datadvd/k3bdvdview.h +++ b/libk3b/projects/datadvd/k3bdvdview.h @@ -24,7 +24,7 @@ class K3bDvdDoc; class K3bDvdView : public K3bDataView { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/k3babstractwriter.cpp b/libk3b/projects/k3babstractwriter.cpp index 26bf989..f2c65f2 100644 --- a/libk3b/projects/k3babstractwriter.cpp +++ b/libk3b/projects/k3babstractwriter.cpp @@ -55,8 +55,8 @@ void K3bAbstractWriter::cancel() if( burnDevice() ) { // we need to unlock the writer because cdrecord locked it while writing emit infoMessage( i18n("Unlocking drive..."), INFO ); - connect( K3bDevice::unblock( burnDevice() ), TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotUnblockWhileCancellationFinished(bool)) ); + connect( K3bDevice::unblock( burnDevice() ), TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotUnblockWhileCancellationFinished(bool)) ); } else { emit canceled(); @@ -72,8 +72,8 @@ void K3bAbstractWriter::slotUnblockWhileCancellationFinished( bool success ) if( k3bcore->globalSettings()->ejectMedia() ) { emit newSubTask( i18n("Ejecting CD") ); // FIXME: "media" instead of "CD" - connect( K3bDevice::eject( burnDevice() ), TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotEjectWhileCancellationFinished(bool)) ); + connect( K3bDevice::eject( burnDevice() ), TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotEjectWhileCancellationFinished(bool)) ); } else { emit canceled(); diff --git a/libk3b/projects/k3babstractwriter.h b/libk3b/projects/k3babstractwriter.h index 803bf47..7355da3 100644 --- a/libk3b/projects/k3babstractwriter.h +++ b/libk3b/projects/k3babstractwriter.h @@ -30,7 +30,7 @@ class K3bJobHandler; class K3bAbstractWriter : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index 42174c7..c9ae55b 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -146,8 +146,8 @@ K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, { d = new Private(); d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, TQT_SIGNAL(throughput(int)), - this, TQT_SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQ_SIGNAL(throughput(int)), + this, TQ_SLOT(slotThroughput(int)) ); m_eject = k3bcore->globalSettings()->ejectMedia(); @@ -166,8 +166,8 @@ K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, m_comSock->socketDevice()->setReceiveBufferSize(49152); // magic number from TQt documentation m_comSock->socketDevice()->setBlocking(false); - connect( m_comSock, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(parseCdrdaoMessage())); + connect( m_comSock, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(parseCdrdaoMessage())); } } @@ -464,10 +464,10 @@ void K3bCdrdaoWriter::start() m_process->setRunPrivileged(true); m_process->setSplitStdout(false); m_process->setRawStdin(true); - connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), - this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(stderrLine(const TQString&)), + this, TQ_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); m_canceled = false; m_knownError = false; diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h index 1f8c99b..28012b8 100644 --- a/libk3b/projects/k3bcdrdaowriter.h +++ b/libk3b/projects/k3bcdrdaowriter.h @@ -33,7 +33,7 @@ class TQSocket; class K3bCdrdaoWriter : public K3bAbstractWriter { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp index ce29051..230f8e6 100644 --- a/libk3b/projects/k3bcdrecordwriter.cpp +++ b/libk3b/projects/k3bcdrecordwriter.cpp @@ -74,8 +74,8 @@ K3bCdrecordWriter::K3bCdrecordWriter( K3bDevice::Device* dev, K3bJobHandler* hdl { d = new Private(); d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, TQT_SIGNAL(throughput(int)), - this, TQT_SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQ_SIGNAL(throughput(int)), + this, TQ_SLOT(slotThroughput(int)) ); m_process = 0; m_writingMode = K3b::TAO; @@ -145,9 +145,9 @@ void K3bCdrecordWriter::prepareProcess() m_process->setSplitStdout(true); m_process->setSuppressEmptyLines(true); m_process->setRawStdin(true); // we only use stdin when writing on-the-fly - connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(stdoutLine(const TQString&)), this, TQ_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord"); diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h index 8737ca2..2663e76 100644 --- a/libk3b/projects/k3bcdrecordwriter.h +++ b/libk3b/projects/k3bcdrecordwriter.h @@ -32,7 +32,7 @@ namespace K3bDevice { class K3bCdrecordWriter : public K3bAbstractWriter { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/k3bdoc.cpp b/libk3b/projects/k3bdoc.cpp index 2ae4880..c3d5cb8 100644 --- a/libk3b/projects/k3bdoc.cpp +++ b/libk3b/projects/k3bdoc.cpp @@ -45,7 +45,7 @@ K3bDoc::K3bDoc( TQObject* parent ) m_modified(false), m_view(0) { - connect( this, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); + connect( this, TQ_SIGNAL(changed()), this, TQ_SLOT(slotChanged()) ); } diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index 116974e..63bf836 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -21,7 +21,7 @@ #include <config.h> #endif -// include files for QT +// include files for TQt #include <tqobject.h> #include <tqstring.h> #include <tqptrlist.h> @@ -56,7 +56,7 @@ namespace K3b { */ class LIBK3B_EXPORT K3bDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp index 1079533..da05335 100644 --- a/libk3b/projects/k3bdvdrecordwriter.cpp +++ b/libk3b/projects/k3bdvdrecordwriter.cpp @@ -42,10 +42,10 @@ void K3bDvdrecordWriter::prepareProcess() m_process = new K3bProcess(); m_process->setRunPrivileged(true); m_process->setSplitStdout(true); - connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( m_process, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SIGNAL(dataWritten()) ); + connect( m_process, TQ_SIGNAL(stdoutLine(const TQString&)), this, TQ_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQ_SIGNAL(stderrLine(const TQString&)), this, TQ_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SIGNAL(dataWritten()) ); // if( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "dvd-patch" ) ) // m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord"); diff --git a/libk3b/projects/k3bdvdrecordwriter.h b/libk3b/projects/k3bdvdrecordwriter.h index 5b2ab23..93acccb 100644 --- a/libk3b/projects/k3bdvdrecordwriter.h +++ b/libk3b/projects/k3bdvdrecordwriter.h @@ -29,7 +29,7 @@ namespace K3bDevice { */ class K3bDvdrecordWriter : public K3bCdrecordWriter { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp index e25e758..24828b2 100644 --- a/libk3b/projects/k3bgrowisofshandler.cpp +++ b/libk3b/projects/k3bgrowisofshandler.cpp @@ -65,7 +65,7 @@ void K3bGrowisofsHandler::reset( K3bDevice::Device* dev, bool dao ) void K3bGrowisofsHandler::handleStart() { -// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBufferStatus()) ); +// TQTimer::singleShot( 2000, this, TQ_SLOT(slotCheckBufferStatus()) ); } @@ -298,9 +298,9 @@ void K3bGrowisofsHandler::handleExit( int exitCode ) void K3bGrowisofsHandler::slotCheckBufferStatus() { connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::BUFFER_CAPACITY, m_device ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotCheckBufferStatusDone(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotCheckBufferStatusDone(K3bDevice::DeviceHandler*)) ); } @@ -308,7 +308,7 @@ void K3bGrowisofsHandler::slotCheckBufferStatusDone( K3bDevice::DeviceHandler* d { if( dh->success() && dh->bufferCapacity() > 0 ) { emit deviceBuffer( 100 * (dh->bufferCapacity() - dh->availableBufferCapacity() ) / dh->bufferCapacity() ); - TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBufferStatus()) ); + TQTimer::singleShot( 500, this, TQ_SLOT(slotCheckBufferStatus()) ); } else { kdDebug() << "(K3bGrowisofsHandler) stopping buffer check." << endl; diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h index d874173..a872a60 100644 --- a/libk3b/projects/k3bgrowisofshandler.h +++ b/libk3b/projects/k3bgrowisofshandler.h @@ -31,7 +31,7 @@ namespace K3bDevice { */ class K3bGrowisofsHandler : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp index ebb26a4..dbbc97a 100644 --- a/libk3b/projects/k3bgrowisofswriter.cpp +++ b/libk3b/projects/k3bgrowisofswriter.cpp @@ -102,20 +102,20 @@ K3bGrowisofsWriter::K3bGrowisofsWriter( K3bDevice::Device* dev, K3bJobHandler* h { d = new Private; d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, TQT_SIGNAL(throughput(int)), - this, TQT_SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQ_SIGNAL(throughput(int)), + this, TQ_SLOT(slotThroughput(int)) ); d->gh = new K3bGrowisofsHandler( this ); - connect( d->gh, TQT_SIGNAL(infoMessage(const TQString&, int)), - this,TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( d->gh, TQT_SIGNAL(newSubTask(const TQString&)), - this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( d->gh, TQT_SIGNAL(buffer(int)), - this, TQT_SIGNAL(buffer(int)) ); - connect( d->gh, TQT_SIGNAL(deviceBuffer(int)), - this, TQT_SIGNAL(deviceBuffer(int)) ); - connect( d->gh, TQT_SIGNAL(flushingCache()), - this, TQT_SLOT(slotFlushingCache()) ); + connect( d->gh, TQ_SIGNAL(infoMessage(const TQString&, int)), + this,TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( d->gh, TQ_SIGNAL(newSubTask(const TQString&)), + this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( d->gh, TQ_SIGNAL(buffer(int)), + this, TQ_SIGNAL(buffer(int)) ); + connect( d->gh, TQ_SIGNAL(deviceBuffer(int)), + this, TQ_SIGNAL(deviceBuffer(int)) ); + connect( d->gh, TQ_SIGNAL(flushingCache()), + this, TQ_SLOT(slotFlushingCache()) ); } @@ -182,9 +182,9 @@ bool K3bGrowisofsWriter::prepareProcess() // d->process->setPriority( TDEProcess::PrioHighest ); d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(const TQString&)) ); - connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), this, TQT_SLOT(slotReceivedStderr(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(slotReceivedStderr(const TQString&)) ); + connect( d->process, TQ_SIGNAL(stdoutLine(const TQString&)), this, TQ_SLOT(slotReceivedStderr(const TQString&)) ); + connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); // @@ -394,8 +394,8 @@ void K3bGrowisofsWriter::start() if( d->usingRingBuffer ) { if( !d->ringBuffer ) { d->ringBuffer = new K3bPipeBuffer( this, this ); - connect( d->ringBuffer, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(buffer(int)) ); - connect( d->ringBuffer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotRingBufferFinished(bool)) ); + connect( d->ringBuffer, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(buffer(int)) ); + connect( d->ringBuffer, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotRingBufferFinished(bool)) ); } d->ringBuffer->writeToFd( d->process->stdinFd() ); @@ -571,9 +571,9 @@ void K3bGrowisofsWriter::slotProcessExited( TDEProcess* p ) else { emit newSubTask( i18n("Ejecting DVD") ); connect( K3bDevice::eject( burnDevice() ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); } } diff --git a/libk3b/projects/k3bgrowisofswriter.h b/libk3b/projects/k3bgrowisofswriter.h index 723bce3..4014ba9 100644 --- a/libk3b/projects/k3bgrowisofswriter.h +++ b/libk3b/projects/k3bgrowisofswriter.h @@ -29,7 +29,7 @@ class TDEProcess; class K3bGrowisofsWriter : public K3bAbstractWriter { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index 1c7533e..57ed105 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -37,10 +37,10 @@ K3bMixedDoc::K3bMixedDoc( TQObject* parent ) m_dataDoc = new K3bDataDoc( this ); m_audioDoc = new K3bAudioDoc( this ); - connect( m_dataDoc, TQT_SIGNAL(changed()), - this, TQT_SIGNAL(changed()) ); - connect( m_audioDoc, TQT_SIGNAL(changed()), - this, TQT_SIGNAL(changed()) ); + connect( m_dataDoc, TQ_SIGNAL(changed()), + this, TQ_SIGNAL(changed()) ); + connect( m_audioDoc, TQ_SIGNAL(changed()), + this, TQ_SIGNAL(changed()) ); } diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h index 3e55064..6e65ce4 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.h +++ b/libk3b/projects/mixedcd/k3bmixeddoc.h @@ -32,7 +32,7 @@ class TDEConfig; class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index 7d5858e..9bc9f02 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -103,23 +103,23 @@ K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, TQObject* parent d = new Private; m_isoImager = new K3bIsoImager( doc->dataDoc(), this, this ); - connect( m_isoImager, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_isoImager, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotIsoImagerPercent(int)) ); - connect( m_isoImager, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotIsoImagerFinished(bool)) ); - connect( m_isoImager, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_isoImager, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_isoImager, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotIsoImagerPercent(int)) ); + connect( m_isoImager, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotIsoImagerFinished(bool)) ); + connect( m_isoImager, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); m_audioImager = new K3bAudioImager( doc->audioDoc(), this, this ); - connect( m_audioImager, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_audioImager, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotAudioDecoderPercent(int)) ); - connect( m_audioImager, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotAudioDecoderSubPercent(int)) ); - connect( m_audioImager, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAudioDecoderFinished(bool)) ); - connect( m_audioImager, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotAudioDecoderNextTrack(int, int)) ); + connect( m_audioImager, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_audioImager, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotAudioDecoderPercent(int)) ); + connect( m_audioImager, TQ_SIGNAL(subPercent(int)), this, TQ_SLOT(slotAudioDecoderSubPercent(int)) ); + connect( m_audioImager, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotAudioDecoderFinished(bool)) ); + connect( m_audioImager, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotAudioDecoderNextTrack(int, int)) ); m_msInfoFetcher = new K3bMsInfoFetcher( this, this ); - connect( m_msInfoFetcher, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMsInfoFetched(bool)) ); - connect( m_msInfoFetcher, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_msInfoFetcher, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotMsInfoFetched(bool)) ); + connect( m_msInfoFetcher, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); m_writer = 0; m_tocFile = 0; @@ -251,10 +251,10 @@ void K3bMixedJob::startFirstCopy() // the maxspeed job gets the device from the doc: m_doc->audioDoc()->setBurner( m_doc->burner() ); d->maxSpeedJob = new K3bAudioMaxSpeedJob( m_doc->audioDoc(), this, this ); - connect( d->maxSpeedJob, TQT_SIGNAL(percent(int)), - this, TQT_SIGNAL(subPercent(int)) ); - connect( d->maxSpeedJob, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotMaxSpeedJobFinished(bool)) ); + connect( d->maxSpeedJob, TQ_SIGNAL(percent(int)), + this, TQ_SIGNAL(subPercent(int)) ); + connect( d->maxSpeedJob, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotMaxSpeedJobFinished(bool)) ); } d->maxSpeedJob->start(); } @@ -510,8 +510,8 @@ void K3bMixedJob::slotWriterFinished( bool success ) // reload the media (as a subtask so the user does not see the "Flushing cache" or "Fixating" messages while // doing so emit newSubTask( i18n("Reloading the medium") ); - connect( K3bDevice::reload( m_doc->burner() ), TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotMediaReloadedForSecondSession(bool)) ); + connect( K3bDevice::reload( m_doc->burner() ), TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotMediaReloadedForSecondSession(bool)) ); } else { d->copiesDone++; @@ -690,20 +690,20 @@ bool K3bMixedJob::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(slotWriterJobPercent(int)) ); - connect( m_writer, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_writer, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); - connect( m_writer, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( m_writer, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writer, TQT_SIGNAL(buffer(int)), this, TQT_SIGNAL(bufferStatus(int)) ); - connect( m_writer, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); - connect( m_writer, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); - connect( m_writer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotWriterFinished(bool)) ); - // 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(percent(int)), this, TQ_SLOT(slotWriterJobPercent(int)) ); + connect( m_writer, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( m_writer, TQ_SIGNAL(subPercent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_writer, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_writer, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotWriterNextTrack(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(slotWriterFinished(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; } @@ -1228,14 +1228,14 @@ void K3bMixedJob::normalizeFiles() if( !m_normalizeJob ) { m_normalizeJob = new K3bAudioNormalizeJob( this, this ); - connect( m_normalizeJob, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_normalizeJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotNormalizeProgress(int)) ); - connect( m_normalizeJob, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotNormalizeSubProgress(int)) ); - connect( m_normalizeJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotNormalizeJobFinished(bool)) ); - connect( m_normalizeJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_normalizeJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_normalizeJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_normalizeJob, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotNormalizeProgress(int)) ); + connect( m_normalizeJob, TQ_SIGNAL(subPercent(int)), this, TQ_SLOT(slotNormalizeSubProgress(int)) ); + connect( m_normalizeJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotNormalizeJobFinished(bool)) ); + connect( m_normalizeJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_normalizeJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); } // add all the files diff --git a/libk3b/projects/mixedcd/k3bmixedjob.h b/libk3b/projects/mixedcd/k3bmixedjob.h index a36d47f..747129b 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.h +++ b/libk3b/projects/mixedcd/k3bmixedjob.h @@ -41,7 +41,7 @@ namespace K3bDevice { */ class K3bMixedJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index 5379ba1..74a53d2 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -37,8 +37,8 @@ K3bMovixDoc::K3bMovixDoc( TQObject* parent ) : K3bDataDoc( parent ) { - connect( this, TQT_SIGNAL(itemRemoved(K3bDataItem*)), - this, TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( this, TQ_SIGNAL(itemRemoved(K3bDataItem*)), + this, TQ_SLOT(slotDataItemRemoved(K3bDataItem*)) ); } diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h index 1436eba..d81948f 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.h +++ b/libk3b/projects/movixcd/k3bmovixdoc.h @@ -33,7 +33,7 @@ class TDEConfig; class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.h b/libk3b/projects/movixcd/k3bmovixdocpreparer.h index d047166..491230d 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.h +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.h @@ -29,7 +29,7 @@ class K3bDirItem; */ class K3bMovixDocPreparer : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp index 837fe0c..e23f24d 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.cpp +++ b/libk3b/projects/movixcd/k3bmovixjob.cpp @@ -35,26 +35,26 @@ K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* parent m_movixDocPreparer = new K3bMovixDocPreparer( doc, this, this ); // pipe signals - connect( m_dataJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) ); - connect( m_dataJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); - connect( m_dataJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( m_dataJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_dataJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) ); - connect( m_dataJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SIGNAL(deviceBuffer(int)) ); - connect( m_dataJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); - connect( m_dataJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); - connect( m_dataJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_dataJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); - connect( m_dataJob, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_dataJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) ); + connect( m_dataJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(percent(int)) ); + connect( m_dataJob, TQ_SIGNAL(subPercent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_dataJob, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_dataJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( m_dataJob, TQ_SIGNAL(bufferStatus(int)), this, TQ_SIGNAL(bufferStatus(int)) ); + connect( m_dataJob, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SIGNAL(deviceBuffer(int)) ); + connect( m_dataJob, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) ); + connect( m_dataJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newTask(const TQString&)) ); + connect( m_dataJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_dataJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_dataJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_dataJob, TQ_SIGNAL(burning(bool)), this, TQ_SIGNAL(burning(bool)) ); // we need to clean up here - connect( m_dataJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDataJobFinished(bool)) ); + connect( m_dataJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotDataJobFinished(bool)) ); - connect( m_movixDocPreparer, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_movixDocPreparer, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); } diff --git a/libk3b/projects/movixcd/k3bmovixjob.h b/libk3b/projects/movixcd/k3bmovixjob.h index dbed444..3ddcc8a 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.h +++ b/libk3b/projects/movixcd/k3bmovixjob.h @@ -32,7 +32,7 @@ class K3bFileItem; class K3bMovixJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.h b/libk3b/projects/movixdvd/k3bmovixdvddoc.h index c5472e3..7b639e3 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.h +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.h @@ -23,7 +23,7 @@ class TDEConfig; class LIBK3B_EXPORT K3bMovixDvdDoc : public K3bMovixDoc { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp index dfe8061..1b0c6c5 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp @@ -35,25 +35,25 @@ K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject m_movixDocPreparer = new K3bMovixDocPreparer( doc, this, this ); // pipe signals - connect( m_dvdJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(percent(int)) ); - connect( m_dvdJob, TQT_SIGNAL(subPercent(int)), this, TQT_SIGNAL(subPercent(int)) ); - connect( m_dvdJob, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SIGNAL(processedSubSize(int, int)) ); - connect( m_dvdJob, TQT_SIGNAL(processedSize(int, int)), this, TQT_SIGNAL(processedSize(int, int)) ); - connect( m_dvdJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SIGNAL(bufferStatus(int)) ); - connect( m_dvdJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SIGNAL(writeSpeed(int, int)) ); - connect( m_dvdJob, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SIGNAL(newTask(const TQString&)) ); - connect( m_dvdJob, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SIGNAL(newSubTask(const TQString&)) ); - connect( m_dvdJob, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); - connect( m_dvdJob, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); - connect( m_dvdJob, TQT_SIGNAL(burning(bool)), this, TQT_SIGNAL(burning(bool)) ); + connect( m_dvdJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(percent(int)) ); + connect( m_dvdJob, TQ_SIGNAL(subPercent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_dvdJob, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SIGNAL(processedSubSize(int, int)) ); + connect( m_dvdJob, TQ_SIGNAL(processedSize(int, int)), this, TQ_SIGNAL(processedSize(int, int)) ); + connect( m_dvdJob, TQ_SIGNAL(bufferStatus(int)), this, TQ_SIGNAL(bufferStatus(int)) ); + connect( m_dvdJob, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SIGNAL(writeSpeed(int, int)) ); + connect( m_dvdJob, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SIGNAL(newTask(const TQString&)) ); + connect( m_dvdJob, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SIGNAL(newSubTask(const TQString&)) ); + connect( m_dvdJob, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)) ); + connect( m_dvdJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_dvdJob, TQ_SIGNAL(burning(bool)), this, TQ_SIGNAL(burning(bool)) ); // we need to clean up here - connect( m_dvdJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDvdJobFinished(bool)) ); + connect( m_dvdJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotDvdJobFinished(bool)) ); - connect( m_movixDocPreparer, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); + connect( m_movixDocPreparer, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SIGNAL(infoMessage(const TQString&, int)) ); } diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.h b/libk3b/projects/movixdvd/k3bmovixdvdjob.h index 2ddea38..dc51cae 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.h +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.h @@ -32,7 +32,7 @@ class K3bFileItem; class K3bMovixDvdJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index eb40f16..c11aac2 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// QT-includes +// TQt includes #include <tqstring.h> #include <tqstringlist.h> #include <tqfile.h> @@ -59,11 +59,11 @@ K3bVcdDoc::K3bVcdDoc( TQObject* parent ) m_vcdType = NONE; m_urlAddingTimer = new TQTimer( this ); - connect( m_urlAddingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotWorkUrlQueue() ) ); + connect( m_urlAddingTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotWorkUrlQueue() ) ); // FIXME: remove the newTracks() signal and replace it with the changed signal - connect( this, TQT_SIGNAL( newTracks() ), this, TQT_SIGNAL( changed() ) ); - connect( this, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQT_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( newTracks() ), this, TQ_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQ_SIGNAL( changed() ) ); } K3bVcdDoc::~K3bVcdDoc() diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h index e752a98..335b084 100644 --- a/libk3b/projects/videocd/k3bvcddoc.h +++ b/libk3b/projects/videocd/k3bvcddoc.h @@ -16,7 +16,7 @@ #ifndef K3BVCDDOC_H #define K3BVCDDOC_H -// TQt Includes +// TQt includes #include <tqptrqueue.h> #include <tqfile.h> #include <tqstring.h> @@ -47,7 +47,7 @@ class TDEConfig; class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index d16e7e0..e801b01 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -225,12 +225,12 @@ void K3bVcdJob::vcdxBuild() *m_process << TQString( "%1" ).arg( TQFile::encodeName( m_xmlFile ).data() ); - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotVcdxBuildFinished() ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseVcdxBuildOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotVcdxBuildFinished() ) ); // vcdxbuild commandline parameters kdDebug() << "***** vcdxbuild parameters:" << endl; @@ -432,19 +432,19 @@ bool K3bVcdJob::prepareWriterJob() } - 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( slotWriterJobPercent( int ) ) ); - connect( m_writerJob, TQT_SIGNAL( processedSize( int, int ) ), this, TQT_SLOT( slotProcessedSize( int, int ) ) ); - connect( m_writerJob, TQT_SIGNAL( subPercent( int ) ), this, TQT_SIGNAL( subPercent( int ) ) ); - connect( m_writerJob, TQT_SIGNAL( processedSubSize( int, int ) ), this, TQT_SIGNAL( processedSubSize( int, int ) ) ); - connect( m_writerJob, TQT_SIGNAL( nextTrack( int, int ) ), this, TQT_SLOT( slotWriterNextTrack( int, int ) ) ); - connect( m_writerJob, TQT_SIGNAL( buffer( int ) ), this, TQT_SIGNAL( bufferStatus( int ) ) ); - connect( m_writerJob, TQT_SIGNAL( deviceBuffer( int ) ), this, TQT_SIGNAL( deviceBuffer( int ) ) ); - connect( m_writerJob, TQT_SIGNAL( writeSpeed( int, int ) ), this, TQT_SIGNAL( writeSpeed( int, int ) ) ); - connect( m_writerJob, TQT_SIGNAL( finished( bool ) ), this, TQT_SLOT( slotWriterJobFinished( bool ) ) ); - 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( slotWriterJobPercent( int ) ) ); + connect( m_writerJob, TQ_SIGNAL( processedSize( int, int ) ), this, TQ_SLOT( slotProcessedSize( int, int ) ) ); + connect( m_writerJob, TQ_SIGNAL( subPercent( int ) ), this, TQ_SIGNAL( subPercent( int ) ) ); + connect( m_writerJob, TQ_SIGNAL( processedSubSize( int, int ) ), this, TQ_SIGNAL( processedSubSize( int, int ) ) ); + connect( m_writerJob, TQ_SIGNAL( nextTrack( int, int ) ), this, TQ_SLOT( slotWriterNextTrack( 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( slotWriterJobFinished( 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& ) ) ); return true; } diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h index 9eca0ed..af22869 100644 --- a/libk3b/projects/videocd/k3bvcdjob.h +++ b/libk3b/projects/videocd/k3bvcdjob.h @@ -32,7 +32,7 @@ namespace K3bDevice { class K3bVcdJob : public K3bBurnJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index b0d60cf..4a252be 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -20,7 +20,7 @@ #include <tdelocale.h> #include <kstandarddirs.h> -// TQt Includes +// TQt includes #include <tqstring.h> #include <tqfile.h> diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index f529275..ff4b48d 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -16,7 +16,7 @@ #ifndef K3BVCDTRACK_H #define K3BVCDTRACK_H -// TQt Includes +// TQt includes #include <tqstring.h> #include <tqfileinfo.h> #include <tqfile.h> diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.h b/libk3b/projects/videodvd/k3bvideodvdimager.h index 5fa181e..e05f5d6 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.h +++ b/libk3b/projects/videodvd/k3bvideodvdimager.h @@ -31,7 +31,7 @@ class K3bVideoDvdDoc; */ class K3bVideoDvdImager : public K3bIsoImager { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.h b/libk3b/projects/videodvd/k3bvideodvdjob.h index f187038..d10237c 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.h +++ b/libk3b/projects/videodvd/k3bvideodvdjob.h @@ -27,7 +27,7 @@ class K3bVideoDvdDoc; */ class K3bVideoDvdJob : public K3bDvdJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp index f9e7bc3..8eba682 100644 --- a/libk3b/tools/k3bbusywidget.cpp +++ b/libk3b/tools/k3bbusywidget.cpp @@ -27,7 +27,7 @@ K3bBusyWidget::K3bBusyWidget( TQWidget* parent, const char* name ) m_busyTimer = new TQTimer( this ); m_iBusyPosition = 0; - connect( m_busyTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animateBusy()) ); + connect( m_busyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animateBusy()) ); m_bBusy = false; } diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h index 740afef..88efba4 100644 --- a/libk3b/tools/k3bbusywidget.h +++ b/libk3b/tools/k3bbusywidget.h @@ -26,7 +26,7 @@ class TQTimer; class LIBK3B_EXPORT K3bBusyWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h index bfa7509..2a74db9 100644 --- a/libk3b/tools/k3bcutcombobox.h +++ b/libk3b/tools/k3bcutcombobox.h @@ -34,7 +34,7 @@ class TQResizeEvent; */ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp index 0ca6075..28b7a23 100644 --- a/libk3b/tools/k3bdevicecombobox.cpp +++ b/libk3b/tools/k3bdevicecombobox.cpp @@ -36,10 +36,10 @@ K3bDeviceComboBox::K3bDeviceComboBox( TQWidget* parent, const char* name ) : KComboBox( parent, name ) { d = new Private(); - connect( this, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotActivated(int)) ); - connect( k3bcore->deviceManager(), TQT_SIGNAL(changed(K3bDevice::DeviceManager*)), - this, TQT_SLOT(slotDeviceManagerChanged(K3bDevice::DeviceManager*)) ); + connect( this, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotActivated(int)) ); + connect( k3bcore->deviceManager(), TQ_SIGNAL(changed(K3bDevice::DeviceManager*)), + this, TQ_SLOT(slotDeviceManagerChanged(K3bDevice::DeviceManager*)) ); } diff --git a/libk3b/tools/k3bdevicecombobox.h b/libk3b/tools/k3bdevicecombobox.h index 577bd1e..7efffd8 100644 --- a/libk3b/tools/k3bdevicecombobox.h +++ b/libk3b/tools/k3bdevicecombobox.h @@ -33,7 +33,7 @@ namespace K3bDevice { */ class LIBK3B_EXPORT K3bDeviceComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bdevicehandler.h b/libk3b/tools/k3bdevicehandler.h index bdba4f0..4752b17 100644 --- a/libk3b/tools/k3bdevicehandler.h +++ b/libk3b/tools/k3bdevicehandler.h @@ -46,7 +46,7 @@ namespace K3bDevice */ class LIBK3B_EXPORT DeviceHandler : public K3bThreadJob { - Q_OBJECT + TQ_OBJECT public: @@ -178,8 +178,8 @@ namespace K3bDevice * Usage: * \code * connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::MOUNT, dev ), - * TQT_SIGNAL(finished(DeviceHandler*)), - * this, TQT_SLOT(someSlot(DeviceHandler*)) ); + * TQ_SIGNAL(finished(DeviceHandler*)), + * this, TQ_SLOT(someSlot(DeviceHandler*)) ); * * void someSlot( DeviceHandler* dh ) { * if( dh->success() ) { diff --git a/libk3b/tools/k3bdeviceselectiondialog.h b/libk3b/tools/k3bdeviceselectiondialog.h index 390f55e..e4497b7 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.h +++ b/libk3b/tools/k3bdeviceselectiondialog.h @@ -30,7 +30,7 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDeviceSelectionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h index b33ce5b..86e270a 100644 --- a/libk3b/tools/k3bdirsizejob.h +++ b/libk3b/tools/k3bdirsizejob.h @@ -30,7 +30,7 @@ */ class LIBK3B_EXPORT K3bDirSizeJob : public K3bThreadJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bfilesplitter.cpp b/libk3b/tools/k3bfilesplitter.cpp index a4f0553..965d510 100644 --- a/libk3b/tools/k3bfilesplitter.cpp +++ b/libk3b/tools/k3bfilesplitter.cpp @@ -155,11 +155,7 @@ void K3bFileSplitter::flush() d->file.flush(); } -#ifdef USE_QT4 -qint64 K3bFileSplitter::size() const -#else // USE_QT4 TQIODevice::Offset K3bFileSplitter::size() const -#endif // USE_QT4 { // not implemented due to Offset size limitations return 0; diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h index 7aaf25e..d7e26cf 100644 --- a/libk3b/tools/k3bfilesplitter.h +++ b/libk3b/tools/k3bfilesplitter.h @@ -63,11 +63,6 @@ class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice virtual void close(); -#ifdef USE_QT4 - inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); } - inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); } -#endif // USE_QT4 - /** * File descriptor to read from and write to. * Not implemented yet! @@ -79,11 +74,7 @@ class LIBK3B_EXPORT K3bFileSplitter : public TQIODevice /** * Not implemented */ -#ifdef USE_QT4 - virtual qint64 size() const; -#else // USE_QT4 virtual Offset size() const; -#endif // USE_QT4 /** * Not implemented diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp index 3dd9731..29bd238 100644 --- a/libk3b/tools/k3bintmapcombobox.cpp +++ b/libk3b/tools/k3bintmapcombobox.cpp @@ -35,10 +35,10 @@ K3bIntMapComboBox::K3bIntMapComboBox( TQWidget* parent, const char* name ) : KComboBox( parent, name ) { d = new Private; - connect( this, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotItemHighlighted(int)) ); - connect( this, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotItemActivated(int)) ); + connect( this, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotItemHighlighted(int)) ); + connect( this, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotItemActivated(int)) ); } @@ -82,7 +82,7 @@ bool K3bIntMapComboBox::insertItem( int value, const TQString& text, const TQStr index = KComboBox::count(); d->valueIndexMap[value] = index; - d->indexValueDescriptionMap[index] = tqMakePair<int, TQString>( value, description ); + d->indexValueDescriptionMap[index] = qMakePair<int, TQString>( value, description ); KComboBox::insertItem( text ); diff --git a/libk3b/tools/k3bintmapcombobox.h b/libk3b/tools/k3bintmapcombobox.h index 0b17c00..6775aa0 100644 --- a/libk3b/tools/k3bintmapcombobox.h +++ b/libk3b/tools/k3bintmapcombobox.h @@ -29,7 +29,7 @@ */ class LIBK3B_EXPORT K3bIntMapComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp index a4d20d4..77e499c 100644 --- a/libk3b/tools/k3bintvalidator.cpp +++ b/libk3b/tools/k3bintvalidator.cpp @@ -25,14 +25,14 @@ K3bIntValidator::K3bIntValidator ( TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { m_min = m_max = 0; } K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * parent, const char * name ) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { m_min = bottom; m_max = top; diff --git a/libk3b/tools/k3blibdvdcss.cpp b/libk3b/tools/k3blibdvdcss.cpp index 5baf8b4..bb0e375 100644 --- a/libk3b/tools/k3blibdvdcss.cpp +++ b/libk3b/tools/k3blibdvdcss.cpp @@ -226,7 +226,7 @@ bool K3bLibDvdCss::crackAllKeys() const K3bIso9660File* file = dynamic_cast<const K3bIso9660File*>( dir->entry( filename ) ); if( file && file->size() > 0 ) { - d->titleOffsets.append( tqMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) ); + d->titleOffsets.append( qMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) ); kdDebug() << "(K3bLibDvdCss) Get key for /" << filename << " at " << file->startSector() << endl; if( seek( (int)file->startSector(), DVDCSS_SEEK_KEY ) < 0 ) { kdDebug() << "(K3bLibDvdCss) unable to seek to " << file->startSector() << endl; diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index 552c218..8d22df8 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -520,7 +520,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i else flags |= TQStyle::Style_Off; - listView()->style().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags ); + listView()->style().drawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags ); } } } @@ -552,8 +552,8 @@ K3bListView::K3bListView( TQWidget* parent, const char* name ) { d = new Private; - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); m_editorButton = 0; m_editorComboBox = 0; @@ -709,8 +709,8 @@ void K3bListView::prepareButton( K3bListViewItem*, int ) { if( !m_editorButton ) { m_editorButton = new TQPushButton( viewport() ); - connect( m_editorButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditorButtonClicked()) ); + connect( m_editorButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditorButtonClicked()) ); } // TODO: do some useful things @@ -724,8 +724,8 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::COMBO: if( !m_editorComboBox ) { m_editorComboBox = new TQComboBox( viewport() ); - connect( m_editorComboBox, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotEditorComboBoxActivated(const TQString&)) ); + connect( m_editorComboBox, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotEditorComboBoxActivated(const TQString&)) ); m_editorComboBox->installEventFilter( this ); } m_editorComboBox->clear(); @@ -769,9 +769,9 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::SPIN: if( !m_editorSpinBox ) { m_editorSpinBox = new TQSpinBox( viewport() ); - d->spinBoxLineEdit = static_cast<TQLineEdit*>(TQT_TQWIDGET( m_editorSpinBox->child( 0, TQLINEEDIT_OBJECT_NAME_STRING ) )); - connect( m_editorSpinBox, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotEditorSpinBoxValueChanged(int)) ); + d->spinBoxLineEdit = static_cast<TQLineEdit*>( m_editorSpinBox->child( 0, "TQLineEdit" ) ); + connect( m_editorSpinBox, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotEditorSpinBoxValueChanged(int)) ); // m_editorSpinBox->installEventFilter( this ); d->spinBoxLineEdit->installEventFilter( this ); } @@ -782,9 +782,9 @@ TQWidget* K3bListView::prepareEditor( K3bListViewItem* item, int col ) case K3bListViewItem::MSF: if( !m_editorMsfEdit ) { m_editorMsfEdit = new K3bMsfEdit( viewport() ); - d->msfEditLineEdit = static_cast<TQLineEdit*>(TQT_TQWIDGET( m_editorMsfEdit->child( 0, TQLINEEDIT_OBJECT_NAME_STRING ) )); - connect( m_editorMsfEdit, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotEditorMsfEditValueChanged(int)) ); + d->msfEditLineEdit = static_cast<TQLineEdit*>( m_editorMsfEdit->child( 0, "TQLineEdit" ) ); + connect( m_editorMsfEdit, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotEditorMsfEditValueChanged(int)) ); // m_editorMsfEdit->installEventFilter( this ); d->msfEditLineEdit->installEventFilter( this ); } @@ -1015,11 +1015,11 @@ void K3bListView::slotEditorButtonClicked( K3bListViewItem* item, int col ) bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::KeyPress ) { - TQKeyEvent* ke = TQT_TQKEYEVENT(e); + TQKeyEvent* ke = static_cast<TQKeyEvent*>(e); if( ke->key() == Key_Tab ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { + if( o == m_editorLineEdit || + o == d->msfEditLineEdit || + o == d->spinBoxLineEdit ) { K3bListViewItem* lastEditItem = m_currentEditItem; doRename(); @@ -1059,9 +1059,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } if( ke->key() == Key_Return || ke->key() == Key_Enter ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { + if( o == m_editorLineEdit || + o == d->msfEditLineEdit || + o == d->spinBoxLineEdit ) { K3bListViewItem* lastEditItem = m_currentEditItem; doRename(); @@ -1079,9 +1079,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } } else if( ke->key() == Key_Escape ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { + if( o == m_editorLineEdit || + o == d->msfEditLineEdit || + o == d->spinBoxLineEdit ) { hideEditor(); // keep the focus here @@ -1092,12 +1092,12 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } } - else if( e->type() == TQEvent::MouseButtonPress && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { + else if( e->type() == TQEvent::MouseButtonPress && o == viewport() ) { // first let's grab the focus viewport()->setFocus(); - TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* me = static_cast<TQMouseEvent*>( e ); TQListViewItem* item = itemAt( me->pos() ); int col = header()->sectionAt( me->pos().x() ); if( K3bCheckListViewItem* ci = dynamic_cast<K3bCheckListViewItem*>( item ) ) { @@ -1108,7 +1108,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } } - if( me->button() == Qt::LeftButton ) { + if( me->button() == TQt::LeftButton ) { if( item != m_currentEditItem || m_currentEditColumn != col ) { doRename(); if( K3bListViewItem* k3bItem = dynamic_cast<K3bListViewItem*>(item) ) { @@ -1138,12 +1138,12 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e ) } else if( e->type() == TQEvent::FocusOut ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) || - TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) { + if( o == m_editorLineEdit || + o == d->msfEditLineEdit || + o == d->spinBoxLineEdit || + o == m_editorComboBox ) { // make sure we did not lose the focus to one of the edit widgets' children - if( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) { + if( !tqApp->focusWidget() || tqApp->focusWidget()->parentWidget() != o ) { doRename(); hideEditor(); } @@ -1174,7 +1174,7 @@ void K3bListView::viewportResizeEvent( TQResizeEvent* e ) if( bgPix.width() < m_backgroundPixmap.width() || bgPix.height() < m_backgroundPixmap.height() ) { - TQPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), TQ_ScaleMin ) ); + TQPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), TQImage::ScaleMin ) ); if( m_backgroundPixmapPosition == TOP_LEFT ) bitBlt( &bgPix, 0, 0, &newBgPix, 0, 0, diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h index b29f594..6f654be 100644 --- a/libk3b/tools/k3blistview.h +++ b/libk3b/tools/k3blistview.h @@ -157,7 +157,7 @@ class LIBK3B_EXPORT K3bListView : public TDEListView { friend class K3bListViewItem; - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp index 8bb5f69..a5ebf21 100644 --- a/libk3b/tools/k3blistviewitemanimator.cpp +++ b/libk3b/tools/k3blistviewitemanimator.cpp @@ -53,7 +53,7 @@ void K3bListViewItemAnimator::init() m_item = 0; m_column = 0; m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimate()) ); } diff --git a/libk3b/tools/k3blistviewitemanimator.h b/libk3b/tools/k3blistviewitemanimator.h index 68c60dd..e095d7e 100644 --- a/libk3b/tools/k3blistviewitemanimator.h +++ b/libk3b/tools/k3blistviewitemanimator.h @@ -29,7 +29,7 @@ class TQTimer; */ class LIBK3B_EXPORT K3bListViewItemAnimator : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index 39eff96..e1384de 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -73,8 +73,8 @@ K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, TQObject* parent, const char* name ) { d = new K3bMd5JobPrivate; d->data = new char[K3bMd5JobPrivate::BUFFERSIZE]; - connect( &d->timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdate()) ); + connect( &d->timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdate()) ); } @@ -135,7 +135,7 @@ void K3bMd5Job::setupFdNotifier() // the TQSocketNotifier will fire once the fd is closed delete d->fdNotifier; d->fdNotifier = new TQSocketNotifier( d->fileDes, TQSocketNotifier::Read, this ); - connect( d->fdNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdate()) ); + connect( d->fdNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdate()) ); d->fdNotifier->setEnabled( true ); } diff --git a/libk3b/tools/k3bmd5job.h b/libk3b/tools/k3bmd5job.h index b2cf948..6079e77 100644 --- a/libk3b/tools/k3bmd5job.h +++ b/libk3b/tools/k3bmd5job.h @@ -30,7 +30,7 @@ class K3bIso9660File; class LIBK3B_EXPORT K3bMd5Job : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index 07ed77d..7926e97 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -36,13 +36,13 @@ K3bMsfValidator::K3bMsfValidator( TQObject* parent, const char* name ) K3bMsfEdit::K3bMsfEdit( TQWidget* parent, const char* name ) : TQSpinBox( parent, name ) { - setValidator( new K3bMsfValidator( TQT_TQOBJECT(this) ) ); + setValidator( new K3bMsfValidator( this ) ); setMinValue( 0 ); // some very high value (10000 minutes) setMaxValue( 10000*60*75 ); - connect( this, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValueChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValueChanged(int)) ); } @@ -60,7 +60,7 @@ TQSize K3bMsfEdit::sizeHint() const int w = fm.width( "00:00:00" ); int wx = fm.width( ' ' )*2; int frame = style().pixelMetric( TQStyle::PM_SpinBoxFrameWidth ); - return style().tqsizeFromContents(TQStyle::CT_SpinBox, this, + return style().sizeFromContents(TQStyle::CT_SpinBox, this, TQSize( w + wx + downRect().width() + frame*2, h + frame*2). expandedTo( TQApplication::globalStrut() )); diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h index f80827a..b71f194 100644 --- a/libk3b/tools/k3bmsfedit.h +++ b/libk3b/tools/k3bmsfedit.h @@ -34,7 +34,7 @@ class K3bMsfValidator : public TQRegExpValidator class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp index c502d95..de4cb22 100644 --- a/libk3b/tools/k3bmultichoicedialog.cpp +++ b/libk3b/tools/k3bmultichoicedialog.cpp @@ -82,8 +82,8 @@ K3bMultiChoiceDialog::K3bMultiChoiceDialog( const TQString& caption, : KDialog( parent, name ) { d = new Private(); - d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); - connect( d->mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(done(int)) ); + d->mapper = new TQSignalMapper( this ); + connect( d->mapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(done(int)) ); setCaption( caption ); @@ -126,8 +126,8 @@ int K3bMultiChoiceDialog::addButton( const KGuiItem& b ) KPushButton* button = new KPushButton( b, this ); d->buttonLayout->add( button ); d->buttons.append(button); - d->mapper->setMapping( TQT_TQOBJECT(button), d->buttons.count() ); - connect( button, TQT_SIGNAL(clicked()), d->mapper, TQT_SLOT(map()) ); + d->mapper->setMapping( button, d->buttons.count() ); + connect( button, TQ_SIGNAL(clicked()), d->mapper, TQ_SLOT(map()) ); return d->buttons.count(); } diff --git a/libk3b/tools/k3bmultichoicedialog.h b/libk3b/tools/k3bmultichoicedialog.h index 02709e6..ab63420 100644 --- a/libk3b/tools/k3bmultichoicedialog.h +++ b/libk3b/tools/k3bmultichoicedialog.h @@ -27,7 +27,7 @@ class TQCloseEvent; class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bprogressdialog.h b/libk3b/tools/k3bprogressdialog.h index cb0f989..581ade1 100644 --- a/libk3b/tools/k3bprogressdialog.h +++ b/libk3b/tools/k3bprogressdialog.h @@ -33,7 +33,7 @@ class TQWidgetStack; */ class LIBK3B_EXPORT K3bProgressDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index 780a338..d7e6b89 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -80,7 +80,7 @@ void K3bPushButton::setDelayedPopupMenu( TQPopupMenu* popup ) { if( !d->popupTimer ) { d->popupTimer = new TQTimer( this ); - connect( d->popupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayedPopup()) ); + connect( d->popupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayedPopup()) ); } setPopup( popup ); @@ -99,12 +99,12 @@ bool K3bPushButton::eventFilter( TQObject* o, TQEvent* ev ) // is moved by a small distance. if( popup() ) { if( ev->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); d->mousePressPos = mev->pos(); d->popupTimer->start( TQApplication::startDragTime() ); } else if( ev->type() == TQEvent::MouseMove ) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if( ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { d->popupTimer->stop(); slotDelayedPopup(); diff --git a/libk3b/tools/k3bpushbutton.h b/libk3b/tools/k3bpushbutton.h index 13a8fec..8673b6a 100644 --- a/libk3b/tools/k3bpushbutton.h +++ b/libk3b/tools/k3bpushbutton.h @@ -25,7 +25,7 @@ */ class LIBK3B_EXPORT K3bPushButton : public KPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp index d19f579..164f413 100644 --- a/libk3b/tools/k3bradioaction.cpp +++ b/libk3b/tools/k3bradioaction.cpp @@ -78,12 +78,12 @@ void K3bRadioAction::slotActivated() if( m_alwaysEmit ) emit activated(); - const TQObject *senderObj = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); + const TQObject *senderObj = sender(); - if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) ) + if ( !senderObj || !::tqt_cast<const TDEToolBarButton *>( senderObj ) ) return; - const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true ); + const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( senderObj ) )->on( true ); return; } diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h index 1932efb..f554c0e 100644 --- a/libk3b/tools/k3bradioaction.h +++ b/libk3b/tools/k3bradioaction.h @@ -28,7 +28,7 @@ */ class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: @@ -47,8 +47,8 @@ class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The TQ_SLOT's parent. + * @param slot The TQ_SLOT to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -79,8 +79,8 @@ class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The TQ_SLOT's parent. + * @param slot The TQ_SLOT to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -91,8 +91,8 @@ class LIBK3B_EXPORT K3bRadioAction : public TDEToggleAction * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The TQ_SLOT's parent. + * @param slot The TQ_SLOT to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index c015763..c72e26f 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -30,7 +30,7 @@ * TQLabel */ class LIBK3B_EXPORT K3bRichTextLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bsignalwaiter.cpp b/libk3b/tools/k3bsignalwaiter.cpp index 50284c4..359ddcf 100644 --- a/libk3b/tools/k3bsignalwaiter.cpp +++ b/libk3b/tools/k3bsignalwaiter.cpp @@ -36,7 +36,7 @@ void K3bSignalWaiter::waitForSignal( TQObject* o, const char* signal ) { K3bSignalWaiter w; connect( o, signal, - &w, TQT_SLOT(slotSignal()) ); + &w, TQ_SLOT(slotSignal()) ); TQApplication::eventLoop()->enterLoop(); } @@ -47,7 +47,7 @@ void K3bSignalWaiter::waitForJob( K3bJob* job ) if( !job->active() ) return; - waitForSignal( job, TQT_SIGNAL(finished(bool)) ); + waitForSignal( job, TQ_SIGNAL(finished(bool)) ); } diff --git a/libk3b/tools/k3bsignalwaiter.h b/libk3b/tools/k3bsignalwaiter.h index e81b0de..29e605a 100644 --- a/libk3b/tools/k3bsignalwaiter.h +++ b/libk3b/tools/k3bsignalwaiter.h @@ -24,7 +24,7 @@ class K3bJob; class K3bSignalWaiter : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bthreadwidget.h b/libk3b/tools/k3bthreadwidget.h index 89fefda..5ac5c3e 100644 --- a/libk3b/tools/k3bthreadwidget.h +++ b/libk3b/tools/k3bthreadwidget.h @@ -34,7 +34,7 @@ namespace K3bDevice { */ class K3bThreadWidget : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3bthroughputestimator.h b/libk3b/tools/k3bthroughputestimator.h index c143b2f..0b43d44 100644 --- a/libk3b/tools/k3bthroughputestimator.h +++ b/libk3b/tools/k3bthroughputestimator.h @@ -27,7 +27,7 @@ */ class K3bThroughputEstimator : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h index d19d82d..811d081 100644 --- a/libk3b/tools/k3btitlelabel.h +++ b/libk3b/tools/k3btitlelabel.h @@ -25,7 +25,7 @@ class TQResizeEvent; class LIBK3B_EXPORT K3bTitleLabel : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index 8b00f51..a9467f2 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -38,7 +38,7 @@ */ class K3bToolBoxSeparator : public TQWidget { - // Q_OBJECT + // TQ_OBJECT public: @@ -71,7 +71,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), + style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), colorGroup(), flags ); } @@ -101,22 +101,22 @@ K3bToolBoxButton::K3bToolBoxButton( TDEAction* action, TQWidget* parent ) // if( ta->isChecked() ) // toggle(); -// connect( ta, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggle()) ); -// connect( this, TQT_SIGNAL(toggled(bool)), ta, TQT_SLOT(setChecked(bool)) ); +// connect( ta, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(toggle()) ); +// connect( this, TQ_SIGNAL(toggled(bool)), ta, TQ_SLOT(setChecked(bool)) ); // } // else if( TDEActionMenu* am = dynamic_cast<TDEActionMenu*>( action ) ) { m_popupMenu = am->popupMenu(); - connect( this, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotPopupActivated()) ); + connect( this, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotPopupActivated()) ); setPopup( m_popupMenu ); } else { - connect( this, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); + connect( this, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); } - connect( action, TQT_SIGNAL(enabled(bool)), this, TQT_SLOT(setEnabled(bool)) ); + connect( action, TQ_SIGNAL(enabled(bool)), this, TQ_SLOT(setEnabled(bool)) ); } @@ -141,7 +141,7 @@ K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon, TQToolTip::add( this, tooltip ); if( receiver && slot ) - connect( this, TQT_SIGNAL(clicked()), receiver, slot ); + connect( this, TQ_SIGNAL(clicked()), receiver, slot ); } diff --git a/libk3b/tools/k3btoolbox.h b/libk3b/tools/k3btoolbox.h index 45621c1..bab55a8 100644 --- a/libk3b/tools/k3btoolbox.h +++ b/libk3b/tools/k3btoolbox.h @@ -35,7 +35,7 @@ class TQResizeEvent; */ class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton { - Q_OBJECT + TQ_OBJECT public: @@ -58,7 +58,7 @@ class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton class LIBK3B_EXPORT K3bToolBox : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index cdc26b9..3544ad6 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -68,7 +68,7 @@ void K3bToolButton::drawButton( TQPainter* p ) if( isEnabled() ) arrowFlags |= TQStyle::Style_Enabled; - style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p, + style().drawPrimitive(TQStyle::PE_ArrowDown, p, TQRect(width()-7, height()-7, 7, 7), colorGroup(), arrowFlags, TQStyleOption() ); } @@ -83,7 +83,7 @@ bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev ) // is moved by a small distance. if( TQToolButton::popup() ) { if( ev->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if( d->instantMenu ) { setDown(true); @@ -95,7 +95,7 @@ bool K3bToolButton::eventFilter( TQObject* o, TQEvent* ev ) } } else if( ev->type() == TQEvent::MouseMove ) { - TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev); if( !d->instantMenu && ( mev->pos() - d->mousePressPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { openPopup(); diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h index 670951f..d6d6b57 100644 --- a/libk3b/tools/kcutlabel.h +++ b/libk3b/tools/kcutlabel.h @@ -26,7 +26,7 @@ */ class LIBK3B_EXPORT KCutLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: |