diff options
451 files changed, 2178 insertions, 2149 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 6d0dcb8..8fc93cf 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index b0fe2a8..0993d67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -20,13 +25,10 @@ project( k3b ) ##### include essential cmake modules ########### include( FindPkgConfig ) +include( CheckCSourceCompiles ) include( CheckIncludeFile ) include( CheckLibraryExists ) include( CheckSymbolExists ) -# EXAMPLE: -# include( CheckTypeSize ) -# include( CheckCSourceCompiles ) -# include( CheckCXXSourceCompiles ) ##### include our cmake modules ################# @@ -34,11 +36,6 @@ include( CheckSymbolExists ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths ####################### include( TDESetupPaths ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 7047c34..1bfe83c 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -183,6 +183,7 @@ if( WITH_TAGLIB ) if( NOT TAGLIB_FOUND ) tde_message_fatal( "taglib is requested, but was not found on your system" ) endif( ) + set( HAVE_TAGLIB 1 ) endif( ) @@ -242,3 +243,38 @@ if( WITH_LAME ) tde_message_fatal( "lame is requested, but was not found on your system" ) endif( ) endif( ) + + +##### check architecture + +if( NOT CMAKE_ARCHITECTURE ) + execute_process( + COMMAND ${CMAKE_C_COMPILER} -dumpmachine + OUTPUT_VARIABLE CMAKE_ARCHITECTURE + ERROR_VARIABLE CMAKE_ARCHITECTURE + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_STRIP_TRAILING_WHITESPACE ) + set( CMAKE_ARCHITECTURE "${CMAKE_ARCHITECTURE}" CACHE INTERNAL "" FORCE ) + message( STATUS "Detected ${CMAKE_ARCHITECTURE} target architecture" ) +endif( ) + + +##### check specific architecture dependant support + +if( ${CMAKE_ARCHITECTURE} MATCHES "i.86" ) + + # MMX support + message( STATUS "Performing MMX support test" ) + check_c_source_compiles( " + int main() { + #if defined(__GNUC__) + __asm__(\"pxor %mm0, %mm0\"); + #else + #error Not gcc on x86/x86_64 + #endif + return 0; + }" + HAVE_X86_MMX + ) + +endif( ) diff --git a/RELEASE_HOWTO b/RELEASE_HOWTO index 7346b6a..1710bcd 100644 --- a/RELEASE_HOWTO +++ b/RELEASE_HOWTO @@ -11,7 +11,7 @@ Howto create a K3b release (stable branch) 3. Create the tarball. 4. Test the tarball. That includes removing any trace of K3b from the test system before and in the ideal - case compile on a minimal system meaning minimal KDE/QT versions. + case compile on a minimal system meaning minimal TDE/TQt versions. 5. Upload the tarball to upload.sf.net/incoming and create a release on www.sourceforge.net (or use releaseforge, a nice little application which automates the whole sourceforge release thing). diff --git a/config.h.cmake b/config.h.cmake index 03370d3..5585fa0 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -33,3 +33,8 @@ // Don't define HAVE_RESMGR due to it seems to be totally outdated // #cmakedefine HAVE_RESMGR + +#cmakedefine HAVE_TAGLIB + +// Defined if you have MMX support +#cmakedefine HAVE_X86_MMX 1 diff --git a/doc/en/dcop.docbook b/doc/en/dcop.docbook index 0958946..4ab7cd4 100644 --- a/doc/en/dcop.docbook +++ b/doc/en/dcop.docbook @@ -76,13 +76,13 @@ void burn() <para>K3b offers the K3bProjectInterface as listed above or the more powerful K3bDataProjectInterface which only applies to data projects (CD and DVD): <programlisting> -void createFolder(QString name) -void createFolder(QString name,QString parent) -void addUrl(KURL url,QString parent) -void addUrls(KURL::List urls,QString parent) -void removeItem(QString path) -void renameItem(QString path,QString newName) -void setVolumeID(QString id) +void createFolder(TQString name) +void createFolder(TQString name,TQString parent) +void addUrl(KURL url,TQString parent) +void addUrls(KURL::List urls,TQString parent) +void removeItem(TQString path) +void renameItem(TQString path,TQString newName) +void setVolumeID(TQString id) </programlisting> </para> diff --git a/doc/man/k3b.1 b/doc/man/k3b.1 index 08ca27b..afe7f14 100644 --- a/doc/man/k3b.1 +++ b/doc/man/k3b.1 @@ -24,8 +24,8 @@ file(s) to open .B \-\-help Show help about options .TP -.B \-\-help\-qt -Show Qt specific options +.B \-\-help\-tqt +Show TQt specific options .TP .B \-\-help\-tde Show TDE specific options @@ -83,7 +83,7 @@ Format a DVD-RW or DVD+RW .TP .BI \-\-lang \ language Set the GUI language -.SS "Qt options:" +.SS "TQt options:" .TP .BI \-\-display \ displayname Use the X-server display \fIdisplayname\fP. @@ -102,7 +102,7 @@ using the QApplication::ManyColor color specification. .TP .B \-\-nograb -tells Qt to never grab the mouse or the keyboard. +tells TQt to never grab the mouse or the keyboard. .TP .B \-\-dograb running under a debugger can cause an implicit diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp index 482ece6..89a4d86 100644 --- a/k3bsetup/k3bsetup2.cpp +++ b/k3bsetup/k3bsetup2.cpp @@ -144,14 +144,14 @@ K3bSetup2::K3bSetup2( TQWidget *parent, const char *, const TQStringList& ) w->textLabel2->hide(); - connect( w->m_checkUseBurningGroup, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(updateViews()) ); - connect( w->m_editBurningGroup, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateViews()) ); - connect( w->m_editSearchPath, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotSearchPrograms()) ); - connect( w->m_buttonAddDevice, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddDevice()) ); + connect( w->m_checkUseBurningGroup, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(updateViews()) ); + connect( w->m_editBurningGroup, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateViews()) ); + connect( w->m_editSearchPath, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotSearchPrograms()) ); + connect( w->m_buttonAddDevice, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddDevice()) ); d->externalBinManager = new K3bExternalBinManager( this ); @@ -171,7 +171,7 @@ K3bSetup2::K3bSetup2( TQWidget *parent, const char *, const TQStringList& ) // This is a hack to work around a kcm bug which makes the faulty assumption that // every module starts without anything to apply // - TQTimer::singleShot( 0, this, TQT_SLOT(updateViews()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(updateViews()) ); if( getuid() != 0 || !d->config->checkConfigFilesWritable( true ) ) makeReadOnly(); @@ -383,7 +383,7 @@ void K3bSetup2::defaults() // This is a hack to work around a kcm bug which makes the faulty assumption that // every module defaults to a state where nothing is to be applied // - TQTimer::singleShot( 0, this, TQT_SLOT(updateViews()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(updateViews()) ); } diff --git a/k3bsetup/k3bsetup2.h b/k3bsetup/k3bsetup2.h index bff71f0..8cccaa2 100644 --- a/k3bsetup/k3bsetup2.h +++ b/k3bsetup/k3bsetup2.h @@ -27,7 +27,7 @@ class TQCheckListItem; class K3bSetup2: public TDECModule { - Q_OBJECT + TQ_OBJECT public: 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: diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp index e195eb1..34dd909 100644 --- a/libk3bdevice/k3bcdtext.cpp +++ b/libk3bdevice/k3bcdtext.cpp @@ -556,7 +556,7 @@ TQCString K3bDevice::encodeCdText( const TQString& s, bool* illegalChars ) if( illegalChars ) *illegalChars = false; - // TODO: do this without QT + // TODO: do this without TQt TQTextCodec* codec = TQTextCodec::codecForName("ISO8859-1"); if( codec ) { TQCString encoded = codec->fromUnicode( s ); diff --git a/libk3bdevice/k3bconnection.cpp b/libk3bdevice/k3bconnection.cpp index 47cc98c..0d519ea 100644 --- a/libk3bdevice/k3bconnection.cpp +++ b/libk3bdevice/k3bconnection.cpp @@ -94,9 +94,9 @@ bool K3bDevice::Connection::open() d->m_hwdevices = TDEGlobal::hardwareDevices(); // Connect device monitoring signals/slots - connect(d->m_hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*))); - connect(d->m_hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(RemoveDeviceHandler(TDEGenericDevice*))); - connect(d->m_hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(ModifyDeviceHandler(TDEGenericDevice*))); + connect(d->m_hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(AddDeviceHandler(TDEGenericDevice*))); + connect(d->m_hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(RemoveDeviceHandler(TDEGenericDevice*))); + connect(d->m_hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(ModifyDeviceHandler(TDEGenericDevice*))); d->bOpen = true; diff --git a/libk3bdevice/k3bconnection.h b/libk3bdevice/k3bconnection.h index 311a70e..9deb458 100644 --- a/libk3bdevice/k3bconnection.h +++ b/libk3bdevice/k3bconnection.h @@ -38,7 +38,7 @@ namespace K3bDevice { class Device; /** - * This is a simple wrapper which creates QT signals whenever a new optical + * This is a simple wrapper which creates TQt signals whenever a new optical * drive is plugged into the system or one is unplugged. * * The Connection class also handles media changes. Whenever a new medium is inserted @@ -50,7 +50,7 @@ namespace K3bDevice { */ class LIBK3BDEVICE_EXPORT Connection : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/libk3bdevice/k3bdevicemanager.h b/libk3bdevice/k3bdevicemanager.h index 13eb897..aa61807 100644 --- a/libk3bdevice/k3bdevicemanager.h +++ b/libk3bdevice/k3bdevicemanager.h @@ -49,7 +49,7 @@ namespace K3bDevice { */ class LIBK3BDEVICE_EXPORT DeviceManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.h b/plugins/audiooutput/alsa/k3balsaoutputplugin.h index 3f02749..866ef16 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.h +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.h @@ -52,7 +52,7 @@ class K3bAlsaOutputPlugin : public K3bAudioOutputPlugin class K3bAlsaOutputPluginConfigWidget : public K3bPluginConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h index 1b493b7..0afd20a 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h +++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h @@ -23,7 +23,7 @@ class K3bFFMpegFile; class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -43,7 +43,7 @@ class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory class K3bFFMpegDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/flac/CMakeLists.txt b/plugins/decoder/flac/CMakeLists.txt index 20e4256..090e3d6 100644 --- a/plugins/decoder/flac/CMakeLists.txt +++ b/plugins/decoder/flac/CMakeLists.txt @@ -18,11 +18,13 @@ include_directories( ${CMAKE_SOURCE_DIR}/libk3bdevice ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${TAGLIB_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} ${FLAC_LIBRARY_DIRS} + ${TAGLIB_LIBRARY_DIRS} ) if( ${FLAC_VERSION} VERSION_GREATER "1.1.1" ) @@ -34,7 +36,7 @@ endif( ) tde_add_kpart( libk3bflacdecoder AUTOMOC SOURCES k3bflacdecoder.cpp LINK tdecore-shared k3b-shared k3bdevice-shared - ${FLAC_LIBRARIES} + ${FLAC_LIBRARIES} ${TAGLIB_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp index 671bf4c..6a95854 100644 --- a/plugins/decoder/flac/k3bflacdecoder.cpp +++ b/plugins/decoder/flac/k3bflacdecoder.cpp @@ -33,6 +33,7 @@ #ifdef HAVE_TAGLIB #include <taglib/tag.h> #include <taglib/flacfile.h> +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) #endif #if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6 @@ -56,7 +57,7 @@ public: file = f; file->open(IO_ReadOnly); - TQT_TQIODEVICE(internalBuffer)->flush(); + internalBuffer->flush(); set_metadata_respond(FLAC__METADATA_TYPE_STREAMINFO); set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT); @@ -293,9 +294,9 @@ bool K3bFLACDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate, int kdDebug() << "(K3bFLACDecoder) using taglib to read tag" << endl; TagLib::FLAC::File f( TQFile::encodeName(filename()) ); if( f.isOpen() ) { - addMetaInfo( META_TITLE, TStringToQString( f.tag()->title() ) ); - addMetaInfo( META_ARTIST, TStringToQString( f.tag()->artist() ) ); - addMetaInfo( META_COMMENT, TStringToQString( f.tag()->comment() ) ); + addMetaInfo( META_TITLE, TStringToTQString( f.tag()->title() ) ); + addMetaInfo( META_ARTIST, TStringToTQString( f.tag()->artist() ) ); + addMetaInfo( META_COMMENT, TStringToTQString( f.tag()->comment() ) ); } } #endif diff --git a/plugins/decoder/flac/k3bflacdecoder.h b/plugins/decoder/flac/k3bflacdecoder.h index 83904dd..d2f1d87 100644 --- a/plugins/decoder/flac/k3bflacdecoder.h +++ b/plugins/decoder/flac/k3bflacdecoder.h @@ -23,7 +23,7 @@ class KURL; class K3bFLACDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -41,7 +41,7 @@ class K3bFLACDecoderFactory : public K3bAudioDecoderFactory class K3bFLACDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/libsndfile/CMakeLists.txt b/plugins/decoder/libsndfile/CMakeLists.txt index 7f8c947..f9a35ed 100644 --- a/plugins/decoder/libsndfile/CMakeLists.txt +++ b/plugins/decoder/libsndfile/CMakeLists.txt @@ -18,6 +18,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libk3bdevice ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${SNDFILE_INCLUDE_DIRS} ) link_directories( diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h index 5840ee7..8cf5e97 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h @@ -24,7 +24,7 @@ class KURL; class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -44,7 +44,7 @@ class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory class K3bLibsndfileDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/mp3/CMakeLists.txt b/plugins/decoder/mp3/CMakeLists.txt index 4b180f5..a04a4e9 100644 --- a/plugins/decoder/mp3/CMakeLists.txt +++ b/plugins/decoder/mp3/CMakeLists.txt @@ -18,11 +18,13 @@ include_directories( ${CMAKE_SOURCE_DIR}/libk3bdevice ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${TAGLIB_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} ${MAD_LIBRARY_DIRS} + ${TAGLIB_LIBRARY_DIRS} ) @@ -31,7 +33,7 @@ link_directories( tde_add_kpart( libk3bmaddecoder AUTOMOC SOURCES k3bmad.cpp k3bmaddecoder.cpp LINK tdecore-shared k3b-shared k3bdevice-shared - ${MAD_LIBRARIES} + ${MAD_LIBRARIES} ${TAGLIB_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp index a28e24b..ece3ea7 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.cpp +++ b/plugins/decoder/mp3/k3bmaddecoder.cpp @@ -48,6 +48,7 @@ #ifdef HAVE_TAGLIB #include <taglib/tag.h> #include <taglib/mpegfile.h> +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) #endif @@ -110,11 +111,11 @@ TQString K3bMadDecoder::metaInfo( MetaDataField f ) if ( file.tag() ) { switch( f ) { case META_TITLE: - return TStringToQString( file.tag()->title() ); + return TStringToTQString( file.tag()->title() ); case META_ARTIST: - return TStringToQString( file.tag()->artist() ); + return TStringToTQString( file.tag()->artist() ); case META_COMMENT: - return TStringToQString( file.tag()->comment() ); + return TStringToTQString( file.tag()->comment() ); default: return TQString(); } diff --git a/plugins/decoder/mp3/k3bmaddecoder.h b/plugins/decoder/mp3/k3bmaddecoder.h index df63a1d..de1fe9e 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.h +++ b/plugins/decoder/mp3/k3bmaddecoder.h @@ -26,7 +26,7 @@ extern "C" { class K3bMadDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -44,7 +44,7 @@ class K3bMadDecoderFactory : public K3bAudioDecoderFactory class K3bMadDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/musepack/k3bmpcdecoder.h b/plugins/decoder/musepack/k3bmpcdecoder.h index a7f8ae7..aac2312 100644 --- a/plugins/decoder/musepack/k3bmpcdecoder.h +++ b/plugins/decoder/musepack/k3bmpcdecoder.h @@ -23,7 +23,7 @@ class K3bMpcWrapper; class K3bMpcDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -41,7 +41,7 @@ class K3bMpcDecoderFactory : public K3bAudioDecoderFactory class K3bMpcDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.h b/plugins/decoder/ogg/k3boggvorbisdecoder.h index 6f298bc..8a465e6 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.h +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.h @@ -25,7 +25,7 @@ class KURL; class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -46,7 +46,7 @@ class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory */ class K3bOggVorbisDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/skeleton.h b/plugins/decoder/skeleton.h index 19602a6..64cef9d 100644 --- a/plugins/decoder/skeleton.h +++ b/plugins/decoder/skeleton.h @@ -21,7 +21,7 @@ class K3b<name>DecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -39,7 +39,7 @@ class K3b<name>DecoderFactory : public K3bAudioDecoderFactory class K3b<name>Decoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/wave/k3bwavedecoder.h b/plugins/decoder/wave/k3bwavedecoder.h index 892425d..bdd0a8d 100644 --- a/plugins/decoder/wave/k3bwavedecoder.h +++ b/plugins/decoder/wave/k3bwavedecoder.h @@ -28,7 +28,7 @@ class TQFile; class LIBK3B_EXPORT K3bWaveDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -46,7 +46,7 @@ class LIBK3B_EXPORT K3bWaveDecoderFactory : public K3bAudioDecoderFactory class LIBK3B_EXPORT K3bWaveDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index 2a3ccba..ce2d0d6 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -207,12 +207,12 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension ) d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotExternalProgramFinished(TDEProcess*)) ); - connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), - this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) ); - connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), - this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) ); + connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotExternalProgramFinished(TDEProcess*)) ); + connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)), + this, TQ_SLOT(slotExternalProgramOutputLine(const TQString&)) ); + connect( d->process, TQ_SIGNAL(stdoutLine(const TQString&)), + this, TQ_SLOT(slotExternalProgramOutputLine(const TQString&)) ); // create the commandline diff --git a/plugins/encoder/external/k3bexternalencoder.h b/plugins/encoder/external/k3bexternalencoder.h index 1ef865a..4ab5930 100644 --- a/plugins/encoder/external/k3bexternalencoder.h +++ b/plugins/encoder/external/k3bexternalencoder.h @@ -26,7 +26,7 @@ class TDEProcess; class K3bExternalEncoder : public K3bAudioEncoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index 0f89798..18a986d 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -119,14 +119,14 @@ K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( TQWidget* pa lay->setMargin( 0 ); lay->addWidget( w ); - connect( w->m_viewEncoders, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); - connect( w->m_buttonAdd, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewCommand()) ); - connect( w->m_buttonEdit, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditCommand()) ); - connect( w->m_buttonRemove, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveCommand()) ); + connect( w->m_viewEncoders, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); + connect( w->m_buttonAdd, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewCommand()) ); + connect( w->m_buttonEdit, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditCommand()) ); + connect( w->m_buttonRemove, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveCommand()) ); m_editDlg = new K3bExternalEncoderEditDialog( this ); } diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.h b/plugins/encoder/external/k3bexternalencoderconfigwidget.h index 8fe19c6..68027f0 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.h +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.h @@ -26,7 +26,7 @@ class K3bExternalEncoderEditDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -46,7 +46,7 @@ class K3bExternalEncoderEditDialog : public KDialogBase class K3bExternalEncoderSettingsWidget : public K3bPluginConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index 127422b..9b08dcd 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -427,10 +427,10 @@ K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* parent, co // TODO: add whatsthis help for the quality level. // TQString qualityLevelWhatsThis = i18n("<p>"); - connect( m_w->m_buttonManualSettings, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotShowManualSettings()) ); - connect( m_w->m_sliderQuality, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotQualityLevelChanged(int)) ); + connect( m_w->m_buttonManualSettings, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotShowManualSettings()) ); + connect( m_w->m_sliderQuality, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotQualityLevelChanged(int)) ); updateManualSettingsLabel(); slotQualityLevelChanged( 5 ); diff --git a/plugins/encoder/lame/k3blameencoder.h b/plugins/encoder/lame/k3blameencoder.h index 2e3ca09..7e2a95b 100644 --- a/plugins/encoder/lame/k3blameencoder.h +++ b/plugins/encoder/lame/k3blameencoder.h @@ -29,7 +29,7 @@ class KDialogBase; class K3bLameEncoder : public K3bAudioEncoder { - Q_OBJECT + TQ_OBJECT public: @@ -65,7 +65,7 @@ class K3bLameEncoder : public K3bAudioEncoder class K3bLameEncoderSettingsWidget : public K3bPluginConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index c2ce5b3..2936a3c 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -455,8 +455,8 @@ K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( TQWidget* lay->addWidget( w ); - connect( w->m_slideQualityLevel, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotQualityLevelChanged(int)) ); + connect( w->m_slideQualityLevel, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotQualityLevelChanged(int)) ); slotQualityLevelChanged( 4 ); } diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.h b/plugins/encoder/ogg/k3boggvorbisencoder.h index 8f632f3..50dbcf5 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.h +++ b/plugins/encoder/ogg/k3boggvorbisencoder.h @@ -26,7 +26,7 @@ class base_K3bOggVorbisEncoderSettingsWidget; class K3bOggVorbisEncoder : public K3bAudioEncoder { - Q_OBJECT + TQ_OBJECT public: @@ -62,7 +62,7 @@ class K3bOggVorbisEncoder : public K3bAudioEncoder class K3bOggVorbisEncoderSettingsWidget : public K3bPluginConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/encoder/skeleton.h b/plugins/encoder/skeleton.h index c353349..0fcf1cc 100644 --- a/plugins/encoder/skeleton.h +++ b/plugins/encoder/skeleton.h @@ -23,7 +23,7 @@ class K3b<name>Encoder : public K3bAudioEncoder { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ class K3b<name>Encoder : public K3bAudioEncoder class K3b<name>EncoderSettingsWidget : public K3bPluginConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index d91502f..8b170f6 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -182,12 +182,12 @@ bool K3bSoxEncoder::initEncoderInternal( const TQString& extension ) d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotSoxFinished(TDEProcess*)) ); - connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), - this, TQT_SLOT(slotSoxOutputLine(const TQString&)) ); - connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), - this, TQT_SLOT(slotSoxOutputLine(const TQString&)) ); + connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotSoxFinished(TDEProcess*)) ); + connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)), + this, TQ_SLOT(slotSoxOutputLine(const TQString&)) ); + connect( d->process, TQ_SIGNAL(stdoutLine(const TQString&)), + this, TQ_SLOT(slotSoxOutputLine(const TQString&)) ); // input settings *d->process << soxBin->path @@ -376,7 +376,7 @@ K3bSoxEncoderSettingsWidget::K3bSoxEncoderSettingsWidget( TQWidget* parent, cons : K3bPluginConfigWidget( parent, name ) { w = new base_K3bSoxEncoderConfigWidget( this ); - w->m_editSamplerate->setValidator( new TQIntValidator( TQT_TQOBJECT(w->m_editSamplerate) ) ); + w->m_editSamplerate->setValidator( new TQIntValidator( w->m_editSamplerate ) ); TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); diff --git a/plugins/encoder/sox/k3bsoxencoder.h b/plugins/encoder/sox/k3bsoxencoder.h index a34271f..d495dd3 100644 --- a/plugins/encoder/sox/k3bsoxencoder.h +++ b/plugins/encoder/sox/k3bsoxencoder.h @@ -26,7 +26,7 @@ class TDEProcess; class K3bSoxEncoder : public K3bAudioEncoder { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ class K3bSoxEncoder : public K3bAudioEncoder class K3bSoxEncoderSettingsWidget : public K3bPluginConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index aa708d2..d4f4334 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -83,7 +83,7 @@ K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc // d->progressDialog = 0; // pattern group - TQGroupBox* patternGroup = new TQGroupBox( 2, Qt::Horizontal, + TQGroupBox* patternGroup = new TQGroupBox( 2, TQt::Horizontal, i18n("Rename Pattern"), this ); patternGroup->setInsideMargin( KDialog::marginHint() ); patternGroup->setInsideSpacing( KDialog::spacingHint() ); @@ -94,7 +94,7 @@ K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc d->scanButton = new TQPushButton( i18n("Scan"), patternGroup ); // the files view - TQGroupBox* filesGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox* filesGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Found Files"), this ); filesGroup->setInsideMargin( KDialog::marginHint() ); filesGroup->setInsideSpacing( KDialog::spacingHint() ); @@ -112,7 +112,7 @@ K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc box->addWidget( patternGroup ); box->addWidget( filesGroup ); - connect( d->scanButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScanClicked()) ); + connect( d->scanButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotScanClicked()) ); TQToolTip::add( d->scanButton, i18n("Scan for renamable files") ); TQWhatsThis::add( d->comboPattern, i18n("<qt>This specifies how the files should be renamed. " @@ -215,7 +215,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewIt TQCheckListItem::CheckBox ); fileViewItem->setText(1, item->k3bName() ); fileViewItem->setOn(true); - d->renamableItems.append( tqMakePair( (K3bFileItem*)item, fileViewItem ) ); + d->renamableItems.append( qMakePair( (K3bFileItem*)item, fileViewItem ) ); } } diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h index 649e40f..69aeacd 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.h @@ -29,7 +29,7 @@ class TQListViewItem; class K3bAudioMetainfoRenamerPluginWidget : public TQWidget, public K3bProjectPluginGUIBase { - Q_OBJECT + TQ_OBJECT public: @@ -62,7 +62,7 @@ class K3bAudioMetainfoRenamerPluginWidget : public TQWidget, public K3bProjectPl class K3bAudioMetainfoRenamerPlugin : public K3bProjectPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp index 21b620a..7d254f8 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp @@ -73,13 +73,13 @@ void K3bAudioProjectCddbPlugin::activate( K3bDoc* doc, TQWidget* parent ) else { if( !m_cddb ) { m_cddb = new K3bCddb( this ); - connect( m_cddb, TQT_SIGNAL(queryFinished(int)), - this, TQT_SLOT(slotCddbQueryFinished(int)) ); + connect( m_cddb, TQ_SIGNAL(queryFinished(int)), + this, TQ_SLOT(slotCddbQueryFinished(int)) ); } if( !m_progress ) { m_progress = new K3bProgressDialog( i18n("Query Cddb"), parent, i18n("Audio Project") ); - connect( m_progress, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotCancelClicked()) ); + connect( m_progress, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotCancelClicked()) ); } // read the k3b config :) diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h index 6a9470f..d0d5c63 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.h @@ -26,7 +26,7 @@ class TQWidget; class K3bAudioProjectCddbPlugin : public K3bProjectPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/fastscale/CMakeLists.txt b/src/fastscale/CMakeLists.txt index 66812fd..91bb8c7 100644 --- a/src/fastscale/CMakeLists.txt +++ b/src/fastscale/CMakeLists.txt @@ -21,15 +21,22 @@ link_directories( ${TQT_LIBRARY_DIRS} ) -# Force to use C compiler for asm_scale.S instead of ASM -# because contains mixed code - ASM with C definitions -set_source_files_properties( asm_scale.S PROPERTIES LANGUAGE C ) - -# TODO add assembler flags here (2016-01-14, Fat-Zer) ##### fastscale (static) ######################## +set( fastscale_SRCS scale.cpp ) + +if( HAVE_X86_MMX ) + list( APPEND fastscale_SRCS asm_scale.S ) + + # Force to use C compiler for asm_scale.S instead of ASM + # because it contains mixed code - ASM with C definitions + set_source_files_properties( asm_scale.S PROPERTIES LANGUAGE C ) + + add_compile_options( -DHAVE_X86_MMX ) +endif( ) + tde_add_library( fastscale STATIC_PIC AUTOMOC - SOURCES scale.cpp asm_scale.S + SOURCES ${fastscale_SRCS} LINK tdecore-shared ) diff --git a/src/fastscale/scale.cpp b/src/fastscale/scale.cpp index fb6a612..62320bf 100644 --- a/src/fastscale/scale.cpp +++ b/src/fastscale/scale.cpp @@ -1920,7 +1920,7 @@ void MImageScale::mimageScaleAARGB(MImageScaleInfo *isi, unsigned int *dest, // } TQImage scale(const TQImage& image, int width, int height, - SmoothAlgorithm alg, TQ_ScaleMode mode, double blur ) + SmoothAlgorithm alg, TQImage::ScaleMode mode, double blur ) { if( image.isNull()) return image.copy(); diff --git a/src/fastscale/scale.h b/src/fastscale/scale.h index 9aab7db..e02062a 100644 --- a/src/fastscale/scale.h +++ b/src/fastscale/scale.h @@ -27,7 +27,7 @@ namespace ImageUtils { enum SmoothAlgorithm { SMOOTH_NONE, SMOOTH_FAST, SMOOTH_NORMAL, SMOOTH_BEST }; TQImage scale(const TQImage& image, int width, int height, - SmoothAlgorithm alg, TQ_ScaleMode mode = TQ_ScaleFree, double blur = 1.0); + SmoothAlgorithm alg, TQImage::ScaleMode mode = TQImage::ScaleFree, double blur = 1.0); } #endif diff --git a/src/k3b.cpp b/src/k3b.cpp index abebb66..d4ada12 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -16,7 +16,7 @@ #include <config.h> -// include files for QT +// include files for TQt #include <tqdir.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -175,9 +175,9 @@ K3bMainWindow::K3bMainWindow() // disable actions at startup slotStateChanged( "state_project_active", KXMLGUIClient::StateReverse ); - connect( k3bappcore->projectManager(), TQT_SIGNAL(newProject(K3bDoc*)), TQT_TQOBJECT(this), TQT_SLOT(createClient(K3bDoc*)) ); - connect( k3bcore->deviceManager(), TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystemTimed()) ); - connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotAudioServerError(const TQString&)) ); + connect( k3bappcore->projectManager(), TQ_SIGNAL(newProject(K3bDoc*)), this, TQ_SLOT(createClient(K3bDoc*)) ); + connect( k3bcore->deviceManager(), TQ_SIGNAL(changed()), this, TQ_SLOT(slotCheckSystemTimed()) ); + connect( K3bAudioServer::instance(), TQ_SIGNAL(error(const TQString&)), this, TQ_SLOT(slotAudioServerError(const TQString&)) ); // FIXME: now make sure the welcome screen is displayed completely resize( 780, 550 ); @@ -211,59 +211,59 @@ void K3bMainWindow::initActions() // see the correct solution?) *actionCollection() += *k3bappcore->appDeviceManager()->actionCollection(); - actionFileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - actionFileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - actionFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - actionFileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - actionFileSaveAll = new TDEAction( i18n("Save All"), "save_all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAll()), + actionFileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + actionFileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + actionFileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + actionFileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + actionFileSaveAll = new TDEAction( i18n("Save All"), "save_all", 0, this, TQ_SLOT(slotFileSaveAll()), actionCollection(), "file_save_all" ); - actionFileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - actionFileCloseAll = new TDEAction( i18n("Close All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileCloseAll()), + actionFileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + actionFileCloseAll = new TDEAction( i18n("Close All"), 0, 0, this, TQ_SLOT(slotFileCloseAll()), actionCollection(), "file_close_all" ); - actionFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); - actionViewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection()); - actionSettingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSettingsConfigure()), actionCollection() ); + actionFileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + actionViewStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotViewStatusBar()), actionCollection()); + actionSettingsConfigure = KStdAction::preferences(this, TQ_SLOT(slotSettingsConfigure()), actionCollection() ); // the tip action - (void)KStdAction::tipOfDay(TQT_TQOBJECT(this), TQT_SLOT(slotShowTips()), actionCollection() ); - (void)KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + (void)KStdAction::tipOfDay(this, TQ_SLOT(slotShowTips()), actionCollection() ); + (void)KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); setStandardToolBarMenuEnabled(true); - KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() ); + KStdAction::showMenubar( this, TQ_SLOT(slotShowMenuBar()), actionCollection() ); actionFileNewMenu = new TDEActionMenu( i18n("&New Project"), "document-new", actionCollection(), "file_new" ); - actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()), + actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, this, TQ_SLOT(slotNewAudioDoc()), actionCollection(), "file_new_audio"); - actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()), + actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, this, TQ_SLOT(slotNewDataDoc()), actionCollection(), "file_new_data"); - actionFileNewMixed = new TDEAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMixedDoc()), + actionFileNewMixed = new TDEAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, this, TQ_SLOT(slotNewMixedDoc()), actionCollection(), "file_new_mixed"); - actionFileNewVcd = new TDEAction(i18n("New &Video CD Project"), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVcdDoc()), + actionFileNewVcd = new TDEAction(i18n("New &Video CD Project"), "videocd", 0, this, TQ_SLOT(slotNewVcdDoc()), actionCollection(), "file_new_vcd"); - actionFileNewMovix = new TDEAction(i18n("New &eMovix CD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDoc()), + actionFileNewMovix = new TDEAction(i18n("New &eMovix CD Project"), "emovix", 0, this, TQ_SLOT(slotNewMovixDoc()), actionCollection(), "file_new_movix"); - actionFileNewMovixDvd = new TDEAction(i18n("New &eMovix DVD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDvdDoc()), + actionFileNewMovixDvd = new TDEAction(i18n("New &eMovix DVD Project"), "emovix", 0, this, TQ_SLOT(slotNewMovixDvdDoc()), actionCollection(), "file_new_movix_dvd"); - actionFileNewDvd = new TDEAction(i18n("New Data &DVD Project"), "datadvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDvdDoc()), + actionFileNewDvd = new TDEAction(i18n("New Data &DVD Project"), "datadvd", 0, this, TQ_SLOT(slotNewDvdDoc()), actionCollection(), "file_new_dvd"); - actionFileNewVideoDvd = new TDEAction(i18n("New V&ideo DVD Project"), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVideoDvdDoc()), + actionFileNewVideoDvd = new TDEAction(i18n("New V&ideo DVD Project"), "videodvd", 0, this, TQ_SLOT(slotNewVideoDvdDoc()), actionCollection(), "file_new_video_dvd"); - actionFileContinueMultisession = new TDEAction( i18n("Continue Multisession Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinueMultisession()), + actionFileContinueMultisession = new TDEAction( i18n("Continue Multisession Project"), "datacd", 0, this, TQ_SLOT(slotContinueMultisession()), actionCollection(), "file_continue_multisession" ); actionFileNewMenu->setDelayed( false ); actionFileNewMenu->insert( actionFileNewData ); actionFileNewMenu->insert( actionFileNewDvd ); actionFileNewMenu->insert( actionFileContinueMultisession ); - actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( this ) ); actionFileNewMenu->insert( actionFileNewAudio ); - actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( this ) ); actionFileNewMenu->insert( actionFileNewMixed ); - actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( this ) ); actionFileNewMenu->insert( actionFileNewVcd ); actionFileNewMenu->insert( actionFileNewVideoDvd ); - actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + actionFileNewMenu->insert( new TDEActionSeparator( this ) ); actionFileNewMenu->insert( actionFileNewMovix ); actionFileNewMenu->insert( actionFileNewMovixDvd ); @@ -271,54 +271,54 @@ void K3bMainWindow::initActions() - actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()), + actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "document-new", 0, this, TQ_SLOT(slotProjectAddFiles()), actionCollection(), "project_add_files"); TDEAction* actionClearProject = new TDEAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotClearProject()), actionCollection(), "project_clear_project" ); + this, TQ_SLOT(slotClearProject()), actionCollection(), "project_clear_project" ); - actionViewDirTreeView = new TDEToggleAction(i18n("Show Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDirTreeView()), + actionViewDirTreeView = new TDEToggleAction(i18n("Show Directories"), 0, this, TQ_SLOT(slotShowDirTreeView()), actionCollection(), "view_dir_tree"); - actionViewContentsView = new TDEToggleAction(i18n("Show Contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowContentsView()), + actionViewContentsView = new TDEToggleAction(i18n("Show Contents"), 0, this, TQ_SLOT(slotShowContentsView()), actionCollection(), "view_contents"); - actionViewDocumentHeader = new TDEToggleAction(i18n("Show Document Header"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDocumentHeader()), + actionViewDocumentHeader = new TDEToggleAction(i18n("Show Document Header"), 0, this, TQ_SLOT(slotViewDocumentHeader()), actionCollection(), "view_document_header"); - actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()), + actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, this, TQ_SLOT(slotBlankCdrw()), actionCollection(), "tools_blank_cdrw" ); - TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg(""), "formatdvd", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); - actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()), + TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg(""), "formatdvd", 0, this, + TQ_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" ); + actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, this, TQ_SLOT(slotWriteCdImage()), actionCollection(), "tools_write_cd_image" ); - TDEAction* actionToolsWriteDvdImage = new TDEAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteDvdIsoImage()), + TDEAction* actionToolsWriteDvdImage = new TDEAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, this, TQ_SLOT(slotWriteDvdIsoImage()), actionCollection(), "tools_write_dvd_iso" ); - actionCdCopy = new TDEAction(i18n("&Copy CD..."), "cdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCdCopy()), + actionCdCopy = new TDEAction(i18n("&Copy CD..."), "cdcopy", 0, this, TQ_SLOT(slotCdCopy()), actionCollection(), "tools_copy_cd" ); - TDEAction* actionToolsDvdCopy = new TDEAction(i18n("Copy &DVD..."), "dvdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdCopy()), + TDEAction* actionToolsDvdCopy = new TDEAction(i18n("Copy &DVD..."), "dvdcopy", 0, this, TQ_SLOT(slotDvdCopy()), actionCollection(), "tools_copy_dvd" ); - actionToolsCddaRip = new TDEAction( i18n("Rip Audio CD..."), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCddaRip()), + actionToolsCddaRip = new TDEAction( i18n("Rip Audio CD..."), "cddarip", 0, this, TQ_SLOT(slotCddaRip()), actionCollection(), "tools_cdda_rip" ); - actionToolsVideoDvdRip = new TDEAction( i18n("Rip Video DVD..."), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoDvdRip()), + actionToolsVideoDvdRip = new TDEAction( i18n("Rip Video DVD..."), "videodvd", 0, this, TQ_SLOT(slotVideoDvdRip()), actionCollection(), "tools_videodvd_rip" ); - actionToolsVideoCdRip = new TDEAction( i18n("Rip Video CD..."), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoCdRip()), + actionToolsVideoCdRip = new TDEAction( i18n("Rip Video CD..."), "videocd", 0, this, TQ_SLOT(slotVideoCdRip()), actionCollection(), "tools_videocd_rip" ); - (void)new TDEAction( i18n("System Check"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()), + (void)new TDEAction( i18n("System Check"), 0, 0, this, TQ_SLOT(slotCheckSystem()), actionCollection(), "help_check_system" ); #ifdef HAVE_K3BSETUP - actionSettingsK3bSetup = new TDEAction(i18n("&Setup System Permissions..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotK3bSetup()), + actionSettingsK3bSetup = new TDEAction(i18n("&Setup System Permissions..."), "configure", 0, this, TQ_SLOT(slotK3bSetup()), actionCollection(), "settings_k3bsetup" ); #endif #ifdef K3B_DEBUG - (void)new TDEAction( "Test Media Selection ComboBox", 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotMediaSelectionTester()), actionCollection(), + (void)new TDEAction( "Test Media Selection ComboBox", 0, 0, this, + TQ_SLOT(slotMediaSelectionTester()), actionCollection(), "test_media_selection" ); #endif @@ -408,7 +408,7 @@ void K3bMainWindow::initView() documentHullLayout->addWidget( m_documentHeader, 0, 0 ); documentHullLayout->addWidget( m_documentTab, 1, 0 ); - connect( m_documentTab, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrentDocChanged()) ); + connect( m_documentTab, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentDocChanged()) ); d->welcomeWidget = new K3bWelcomeWidget( this, m_documentTab ); m_documentTab->addTab( d->welcomeWidget, i18n("Quickstart") ); @@ -427,8 +427,8 @@ void K3bMainWindow::initView() m_dirTreeDock->setWidget( sidePanel ); m_dirTreeDock->manualDock( mainDock, KDockWidget::DockTop, 4000 ); - connect( m_dirTreeDock, TQT_SIGNAL(iMBeingClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotDirTreeDockHidden()) ); - connect( m_dirTreeDock, TQT_SIGNAL(hasUndocked()), TQT_TQOBJECT(this), TQT_SLOT(slotDirTreeDockHidden()) ); + connect( m_dirTreeDock, TQ_SIGNAL(iMBeingClosed()), this, TQ_SLOT(slotDirTreeDockHidden()) ); + connect( m_dirTreeDock, TQ_SIGNAL(hasUndocked()), this, TQ_SLOT(slotDirTreeDockHidden()) ); // --------------------------------------------------------------------------------------------- // --- Contents Dock --------------------------------------------------------------------------- @@ -439,24 +439,24 @@ void K3bMainWindow::initView() m_contentsDock->setWidget( m_dirView ); m_contentsDock->manualDock( m_dirTreeDock, KDockWidget::DockRight, 2000 ); - connect( m_contentsDock, TQT_SIGNAL(iMBeingClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotContentsDockHidden()) ); - connect( m_contentsDock, TQT_SIGNAL(hasUndocked()), TQT_TQOBJECT(this), TQT_SLOT(slotContentsDockHidden()) ); + connect( m_contentsDock, TQ_SIGNAL(iMBeingClosed()), this, TQ_SLOT(slotContentsDockHidden()) ); + connect( m_contentsDock, TQ_SIGNAL(hasUndocked()), this, TQ_SLOT(slotContentsDockHidden()) ); // --------------------------------------------------------------------------------------------- // --- filetreecombobox-toolbar ---------------------------------------------------------------- K3bFileTreeComboBox* m_fileTreeComboBox = new K3bFileTreeComboBox( 0 ); - connect( m_fileTreeComboBox, TQT_SIGNAL(urlExecuted(const KURL&)), m_dirView, TQT_SLOT(showUrl(const KURL& )) ); - connect( m_fileTreeComboBox, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), m_dirView, - TQT_SLOT(showDevice(K3bDevice::Device* )) ); - connect( m_dirView, TQT_SIGNAL(urlEntered(const KURL&)), m_fileTreeComboBox, TQT_SLOT(setUrl(const KURL&)) ); - connect( m_dirView, TQT_SIGNAL(deviceSelected(K3bDevice::Device*)), m_fileTreeComboBox, TQT_SLOT(setDevice(K3bDevice::Device*)) ); + connect( m_fileTreeComboBox, TQ_SIGNAL(urlExecuted(const KURL&)), m_dirView, TQ_SLOT(showUrl(const KURL& )) ); + connect( m_fileTreeComboBox, TQ_SIGNAL(deviceExecuted(K3bDevice::Device*)), m_dirView, + TQ_SLOT(showDevice(K3bDevice::Device* )) ); + connect( m_dirView, TQ_SIGNAL(urlEntered(const KURL&)), m_fileTreeComboBox, TQ_SLOT(setUrl(const KURL&)) ); + connect( m_dirView, TQ_SIGNAL(deviceSelected(K3bDevice::Device*)), m_fileTreeComboBox, TQ_SLOT(setDevice(K3bDevice::Device*)) ); KWidgetAction* fileTreeComboAction = new KWidgetAction( m_fileTreeComboBox, i18n("&Quick Dir Selector"), 0, 0, 0, actionCollection(), "quick_dir_selector" ); fileTreeComboAction->setAutoSized(true); - (void)new TDEAction( i18n("Go"), "key_enter", 0, TQT_TQOBJECT(m_fileTreeComboBox), TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" ); + (void)new TDEAction( i18n("Go"), "key_enter", 0, m_fileTreeComboBox, TQ_SLOT(slotGoUrl()), actionCollection(), "go_url" ); // --------------------------------------------------------------------------------------------- } @@ -851,7 +851,7 @@ bool K3bMainWindow::queryExit() ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// TQ_SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// @@ -1202,7 +1202,7 @@ void K3bMainWindow::slotEditToolbars() { saveMainWindowSettings( m_config, "main_window_settings" ); KEditToolbar dlg( factory() ); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotNewToolBarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotNewToolBarConfig())); dlg.exec(); } @@ -1468,7 +1468,7 @@ void K3bMainWindow::slotCheckSystemTimed() // run the system check from the event queue so we do not // mess with the device state resetting throughout the app // when called from K3bDeviceManager::changed - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotCheckSystem()) ); } @@ -61,7 +61,7 @@ namespace K3bDevice { class K3bMainWindow : public KParts::DockMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp index 9e6c54d..72636ad 100644 --- a/src/k3bappdevicemanager.cpp +++ b/src/k3bappdevicemanager.cpp @@ -42,21 +42,21 @@ K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name ) // setup actions TDEActionMenu* devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup" ); - m_actionDiskInfo = new TDEAction( i18n("Media &Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(diskInfo()), + m_actionDiskInfo = new TDEAction( i18n("Media &Info"), "application-vnd.tde.info", 0, this, TQ_SLOT(diskInfo()), m_actionCollection, "device_diskinfo"); - m_actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom-unmounted", 0, this, TQT_SLOT(unmountDisk()), + m_actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom-unmounted", 0, this, TQ_SLOT(unmountDisk()), m_actionCollection, "device_unmount"); - m_actionMount = new TDEAction( i18n("&Mount"), "media-optical-cdrom-mounted", 0, this, TQT_SLOT(mountDisk()), + m_actionMount = new TDEAction( i18n("&Mount"), "media-optical-cdrom-mounted", 0, this, TQ_SLOT(mountDisk()), m_actionCollection, "device_mount"); - m_actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(ejectDisk()), + m_actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQ_SLOT(ejectDisk()), m_actionCollection, "device_eject"); - m_actionLoad = new TDEAction( i18n("L&oad"), "", 0, this, TQT_SLOT(loadDisk()), + m_actionLoad = new TDEAction( i18n("L&oad"), "", 0, this, TQ_SLOT(loadDisk()), m_actionCollection, "device_load"); -// TDEAction* actionUnlock = new TDEAction( i18n("Un&lock"), "", 0, this, TQT_SLOT(unlockDevice()), +// TDEAction* actionUnlock = new TDEAction( i18n("Un&lock"), "", 0, this, TQ_SLOT(unlockDevice()), // m_actionCollection, "device_unlock" ); -// TDEAction* actionlock = new TDEAction( i18n("Loc&k"), "", 0, this, TQT_SLOT(lockDevice()), +// TDEAction* actionlock = new TDEAction( i18n("Loc&k"), "", 0, this, TQ_SLOT(lockDevice()), // m_actionCollection, "device_lock" ); - m_actionSetReadSpeed = new TDEAction( i18n("Set Read Speed..."), "", 0, this, TQT_SLOT(setReadSpeed()), + m_actionSetReadSpeed = new TDEAction( i18n("Set Read Speed..."), "", 0, this, TQ_SLOT(setReadSpeed()), m_actionCollection, "device_set_read_speed" ); m_actionDiskInfo->setToolTip( i18n("Display generic medium information") ); @@ -85,8 +85,8 @@ K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name ) void K3bAppDeviceManager::setMediaCache( K3bMediaCache* c ) { - connect( c, TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( c, TQ_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } diff --git a/src/k3bappdevicemanager.h b/src/k3bappdevicemanager.h index 19d7aa3..c97522e 100644 --- a/src/k3bappdevicemanager.h +++ b/src/k3bappdevicemanager.h @@ -39,7 +39,7 @@ namespace TDEIO { */ class K3bAppDeviceManager : public K3bDevice::DeviceManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index f7483da..a9713e4 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -72,16 +72,16 @@ K3bApplication::K3bApplication() TDEGlobal::locale()->insertCatalogue( "libk3bdevice" ); TDEGlobal::locale()->insertCatalogue( "libk3b" ); - m_core = new Core( TQT_TQOBJECT(this) ); + m_core = new Core( this ); // TODO: move to K3bCore? // from this point on available through K3bAudioServer::instance() - m_audioServer = new K3bAudioServer( TQT_TQOBJECT(this), "K3bAudioServer" ); + m_audioServer = new K3bAudioServer( this, "K3bAudioServer" ); - connect( m_core, TQT_SIGNAL(initializationInfo(const TQString&)), - TQT_SIGNAL(initializationInfo(const TQString&)) ); + connect( m_core, TQ_SIGNAL(initializationInfo(const TQString&)), + TQ_SIGNAL(initializationInfo(const TQString&)) ); - connect( this, TQT_SIGNAL(shutDown()), TQT_SLOT(slotShutDown()) ); + connect( this, TQ_SIGNAL(shutDown()), TQ_SLOT(slotShutDown()) ); } @@ -104,10 +104,10 @@ void K3bApplication::init() m_core->m_themeManager->readConfig( config() ); splash = new K3bSplash( 0 ); - splash->connect( this, TQT_SIGNAL(initializationInfo(const TQString&)), TQT_SLOT(addInfo(const TQString&)) ); + splash->connect( this, TQ_SIGNAL(initializationInfo(const TQString&)), TQ_SLOT(addInfo(const TQString&)) ); // kill the splash after 5 seconds - TQTimer::singleShot( 5000, splash, TQT_SLOT(close()) ); + TQTimer::singleShot( 5000, splash, TQ_SLOT(close()) ); splash->show(); tqApp->processEvents(); @@ -382,8 +382,8 @@ void K3bApplication::Core::init() mediaCache()->buildDeviceList( deviceManager() ); - connect( deviceManager(), TQT_SIGNAL(changed(K3bDevice::DeviceManager*)), - mediaCache(), TQT_SLOT(buildDeviceList(K3bDevice::DeviceManager*)) ); + connect( deviceManager(), TQ_SIGNAL(changed(K3bDevice::DeviceManager*)), + mediaCache(), TQ_SLOT(buildDeviceList(K3bDevice::DeviceManager*)) ); } diff --git a/src/k3bapplication.h b/src/k3bapplication.h index e0a50e1..989831e 100644 --- a/src/k3bapplication.h +++ b/src/k3bapplication.h @@ -37,7 +37,7 @@ class K3bMediaCache; class K3bApplication : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: @@ -75,7 +75,7 @@ class K3bApplication : public KUniqueApplication */ class K3bApplication::Core : public K3bCore { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3baudioplayer.cpp b/src/k3baudioplayer.cpp index 04f569f..71e6557 100644 --- a/src/k3baudioplayer.cpp +++ b/src/k3baudioplayer.cpp @@ -223,10 +223,10 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name ) // actions // ------------------------------------------------------------------------ m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", - Key_Delete, this, TQT_SLOT(slotRemoveSelected()), + Key_Delete, this, TQ_SLOT(slotRemoveSelected()), this, "audioplayer_remove" ); m_actionClear = new TDEAction( i18n( "Clear List" ), "edit-clear", - 0, this, TQT_SLOT(clear()), + 0, this, TQ_SLOT(clear()), this, "audioplayer_clear" ); m_contextMenu = new TDEActionMenu( this, "audio_player_menu" ); @@ -237,26 +237,26 @@ K3bAudioPlayer::K3bAudioPlayer( TQWidget* parent, const char* name ) // connections // ------------------------------------------------------------------------ - connect( m_viewPlayList, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_viewPlayList, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect( m_buttonPlay, TQT_SIGNAL(clicked()), this, TQT_SLOT(play()) ); - connect( m_buttonStop, TQT_SIGNAL(clicked()), this, TQT_SLOT(stop()) ); - connect( m_buttonPause, TQT_SIGNAL(clicked()), this, TQT_SLOT(pause()) ); + connect( m_buttonPlay, TQ_SIGNAL(clicked()), this, TQ_SLOT(play()) ); + connect( m_buttonStop, TQ_SIGNAL(clicked()), this, TQ_SLOT(stop()) ); + connect( m_buttonPause, TQ_SIGNAL(clicked()), this, TQ_SLOT(pause()) ); - connect( m_buttonForward, TQT_SIGNAL(clicked()), this, TQT_SLOT(forward()) ); - connect( m_buttonBack, TQT_SIGNAL(clicked()), this, TQT_SLOT(back()) ); + connect( m_buttonForward, TQ_SIGNAL(clicked()), this, TQ_SLOT(forward()) ); + connect( m_buttonBack, TQ_SIGNAL(clicked()), this, TQ_SLOT(back()) ); - connect( m_seekSlider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(seek(int)) ); - connect( m_seekSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotUpdateCurrentTime(int)) ); + connect( m_seekSlider, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(seek(int)) ); + connect( m_seekSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotUpdateCurrentTime(int)) ); - connect( m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateDisplay()) ); - connect( m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckEnd()) ); + connect( m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateDisplay()) ); + connect( m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCheckEnd()) ); - connect( m_viewPlayList, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotPlayItem(TQListViewItem*)) ); - connect( m_viewPlayList, TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*)) ); + connect( m_viewPlayList, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotPlayItem(TQListViewItem*)) ); + connect( m_viewPlayList, TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TQDropEvent*,TQListViewItem*)) ); // ------------------------------------------------------------------------ diff --git a/src/k3baudioplayer.h b/src/k3baudioplayer.h index 7e375d5..f3560ca 100644 --- a/src/k3baudioplayer.h +++ b/src/k3baudioplayer.h @@ -84,7 +84,7 @@ class K3bPlayListViewItem : public TDEListViewItem */ class K3bPlayListView : public TDEListView { -Q_OBJECT +TQ_OBJECT public: @@ -104,7 +104,7 @@ Q_OBJECT */ class K3bAudioPlayer : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/k3bburnprogressdialog.cpp b/src/k3bburnprogressdialog.cpp index 9ce456d..0b9bdc1 100644 --- a/src/k3bburnprogressdialog.cpp +++ b/src/k3bburnprogressdialog.cpp @@ -83,12 +83,12 @@ void K3bBurnProgressDialog::setBurnJob( K3bBurnJob* burnJob ) K3bJobProgressDialog::setJob(burnJob); if( burnJob ) { - connect( burnJob, TQT_SIGNAL(bufferStatus(int)), this, TQT_SLOT(slotBufferStatus(int)) ); - connect( burnJob, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) ); - connect( burnJob, TQT_SIGNAL(writeSpeed(int, int)), this, TQT_SLOT(slotWriteSpeed(int, int)) ); - connect( burnJob, TQT_SIGNAL(burning(bool)), m_progressWritingBuffer, TQT_SLOT(setEnabled(bool)) ); - connect( burnJob, TQT_SIGNAL(burning(bool)), m_progressDeviceBuffer, TQT_SLOT(setEnabled(bool)) ); - connect( burnJob, TQT_SIGNAL(burning(bool)), m_labelWritingSpeed, TQT_SLOT(setEnabled(bool)) ); + connect( burnJob, TQ_SIGNAL(bufferStatus(int)), this, TQ_SLOT(slotBufferStatus(int)) ); + connect( burnJob, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SLOT(slotDeviceBuffer(int)) ); + connect( burnJob, TQ_SIGNAL(writeSpeed(int, int)), this, TQ_SLOT(slotWriteSpeed(int, int)) ); + connect( burnJob, TQ_SIGNAL(burning(bool)), m_progressWritingBuffer, TQ_SLOT(setEnabled(bool)) ); + connect( burnJob, TQ_SIGNAL(burning(bool)), m_progressDeviceBuffer, TQ_SLOT(setEnabled(bool)) ); + connect( burnJob, TQ_SIGNAL(burning(bool)), m_labelWritingSpeed, TQ_SLOT(setEnabled(bool)) ); if( burnJob->writer() ) m_labelWriter->setText( i18n("Writer: %1 %2").arg(burnJob->writer()->vendor()). diff --git a/src/k3bburnprogressdialog.h b/src/k3bburnprogressdialog.h index ddd8295..6fe3949 100644 --- a/src/k3bburnprogressdialog.h +++ b/src/k3bburnprogressdialog.h @@ -29,7 +29,7 @@ class TQLabel; */ class K3bBurnProgressDialog : public K3bJobProgressDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bcontentsview.h b/src/k3bcontentsview.h index e14a1c6..59802c5 100644 --- a/src/k3bcontentsview.h +++ b/src/k3bcontentsview.h @@ -25,7 +25,7 @@ class K3bThemedHeader; class K3bContentsView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bdatamodewidget.h b/src/k3bdatamodewidget.h index 530379c..9717a92 100644 --- a/src/k3bdatamodewidget.h +++ b/src/k3bdatamodewidget.h @@ -25,7 +25,7 @@ class TDEConfigBase; class K3bDataModeWidget : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index 4be80bc..08d861d 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -114,7 +114,7 @@ void K3bDebuggingOutputDialog::clear() addOutput( "System", "K3b Version: " + k3bcore->version() ); addOutput( "System", "KDE Version: " + TQString(KDE::versionString()) ); - addOutput( "System", "QT Version: " + TQString(tqVersion()) ); + addOutput( "System", "TQt Version: " + TQString(tqVersion()) ); addOutput( "System", "Kernel: " + K3b::kernelVersion() ); // devices in the logfile diff --git a/src/k3bdebuggingoutputdialog.h b/src/k3bdebuggingoutputdialog.h index 8d43561..6d4f348 100644 --- a/src/k3bdebuggingoutputdialog.h +++ b/src/k3bdebuggingoutputdialog.h @@ -23,7 +23,7 @@ class TQTextEdit; class K3bDebuggingOutputDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bdebuggingoutputfile.cpp b/src/k3bdebuggingoutputfile.cpp index 614c512..54dbda6 100644 --- a/src/k3bdebuggingoutputfile.cpp +++ b/src/k3bdebuggingoutputfile.cpp @@ -42,7 +42,7 @@ bool K3bDebuggingOutputFile::open() addOutput( "System", "K3b Version: " + k3bcore->version() ); addOutput( "System", "KDE Version: " + TQString(KDE::versionString()) ); - addOutput( "System", "QT Version: " + TQString(tqVersion()) ); + addOutput( "System", "TQt Version: " + TQString(tqVersion()) ); addOutput( "System", "Kernel: " + K3b::kernelVersion() ); // devices in the logfile diff --git a/src/k3bdebuggingoutputfile.h b/src/k3bdebuggingoutputfile.h index 4cf950b..ff072c2 100644 --- a/src/k3bdebuggingoutputfile.h +++ b/src/k3bdebuggingoutputfile.h @@ -19,21 +19,9 @@ #include <tqfile.h> #include <tqobject.h> -#ifdef Q_MOC_RUN -#define USE_QT4 -#endif // Q_MOC_RUN - -// MOC_SKIP_BEGIN -#ifdef USE_QT4 -class K3bDebuggingOutputFile : public TQFile -#else // USE_QT4 -// MOC_SKIP_END class K3bDebuggingOutputFile : public TQObject, public TQFile -// MOC_SKIP_BEGIN -#endif // USE_QT4 -// MOC_SKIP_END { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp index e8e1bb9..22c36ae 100644 --- a/src/k3bdiroperator.cpp +++ b/src/k3bdiroperator.cpp @@ -49,11 +49,11 @@ K3bDirOperator::K3bDirOperator(const KURL& url, TQWidget* parent, const char* na bmMan->setUpdate( true ); bmMan->setShowNSBookmarks( false ); - m_bmPopup = new TDEActionMenu( i18n("Bookmarks"), "bookmark", TQT_TQOBJECT(this), "bookmarks" ); + m_bmPopup = new TDEActionMenu( i18n("Bookmarks"), "bookmark", this, "bookmarks" ); m_bmMenu = new KBookmarkMenu( bmMan, this, m_bmPopup->popupMenu(), actionCollection(), true ); (void)new TDEAction( i18n("&Add to Project"), SHIFT+Key_Return, - TQT_TQOBJECT(this), TQT_SLOT(slotAddFilesToProject()), + this, TQ_SLOT(slotAddFilesToProject()), actionCollection(), "add_file_to_project"); } diff --git a/src/k3bdiroperator.h b/src/k3bdiroperator.h index b7cc5df..b1cbb0b 100644 --- a/src/k3bdiroperator.h +++ b/src/k3bdiroperator.h @@ -32,7 +32,7 @@ class TDEActionMenu; */ class K3bDirOperator : public KDirOperator, public KBookmarkOwner { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp index 35cbe1d..8d72ffe 100644 --- a/src/k3bdirview.cpp +++ b/src/k3bdirview.cpp @@ -36,7 +36,7 @@ #include <k3bpassivepopup.h> #include <unistd.h> -// QT-includes +// TQt includes #include <tqdir.h> #include <tqlistview.h> #include <tqstring.h> @@ -135,24 +135,24 @@ K3bDirView::K3bDirView(K3bFileTreeView* treeView, TQWidget *parent, const char * m_mainSplitter->setSizes( sizes ); } - connect( m_fileTreeView, TQT_SIGNAL(urlExecuted(const KURL&)), - this, TQT_SLOT(slotDirActivated(const KURL&)) ); - connect( m_fileTreeView, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), - this, TQT_SLOT(showDevice(K3bDevice::Device*)) ); - connect( m_fileTreeView, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), - this, TQT_SIGNAL(deviceSelected(K3bDevice::Device*)) ); - connect( m_fileTreeView, TQT_SIGNAL(contextMenu(K3bDevice::Device*, const TQPoint&)), - this, TQT_SLOT(slotFileTreeContextMenu(K3bDevice::Device*, const TQPoint&)) ); - - connect( m_fileView, TQT_SIGNAL(urlEntered(const KURL&)), m_fileTreeView, TQT_SLOT(followUrl(const KURL&)) ); - connect( m_fileView, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SIGNAL(urlEntered(const KURL&)) ); - - connect( k3bappcore->appDeviceManager(), TQT_SIGNAL(mountFinished(const TQString&)), - this, TQT_SLOT(slotMountFinished(const TQString&)) ); - connect( k3bappcore->appDeviceManager(), TQT_SIGNAL(unmountFinished(bool)), - this, TQT_SLOT(slotUnmountFinished(bool)) ); - connect( k3bappcore->appDeviceManager(), TQT_SIGNAL(detectingDiskInfo(K3bDevice::Device*)), - this, TQT_SLOT(slotDetectingDiskInfo(K3bDevice::Device*)) ); + connect( m_fileTreeView, TQ_SIGNAL(urlExecuted(const KURL&)), + this, TQ_SLOT(slotDirActivated(const KURL&)) ); + connect( m_fileTreeView, TQ_SIGNAL(deviceExecuted(K3bDevice::Device*)), + this, TQ_SLOT(showDevice(K3bDevice::Device*)) ); + connect( m_fileTreeView, TQ_SIGNAL(deviceExecuted(K3bDevice::Device*)), + this, TQ_SIGNAL(deviceSelected(K3bDevice::Device*)) ); + connect( m_fileTreeView, TQ_SIGNAL(contextMenu(K3bDevice::Device*, const TQPoint&)), + this, TQ_SLOT(slotFileTreeContextMenu(K3bDevice::Device*, const TQPoint&)) ); + + connect( m_fileView, TQ_SIGNAL(urlEntered(const KURL&)), m_fileTreeView, TQ_SLOT(followUrl(const KURL&)) ); + connect( m_fileView, TQ_SIGNAL(urlEntered(const KURL&)), this, TQ_SIGNAL(urlEntered(const KURL&)) ); + + connect( k3bappcore->appDeviceManager(), TQ_SIGNAL(mountFinished(const TQString&)), + this, TQ_SLOT(slotMountFinished(const TQString&)) ); + connect( k3bappcore->appDeviceManager(), TQ_SIGNAL(unmountFinished(bool)), + this, TQ_SLOT(slotUnmountFinished(bool)) ); + connect( k3bappcore->appDeviceManager(), TQ_SIGNAL(detectingDiskInfo(K3bDevice::Device*)), + this, TQ_SLOT(slotDetectingDiskInfo(K3bDevice::Device*)) ); } K3bDirView::~K3bDirView() diff --git a/src/k3bdirview.h b/src/k3bdirview.h index 3c5603e..39097b6 100644 --- a/src/k3bdirview.h +++ b/src/k3bdirview.h @@ -51,7 +51,7 @@ namespace TDEIO { */ class K3bDirView : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bdiskinfoview.h b/src/k3bdiskinfoview.h index fb45fac..6e19fdf 100644 --- a/src/k3bdiskinfoview.h +++ b/src/k3bdiskinfoview.h @@ -32,7 +32,7 @@ namespace K3bDevice { class K3bDiskInfoView : public K3bMediaContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index df35a07..ec1f938 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -117,8 +117,8 @@ K3bEmptyDiscWaiter::K3bEmptyDiscWaiter( K3bDevice::Device* device, TQWidget* par grid->setColStretch( 3, 1 ); // ----------------------------- - connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( k3bappcore->mediaCache(), TQ_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotMediumChanged(K3bDevice::Device*)) ); TQToolTip::add( actionButton(KDialogBase::User1), i18n("Force K3b to continue if it seems not to detect your empty CD/DVD.") ); @@ -314,9 +314,9 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) job.setForceNoEject( true ); d->erasingInfoDialog->setText( i18n("Preformatting DVD+RW") ); - connect( &job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotErasingFinished(bool)) ); - connect( &job, TQT_SIGNAL(percent(int)), d->erasingInfoDialog, TQT_SLOT(setProgress(int)) ); - connect( d->erasingInfoDialog, TQT_SIGNAL(cancelClicked()), &job, TQT_SLOT(cancel()) ); + connect( &job, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotErasingFinished(bool)) ); + connect( &job, TQ_SIGNAL(percent(int)), d->erasingInfoDialog, TQ_SLOT(setProgress(int)) ); + connect( d->erasingInfoDialog, TQ_SIGNAL(cancelClicked()), &job, TQ_SLOT(cancel()) ); job.start( medium.diskInfo() ); d->erasingInfoDialog->exec( true ); } @@ -492,9 +492,9 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) job.setForceNoEject(true); d->erasingInfoDialog->setText( i18n("Formatting DVD-RW") ); - connect( &job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotErasingFinished(bool)) ); - connect( &job, TQT_SIGNAL(percent(int)), d->erasingInfoDialog, TQT_SLOT(setProgress(int)) ); - connect( d->erasingInfoDialog, TQT_SIGNAL(cancelClicked()), &job, TQT_SLOT(cancel()) ); + connect( &job, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotErasingFinished(bool)) ); + connect( &job, TQ_SIGNAL(percent(int)), d->erasingInfoDialog, TQ_SLOT(setProgress(int)) ); + connect( d->erasingInfoDialog, TQ_SIGNAL(cancelClicked()), &job, TQ_SLOT(cancel()) ); job.start( medium.diskInfo() ); d->erasingInfoDialog->exec( true ); } @@ -566,8 +566,8 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev ) job.setForceNoEject(true); job.setSpeed( 0 ); // Auto job.setWritingApp( erasingApp ); - connect( &job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotErasingFinished(bool)) ); - connect( d->erasingInfoDialog, TQT_SIGNAL(cancelClicked()), &job, TQT_SLOT(cancel()) ); + connect( &job, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotErasingFinished(bool)) ); + connect( d->erasingInfoDialog, TQ_SIGNAL(cancelClicked()), &job, TQ_SLOT(cancel()) ); job.start(); d->erasingInfoDialog->exec( false ); } @@ -664,9 +664,9 @@ void K3bEmptyDiscWaiter::slotErasingFinished( bool success ) { if( success ) { connect( K3bDevice::reload( d->device ), - TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQ_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - TQT_SLOT(slotReloadingAfterErasingFinished(K3bDevice::DeviceHandler*)) ); + TQ_SLOT(slotReloadingAfterErasingFinished(K3bDevice::DeviceHandler*)) ); } else { K3bDevice::eject( d->device ); @@ -685,7 +685,7 @@ void K3bEmptyDiscWaiter::slotReloadingAfterErasingFinished( K3bDevice::DeviceHan int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, bool appendable, int mediaType, TQWidget* parent ) { - K3bEmptyDiscWaiter d( device, parent ? parent : TQT_TQWIDGET(tqApp->activeWindow()) ); + K3bEmptyDiscWaiter d( device, parent ? parent : tqApp->activeWindow() ); int mediaState = K3bDevice::STATE_EMPTY; if( appendable ) mediaState |= K3bDevice::STATE_INCOMPLETE; return d.waitForDisc( mediaState, mediaType ); @@ -698,7 +698,7 @@ int K3bEmptyDiscWaiter::wait( K3bDevice::Device* device, const TQString& message, TQWidget* parent ) { - K3bEmptyDiscWaiter d( device, parent ? parent : TQT_TQWIDGET(tqApp->activeWindow()) ); + K3bEmptyDiscWaiter d( device, parent ? parent : tqApp->activeWindow() ); return d.waitForDisc( mediaState, mediaType, message ); } diff --git a/src/k3bemptydiscwaiter.h b/src/k3bemptydiscwaiter.h index 69207b9..87e22bb 100644 --- a/src/k3bemptydiscwaiter.h +++ b/src/k3bemptydiscwaiter.h @@ -37,7 +37,7 @@ namespace K3bDevice { */ class K3bEmptyDiscWaiter : public KDialogBase, public K3bJobHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bfiletreecombobox.cpp b/src/k3bfiletreecombobox.cpp index 4075df7..ed534dc 100644 --- a/src/k3bfiletreecombobox.cpp +++ b/src/k3bfiletreecombobox.cpp @@ -73,13 +73,13 @@ K3bFileTreeComboBox::K3bFileTreeComboBox( TQWidget* parent, const char* name ) // HACK! Why the hell is TQComboBox that closed??? listBox()->insertItem( "HACK" ); - connect( m_fileTreeView, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), - this, TQT_SLOT(slotDeviceExecuted(K3bDevice::Device*)) ); - connect( m_fileTreeView, TQT_SIGNAL(urlExecuted(const KURL&)), - this, TQT_SLOT(slotUrlExecuted(const KURL&)) ); + connect( m_fileTreeView, TQ_SIGNAL(deviceExecuted(K3bDevice::Device*)), + this, TQ_SLOT(slotDeviceExecuted(K3bDevice::Device*)) ); + connect( m_fileTreeView, TQ_SIGNAL(urlExecuted(const KURL&)), + this, TQ_SLOT(slotUrlExecuted(const KURL&)) ); - connect( lineEdit(), TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotGoUrl()) ); + connect( lineEdit(), TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotGoUrl()) ); // TODO: subclass KURLCompletition to support the dev:/ stuff and block any non-local urls } @@ -273,7 +273,7 @@ bool K3bFileTreeComboBox::eventFilter( TQObject* o, TQEvent* e ) } else if( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*)e; - if ( !TQT_TQRECT_OBJECT(m_fileTreeView->rect()).contains( me->pos() ) ) { + if ( !m_fileTreeView->rect().contains( me->pos() ) ) { TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); arrowRect = TQStyle::visualRect(arrowRect, this); @@ -301,7 +301,7 @@ void K3bFileTreeComboBox::mousePressEvent( TQMouseEvent* e ) { // mainly from qcombobox.cpp - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; if ( d->ignoreNextMouseClick ) { d->ignoreNextMouseClick = FALSE; diff --git a/src/k3bfiletreecombobox.h b/src/k3bfiletreecombobox.h index ffe66e9..47df3d4 100644 --- a/src/k3bfiletreecombobox.h +++ b/src/k3bfiletreecombobox.h @@ -30,7 +30,7 @@ namespace K3bDevice { class K3bFileTreeComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 740d750..739a2b4 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -67,8 +67,8 @@ K3bDeviceBranch::K3bDeviceBranch( KFileTreeView* view, K3bDevice::Device* dev, K root()->setExpandable(false); updateLabel(); - connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( k3bappcore->mediaCache(), TQ_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } @@ -343,7 +343,7 @@ void K3bDeviceTreeToolTip::maybeTip( const TQPoint& pos ) lay->addMultiCellWidget( label, 0, 0, 0, 1 ); label = new TQLabel( details, tooltip ); label->setMargin( 9 ); - label->setAlignment( Qt::Vertical ); + label->setAlignment( TQt::Vertical ); lay->addMultiCellWidget( label, 1, 2, 0, 0 ); label = new TQLabel( tooltip ); lay->addWidget( label, 2, 1 ); @@ -413,15 +413,15 @@ K3bFileTreeView::K3bFileTreeView( TQWidget *parent, const char *name ) m_dirOnlyMode = true; m_menuEnabled = false; - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem* , const TQPoint& )), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem* , const TQPoint& )) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem* , const TQPoint& )), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem* , const TQPoint& )) ); // we always simulate the single click slotSettingsChangedK3b(TDEApplication::SETTINGS_MOUSE); if( kapp ) - connect( kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChangedK3b(int)) ); + connect( kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChangedK3b(int)) ); initActions(); } @@ -449,11 +449,11 @@ void K3bFileTreeView::initActions() // m_devicePopupMenu = new TDEActionMenu( m_actionCollection, "device_popup_menu" ); // m_urlPopupMenu = new TDEActionMenu( m_actionCollection, "url_popup_menu" ); -// TDEAction* actionDiskInfo = new TDEAction( i18n("&Disk Info"), "application-vnd.tde.info", 0, this, TQT_SLOT(slotShowDiskInfo()), +// TDEAction* actionDiskInfo = new TDEAction( i18n("&Disk Info"), "application-vnd.tde.info", 0, this, TQ_SLOT(slotShowDiskInfo()), // m_actionCollection, "disk_info"); -// TDEAction* actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom-unmounted", 0, this, TQT_SLOT(slotUnmountDisk()), +// TDEAction* actionUnmount = new TDEAction( i18n("&Unmount"), "media-optical-cdrom-unmounted", 0, this, TQ_SLOT(slotUnmountDisk()), // m_actionCollection, "disk_unmount"); -// TDEAction* actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQT_SLOT(slotEjectDisk()), +// TDEAction* actionEject = new TDEAction( i18n("&Eject"), "", 0, this, TQ_SLOT(slotEjectDisk()), // m_actionCollection, "disk_eject"); // m_devicePopupMenu->insert( actionDiskInfo ); @@ -498,12 +498,12 @@ void K3bFileTreeView::addCdDeviceBranches( K3bDevice::DeviceManager* dm ) d->deviceManager = dm; // make sure we get changes to the config - connect( dm, TQT_SIGNAL(changed(K3bDevice::DeviceManager*)), - this, TQT_SLOT(addCdDeviceBranches(K3bDevice::DeviceManager*)) ); + connect( dm, TQ_SIGNAL(changed(K3bDevice::DeviceManager*)), + this, TQ_SLOT(addCdDeviceBranches(K3bDevice::DeviceManager*)) ); if( K3bAppDeviceManager* appDevM = dynamic_cast<K3bAppDeviceManager*>( dm ) ) - connect( appDevM, TQT_SIGNAL(currentDeviceChanged(K3bDevice::Device*)), - this, TQT_SLOT(setCurrentDevice(K3bDevice::Device*)) ); + connect( appDevM, TQ_SIGNAL(currentDeviceChanged(K3bDevice::Device*)), + this, TQ_SLOT(setCurrentDevice(K3bDevice::Device*)) ); } K3bDevice::Device* currentDevice = k3bappcore->appDeviceManager()->currentDevice(); @@ -693,19 +693,19 @@ void K3bFileTreeView::slotSettingsChangedK3b(int category) // we force single click like konqueror does. This really should be done in KFileTreeView if( category == TDEApplication::SETTINGS_MOUSE ) { - disconnect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); + disconnect(this, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); if( !TDEGlobalSettings::singleClick() ) - connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int))); } } void K3bFileTreeView::slotMouseButtonClickedK3b( int btn, TQListViewItem *item, const TQPoint &pos, int c ) { - if( (btn == Qt::LeftButton) && item ) + if( (btn == TQt::LeftButton) && item ) emitExecute(item, pos, c); } diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h index 371f2df..5ecb576 100644 --- a/src/k3bfiletreeview.h +++ b/src/k3bfiletreeview.h @@ -39,7 +39,7 @@ namespace TDEIO { class K3bDeviceBranch : public KFileTreeBranch { - Q_OBJECT + TQ_OBJECT public: @@ -116,7 +116,7 @@ class K3bFileTreeViewItem : public KFileTreeViewItem */ class K3bFileTreeView : public KFileTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp index d82e611..dc70e32 100644 --- a/src/k3bfileview.cpp +++ b/src/k3bfileview.cpp @@ -108,11 +108,11 @@ void K3bFileView::setupGUI() filter += "\n" + i18n("video/mpeg |MPEG Video Files"); m_filterWidget->setFilter(filter); - connect( m_filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged()) ); + connect( m_filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged()) ); - connect( m_dirOp, TQT_SIGNAL(fileHighlighted(const KFileItem*)), this, TQT_SLOT(slotFileHighlighted(const KFileItem*)) ); - connect( m_dirOp, TQT_SIGNAL(urlEntered(const KURL&)), this, TQT_SIGNAL(urlEntered(const KURL&)) ); - connect( m_dirOp, TQT_SIGNAL(fileSelected(const KFileItem*)), m_dirOp, TQT_SLOT(slotAddFilesToProject()) ); + connect( m_dirOp, TQ_SIGNAL(fileHighlighted(const KFileItem*)), this, TQ_SLOT(slotFileHighlighted(const KFileItem*)) ); + connect( m_dirOp, TQ_SIGNAL(urlEntered(const KURL&)), this, TQ_SIGNAL(urlEntered(const KURL&)) ); + connect( m_dirOp, TQ_SIGNAL(fileSelected(const KFileItem*)), m_dirOp, TQ_SLOT(slotAddFilesToProject()) ); slotFileHighlighted(0); } diff --git a/src/k3bfileview.h b/src/k3bfileview.h index c0d4bd8..eca1330 100644 --- a/src/k3bfileview.h +++ b/src/k3bfileview.h @@ -36,7 +36,7 @@ class K3bToolBox; */ class K3bFileView : public K3bContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bfirstrun.h b/src/k3bfirstrun.h index 6524cde..84c237d 100644 --- a/src/k3bfirstrun.h +++ b/src/k3bfirstrun.h @@ -21,7 +21,7 @@ class K3bFirstRun : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp index eafc637..c11f1a1 100644 --- a/src/k3bflatbutton.cpp +++ b/src/k3bflatbutton.cpp @@ -53,7 +53,7 @@ K3bFlatButton::K3bFlatButton( TDEAction* a, TQWidget *parent, const char *name ) setText( a->text() ); TQToolTip::add( this, a->toolTip() ); setPixmap( TDEGlobal::iconLoader()->loadIcon( a->icon(), TDEIcon::NoGroup, 32 ) ); - connect( this, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) ); + connect( this, TQ_SIGNAL(clicked()), a, TQ_SLOT(activate()) ); } @@ -66,8 +66,8 @@ void K3bFlatButton::init() setMargin(5); setFrameStyle( TQFrame::Box|TQFrame::Plain ); - connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), this, TQT_SLOT(slotThemeChanged()) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(slotThemeChanged()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(slotThemeChanged()) ); slotThemeChanged(); } @@ -102,7 +102,7 @@ void K3bFlatButton::leaveEvent( TQEvent* ) void K3bFlatButton::mousePressEvent( TQMouseEvent* e ) { - if( e->button() == Qt::LeftButton ) { + if( e->button() == TQt::LeftButton ) { emit pressed(); m_pressed = true; } @@ -113,7 +113,7 @@ void K3bFlatButton::mousePressEvent( TQMouseEvent* e ) void K3bFlatButton::mouseReleaseEvent( TQMouseEvent* e ) { - if( e->button() == Qt::LeftButton ) { + if( e->button() == TQt::LeftButton ) { if( m_pressed ) emit clicked(); m_pressed = false; diff --git a/src/k3bflatbutton.h b/src/k3bflatbutton.h index 4de1f9d..00a9bb7 100644 --- a/src/k3bflatbutton.h +++ b/src/k3bflatbutton.h @@ -31,7 +31,7 @@ class TDEAction; */ class K3bFlatButton : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp index 92031e2..db82ed0 100644 --- a/src/k3binteractiondialog.cpp +++ b/src/k3binteractiondialog.cpp @@ -86,9 +86,9 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent, m_buttonLoadSettings = new K3bToolButton( /*i18n("User Defaults"), */this ); ((K3bToolButton*)m_buttonLoadSettings)->setIconSet( SmallIconSet( "document-revert" ) ); TQPopupMenu* userDefaultsPopup = new TQPopupMenu( m_buttonLoadSettings ); - userDefaultsPopup->insertItem( i18n("Load default settings"), this, TQT_SLOT(slotLoadK3bDefaults()) ); - userDefaultsPopup->insertItem( i18n("Load saved settings"), this, TQT_SLOT(slotLoadUserDefaults()) ); - userDefaultsPopup->insertItem( i18n("Load last used settings"), this, TQT_SLOT(slotLoadLastSettings()) ); + userDefaultsPopup->insertItem( i18n("Load default settings"), this, TQ_SLOT(slotLoadK3bDefaults()) ); + userDefaultsPopup->insertItem( i18n("Load saved settings"), this, TQ_SLOT(slotLoadUserDefaults()) ); + userDefaultsPopup->insertItem( i18n("Load last used settings"), this, TQ_SLOT(slotLoadLastSettings()) ); ((TQToolButton*)m_buttonLoadSettings)->setPopup( userDefaultsPopup ); ((K3bToolButton*)m_buttonLoadSettings)->setInstantMenu( true ); layout2->addWidget( m_buttonLoadSettings ); @@ -215,22 +215,22 @@ TQSize K3bInteractionDialog::sizeHint() const void K3bInteractionDialog::initConnections() { if( m_buttonStart ) { - connect( m_buttonStart, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotStartClickedInternal()) ); + connect( m_buttonStart, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotStartClickedInternal()) ); } if( m_buttonSave ) { -// connect( m_buttonSave, TQT_SIGNAL(clicked()), -// this, TQT_SLOT(slotSaveLastSettings()) ); - connect( m_buttonSave, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveClicked()) ); +// connect( m_buttonSave, TQ_SIGNAL(clicked()), +// this, TQ_SLOT(slotSaveLastSettings()) ); + connect( m_buttonSave, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveClicked()) ); } if( m_buttonCancel ) - connect( m_buttonCancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCancelClicked()) ); + connect( m_buttonCancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCancelClicked()) ); if( !m_configGroup.isEmpty() ) { - connect( m_buttonSaveSettings, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSaveUserDefaults()) ); + connect( m_buttonSaveSettings, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSaveUserDefaults()) ); } } @@ -584,7 +584,7 @@ int K3bInteractionDialog::exec( bool returnOnHide ) loadStartupSettings(); show(); if( m_delayedInit ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotDelayedInit()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotDelayedInit()) ); else init(); diff --git a/src/k3binteractiondialog.h b/src/k3binteractiondialog.h index 65e047f..3d80664 100644 --- a/src/k3binteractiondialog.h +++ b/src/k3binteractiondialog.h @@ -37,7 +37,7 @@ class KGuiItem; */ class K3bInteractionDialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3binterface.cpp b/src/k3binterface.cpp index cd6f4d7..0d90fa1 100644 --- a/src/k3binterface.cpp +++ b/src/k3binterface.cpp @@ -143,28 +143,28 @@ void K3bInterface::copyDvd( const KURL& dev ) void K3bInterface::copyCd() { // HACK since we want this method to return immediately - TQTimer::singleShot( 0, m_main, TQT_SLOT(slotCdCopy()) ); + TQTimer::singleShot( 0, m_main, TQ_SLOT(slotCdCopy()) ); } void K3bInterface::copyDvd() { // HACK since we want this method to return immediately - TQTimer::singleShot( 0, m_main, TQT_SLOT(slotDvdCopy()) ); + TQTimer::singleShot( 0, m_main, TQ_SLOT(slotDvdCopy()) ); } void K3bInterface::eraseCdrw() { // HACK since we want this method to return immediately - TQTimer::singleShot( 0, m_main, TQT_SLOT(slotBlankCdrw()) ); + TQTimer::singleShot( 0, m_main, TQ_SLOT(slotBlankCdrw()) ); } void K3bInterface::formatDvd() { // HACK since we want this method to return immediately - TQTimer::singleShot( 0, m_main, TQT_SLOT(slotFormatDvd()) ); + TQTimer::singleShot( 0, m_main, TQ_SLOT(slotFormatDvd()) ); } diff --git a/src/k3bjobinterface.cpp b/src/k3bjobinterface.cpp index 4eb1dd5..ee6fab5 100644 --- a/src/k3bjobinterface.cpp +++ b/src/k3bjobinterface.cpp @@ -38,22 +38,22 @@ void K3bJobInterface::setJob( K3bJob* job ) m_lastProgress = m_lastSubProgress = 0; if( m_job ) { - connect( m_job, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SLOT(slotNewTask(const TQString&)) ); - connect( m_job, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); - connect( m_job, TQT_SIGNAL(infoMessage(const TQString&, int)), this, TQT_SLOT(slotInfoMessage(const TQString&, int)) ); - connect( m_job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotFinished(bool)) ); - connect( m_job, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()) ); - connect( m_job, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); - connect( m_job, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotProgress(int)) ); - connect( m_job, TQT_SIGNAL(subPercent(int)), this, TQT_SLOT(slotSubProgress(int)) ); - connect( m_job, TQT_SIGNAL(nextTrack(int, int)), this, TQT_SLOT(slotNextTrack(int, int)) ); + connect( m_job, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SLOT(slotNewTask(const TQString&)) ); + connect( m_job, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SLOT(slotNewSubTask(const TQString&)) ); + connect( m_job, TQ_SIGNAL(infoMessage(const TQString&, int)), this, TQ_SLOT(slotInfoMessage(const TQString&, int)) ); + connect( m_job, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotFinished(bool)) ); + connect( m_job, TQ_SIGNAL(started()), this, TQ_SLOT(slotStarted()) ); + connect( m_job, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) ); + connect( m_job, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotProgress(int)) ); + connect( m_job, TQ_SIGNAL(subPercent(int)), this, TQ_SLOT(slotSubProgress(int)) ); + connect( m_job, TQ_SIGNAL(nextTrack(int, int)), this, TQ_SLOT(slotNextTrack(int, int)) ); if( m_job->inherits( "K3bBurnJob" ) ) { - connect( m_job, TQT_SIGNAL(bufferStatus(int)), this, TQT_SLOT(slotBuffer(int)) ); - connect( m_job, TQT_SIGNAL(deviceBuffer(int)), this, TQT_SLOT(slotDeviceBuffer(int)) ); + connect( m_job, TQ_SIGNAL(bufferStatus(int)), this, TQ_SLOT(slotBuffer(int)) ); + connect( m_job, TQ_SIGNAL(deviceBuffer(int)), this, TQ_SLOT(slotDeviceBuffer(int)) ); } - connect( m_job, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( m_job, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); } } diff --git a/src/k3bjobinterface.h b/src/k3bjobinterface.h index 35f1f71..e4c07ea 100644 --- a/src/k3bjobinterface.h +++ b/src/k3bjobinterface.h @@ -30,7 +30,7 @@ class K3bJob; */ class K3bJobInterface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index 14a710f..0f1dee2 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -98,7 +98,7 @@ K3bJobProgressDialog::K3bJobProgressDialog( TQWidget* parent, m_job = 0; m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateTime()) ); } @@ -254,10 +254,10 @@ void K3bJobProgressDialog::setupGUI() slotThemeChanged(); - connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), - this, TQT_SLOT(slotThemeChanged()) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), - this, TQT_SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), + this, TQ_SLOT(slotThemeChanged()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), + this, TQ_SLOT(slotThemeChanged()) ); } @@ -306,9 +306,9 @@ void K3bJobProgressDialog::closeEvent( TQCloseEvent* e ) void K3bJobProgressDialog::setupConnections() { - connect( m_buttonCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCancelButtonPressed()) ); - connect( m_buttonClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); - connect( m_buttonShowDebug, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowDebuggingOutput()) ); + connect( m_buttonCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCancelButtonPressed()) ); + connect( m_buttonClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()) ); + connect( m_buttonShowDebug, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowDebuggingOutput()) ); } @@ -434,23 +434,23 @@ void K3bJobProgressDialog::setJob( K3bJob* job ) if( job ) { // connect to all the shit - connect( job, TQT_SIGNAL(infoMessage(const TQString&,int)), this, TQT_SLOT(slotInfoMessage(const TQString&,int)) ); + connect( job, TQ_SIGNAL(infoMessage(const TQString&,int)), this, TQ_SLOT(slotInfoMessage(const TQString&,int)) ); - connect( job, TQT_SIGNAL(percent(int)), m_progressPercent, TQT_SLOT(setValue(int)) ); - connect( job, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotProgress(int)) ); - connect( job, TQT_SIGNAL(subPercent(int)), m_progressSubPercent, TQT_SLOT(setValue(int)) ); + connect( job, TQ_SIGNAL(percent(int)), m_progressPercent, TQ_SLOT(setValue(int)) ); + connect( job, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotProgress(int)) ); + connect( job, TQ_SIGNAL(subPercent(int)), m_progressSubPercent, TQ_SLOT(setValue(int)) ); - connect( job, TQT_SIGNAL(processedSubSize(int, int)), this, TQT_SLOT(slotProcessedSubSize(int, int)) ); - connect( job, TQT_SIGNAL(processedSize(int, int)), this, TQT_SLOT(slotProcessedSize(int, int)) ); + connect( job, TQ_SIGNAL(processedSubSize(int, int)), this, TQ_SLOT(slotProcessedSubSize(int, int)) ); + connect( job, TQ_SIGNAL(processedSize(int, int)), this, TQ_SLOT(slotProcessedSize(int, int)) ); - connect( job, TQT_SIGNAL(newTask(const TQString&)), this, TQT_SLOT(slotNewTask(const TQString&)) ); - connect( job, TQT_SIGNAL(newSubTask(const TQString&)), this, TQT_SLOT(slotNewSubTask(const TQString&)) ); - connect( job, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted()) ); - connect( job, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotFinished(bool)) ); - connect( job, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); + connect( job, TQ_SIGNAL(newTask(const TQString&)), this, TQ_SLOT(slotNewTask(const TQString&)) ); + connect( job, TQ_SIGNAL(newSubTask(const TQString&)), this, TQ_SLOT(slotNewSubTask(const TQString&)) ); + connect( job, TQ_SIGNAL(started()), this, TQ_SLOT(slotStarted()) ); + connect( job, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotFinished(bool)) ); + connect( job, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) ); - connect( job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - this, TQT_SLOT(slotDebuggingOutput(const TQString&, const TQString&)) ); + connect( job, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + this, TQ_SLOT(slotDebuggingOutput(const TQString&, const TQString&)) ); m_labelJob->setText( m_job->jobDescription() ); m_labelJobDetails->setText( m_job->jobDetails() ); @@ -467,8 +467,8 @@ void K3bJobProgressDialog::setJob( K3bJob* job ) if( m_osd ) { m_osd->setText( job->jobDescription() ); // FIXME: use a setJob method and let the osd also change the text color to red/green - // connect( job, TQT_SIGNAL(newTask(const TQString&)), m_osd, TQT_SLOT(setText(const TQString&)) ); - connect( job, TQT_SIGNAL(percent(int)), m_osd, TQT_SLOT(setProgress(int)) ); + // connect( job, TQ_SIGNAL(newTask(const TQString&)), m_osd, TQ_SLOT(setText(const TQString&)) ); + connect( job, TQ_SIGNAL(percent(int)), m_osd, TQ_SLOT(setProgress(int)) ); } } } @@ -682,14 +682,14 @@ void K3bJobProgressDialog::blockingInformation( const TQString& text, void K3bJobProgressDialog::slotThemeChanged() { if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) { - TQT_TQWIDGET(child( "frame4" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "frame4" ))->setPaletteForegroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "frame5" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "frame5" ))->setPaletteForegroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "progressHeaderFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "progressHeaderFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "headerFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); - TQT_TQWIDGET(child( "headerFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); + static_cast<TQWidget*>(child( "frame4" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + static_cast<TQWidget*>(child( "frame4" ))->setPaletteForegroundColor( theme->backgroundColor() ); + static_cast<TQWidget*>(child( "frame5" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + static_cast<TQWidget*>(child( "frame5" ))->setPaletteForegroundColor( theme->backgroundColor() ); + static_cast<TQWidget*>(child( "progressHeaderFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + static_cast<TQWidget*>(child( "progressHeaderFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); + static_cast<TQWidget*>(child( "headerFrame" ))->setPaletteBackgroundColor( theme->backgroundColor() ); + static_cast<TQWidget*>(child( "headerFrame" ))->setPaletteForegroundColor( theme->backgroundColor() ); } } diff --git a/src/k3bjobprogressdialog.h b/src/k3bjobprogressdialog.h index 160c980..f9942ab 100644 --- a/src/k3bjobprogressdialog.h +++ b/src/k3bjobprogressdialog.h @@ -48,7 +48,7 @@ class K3bThemedLabel; class K3bJobProgressDialog : public KDialog, public K3bJobHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp index ee035e0..dcf2fd6 100644 --- a/src/k3bjobprogressosd.cpp +++ b/src/k3bjobprogressosd.cpp @@ -41,7 +41,7 @@ K3bJobProgressOSD::K3bJobProgressOSD( TQWidget* parent, const char* name ) m_screen(0), m_position(s_outerMargin, s_outerMargin) { - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setBackgroundMode( NoBackground ); // dummy size @@ -50,10 +50,10 @@ K3bJobProgressOSD::K3bJobProgressOSD( TQWidget* parent, const char* name ) // make sure we are always visible KWin::setOnAllDesktops( winId(), true ); - connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), - this, TQT_SLOT(refresh()) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), - this, TQT_SLOT(refresh()) ); + connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), + this, TQ_SLOT(refresh()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), + this, TQ_SLOT(refresh()) ); } @@ -211,11 +211,11 @@ void K3bJobProgressOSD::mousePressEvent( TQMouseEvent* e ) { m_dragOffset = e->pos(); - if( e->button() == Qt::LeftButton && !m_dragging ) { + if( e->button() == TQt::LeftButton && !m_dragging ) { grabMouse( KCursor::sizeAllCursor() ); m_dragging = true; } - else if( e->button() == Qt::RightButton ) { + else if( e->button() == TQt::RightButton ) { TDEPopupMenu m; if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->globalPos() ) ) hide(); diff --git a/src/k3bjobprogressosd.h b/src/k3bjobprogressosd.h index 5159fa8..f4a2f55 100644 --- a/src/k3bjobprogressosd.h +++ b/src/k3bjobprogressosd.h @@ -30,7 +30,7 @@ class TDEConfigBase; */ class K3bJobProgressOSD : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3blsofwrapperdialog.cpp b/src/k3blsofwrapperdialog.cpp index ab18849..619d221 100644 --- a/src/k3blsofwrapperdialog.cpp +++ b/src/k3blsofwrapperdialog.cpp @@ -56,8 +56,8 @@ K3bLsofWrapperDialog::K3bLsofWrapperDialog( TQWidget* parent ) m_label = new K3bRichTextLabel( this ); setMainWidget( m_label ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotQuitOtherApps()) ); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotCheckDevice()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotQuitOtherApps()) ); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotCheckDevice()) ); } diff --git a/src/k3blsofwrapperdialog.h b/src/k3blsofwrapperdialog.h index 14a2876..901adeb 100644 --- a/src/k3blsofwrapperdialog.h +++ b/src/k3blsofwrapperdialog.h @@ -25,7 +25,7 @@ namespace K3bDevice { class K3bLsofWrapperDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bmediacache.h b/src/k3bmediacache.h index e358956..e31f482 100644 --- a/src/k3bmediacache.h +++ b/src/k3bmediacache.h @@ -50,7 +50,7 @@ class TQCustomEvent; */ class K3bMediaCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bmediacontentsview.cpp b/src/k3bmediacontentsview.cpp index 69c57fa..531c2f9 100644 --- a/src/k3bmediacontentsview.cpp +++ b/src/k3bmediacontentsview.cpp @@ -50,8 +50,8 @@ K3bMediaContentsView::K3bMediaContentsView( bool withHeader, d->supportedMediumStates = mediumState; d->autoReload = true; - connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( k3bappcore->mediaCache(), TQ_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } diff --git a/src/k3bmediacontentsview.h b/src/k3bmediacontentsview.h index f888c33..7d485cd 100644 --- a/src/k3bmediacontentsview.h +++ b/src/k3bmediacontentsview.h @@ -33,7 +33,7 @@ class K3bThemedHeader; */ class K3bMediaContentsView : public K3bContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bmediaselectioncombobox.cpp b/src/k3bmediaselectioncombobox.cpp index 8412b59..a0b8d11 100644 --- a/src/k3bmediaselectioncombobox.cpp +++ b/src/k3bmediaselectioncombobox.cpp @@ -108,14 +108,14 @@ K3bMediaSelectionComboBox::K3bMediaSelectionComboBox( TQWidget* parent ) d->font = font(); - 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( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); - connect( this, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotUpdateToolTip(K3bDevice::Device*)) ); + 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*)) ); + connect( k3bappcore->mediaCache(), TQ_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( this, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotUpdateToolTip(K3bDevice::Device*)) ); updateMedia(); diff --git a/src/k3bmediaselectioncombobox.h b/src/k3bmediaselectioncombobox.h index 7f3a742..d8e14e8 100644 --- a/src/k3bmediaselectioncombobox.h +++ b/src/k3bmediaselectioncombobox.h @@ -33,7 +33,7 @@ namespace K3bDevice { */ class K3bMediaSelectionComboBox : public KComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bmediaselectiondialog.cpp b/src/k3bmediaselectiondialog.cpp index 5b3e39a..aa29fa0 100644 --- a/src/k3bmediaselectiondialog.cpp +++ b/src/k3bmediaselectiondialog.cpp @@ -47,8 +47,8 @@ K3bMediaSelectionDialog::K3bMediaSelectionDialog( TQWidget* parent, lay->addWidget( m_combo, 1, 0 ); lay->setRowStretch( 2, 1 ); - connect( m_combo, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); + connect( m_combo, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); slotSelectionChanged( m_combo->selectedDevice() ); } diff --git a/src/k3bmediaselectiondialog.h b/src/k3bmediaselectiondialog.h index e8fb6b3..edce5fb 100644 --- a/src/k3bmediaselectiondialog.h +++ b/src/k3bmediaselectiondialog.h @@ -26,7 +26,7 @@ namespace K3bDevice { class K3bMediaSelectionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bminibutton.cpp b/src/k3bminibutton.cpp index b20399d..3e52d12 100644 --- a/src/k3bminibutton.cpp +++ b/src/k3bminibutton.cpp @@ -27,7 +27,7 @@ K3bMiniButton::K3bMiniButton( TQWidget *parent, const char * name ) :TQPushButton( parent, name ), m_mouseOver( false ) { - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } K3bMiniButton::~K3bMiniButton() diff --git a/src/k3bminibutton.h b/src/k3bminibutton.h index df708ac..2436130 100644 --- a/src/k3bminibutton.h +++ b/src/k3bminibutton.h @@ -33,7 +33,7 @@ class TQEvent; */ class K3bMiniButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp index 6270ae1..86c7d35 100644 --- a/src/k3bpassivepopup.cpp +++ b/src/k3bpassivepopup.cpp @@ -127,20 +127,20 @@ K3bPassivePopup::K3bPassivePopup( TQWidget* parent ) d->pixmapLabel->setAlignment( TQt::AlignTop ); d->timeoutWidget = new K3bTimeoutWidget( this ); - connect( d->timeoutWidget, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClose()) ); + connect( d->timeoutWidget, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClose()) ); d->closeButton = new K3bMiniButton( d->titleLabel ); d->closeButton->setPixmap( style().stylePixmap( TQStyle::SP_TitleBarCloseButton, this ) ); d->closeButton->setFixedSize( d->closeButton->pixmap()->width(), d->closeButton->pixmap()->height() ); TQToolTip::add( d->closeButton, i18n("Close") ); - connect( d->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()) ); + connect( d->closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()) ); d->stickyButton = new K3bMiniButton( d->titleLabel ); d->stickyButton->setToggleButton( true ); d->stickyButton->setPixmap( const_cast< const char** >( sticky_xpm ) ); d->stickyButton->setFixedSize( d->closeButton->pixmap()->width(), d->closeButton->pixmap()->height() ); TQToolTip::add( d->stickyButton, i18n("Keep Open") ); - connect( d->stickyButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSticky(bool)) ); + connect( d->stickyButton, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSticky(bool)) ); grid->addWidget( d->pixmapLabel, 0, 0 ); grid->addWidget( d->messageLabel, 0, 1 ); @@ -218,8 +218,8 @@ void K3bPassivePopup::setMessageType( MessageType m ) void K3bPassivePopup::slideIn() { d->showEffect = K3bWidgetShowEffect::Slide; - connect( K3bWidgetShowEffect::showWidget( this, (K3bWidgetShowEffect::Effect)d->showEffect ), TQT_SIGNAL(widgetShown(TQWidget*)), - this, TQT_SLOT(slotShown()) ); + connect( K3bWidgetShowEffect::showWidget( this, (K3bWidgetShowEffect::Effect)d->showEffect ), TQ_SIGNAL(widgetShown(TQWidget*)), + this, TQ_SLOT(slotShown()) ); } @@ -230,7 +230,7 @@ void K3bPassivePopup::slotShown() d->timeoutWidget->start(); } else - TQTimer::singleShot( d->timeout, this, TQT_SLOT(slotClose()) ); + TQTimer::singleShot( d->timeout, this, TQ_SLOT(slotClose()) ); } @@ -243,8 +243,8 @@ void K3bPassivePopup::slotHidden() void K3bPassivePopup::slotClose() { if( d->showEffect != 0 ) { - connect( K3bWidgetShowEffect::hideWidget( this, (K3bWidgetShowEffect::Effect)d->showEffect ), TQT_SIGNAL(widgetHidden(TQWidget*)), - this, TQT_SLOT(slotHidden()) ); + connect( K3bWidgetShowEffect::hideWidget( this, (K3bWidgetShowEffect::Effect)d->showEffect ), TQ_SIGNAL(widgetHidden(TQWidget*)), + this, TQ_SLOT(slotHidden()) ); } else deleteLater(); diff --git a/src/k3bpassivepopup.h b/src/k3bpassivepopup.h index 27509ff..4a85d70 100644 --- a/src/k3bpassivepopup.h +++ b/src/k3bpassivepopup.h @@ -30,7 +30,7 @@ class TQLabel; */ class K3bPassivePopup : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bprojectinterface.cpp b/src/k3bprojectinterface.cpp index 094e386..cf949cd 100644 --- a/src/k3bprojectinterface.cpp +++ b/src/k3bprojectinterface.cpp @@ -61,7 +61,7 @@ void K3bProjectInterface::addUrl( const TQString& url ) void K3bProjectInterface::burn() { // we want to return this method immediately - TQTimer::singleShot( 0, m_doc->view(), TQT_SLOT(slotBurn()) ); + TQTimer::singleShot( 0, m_doc->view(), TQ_SLOT(slotBurn()) ); } diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp index 5822ed8..face9e7 100644 --- a/src/k3bprojectmanager.cpp +++ b/src/k3bprojectmanager.cpp @@ -109,8 +109,8 @@ void K3bProjectManager::addProject( K3bDoc* doc ) d->projects.append(doc); - connect( doc, TQT_SIGNAL(changed(K3bDoc*)), - this, TQT_SLOT(slotProjectChanged(K3bDoc*)) ); + connect( doc, TQ_SIGNAL(changed(K3bDoc*)), + this, TQ_SLOT(slotProjectChanged(K3bDoc*)) ); emit newProject( doc ); } diff --git a/src/k3bprojectmanager.h b/src/k3bprojectmanager.h index b7a56a1..5c37f1f 100644 --- a/src/k3bprojectmanager.h +++ b/src/k3bprojectmanager.h @@ -27,7 +27,7 @@ class K3bProjectInterface; class K3bProjectManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bprojecttabwidget.cpp b/src/k3bprojecttabwidget.cpp index 3b9bc7c..c5d34c3 100644 --- a/src/k3bprojecttabwidget.cpp +++ b/src/k3bprojecttabwidget.cpp @@ -60,7 +60,7 @@ K3bProjectTabWidget::K3bProjectTabWidget( TQWidget *parent, const char *name, WF tabBar()->setAcceptDrops(true); tabBar()->installEventFilter( this ); - m_projectActionMenu = new TDEActionMenu( i18n("Project"), TQT_TQOBJECT(this) ); + m_projectActionMenu = new TDEActionMenu( i18n("Project"), this ); } @@ -121,8 +121,8 @@ void K3bProjectTabWidget::removePage( TQWidget* w ) void K3bProjectTabWidget::insertTab( K3bDoc* doc ) { TQTabWidget::insertTab( doc->view(), doc->URL().fileName() ); - connect( k3bappcore->projectManager(), TQT_SIGNAL(projectSaved(K3bDoc*)), this, TQT_SLOT(slotDocSaved(K3bDoc*)) ); - connect( doc, TQT_SIGNAL(changed(K3bDoc*)), this, TQT_SLOT(slotDocChanged(K3bDoc*)) ); + connect( k3bappcore->projectManager(), TQ_SIGNAL(projectSaved(K3bDoc*)), this, TQ_SLOT(slotDocSaved(K3bDoc*)) ); + connect( doc, TQ_SIGNAL(changed(K3bDoc*)), this, TQ_SLOT(slotDocChanged(K3bDoc*)) ); m_projectDataMap[doc] = ProjectData( doc ); @@ -174,10 +174,10 @@ K3bDoc* K3bProjectTabWidget::projectAt( const TQPoint& pos ) const bool K3bProjectTabWidget::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tabBar()) ) { + if( o == tabBar() ) { if( e->type() == TQEvent::MouseButtonPress ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if( me->button() == Qt::RightButton ) { + TQMouseEvent* me = static_cast<TQMouseEvent*>(e); + if( me->button() == TQt::RightButton ) { if( projectAt( me->pos() ) ) { // we need change the tab because the actions work on the current tab TQTab* clickedTab = tabBar()->selectTab( me->pos() ); diff --git a/src/k3bprojecttabwidget.h b/src/k3bprojecttabwidget.h index 717f84b..9434e51 100644 --- a/src/k3bprojecttabwidget.h +++ b/src/k3bprojecttabwidget.h @@ -33,7 +33,7 @@ class K3bDoc; */ class K3bProjectTabWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp index 68629f5..662d14a 100644 --- a/src/k3bsidepanel.cpp +++ b/src/k3bsidepanel.cpp @@ -96,7 +96,7 @@ void K3bSidePanel::addButton( TQFrame* frame, TDEAction* a ) b->setAutoRaise( true ); b->setTextPosition( TQToolButton::BesideIcon ); - connect( b, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) ); + connect( b, TQ_SIGNAL(clicked()), a, TQ_SLOT(activate()) ); TQGridLayout* grid = (TQGridLayout*)(frame->layout()); grid->addWidget( b, grid->numRows(), 0 ); diff --git a/src/k3bsidepanel.h b/src/k3bsidepanel.h index e337561..8c75436 100644 --- a/src/k3bsidepanel.h +++ b/src/k3bsidepanel.h @@ -26,7 +26,7 @@ class TDEAction; class K3bSidePanel : public TQToolBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bsplash.h b/src/k3bsplash.h index d523010..cb8f663 100644 --- a/src/k3bsplash.h +++ b/src/k3bsplash.h @@ -27,7 +27,7 @@ class TQString; class K3bSplash : public TQVBox { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index d23e75a..7684cdc 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -79,16 +79,16 @@ K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent ) m_mainWindow->statusBar()->addWidget( new TQLabel( " ", m_mainWindow->statusBar() ), 0, true ); m_mainWindow->statusBar()->addWidget( m_versionBox, 0, true ); - connect( m_mainWindow, TQT_SIGNAL(configChanged(TDEConfig*)), this, TQT_SLOT(update()) ); - connect( m_mainWindow->actionCollection(), TQT_SIGNAL(actionStatusText(const TQString&)), - this, TQT_SLOT(showActionStatusText(const TQString&)) ); - connect( m_mainWindow->actionCollection(), TQT_SIGNAL(clearStatusText()), - this, TQT_SLOT(clearActionStatusText()) ); - connect( k3bappcore->projectManager(), TQT_SIGNAL(activeProjectChanged(K3bDoc*)), - this, TQT_SLOT(slotActiveProjectChanged(K3bDoc*)) ); - connect( k3bappcore->projectManager(), TQT_SIGNAL(projectChanged(K3bDoc*)), - this, TQT_SLOT(slotActiveProjectChanged(K3bDoc*)) ); - connect( (m_updateTimer = new TQTimer( this )), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateProjectStats()) ); + connect( m_mainWindow, TQ_SIGNAL(configChanged(TDEConfig*)), this, TQ_SLOT(update()) ); + connect( m_mainWindow->actionCollection(), TQ_SIGNAL(actionStatusText(const TQString&)), + this, TQ_SLOT(showActionStatusText(const TQString&)) ); + connect( m_mainWindow->actionCollection(), TQ_SIGNAL(clearStatusText()), + this, TQ_SLOT(clearActionStatusText()) ); + connect( k3bappcore->projectManager(), TQ_SIGNAL(activeProjectChanged(K3bDoc*)), + this, TQ_SLOT(slotActiveProjectChanged(K3bDoc*)) ); + connect( k3bappcore->projectManager(), TQ_SIGNAL(projectChanged(K3bDoc*)), + this, TQ_SLOT(slotActiveProjectChanged(K3bDoc*)) ); + connect( (m_updateTimer = new TQTimer( this )), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateProjectStats()) ); update(); } @@ -134,7 +134,7 @@ void K3bStatusBarManager::slotFreeTempSpace(const TQString&, m_pixFreeTemp->setPixmap( SmallIcon("folder_green") ); // update the display every second - TQTimer::singleShot( 2000, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(update()) ); } @@ -153,9 +153,9 @@ void K3bStatusBarManager::clearActionStatusText() bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::MouseButtonDblClick ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->parentWidget()) ) + if( o == m_labelFreeTemp->parentWidget() ) m_mainWindow->showOptionDialog( 0 ); // FIXME: use an enumeration for the option pages - else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) ) + else if( o == m_versionBox ) if( TDEAction* a = m_mainWindow->action( "help_about_app" ) ) a->activate(); } diff --git a/src/k3bstatusbarmanager.h b/src/k3bstatusbarmanager.h index 6fc1f7f..0b04ba2 100644 --- a/src/k3bstatusbarmanager.h +++ b/src/k3bstatusbarmanager.h @@ -28,7 +28,7 @@ class TQTimer; class K3bStatusBarManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index 5202ead..76970a9 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -93,12 +93,12 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const TQValueList<K3bSystemProbl i18n("1 problem", "%n problems", problems.count() ) ); m_closeButton = new TQPushButton( i18n("Close"), this ); - connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); + connect( m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()) ); m_checkDontShowAgain = new TQCheckBox( i18n("Do not show again"), this ); #ifdef HAVE_K3BSETUP m_k3bsetupButton = new TQPushButton( i18n("Start K3bSetup2"), this ); - connect( m_k3bsetupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotK3bSetup()) ); + connect( m_k3bsetupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotK3bSetup()) ); #endif // setup the problem view diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h index b14ed32..e1e6a2d 100644 --- a/src/k3bsystemproblemdialog.h +++ b/src/k3bsystemproblemdialog.h @@ -67,7 +67,7 @@ class K3bSystemProblem */ class K3bSystemProblemDialog : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp index 53b322b..dae8ab0 100644 --- a/src/k3btempdirselectionwidget.cpp +++ b/src/k3btempdirselectionwidget.cpp @@ -40,7 +40,7 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const char *name ) - : TQGroupBox( 4, Qt::Vertical, parent, name ), + : TQGroupBox( 4, TQt::Vertical, parent, name ), m_labelCdSize(0), m_defaultImageFileName( "k3b_image.iso" ) { @@ -59,12 +59,12 @@ K3bTempDirSelectionWidget::K3bTempDirSelectionWidget( TQWidget *parent, const ch m_labelFreeSpace->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); - connect( m_editDirectory, TQT_SIGNAL(openFileDialog(KURLRequester*)), - this, TQT_SLOT(slotTempDirButtonPressed(KURLRequester*)) ); - connect( m_editDirectory, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotUpdateFreeTempSpace()) ); - connect( m_editDirectory->lineEdit(), TQT_SIGNAL(lostFocus()), - this, TQT_SLOT(slotFixTempPath()) ); + connect( m_editDirectory, TQ_SIGNAL(openFileDialog(KURLRequester*)), + this, TQ_SLOT(slotTempDirButtonPressed(KURLRequester*)) ); + connect( m_editDirectory, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_editDirectory->lineEdit(), TQ_SIGNAL(lostFocus()), + this, TQ_SLOT(slotFixTempPath()) ); // choose a default setSelectionMode( DIR ); @@ -115,7 +115,7 @@ void K3bTempDirSelectionWidget::slotUpdateFreeTempSpace() else m_labelCdSize->setPaletteForegroundColor( m_labelFreeSpace->paletteForegroundColor() ); } - TQTimer::singleShot( 1000, this, TQT_SLOT(slotUpdateFreeTempSpace()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(slotUpdateFreeTempSpace()) ); } diff --git a/src/k3btempdirselectionwidget.h b/src/k3btempdirselectionwidget.h index 52308b0..6776cd7 100644 --- a/src/k3btempdirselectionwidget.h +++ b/src/k3btempdirselectionwidget.h @@ -31,7 +31,7 @@ class TDEConfigBase; */ class K3bTempDirSelectionWidget : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bthemedheader.cpp b/src/k3bthemedheader.cpp index a0e59ca..ab4e21d 100644 --- a/src/k3bthemedheader.cpp +++ b/src/k3bthemedheader.cpp @@ -104,10 +104,10 @@ void K3bThemedHeader::init() slotThemeChanged(); - connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), - this, TQT_SLOT(slotThemeChanged()) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), - this, TQT_SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), + this, TQ_SLOT(slotThemeChanged()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), + this, TQ_SLOT(slotThemeChanged()) ); } diff --git a/src/k3bthemedheader.h b/src/k3bthemedheader.h index 2e2666e..5d256c7 100644 --- a/src/k3bthemedheader.h +++ b/src/k3bthemedheader.h @@ -25,7 +25,7 @@ class TQLabel; class K3bThemedHeader : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bthemedlabel.cpp b/src/k3bthemedlabel.cpp index 77138f9..e8df457 100644 --- a/src/k3bthemedlabel.cpp +++ b/src/k3bthemedlabel.cpp @@ -22,10 +22,10 @@ K3bThemedLabel::K3bThemedLabel( TQWidget* parent ) { slotThemeChanged(); - connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), - this, TQT_SLOT(slotThemeChanged()) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), - this, TQT_SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), + this, TQ_SLOT(slotThemeChanged()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), + this, TQ_SLOT(slotThemeChanged()) ); } @@ -35,10 +35,10 @@ K3bThemedLabel::K3bThemedLabel( const TQString& text, TQWidget* parent ) { slotThemeChanged(); - connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), - this, TQT_SLOT(slotThemeChanged()) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), - this, TQT_SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), + this, TQ_SLOT(slotThemeChanged()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), + this, TQ_SLOT(slotThemeChanged()) ); } @@ -47,10 +47,10 @@ K3bThemedLabel::K3bThemedLabel( K3bTheme::PixmapType pix, TQWidget* parent ) { setThemePixmap( pix ); - connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), - this, TQT_SLOT(slotThemeChanged()) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), - this, TQT_SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), + this, TQ_SLOT(slotThemeChanged()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), + this, TQ_SLOT(slotThemeChanged()) ); } diff --git a/src/k3bthemedlabel.h b/src/k3bthemedlabel.h index 8cdc626..65d7074 100644 --- a/src/k3bthemedlabel.h +++ b/src/k3bthemedlabel.h @@ -22,7 +22,7 @@ class K3bThemedLabel : public KCutLabel { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bthememanager.h b/src/k3bthememanager.h index 89b9c9e..2aba05a 100644 --- a/src/k3bthememanager.h +++ b/src/k3bthememanager.h @@ -110,7 +110,7 @@ class K3bTheme class K3bThemeManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3btimeoutwidget.cpp b/src/k3btimeoutwidget.cpp index f0a5d4a..f9106fe 100644 --- a/src/k3btimeoutwidget.cpp +++ b/src/k3btimeoutwidget.cpp @@ -41,7 +41,7 @@ K3bTimeoutWidget::K3bTimeoutWidget( TQWidget* parent ) d = new Private; d->timeout = 10000; d->margin = 4; - connect( &d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeStep()) ); + connect( &d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeStep()) ); } diff --git a/src/k3btimeoutwidget.h b/src/k3btimeoutwidget.h index e62df88..0ffd3a5 100644 --- a/src/k3btimeoutwidget.h +++ b/src/k3btimeoutwidget.h @@ -24,7 +24,7 @@ class TQResizeEvent; class K3bTimeoutWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3btooltip.cpp b/src/k3btooltip.cpp index c123955..4f87a2c 100644 --- a/src/k3btooltip.cpp +++ b/src/k3btooltip.cpp @@ -35,8 +35,8 @@ K3bToolTip::K3bToolTip( TQWidget* widget ) m_tipTimeout( 700 ) { m_parentWidget->installEventFilter( this ); - connect( m_tipTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotCheckShowTip()) ); + connect( m_tipTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotCheckShowTip()) ); } @@ -134,7 +134,7 @@ void K3bToolTip::hideTip() bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(parentWidget()) ) { + if( o == parentWidget() ) { switch( e->type() ) { case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: diff --git a/src/k3btooltip.h b/src/k3btooltip.h index 2565ab7..76e6fb7 100644 --- a/src/k3btooltip.h +++ b/src/k3btooltip.h @@ -28,7 +28,7 @@ class TQTimer; */ class K3bToolTip : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index 99011d2..8541996 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -96,9 +96,9 @@ K3bWelcomeWidget::Display::Display( K3bWelcomeWidget* parent ) m_rows = m_cols = 1; m_buttonMore = new K3bFlatButton( i18n("Further actions..."), this ); - connect( m_buttonMore, TQT_SIGNAL(pressed()), parent, TQT_SLOT(slotMoreActions()) ); + connect( m_buttonMore, TQ_SIGNAL(pressed()), parent, TQ_SLOT(slotMoreActions()) ); - connect( k3bappcore->themeManager(), TQT_SIGNAL(themeChanged()), this, TQT_SLOT(slotThemeChanged()) ); + connect( k3bappcore->themeManager(), TQ_SIGNAL(themeChanged()), this, TQ_SLOT(slotThemeChanged()) ); slotThemeChanged(); } @@ -351,9 +351,9 @@ K3bWelcomeWidget::K3bWelcomeWidget( K3bMainWindow* mw, TQWidget* parent, const c main = new Display( this ); addChild( main ); - connect( main, TQT_SIGNAL(dropped(const KURL::List&)), m_mainWindow, TQT_SLOT(addUrls(const KURL::List&)) ); + connect( main, TQ_SIGNAL(dropped(const KURL::List&)), m_mainWindow, TQ_SLOT(addUrls(const KURL::List&)) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), main, TQT_SLOT(update()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), main, TQ_SLOT(update()) ); } @@ -425,7 +425,7 @@ void K3bWelcomeWidget::fixSize() void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) { - if( e->button() == Qt::RightButton ) { + if( e->button() == TQt::RightButton ) { TQMap<int, TDEAction*> map; TDEPopupMenu addPop; @@ -438,7 +438,7 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) } } - // menu identifiers in QT are always < 0 (when automatically generated) + // menu identifiers in TQt are always < 0 (when automatically generated) // and unique throughout the entire application! int r = 0; int removeAction = 0; @@ -476,7 +476,7 @@ void K3bWelcomeWidget::slotMoreActions() for ( int i = 0; s_allActions[i]; ++i ) { if ( s_allActions[i][0] == '_' ) { - (new TDEActionSeparator( TQT_TQOBJECT(&popup) ))->plug( &popup ); + (new TDEActionSeparator( &popup ))->plug( &popup ); } else { m_mainWindow->actionCollection()->action( s_allActions[i] )->plug( &popup ); diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h index 58d85ca..75fa723 100644 --- a/src/k3bwelcomewidget.h +++ b/src/k3bwelcomewidget.h @@ -39,7 +39,7 @@ class TQShowEvent; class K3bWelcomeWidget : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: @@ -69,7 +69,7 @@ class K3bWelcomeWidget : public TQScrollView class K3bWelcomeWidget::Display : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bwidgetshoweffect.h b/src/k3bwidgetshoweffect.h index bf1db3b..0c13a37 100644 --- a/src/k3bwidgetshoweffect.h +++ b/src/k3bwidgetshoweffect.h @@ -31,7 +31,7 @@ */ class K3bWidgetShowEffect : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp index 981d1fd..19b17c1 100644 --- a/src/k3bwriterselectionwidget.cpp +++ b/src/k3bwriterselectionwidget.cpp @@ -120,7 +120,7 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char TQGroupBox* groupWriter = new TQGroupBox( this ); groupWriter->setTitle( i18n( "Burn Medium" ) ); - groupWriter->setColumnLayout(0, Qt::Vertical ); + groupWriter->setColumnLayout(0, TQt::Vertical ); groupWriter->layout()->setSpacing( 0 ); groupWriter->layout()->setMargin( 0 ); @@ -160,15 +160,15 @@ K3bWriterSelectionWidget::K3bWriterSelectionWidget( TQWidget *parent, const char setTabOrder( m_comboMedium, m_comboSpeed ); setTabOrder( m_comboSpeed, m_comboWritingApp ); - connect( m_comboMedium, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQT_SIGNAL(writerChanged()) ); - connect( m_comboMedium, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SIGNAL(writerChanged(K3bDevice::Device*)) ); - connect( m_comboMedium, TQT_SIGNAL(newMedia()), this, TQT_SIGNAL(newMedia()) ); - connect( m_comboMedium, TQT_SIGNAL(newMedium(K3bDevice::Device*)), this, TQT_SIGNAL(newMedium(K3bDevice::Device*)) ); - connect( m_comboMedium, TQT_SIGNAL(newMedium(K3bDevice::Device*)), this, TQT_SLOT(slotNewBurnMedium(K3bDevice::Device*)) ); - connect( m_comboWritingApp, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWritingAppSelected(int)) ); - connect( this, TQT_SIGNAL(writerChanged()), TQT_SLOT(slotWriterChanged()) ); - connect( m_comboSpeed, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSpeedChanged(int)) ); + connect( m_comboMedium, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQ_SIGNAL(writerChanged()) ); + connect( m_comboMedium, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SIGNAL(writerChanged(K3bDevice::Device*)) ); + connect( m_comboMedium, TQ_SIGNAL(newMedia()), this, TQ_SIGNAL(newMedia()) ); + connect( m_comboMedium, TQ_SIGNAL(newMedium(K3bDevice::Device*)), this, TQ_SIGNAL(newMedium(K3bDevice::Device*)) ); + connect( m_comboMedium, TQ_SIGNAL(newMedium(K3bDevice::Device*)), this, TQ_SLOT(slotNewBurnMedium(K3bDevice::Device*)) ); + connect( m_comboWritingApp, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWritingAppSelected(int)) ); + connect( this, TQ_SIGNAL(writerChanged()), TQ_SLOT(slotWriterChanged()) ); + connect( m_comboSpeed, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSpeedChanged(int)) ); TQToolTip::add( m_comboMedium, i18n("The medium that will be used for burning") ); diff --git a/src/k3bwriterselectionwidget.h b/src/k3bwriterselectionwidget.h index c4cb386..89e57cb 100644 --- a/src/k3bwriterselectionwidget.h +++ b/src/k3bwriterselectionwidget.h @@ -34,7 +34,7 @@ namespace K3bDevice { */ class K3bWriterSelectionWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp index 887741f..88d6544 100644 --- a/src/k3bwritingmodewidget.cpp +++ b/src/k3bwritingmodewidget.cpp @@ -88,7 +88,7 @@ void K3bWritingModeWidget::init() d = new Private(); d->device = 0; - connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(writingModeChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(writingModeChanged(int)) ); TQToolTip::add( this, i18n("Select the writing mode to use") ); diff --git a/src/k3bwritingmodewidget.h b/src/k3bwritingmodewidget.h index eb49f49..ffb36ae 100644 --- a/src/k3bwritingmodewidget.h +++ b/src/k3bwritingmodewidget.h @@ -29,7 +29,7 @@ class TDEConfigBase; */ class K3bWritingModeWidget : public K3bIntMapComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/main.cpp b/src/main.cpp index 7fd2f82..3e8d24c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -145,7 +145,7 @@ int main( int argc, char* argv[] ) K3bApplication app; // we need a running app for the init method - TQTimer::singleShot( 0, &app, TQT_SLOT(init()) ); + TQTimer::singleShot( 0, &app, TQ_SLOT(init()) ); return app.exec(); } diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index 0594f1c..f379983 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -80,8 +80,8 @@ K3bBlankingDialog::K3bBlankingDialog( TQWidget* parent, const char* name ) setupGui(); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotWritingAppChanged(int)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), this, TQ_SLOT(slotWritingAppChanged(int)) ); slotWriterChanged(); slotWritingAppChanged( m_writerSelectionWidget->writingApp() ); } @@ -108,7 +108,7 @@ void K3bBlankingDialog::setupGui() m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE ); // --- setup the blanking type button group ----------------------------- - TQGroupBox* groupBlankType = new TQGroupBox( 1, Qt::Vertical, i18n("&Erase Type"), frame ); + TQGroupBox* groupBlankType = new TQGroupBox( 1, TQt::Vertical, i18n("&Erase Type"), frame ); groupBlankType->layout()->setSpacing( spacingHint() ); groupBlankType->layout()->setMargin( marginHint() ); @@ -131,13 +131,13 @@ void K3bBlankingDialog::slotStartClicked() d->debugFile.open(); if( d->job == 0 ) { - d->job = new K3bBlankingJob( this, TQT_TQOBJECT(this) ); - connect( d->job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - d->debugDialog, TQT_SLOT(addOutput(const TQString&, const TQString&)) ); - connect( d->job, TQT_SIGNAL(debuggingOutput(const TQString&, const TQString&)), - &d->debugFile, TQT_SLOT(addOutput(const TQString&, const TQString&)) ); - connect( d->job, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotJobFinished(bool)) ); + d->job = new K3bBlankingJob( this, this ); + connect( d->job, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + d->debugDialog, TQ_SLOT(addOutput(const TQString&, const TQString&)) ); + connect( d->job, TQ_SIGNAL(debuggingOutput(const TQString&, const TQString&)), + &d->debugFile, TQ_SLOT(addOutput(const TQString&, const TQString&)) ); + connect( d->job, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotJobFinished(bool)) ); } d->job->setDevice( m_writerSelectionWidget->writerDevice() ); @@ -150,7 +150,7 @@ void K3bBlankingDialog::slotStartClicked() if( !d->erasingDlg ) d->erasingDlg = new K3bProgressDialog( i18n("Erasing CD-RW"), this ); - connect( d->erasingDlg, TQT_SIGNAL(cancelClicked()), d->job, TQT_SLOT(cancel()) ); + connect( d->erasingDlg, TQ_SIGNAL(cancelClicked()), d->job, TQ_SLOT(cancel()) ); if( !exitLoopOnHide() ) hide(); diff --git a/src/misc/k3bblankingdialog.h b/src/misc/k3bblankingdialog.h index c78d51c..fd84910 100644 --- a/src/misc/k3bblankingdialog.h +++ b/src/misc/k3bblankingdialog.h @@ -32,7 +32,7 @@ namespace K3bDevice { class K3bBlankingDialog : public K3bInteractionDialog, public K3bJobHandler { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index ae35f47..9a58570 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -76,7 +76,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal mainGrid->setSpacing( spacingHint() ); mainGrid->setMargin( 0 ); - TQGroupBox* groupSource = new TQGroupBox( 1, Qt::Vertical, i18n("Source Medium"), main ); + TQGroupBox* groupSource = new TQGroupBox( 1, TQt::Vertical, i18n("Source Medium"), main ); groupSource->setInsideSpacing( spacingHint() ); groupSource->setInsideMargin( marginHint() ); m_comboSourceDevice = new K3bMediaSelectionComboBox( groupSource ); @@ -99,18 +99,18 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal optionTabGrid->setSpacing( spacingHint() ); optionTabGrid->setMargin( marginHint() ); - TQGroupBox* groupCopyMode = new TQGroupBox( 1, Qt::Vertical, i18n("Copy Mode"), optionTab ); + TQGroupBox* groupCopyMode = new TQGroupBox( 1, TQt::Vertical, i18n("Copy Mode"), optionTab ); groupCopyMode->setInsideMargin( marginHint() ); groupCopyMode->setInsideSpacing( spacingHint() ); m_comboCopyMode = new TQComboBox( groupCopyMode ); m_comboCopyMode->insertItem( i18n("Normal Copy") ); m_comboCopyMode->insertItem( i18n("Clone Copy") ); - TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, TQt::Vertical, i18n("Writing Mode"), optionTab ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -118,7 +118,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal pixLabel->setScaledContents( false ); m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies ); - TQGroupBox* groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* groupOptions = new TQGroupBox( 5, TQt::Vertical, i18n("Settings"), optionTab ); groupOptions->setInsideSpacing( spacingHint() ); groupOptions->setInsideMargin( marginHint() ); m_checkSimulate = K3bStdGuiItems::simulateCheckbox( groupOptions ); @@ -159,7 +159,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - m_groupAdvancedDataOptions = new TQGroupBox( 3, Qt::Vertical, i18n("Data"), advancedTab, "data_options" ); + m_groupAdvancedDataOptions = new TQGroupBox( 3, TQt::Vertical, i18n("Data"), advancedTab, "data_options" ); m_groupAdvancedDataOptions->setInsideSpacing( spacingHint() ); m_groupAdvancedDataOptions->setInsideMargin( marginHint() ); TQHBox* box = new TQHBox( m_groupAdvancedDataOptions ); @@ -169,7 +169,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal m_checkIgnoreDataReadErrors = K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( m_groupAdvancedDataOptions ); m_checkNoCorrection = new TQCheckBox( i18n("No error correction"), m_groupAdvancedDataOptions ); - m_groupAdvancedAudioOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Audio"), advancedTab, "audio_options" ); + m_groupAdvancedAudioOptions = new TQGroupBox( 5, TQt::Vertical, i18n("Audio"), advancedTab, "audio_options" ); m_groupAdvancedAudioOptions->setInsideSpacing( spacingHint() ); m_groupAdvancedAudioOptions->setInsideMargin( marginHint() ); box = new TQHBox( m_groupAdvancedAudioOptions ); @@ -195,18 +195,18 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal mainGrid->setRowStretch( 2, 1 ); - connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, TQT_SLOT(setDevice(K3bDevice::Device*)) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_comboCopyMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkReadCdText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQ_SLOT(setDevice(K3bDevice::Device*)) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkSimulate, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_comboCopyMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkReadCdText, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); TQToolTip::add( m_checkIgnoreDataReadErrors, i18n("Skip unreadable data sectors") ); TQToolTip::add( m_checkNoCorrection, i18n("Disable the source drive's error correction") ); @@ -309,7 +309,7 @@ void K3bCdCopyDialog::slotStartClicked() return; } - K3bCloneJob* job = new K3bCloneJob( dlg, TQT_TQOBJECT(this) ); + K3bCloneJob* job = new K3bCloneJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -325,7 +325,7 @@ void K3bCdCopyDialog::slotStartClicked() burnJob = job; } else { - K3bCdCopyJob* job = new K3bCdCopyJob( dlg, TQT_TQOBJECT(this) ); + K3bCdCopyJob* job = new K3bCdCopyJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); @@ -392,7 +392,7 @@ void K3bCdCopyDialog::toggleAll() - TQT_TQWIDGET( child( "audio_options" ) )->setDisabled( m_comboCopyMode->currentItem() == 1 ); + static_cast<TQWidget*>( child( "audio_options" ) )->setDisabled( m_comboCopyMode->currentItem() == 1 ); m_checkIgnoreDataReadErrors->setDisabled( m_comboCopyMode->currentItem() == 1 ); diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h index 898a1de..27b20eb 100644 --- a/src/misc/k3bcdcopydialog.h +++ b/src/misc/k3bcdcopydialog.h @@ -44,7 +44,7 @@ class TQGroupBox; */ class K3bCdCopyDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index d7bb604..b5526dc 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -126,28 +126,28 @@ K3bCdImageWritingDialog::K3bCdImageWritingDialog( TQWidget* parent, const char* setupGui(); - d->md5Job = new K3bMd5Job( 0, TQT_TQOBJECT(this) ); - connect( d->md5Job, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotMd5JobFinished(bool)) ); - connect( d->md5Job, TQT_SIGNAL(percent(int)), - this, TQT_SLOT(slotMd5JobPercent(int)) ); - - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, TQT_SLOT(setDevice(K3bDevice::Device*)) ); - connect( m_comboImageType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_editImagePath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotUpdateImage(const TQString&)) ); - connect( m_checkDummy, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleAll()) ); + d->md5Job = new K3bMd5Job( 0, this ); + connect( d->md5Job, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotMd5JobFinished(bool)) ); + connect( d->md5Job, TQ_SIGNAL(percent(int)), + this, TQ_SLOT(slotMd5JobPercent(int)) ); + + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQ_SLOT(setDevice(K3bDevice::Device*)) ); + connect( m_comboImageType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_editImagePath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotUpdateImage(const TQString&)) ); + connect( m_checkDummy, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleAll()) ); } @@ -178,7 +178,7 @@ void K3bCdImageWritingDialog::setupGui() // image // ----------------------------------------------------------------------- - TQGroupBox* groupImageUrl = new TQGroupBox( 1, Qt::Horizontal, i18n("Image to Burn"), frame ); + TQGroupBox* groupImageUrl = new TQGroupBox( 1, TQt::Horizontal, i18n("Image to Burn"), frame ); m_editImagePath = new KURLRequester( groupImageUrl ); m_editImagePath->setMode( KFile::File|KFile::ExistingOnly ); m_editImagePath->setCaption( i18n("Choose Image File") ); @@ -192,7 +192,7 @@ void K3bCdImageWritingDialog::setupGui() + "\n" + i18n("*|All Files") ); - TQGroupBox* groupImageType = new TQGroupBox( 1, Qt::Horizontal, i18n("Image Type"), frame ); + TQGroupBox* groupImageType = new TQGroupBox( 1, TQt::Horizontal, i18n("Image Type"), frame ); m_comboImageType = new TQComboBox( groupImageType ); m_comboImageType->insertItem( i18n("Auto Detection") ); m_comboImageType->insertItem( i18n("ISO9660 Image") ); @@ -224,8 +224,8 @@ void K3bCdImageWritingDialog::setupGui() m_infoView->setFullWidth(true); m_infoView->setSelectionMode( TQListView::NoSelection ); - connect( m_infoView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_infoView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); @@ -242,13 +242,13 @@ void K3bCdImageWritingDialog::setupGui() optionTabLayout->setSpacing( spacingHint() ); optionTabLayout->setMargin( marginHint() ); - TQGroupBox* writingModeGroup = new TQGroupBox( 1,Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* writingModeGroup = new TQGroupBox( 1,TQt::Vertical, i18n("Writing Mode"), optionTab ); writingModeGroup->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( writingModeGroup ); // copies -------- - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -259,7 +259,7 @@ void K3bCdImageWritingDialog::setupGui() m_spinCopies->setMaxValue( 999 ); // -------- copies - TQGroupBox* optionGroup = new TQGroupBox( 3,Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* optionGroup = new TQGroupBox( 3,TQt::Vertical, i18n("Settings"), optionTab ); optionGroup->setInsideMargin( marginHint() ); optionGroup->setInsideSpacing( spacingHint() ); m_checkDummy = K3bStdGuiItems::simulateCheckbox( optionGroup ); @@ -354,7 +354,7 @@ void K3bCdImageWritingDialog::slotStartClicked() switch( currentImageType() ) { case IMAGE_CDRECORD_CLONE: { - K3bCloneJob* _job = new K3bCloneJob( &dlg, TQT_TQOBJECT(this) ); + K3bCloneJob* _job = new K3bCloneJob( &dlg, this ); _job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); _job->setImagePath( d->imageFile ); _job->setSimulate( m_checkDummy->isChecked() ); @@ -368,7 +368,7 @@ void K3bCdImageWritingDialog::slotStartClicked() case IMAGE_AUDIO_CUE: { - K3bAudioCueFileWritingJob* job_ = new K3bAudioCueFileWritingJob( &dlg, TQT_TQOBJECT(this) ); + K3bAudioCueFileWritingJob* job_ = new K3bAudioCueFileWritingJob( &dlg, this ); job_->setBurnDevice( m_writerSelectionWidget->writerDevice() ); job_->setSpeed( m_writerSelectionWidget->writerSpeed() ); @@ -387,7 +387,7 @@ void K3bCdImageWritingDialog::slotStartClicked() // for now the K3bBinImageWritingJob decides if it's a toc or a cue file case IMAGE_CDRDAO_TOC: { - K3bBinImageWritingJob* job_ = new K3bBinImageWritingJob( &dlg, TQT_TQOBJECT(this) ); + K3bBinImageWritingJob* job_ = new K3bBinImageWritingJob( &dlg, this ); job_->setWriter( m_writerSelectionWidget->writerDevice() ); job_->setSpeed( m_writerSelectionWidget->writerSpeed() ); diff --git a/src/misc/k3bcdimagewritingdialog.h b/src/misc/k3bcdimagewritingdialog.h index 69830fb..44e33b7 100644 --- a/src/misc/k3bcdimagewritingdialog.h +++ b/src/misc/k3bcdimagewritingdialog.h @@ -47,7 +47,7 @@ class TQPoint; */ class K3bCdImageWritingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index b9a1459..6a3c8a4 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -69,7 +69,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod // // Source group // ////////////////////////////////////////////////////////////////////////// - TQGroupBox* groupSource = new TQGroupBox( 1, Qt::Vertical, i18n("Source Medium"), w ); + TQGroupBox* groupSource = new TQGroupBox( 1, TQt::Vertical, i18n("Source Medium"), w ); groupSource->setInsideSpacing( spacingHint() ); groupSource->setInsideMargin( marginHint() ); m_comboSourceDevice = new K3bMediaSelectionComboBox( groupSource ); @@ -97,11 +97,11 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod optionTabGrid->setSpacing( spacingHint() ); optionTabGrid->setMargin( marginHint() ); - TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, TQt::Vertical, i18n("Writing Mode"), optionTab ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - TQGroupBox* groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* groupOptions = new TQGroupBox( 5, TQt::Vertical, i18n("Settings"), optionTab ); groupOptions->setInsideSpacing( spacingHint() ); groupOptions->setInsideMargin( marginHint() ); m_checkSimulate = K3bStdGuiItems::simulateCheckbox( groupOptions ); @@ -110,7 +110,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod m_checkDeleteImages = K3bStdGuiItems::removeImagesCheckbox( groupOptions ); m_checkVerifyData = K3bStdGuiItems::verifyCheckBox( groupOptions ); - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -153,7 +153,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - TQGroupBox* groupGeneral = new TQGroupBox( 2, Qt::Vertical, i18n("General"), advancedTab ); + TQGroupBox* groupGeneral = new TQGroupBox( 2, TQt::Vertical, i18n("General"), advancedTab ); groupGeneral->setInsideSpacing( spacingHint() ); groupGeneral->setInsideMargin( marginHint() ); TQHBox* box = new TQHBox( groupGeneral ); @@ -190,14 +190,14 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod // // setup connections // ////////////////////////////////////////////////////////////////////////// - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_comboSourceDevice, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); - connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_comboSourceDevice, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotSourceMediumChanged(K3bDevice::Device*)) ); + connect( m_checkSimulate, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); TQToolTip::add( m_checkIgnoreReadErrors, i18n("Skip unreadable sectors") ); TQWhatsThis::add( m_checkIgnoreReadErrors, i18n("<p>If this option is checked and K3b is not able to read a sector from the " @@ -253,7 +253,7 @@ void K3bDvdCopyDialog::slotStartClicked() dlg = new K3bBurnProgressDialog( kapp->mainWidget() ); } - K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, TQT_TQOBJECT(this) ); + K3bDvdCopyJob* job = new K3bDvdCopyJob( dlg, this ); job->setWriterDevice( m_writerSelectionWidget->writerDevice() ); job->setReaderDevice( m_comboSourceDevice->selectedDevice() ); diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h index aad39a3..bbdae7a 100644 --- a/src/misc/k3bdvdcopydialog.h +++ b/src/misc/k3bdvdcopydialog.h @@ -37,7 +37,7 @@ class K3bWritingModeWidget; class K3bDvdCopyDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 7c436fd..635613c 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -58,14 +58,14 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* na m_writerSelectionWidget->setSupportedWritingApps( K3b::DVD_RW_FORMAT ); m_writerSelectionWidget->setForceAutoSpeed(true); - TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), frame ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, TQt::Vertical, i18n("Writing Mode"), frame ); groupWritingMode->layout()->setMargin( marginHint() ); groupWritingMode->layout()->setSpacing( spacingHint() ); m_writingModeWidget = new K3bWritingModeWidget( K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR, groupWritingMode ); - TQGroupBox* groupOptions = new TQGroupBox( 2, Qt::Vertical, i18n("Settings"), frame ); + TQGroupBox* groupOptions = new TQGroupBox( 2, TQt::Vertical, i18n("Settings"), frame ); groupOptions->layout()->setMargin( marginHint() ); groupOptions->layout()->setSpacing( spacingHint() ); m_checkForce = new TQCheckBox( i18n("Force"), groupOptions ); @@ -99,9 +99,9 @@ K3bDvdFormattingDialog::K3bDvdFormattingDialog( TQWidget* parent, const char* na "time and some DVD writers perform a full format even if " "quick format is enabled." ) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, TQT_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQ_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); slotWriterChanged(); } @@ -128,7 +128,7 @@ void K3bDvdFormattingDialog::slotStartClicked() K3bJobProgressDialog d( kapp->mainWidget(), "formattingProgress", false ); - K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, TQT_TQOBJECT(this) ); + K3bDvdFormattingJob* job = new K3bDvdFormattingJob( &d, this ); job->setDevice( m_writerSelectionWidget->writerDevice() ); job->setMode( m_writingModeWidget->writingMode() ); job->setForce( m_checkForce->isChecked() ); diff --git a/src/misc/k3bdvdformattingdialog.h b/src/misc/k3bdvdformattingdialog.h index a30c97a..e7441ae 100644 --- a/src/misc/k3bdvdformattingdialog.h +++ b/src/misc/k3bdvdformattingdialog.h @@ -28,7 +28,7 @@ namespace K3bDevice { class K3bDvdFormattingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index d293f6e..c8f8ff8 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -102,24 +102,24 @@ K3bIsoImageWritingDialog::K3bIsoImageWritingDialog( TQWidget* parent, const char m_writerSelectionWidget->setSupportedWritingApps( K3b::GROWISOFS ); m_writingModeWidget->setSupportedModes( K3b::DAO|K3b::WRITING_MODE_INCR_SEQ|K3b::WRITING_MODE_RES_OVWR ); - m_md5Job = new K3bMd5Job( 0, TQT_TQOBJECT(this) ); - connect( m_md5Job, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotMd5JobFinished(bool)) ); - connect( m_md5Job, TQT_SIGNAL(percent(int)), - this, TQT_SLOT(slotMd5JobPercent(int)) ); + m_md5Job = new K3bMd5Job( 0, this ); + connect( m_md5Job, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotMd5JobFinished(bool)) ); + connect( m_md5Job, TQ_SIGNAL(percent(int)), + this, TQ_SLOT(slotMd5JobPercent(int)) ); updateImageSize( imagePath() ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), - this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), - this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), - this, TQT_SLOT(slotWriterChanged()) ); - connect( m_editImagePath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateImageSize(const TQString&)) ); - connect( m_checkDummy, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), + this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), + this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), + this, TQ_SLOT(slotWriterChanged()) ); + connect( m_editImagePath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateImageSize(const TQString&)) ); + connect( m_checkDummy, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotWriterChanged()) ); } @@ -149,14 +149,14 @@ void K3bIsoImageWritingDialog::setupGui() // image // ----------------------------------------------------------------------- - TQGroupBox* groupImageUrl = new TQGroupBox( 1, Qt::Horizontal, i18n("Image to Burn"), frame ); + TQGroupBox* groupImageUrl = new TQGroupBox( 1, TQt::Horizontal, i18n("Image to Burn"), frame ); m_editImagePath = new KURLRequester( groupImageUrl ); m_editImagePath->setMode( KFile::File|KFile::ExistingOnly ); m_editImagePath->setCaption( i18n("Choose Image File") ); m_editImagePath->setFilter( i18n("*.iso *.ISO|ISO9660 Image Files") + "\n" + i18n("*|All Files") ); - connect( m_editImagePath->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotWriterChanged() ) ); + connect( m_editImagePath->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotWriterChanged() ) ); // image info // ----------------------------------------------------------------------- @@ -170,8 +170,8 @@ void K3bIsoImageWritingDialog::setupGui() m_infoView->setFullWidth(true); m_infoView->setSelectionMode( TQListView::NoSelection ); - connect( m_infoView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_infoView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); m_writerSelectionWidget = new K3bWriterSelectionWidget( frame ); @@ -185,13 +185,13 @@ void K3bIsoImageWritingDialog::setupGui() optionTabLayout->setSpacing( spacingHint() ); optionTabLayout->setMargin( marginHint() ); - TQGroupBox* writingModeGroup = new TQGroupBox( 1,Qt::Vertical, i18n("Writing Mode"), optionTab ); + TQGroupBox* writingModeGroup = new TQGroupBox( 1,TQt::Vertical, i18n("Writing Mode"), optionTab ); writingModeGroup->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( writingModeGroup ); // copies -------- - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), optionTab ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), optionTab ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -202,7 +202,7 @@ void K3bIsoImageWritingDialog::setupGui() m_spinCopies->setMaxValue( 999 ); // -------- copies - TQGroupBox* optionGroup = new TQGroupBox( 3,Qt::Vertical, i18n("Settings"), optionTab ); + TQGroupBox* optionGroup = new TQGroupBox( 3,TQt::Vertical, i18n("Settings"), optionTab ); optionGroup->setInsideMargin( marginHint() ); optionGroup->setInsideSpacing( spacingHint() ); m_checkDummy = K3bStdGuiItems::simulateCheckbox( optionGroup ); diff --git a/src/misc/k3bisoimagewritingdialog.h b/src/misc/k3bisoimagewritingdialog.h index 050a4f2..8eeaeb9 100644 --- a/src/misc/k3bisoimagewritingdialog.h +++ b/src/misc/k3bisoimagewritingdialog.h @@ -41,7 +41,7 @@ class TQPoint; */ class K3bIsoImageWritingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp index 6c4079e..5da5bff 100644 --- a/src/option/k3bburningoptiontab.cpp +++ b/src/option/k3bburningoptiontab.cpp @@ -59,7 +59,7 @@ void K3bBurningOptionTab::setupGui() groupAdvancedLayout->setMargin( 0 ); - TQGroupBox* groupWritingApp = new TQGroupBox( 0, Qt::Vertical, i18n("Burning"), this ); + TQGroupBox* groupWritingApp = new TQGroupBox( 0, TQt::Vertical, i18n("Burning"), this ); groupWritingApp->layout()->setMargin( 0 ); TQGridLayout* bufferLayout = new TQGridLayout( groupWritingApp->layout() ); bufferLayout->setMargin( KDialog::marginHint() ); @@ -80,7 +80,7 @@ void K3bBurningOptionTab::setupGui() bufferLayout->addMultiCellWidget( m_checkAllowWritingAppSelection, 4, 4, 0, 2 ); bufferLayout->setColStretch( 2, 1 ); - TQGroupBox* groupMisc = new TQGroupBox( 2, Qt::Vertical, i18n("Miscellaneous"), this ); + TQGroupBox* groupMisc = new TQGroupBox( 2, TQt::Vertical, i18n("Miscellaneous"), this ); m_checkEject = new TQCheckBox( i18n("Do not &eject medium after write process"), groupMisc ); m_checkAutoErasingRewritable = new TQCheckBox( i18n("Automatically erase CD-RWs and DVD-RWs"), groupMisc ); @@ -89,10 +89,10 @@ void K3bBurningOptionTab::setupGui() groupAdvancedLayout->setRowStretch( 2, 1 ); - connect( m_checkManualWritingBufferSize, TQT_SIGNAL(toggled(bool)), - m_editWritingBufferSize, TQT_SLOT(setEnabled(bool)) ); - connect( m_checkManualWritingBufferSize, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSetDefaultBufferSizes(bool)) ); + connect( m_checkManualWritingBufferSize, TQ_SIGNAL(toggled(bool)), + m_editWritingBufferSize, TQ_SLOT(setEnabled(bool)) ); + connect( m_checkManualWritingBufferSize, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSetDefaultBufferSizes(bool)) ); m_editWritingBufferSize->setDisabled( true ); diff --git a/src/option/k3bburningoptiontab.h b/src/option/k3bburningoptiontab.h index e466b42..4ded273 100644 --- a/src/option/k3bburningoptiontab.h +++ b/src/option/k3bburningoptiontab.h @@ -32,7 +32,7 @@ class TQRadioButton; class K3bBurningOptionTab : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index ba6f704..d34f511 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -99,24 +99,24 @@ K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* parent, const char* name ) // setup connections // ----------------------------------------------------------------------------- - connect( m_buttonAddLocalDir, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirAdd()) ); - connect( m_buttonRemoveLocalDir, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirRemove()) ); - connect( m_buttonLocalDirUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirUp()) ); - connect( m_buttonLocalDirDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocalDirDown()) ); - - connect( m_buttonAddCddbServer, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerAdd()) ); - connect( m_buttonRemoveCddbServer, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerRemove()) ); - connect( m_buttonCddbServerUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerUp()) ); - connect( m_buttonCddbServerDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCddbServerDown()) ); - - connect( m_editLocalDir, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(enDisableButtons()) ); - connect( m_editCddbServer, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(enDisableButtons()) ); - connect( m_viewLocalDir, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(enDisableButtons()) ); - connect( m_viewCddbServer, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(enDisableButtons()) ); - connect( m_comboCddbType, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotServerTypeChanged()) ); - connect( m_comboCddbType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotServerTypeChanged()) ); + connect( m_buttonAddLocalDir, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocalDirAdd()) ); + connect( m_buttonRemoveLocalDir, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocalDirRemove()) ); + connect( m_buttonLocalDirUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocalDirUp()) ); + connect( m_buttonLocalDirDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocalDirDown()) ); + + connect( m_buttonAddCddbServer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCddbServerAdd()) ); + connect( m_buttonRemoveCddbServer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCddbServerRemove()) ); + connect( m_buttonCddbServerUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCddbServerUp()) ); + connect( m_buttonCddbServerDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCddbServerDown()) ); + + connect( m_editLocalDir, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(enDisableButtons()) ); + connect( m_editCddbServer, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(enDisableButtons()) ); + connect( m_viewLocalDir, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(enDisableButtons()) ); + connect( m_viewCddbServer, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(enDisableButtons()) ); + connect( m_comboCddbType, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotServerTypeChanged()) ); + connect( m_comboCddbType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotServerTypeChanged()) ); // ----------------------------------------------------------------------------- enDisableButtons(); diff --git a/src/option/k3bcddboptiontab.h b/src/option/k3bcddboptiontab.h index 75ccd46..4c6368b 100644 --- a/src/option/k3bcddboptiontab.h +++ b/src/option/k3bcddboptiontab.h @@ -21,7 +21,7 @@ class K3bCddbOptionTab : public base_K3bCddbOptionTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index 6fe722b..dba6e4a 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -56,7 +56,7 @@ K3bDeviceOptionTab::K3bDeviceOptionTab( TQWidget* parent, const char* name ) frameLayout->addWidget( m_labelDevicesInfo, 0, 0 ); frameLayout->addWidget( m_deviceWidget, 1, 0 ); - connect( m_deviceWidget, TQT_SIGNAL(refreshButtonClicked()), this, TQT_SLOT(slotRefreshButtonClicked()) ); + connect( m_deviceWidget, TQ_SIGNAL(refreshButtonClicked()), this, TQ_SLOT(slotRefreshButtonClicked()) ); } diff --git a/src/option/k3bdeviceoptiontab.h b/src/option/k3bdeviceoptiontab.h index e54ead0..3b6638c 100644 --- a/src/option/k3bdeviceoptiontab.h +++ b/src/option/k3bdeviceoptiontab.h @@ -25,7 +25,7 @@ class K3bDeviceWidget; class K3bDeviceOptionTab : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index 3a93196..7b8ccdd 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -169,7 +169,7 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *p // Devices Box // ------------------------------------------------ - TQGroupBox* groupDevices = new TQGroupBox( 1, Qt::Vertical, i18n( "CD/DVD Drives" ), this ); + TQGroupBox* groupDevices = new TQGroupBox( 1, TQt::Vertical, i18n( "CD/DVD Drives" ), this ); groupDevices->layout()->setSpacing( KDialog::spacingHint() ); groupDevices->layout()->setMargin( KDialog::marginHint() ); @@ -198,10 +198,10 @@ K3bDeviceWidget::K3bDeviceWidget( K3bDevice::DeviceManager* manager, TQWidget *p // connections // ------------------------------------------------ - // connect( m_buttonRefreshDevices, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRefreshDevices()) ); - connect( m_buttonRefreshDevices, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(refreshButtonClicked()) ); - connect( m_buttonAddDevice, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewDevice()) ); - connect( m_deviceManager, TQT_SIGNAL(changed()), this, TQT_SLOT(init()) ); + // connect( m_buttonRefreshDevices, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRefreshDevices()) ); + connect( m_buttonRefreshDevices, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(refreshButtonClicked()) ); + connect( m_buttonAddDevice, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewDevice()) ); + connect( m_deviceManager, TQ_SIGNAL(changed()), this, TQ_SLOT(init()) ); // ------------------------------------------------ } diff --git a/src/option/k3bdevicewidget.h b/src/option/k3bdevicewidget.h index 310ad3c..76052d4 100644 --- a/src/option/k3bdevicewidget.h +++ b/src/option/k3bdevicewidget.h @@ -41,7 +41,7 @@ class TQLineEdit; */ class K3bDeviceWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/option/k3bexternalbinoptiontab.h b/src/option/k3bexternalbinoptiontab.h index 651e040..d8e99a7 100644 --- a/src/option/k3bexternalbinoptiontab.h +++ b/src/option/k3bexternalbinoptiontab.h @@ -30,7 +30,7 @@ class K3bExternalBinWidget; class K3bExternalBinOptionTab : public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp index e79ac32..683c0f6 100644 --- a/src/option/k3bexternalbinwidget.cpp +++ b/src/option/k3bexternalbinwidget.cpp @@ -184,9 +184,9 @@ K3bExternalBinWidget::K3bExternalBinWidget( K3bExternalBinManager* manager, TQWi m_programRootItems.setAutoDelete( true ); - connect( m_rescanButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rescan()) ); - connect( m_defaultButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetDefaultButtonClicked()) ); - connect( m_programView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotProgramSelectionChanged(TQListViewItem*)) ); + connect( m_rescanButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(rescan()) ); + connect( m_defaultButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetDefaultButtonClicked()) ); + connect( m_programView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotProgramSelectionChanged(TQListViewItem*)) ); slotProgramSelectionChanged( 0 ); } diff --git a/src/option/k3bexternalbinwidget.h b/src/option/k3bexternalbinwidget.h index 142c82a..f0d4272 100644 --- a/src/option/k3bexternalbinwidget.h +++ b/src/option/k3bexternalbinwidget.h @@ -34,7 +34,7 @@ class K3bExternalBin; class K3bExternalBinWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index 7176364..a24512a 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -42,8 +42,8 @@ K3bMiscOptionTab::K3bMiscOptionTab(TQWidget *parent, const char *name ) : base_K3bMiscOptionTab(parent,name) { m_editTempDir->setMode( KFile::Directory ); - connect( m_buttonConfigureAudioOutput, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotConfigureAudioOutput()) ); + connect( m_buttonConfigureAudioOutput, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotConfigureAudioOutput()) ); m_comboActionDialogSettings->insertItem( K3bInteractionDialog::LOAD_K3B_DEFAULTS, i18n("Default Settings"), diff --git a/src/option/k3bmiscoptiontab.h b/src/option/k3bmiscoptiontab.h index aa213ab..d1ec855 100644 --- a/src/option/k3bmiscoptiontab.h +++ b/src/option/k3bmiscoptiontab.h @@ -27,7 +27,7 @@ class KURLRequester; */ class K3bMiscOptionTab : public base_K3bMiscOptionTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/option/k3bnotifyoptiontab.h b/src/option/k3bnotifyoptiontab.h index e00c08f..81f660b 100644 --- a/src/option/k3bnotifyoptiontab.h +++ b/src/option/k3bnotifyoptiontab.h @@ -27,7 +27,7 @@ namespace KNotify { class K3bNotifyOptionTab : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/option/k3boptiondialog.h b/src/option/k3boptiondialog.h index 174838d..748c3d6 100644 --- a/src/option/k3boptiondialog.h +++ b/src/option/k3boptiondialog.h @@ -34,7 +34,7 @@ class K3bThemeOptionTab; */ class K3bOptionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 8f214ee..e9ee61b 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -72,9 +72,9 @@ K3bPluginOptionTab::K3bPluginOptionTab( TQWidget* parent, const char* name ) m_viewPlugins->setAlternateBackground( TQColor() ); m_viewPlugins->setAllColumnsShowFocus(true); - connect( m_viewPlugins, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotConfigureButtonClicked()) ); - connect( m_buttonConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigureButtonClicked()) ); - connect( m_viewPlugins, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( m_viewPlugins, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotConfigureButtonClicked()) ); + connect( m_buttonConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigureButtonClicked()) ); + connect( m_viewPlugins, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); } diff --git a/src/option/k3bpluginoptiontab.h b/src/option/k3bpluginoptiontab.h index f3c6123..1bc6128 100644 --- a/src/option/k3bpluginoptiontab.h +++ b/src/option/k3bpluginoptiontab.h @@ -22,7 +22,7 @@ class K3bPluginOptionTab : public base_K3bPluginOptionTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index adb27f4..dd4b269 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -67,14 +67,14 @@ K3bThemeOptionTab::K3bThemeOptionTab(TQWidget *parent, const char *name ) m_viewTheme->setShadeSortColumn( false ); #endif - connect( m_viewTheme, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(selectionChanged()) ); - connect( kapp, TQT_SIGNAL(appearanceChanged()), - this, TQT_SLOT(selectionChanged()) ); - connect( m_buttonInstallTheme, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInstallTheme()) ); - connect( m_buttonRemoveTheme, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveTheme()) ); + connect( m_viewTheme, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(selectionChanged()) ); + connect( kapp, TQ_SIGNAL(appearanceChanged()), + this, TQ_SLOT(selectionChanged()) ); + connect( m_buttonInstallTheme, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInstallTheme()) ); + connect( m_buttonRemoveTheme, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveTheme()) ); } diff --git a/src/option/k3bthemeoptiontab.h b/src/option/k3bthemeoptiontab.h index 3fa258e..003bdd2 100644 --- a/src/option/k3bthemeoptiontab.h +++ b/src/option/k3bthemeoptiontab.h @@ -25,7 +25,7 @@ */ class K3bThemeOptionTab : public base_K3bThemeOptionTab { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index b0870b8..ec11a1d 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -207,13 +207,13 @@ <tabstop>m_editTitle</tabstop> <tabstop>m_editPerformer</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotCopyTitle()</slot> <slot access="protected" specifier="pure virtual">slotCopyPerformer()</slot> <slot access="protected" specifier="pure virtual">slotCopyArranger()</slot> <slot access="protected" specifier="pure virtual">slotCopyComposer()</slot> <slot access="protected" specifier="pure virtual">slotCopySongwriter()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index f944926..9a1379a 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -204,7 +204,7 @@ <string>Preemph&asis</string> </property> <property name="whatsThis" stdset="0"> - <string><p>Preemphasis is mainly used in audio processing. Higher frequencies in audio Q_SIGNALS usually have lower amplitudes. This can lead to bad signal quality on noisy transmission because the high frequencies might become too weak. To avoid this effect, high frequencies are amplified before transmission (preemphasis); the receiver will then weaken them accordingly for playback.</string> + <string><p>Preemphasis is mainly used in audio processing. Higher frequencies in audio signals usually have lower amplitudes. This can lead to bad signal quality on noisy transmission because the high frequencies might become too weak. To avoid this effect, high frequencies are amplified before transmission (preemphasis); the receiver will then weaken them accordingly for playback.</string> </property> </widget> <widget class="TQCheckBox"> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 3811f86..6e2aa27 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -384,9 +384,9 @@ <slot>slotOptionsChanged()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotOptionsChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 8e4fff8..761cb75 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -79,13 +79,13 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, cons advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - TQGroupBox* advancedSettingsGroup = new TQGroupBox( 1, Qt::Vertical, i18n("Settings"), advancedTab ); + TQGroupBox* advancedSettingsGroup = new TQGroupBox( 1, TQt::Vertical, i18n("Settings"), advancedTab ); m_checkNormalize = K3bStdGuiItems::normalizeCheckBox( advancedSettingsGroup ); - TQGroupBox* advancedGimmickGroup = new TQGroupBox( 1, Qt::Vertical, i18n("Gimmicks"), advancedTab ); + TQGroupBox* advancedGimmickGroup = new TQGroupBox( 1, TQt::Vertical, i18n("Gimmicks"), advancedTab ); m_checkHideFirstTrack = new TQCheckBox( i18n( "Hide first track" ), advancedGimmickGroup, "m_checkHideFirstTrack" ); - m_audioRippingGroup = new TQGroupBox( 3, Qt::Vertical, i18n("Audio Ripping"), advancedTab ); + m_audioRippingGroup = new TQGroupBox( 3, TQt::Vertical, i18n("Audio Ripping"), advancedTab ); TQHBox* box = new TQHBox( m_audioRippingGroup ); box->setSpacing( spacingHint() ); box->setStretchFactor(new TQLabel( i18n("Paranoia mode:"), box ), 1 ); @@ -103,10 +103,10 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, cons addPage( advancedTab, i18n("Advanced") ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkNormalize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNormalizeToggled(bool)) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCacheImageToggled(bool)) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkNormalize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotNormalizeToggled(bool)) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCacheImageToggled(bool)) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); // ToolTips // ------------------------------------------------------------------------- diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h index c564efe..11c3008 100644 --- a/src/projects/k3baudioburndialog.h +++ b/src/projects/k3baudioburndialog.h @@ -41,7 +41,7 @@ class TQShowEvent; */ class K3bAudioBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp index a180f02..1e1fd06 100644 --- a/src/projects/k3baudiocdtextwidget.cpp +++ b/src/projects/k3baudiocdtextwidget.cpp @@ -67,7 +67,7 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* parent, const char* name ) m_allFieldsDlg->w->m_buttonCopyComposer->setPixmap( SmallIcon( "edit-copy" ) ); m_allFieldsDlg->w->m_buttonCopyArranger->setPixmap( SmallIcon( "edit-copy" ) ); - TQValidator* cdTextVal = new K3bCdTextValidator( TQT_TQOBJECT(this) ); + TQValidator* cdTextVal = new K3bCdTextValidator( this ); m_editTitle->setValidator( cdTextVal ); m_editPerformer->setValidator( cdTextVal ); @@ -80,19 +80,19 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* parent, const char* name ) m_allFieldsDlg->w->m_editSongwriter->setValidator( cdTextVal ); m_allFieldsDlg->w->m_editComposer->setValidator( cdTextVal ); - connect( m_allFieldsDlg->w->m_buttonCopyTitle, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyTitle()) ); - connect( m_allFieldsDlg->w->m_buttonCopyPerformer, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyPerformer()) ); - connect( m_allFieldsDlg->w->m_buttonCopyArranger, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyArranger()) ); - connect( m_allFieldsDlg->w->m_buttonCopySongwriter, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopySongwriter()) ); - connect( m_allFieldsDlg->w->m_buttonCopyComposer, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyComposer()) ); - - connect( m_buttonMoreFields, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMoreFields()) ); + connect( m_allFieldsDlg->w->m_buttonCopyTitle, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyTitle()) ); + connect( m_allFieldsDlg->w->m_buttonCopyPerformer, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyPerformer()) ); + connect( m_allFieldsDlg->w->m_buttonCopyArranger, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyArranger()) ); + connect( m_allFieldsDlg->w->m_buttonCopySongwriter, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopySongwriter()) ); + connect( m_allFieldsDlg->w->m_buttonCopyComposer, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyComposer()) ); + + connect( m_buttonMoreFields, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMoreFields()) ); } diff --git a/src/projects/k3baudiocdtextwidget.h b/src/projects/k3baudiocdtextwidget.h index a6ed0d2..b9f828a 100644 --- a/src/projects/k3baudiocdtextwidget.h +++ b/src/projects/k3baudiocdtextwidget.h @@ -24,7 +24,7 @@ class K3bAudioDoc; class K3bAudioCdTextWidget : public base_K3bAudioCdTextWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp index 84b943b..dff3f38 100644 --- a/src/projects/k3baudiodatasourceeditwidget.cpp +++ b/src/projects/k3baudiodatasourceeditwidget.cpp @@ -51,14 +51,14 @@ K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* parent, co grid->setColStretch( 1, 1 ); // setup connections between the msfedits and the editor - connect( m_editor, TQT_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), - this, TQT_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); + connect( m_editor, TQ_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), + this, TQ_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); - connect( m_editStartOffset, TQT_SIGNAL(valueChanged(const K3b::Msf&)), - this, TQT_SLOT(slotStartOffsetEdited(const K3b::Msf&)) ); + connect( m_editStartOffset, TQ_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQ_SLOT(slotStartOffsetEdited(const K3b::Msf&)) ); - connect( m_editEndOffset, TQT_SIGNAL(valueChanged(const K3b::Msf&)), - this, TQT_SLOT(slotEndOffsetEdited(const K3b::Msf&)) ); + connect( m_editEndOffset, TQ_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQ_SLOT(slotEndOffsetEdited(const K3b::Msf&)) ); TQToolTip::add( m_editor, i18n("Drag the edges of the highlighted area to define the portion of the " "audio source you want to include in the Audio CD track. " diff --git a/src/projects/k3baudiodatasourceeditwidget.h b/src/projects/k3baudiodatasourceeditwidget.h index 428caad..49b985e 100644 --- a/src/projects/k3baudiodatasourceeditwidget.h +++ b/src/projects/k3baudiodatasourceeditwidget.h @@ -29,7 +29,7 @@ class K3bMsfEdit; */ class K3bAudioDataSourceEditWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index 690b544..23d9100 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -491,7 +491,7 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p ) pix.fill( colorGroup().base() ); TQPainter pixP; - pixP.begin( &pix, TQT_TQOBJECT(this) ); + pixP.begin( &pix, this ); TQRect drawRect( contentsRect() ); drawRect.setLeft( drawRect.left() + m_margin ); @@ -718,7 +718,7 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e ) if( m_mouseAt ) emit mouseAt( posToMsf( e->pos().x() ) ); - if( e->state() & Qt::LeftButton ) { + if( e->state() & TQt::LeftButton ) { if( m_draggedRange ) { // determine the position the range's end was dragged to and its other end K3b::Msf msfPos = TQMAX( 0, TQMIN( posToMsf( e->pos().x() ), m_length-1 ) ); diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h index 0a31ef9..e1005ff 100644 --- a/src/projects/k3baudioeditorwidget.h +++ b/src/projects/k3baudioeditorwidget.h @@ -27,7 +27,7 @@ class TQPainter; class K3bAudioEditorWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index 30ff9df..e722ed0 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -77,8 +77,8 @@ K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* parent, const ch grid->addWidget( m_busyWidget, 1, 0 ); m_analyserThread = new AnalyserThread(); - m_analyserJob = new K3bThreadJob( m_analyserThread, this, TQT_TQOBJECT(this) ); - connect( m_analyserJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAnalysingFinished(bool)) ); + m_analyserJob = new K3bThreadJob( m_analyserThread, this, this ); + connect( m_analyserJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotAnalysingFinished(bool)) ); } @@ -107,7 +107,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").arg(doc->URL().fileName()) ); dlg.m_busyWidget->showBusy(true); - TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, &dlg, TQ_SLOT(slotAddUrls()) ); int ret = dlg.exec(); TQString message; @@ -199,7 +199,7 @@ void K3bAudioTrackAddingDialog::slotAddUrls() // invalid file, next url if( !valid ) { m_urls.remove( m_urls.begin() ); - TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } @@ -251,7 +251,7 @@ void K3bAudioTrackAddingDialog::slotAnalysingFinished( bool /*success*/ ) } } - TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } diff --git a/src/projects/k3baudiotrackaddingdialog.h b/src/projects/k3baudiotrackaddingdialog.h index 1b14ec9..cf7312d 100644 --- a/src/projects/k3baudiotrackaddingdialog.h +++ b/src/projects/k3baudiotrackaddingdialog.h @@ -32,7 +32,7 @@ class K3bAudioDoc; class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackdialog.h b/src/projects/k3baudiotrackdialog.h index ade45d5..a238ecf 100644 --- a/src/projects/k3baudiotrackdialog.h +++ b/src/projects/k3baudiotrackdialog.h @@ -33,7 +33,7 @@ class K3bAudioTrackWidget; class K3bAudioTrackDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index 2118791..4f644a7 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -70,43 +70,43 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co d->actionPlay = new TDEAction( i18n("Play"), "media-playback-start", TDEShortcut(), - this, TQT_SLOT(playPause()), + this, TQ_SLOT(playPause()), d->actionCollection, "play" ); d->actionPause = new TDEAction( i18n("Pause"), "media-playback-pause", TDEShortcut(), - this, TQT_SLOT(playPause()), + this, TQ_SLOT(playPause()), d->actionCollection, "pause" ); d->actionPlayPause = new TDEAction( i18n("Play/Pause"), "media-playback-start", TDEShortcut(), - this, TQT_SLOT(playPause()), + this, TQ_SLOT(playPause()), d->actionCollection, "play_pause" ); d->actionStop = new TDEAction( i18n("Stop"), "media-playback-stop", TDEShortcut(), - this, TQT_SLOT(stop()), + this, TQ_SLOT(stop()), d->actionCollection, "stop" ); d->actionNext = new TDEAction( i18n("Next"), "media-skip-forward", TDEShortcut(), - this, TQT_SLOT(next()), + this, TQ_SLOT(next()), d->actionCollection, "next" ); d->actionPrev = new TDEAction( i18n("Prev"), "media-skip-backward", TDEShortcut(), - this, TQT_SLOT(prev()), + this, TQ_SLOT(prev()), d->actionCollection, "prev" ); - d->seekSlider = new TQSlider( 0, 100, 1, 0, Qt::Horizontal, 0, "audiotrackplayerslider" ); - connect( d->seekSlider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotSeek(int)) ); + d->seekSlider = new TQSlider( 0, 100, 1, 0, TQt::Horizontal, 0, "audiotrackplayerslider" ); + connect( d->seekSlider, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(slotSeek(int)) ); // FIXME: maybe it's not such a good idea to use a KWidgetAction here since this way the player // can only be used once in one widget. If the action would always create a new slider we could plug // the action into several toolboxes and also use it in some resizing or track splitting dialogs. @@ -118,7 +118,7 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co d->actionCollection, "seek" ); // this should be done in KWidgetAction but is not yet - connect( d->actionSeek, TQT_SIGNAL(enabled(bool)), d->seekSlider, TQT_SLOT(setEnabled(bool)) ); + connect( d->actionSeek, TQ_SIGNAL(enabled(bool)), d->seekSlider, TQ_SLOT(setEnabled(bool)) ); d->actionStop->setEnabled(false); d->actionPause->setEnabled(false); @@ -126,18 +126,18 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co d->actionPrev->setEnabled(false); d->actionSeek->setEnabled(false); - connect( m_doc, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotDocChanged()) ); - connect( m_doc, TQT_SIGNAL(trackChanged(K3bAudioTrack*)), - this, TQT_SLOT(slotTrackChanged(K3bAudioTrack*)) ); - connect( m_doc, TQT_SIGNAL(trackRemoved(K3bAudioTrack*)), - this, TQT_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); - connect( &d->sliderTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateSlider()) ); + connect( m_doc, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotDocChanged()) ); + connect( m_doc, TQ_SIGNAL(trackChanged(K3bAudioTrack*)), + this, TQ_SLOT(slotTrackChanged(K3bAudioTrack*)) ); + connect( m_doc, TQ_SIGNAL(trackRemoved(K3bAudioTrack*)), + this, TQ_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); + connect( &d->sliderTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateSlider()) ); // we just stop the player if the audio server has an error. K3bMainWindow will show the error message // This is all very hacky and has to be improved for K3b 2.0. But then we will probably use Phonon anyway... - connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), this, TQT_SLOT(stop()) ); + connect( K3bAudioServer::instance(), TQ_SIGNAL(error(const TQString&)), this, TQ_SLOT(stop()) ); // tooltips d->actionPlay->setToolTip( i18n("Play") ); diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h index a7583be..b8779bf 100644 --- a/src/projects/k3baudiotrackplayer.h +++ b/src/projects/k3baudiotrackplayer.h @@ -29,7 +29,7 @@ class TDEAction; class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 3ba799b..2c67cb3 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -60,14 +60,14 @@ K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidg m_editorWidget->enableRangeSelection( true ); m_editorWidget->installEventFilter( this ); - connect( m_editorWidget, TQT_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), - this, TQT_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); - connect( m_editorWidget, TQT_SIGNAL(selectedRangeChanged(int)), - this, TQT_SLOT(slotRangeSelectionChanged(int)) ); - connect( m_msfEditStart, TQT_SIGNAL(valueChanged(const K3b::Msf&)), - this, TQT_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); - connect( m_msfEditEnd, TQT_SIGNAL(valueChanged(const K3b::Msf&)), - this, TQT_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); + connect( m_editorWidget, TQ_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), + this, TQ_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); + connect( m_editorWidget, TQ_SIGNAL(selectedRangeChanged(int)), + this, TQ_SLOT(slotRangeSelectionChanged(int)) ); + connect( m_msfEditStart, TQ_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQ_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); + connect( m_msfEditEnd, TQ_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQ_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); setupActions(); @@ -94,11 +94,11 @@ void K3bAudioTrackSplitDialog::setupActions() m_popupMenu = new TDEPopupMenu( this ); TDEAction* actionSplitHere = new TDEAction( i18n("Split Here"), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), + TDEShortcut(), this, TQ_SLOT(slotSplitHere()), actionCollection(), "range_split" ); // FIXME: after the message freeze give this action a proper name like "Remove track part" TDEAction* actionRemoveRange = new TDEAction( i18n("Remove this Range"), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), + TDEShortcut(), this, TQ_SLOT(slotRemoveRange()), actionCollection(), "range_remove" ); actionSplitHere->plug( m_popupMenu ); @@ -162,13 +162,13 @@ void K3bAudioTrackSplitDialog::splitAt( const TQPoint& p ) bool K3bAudioTrackSplitDialog::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorWidget) ) { + if( o == m_editorWidget ) { if( e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* me = static_cast<TQMouseEvent*>( e ); splitAt( me->pos() ); } else if( e->type() == TQEvent::ContextMenu ) { - TQContextMenuEvent* ce = TQT_TQCONTEXTMENUEVENT( e ); + TQContextMenuEvent* ce = static_cast<TQContextMenuEvent*>( e ); ce->consume(); m_lastClickPosition = ce->pos(); if( m_editorWidget->findRange( ce->pos().x() ) > 0 ) diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h index 937688b..96fb39d 100644 --- a/src/projects/k3baudiotracksplitdialog.h +++ b/src/projects/k3baudiotracksplitdialog.h @@ -33,7 +33,7 @@ class TDEPopupMenu; */ class K3bAudioTrackSplitDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp index 07c6027..d82f92a 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.cpp +++ b/src/projects/k3baudiotracktrmlookupdialog.cpp @@ -68,11 +68,11 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, co m_inLoop = false; m_mbJob = new K3bMusicBrainzJob( this ); - connect( m_mbJob, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SLOT(slotMbJobInfoMessage(const TQString&, int)) ); - connect( m_mbJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMbJobFinished(bool)) ); - connect( m_mbJob, TQT_SIGNAL(trackFinished(K3bAudioTrack*, bool)), - this, TQT_SLOT(slotTrackFinished(K3bAudioTrack*, bool)) ); + connect( m_mbJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SLOT(slotMbJobInfoMessage(const TQString&, int)) ); + connect( m_mbJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotMbJobFinished(bool)) ); + connect( m_mbJob, TQ_SIGNAL(trackFinished(K3bAudioTrack*, bool)), + this, TQ_SLOT(slotTrackFinished(K3bAudioTrack*, bool)) ); } diff --git a/src/projects/k3baudiotracktrmlookupdialog.h b/src/projects/k3baudiotracktrmlookupdialog.h index e6c2b2e..7ebca38 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.h +++ b/src/projects/k3baudiotracktrmlookupdialog.h @@ -27,7 +27,7 @@ class K3bBusyWidget; class K3bAudioTrackTRMLookupDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 5eaf550..d20658e 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -68,11 +68,11 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const m_currentMouseOverItem(0), m_currentlyPlayingTrack(0) { - m_player = new K3bAudioTrackPlayer( m_doc, TQT_TQOBJECT(this) ); - connect( m_player, TQT_SIGNAL(playingTrack(K3bAudioTrack*)), TQT_TQOBJECT(this), - TQT_SLOT(showPlayerIndicator(K3bAudioTrack*)) ); - connect( m_player, TQT_SIGNAL(paused(bool)), TQT_TQOBJECT(this), TQT_SLOT(togglePauseIndicator(bool)) ); - connect( m_player, TQT_SIGNAL(stopped()), TQT_TQOBJECT(this), TQT_SLOT(removePlayerIndicator()) ); + m_player = new K3bAudioTrackPlayer( m_doc, this ); + connect( m_player, TQ_SIGNAL(playingTrack(K3bAudioTrack*)), this, + TQ_SLOT(showPlayerIndicator(K3bAudioTrack*)) ); + connect( m_player, TQ_SIGNAL(paused(bool)), this, TQ_SLOT(togglePauseIndicator(bool)) ); + connect( m_player, TQ_SIGNAL(stopped()), this, TQ_SLOT(removePlayerIndicator()) ); setItemMargin( 5 ); setAcceptDrops( true ); @@ -90,27 +90,27 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const setupColumns(); setupActions(); - m_playerItemAnimator = new K3bListViewItemAnimator( TQT_TQOBJECT(this) ); + m_playerItemAnimator = new K3bListViewItemAnimator( this ); m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotAnimation()) ); + connect( m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) ); m_autoOpenTrackTimer = new TQTimer( this ); - connect( m_autoOpenTrackTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDragTimeout()) ); - - connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotProperties()) ); - - connect( doc, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotChanged()) ); - connect( doc, TQT_SIGNAL(trackChanged(K3bAudioTrack*)), - this, TQT_SLOT(slotTrackChanged(K3bAudioTrack*)) ); - connect( doc, TQT_SIGNAL(trackRemoved(K3bAudioTrack*)), - this, TQT_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); + connect( m_autoOpenTrackTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragTimeout()) ); + + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotProperties()) ); + + connect( doc, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotChanged()) ); + connect( doc, TQ_SIGNAL(trackChanged(K3bAudioTrack*)), + this, TQ_SLOT(slotTrackChanged(K3bAudioTrack*)) ); + connect( doc, TQ_SIGNAL(trackRemoved(K3bAudioTrack*)), + this, TQ_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); slotChanged(); @@ -155,33 +155,33 @@ void K3bAudioTrackView::setupActions() m_popupMenu = new TDEPopupMenu( this ); m_actionProperties = new TDEAction( i18n("Properties"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + TDEShortcut(), this, TQ_SLOT(slotProperties()), actionCollection(), "track_properties" ); m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), + Key_Delete, this, TQ_SLOT(slotRemove()), actionCollection(), "track_remove" ); m_actionAddSilence = new TDEAction( i18n("Add Silence") + "...", "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), + TDEShortcut(), this, TQ_SLOT(slotAddSilence()), actionCollection(), "track_add_silence" ); m_actionMergeTracks = new TDEAction( i18n("Merge Tracks"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), + TDEShortcut(), this, TQ_SLOT(slotMergeTracks()), actionCollection(), "track_merge" ); m_actionSplitSource = new TDEAction( i18n("Source to Track"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), + TDEShortcut(), this, TQ_SLOT(slotSplitSource()), actionCollection(), "source_split" ); m_actionSplitTrack = new TDEAction( i18n("Split Track..."), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), + TDEShortcut(), this, TQ_SLOT(slotSplitTrack()), actionCollection(), "track_split" ); m_actionEditSource = new TDEAction( i18n("Edit Source..."), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), + TDEShortcut(), this, TQ_SLOT(slotEditSource()), actionCollection(), "source_edit" ); m_actionPlayTrack = new TDEAction( i18n("Play Track"), "media-playback-start", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), + TDEShortcut(), this, TQ_SLOT(slotPlayTrack()), actionCollection(), "track_play" ); #ifdef HAVE_MUSICBRAINZ - TDEAction* mbAction = new TDEAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotQueryMusicBrainz()), + TDEAction* mbAction = new TDEAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, this, + TQ_SLOT(slotQueryMusicBrainz()), actionCollection(), "project_audio_musicbrainz" ); mbAction->setToolTip( i18n("Try to determine meta information over the internet") ); #endif @@ -394,7 +394,7 @@ void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQL // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } @@ -451,7 +451,7 @@ K3bAudioTrackViewItem* K3bAudioTrackView::getTrackViewItem( K3bAudioTrack* track // so the user may not change the cd-text until the one from the // file is loaded. // - // Since for some reason QT thinks it's bad to open disabled items + // Since for some reason TQt thinks it's bad to open disabled items // we need to open it before disabling it // newItem->showSources( track->numberSources() != 1 ); diff --git a/src/projects/k3baudiotrackview.h b/src/projects/k3baudiotrackview.h index f64e4ee..197c2cd 100644 --- a/src/projects/k3baudiotrackview.h +++ b/src/projects/k3baudiotrackview.h @@ -42,7 +42,7 @@ class K3bAudioTrackPlayer; class K3bAudioTrackView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp index 9c9860e..b285744 100644 --- a/src/projects/k3baudiotrackwidget.cpp +++ b/src/projects/k3baudiotrackwidget.cpp @@ -48,14 +48,14 @@ K3bAudioTrackWidget::K3bAudioTrackWidget( const TQPtrList<K3bAudioTrack>& tracks // no post-gap for the last track m_editPostGap->setDisabled( tracks.count() == 1 && !tracks.getFirst()->next() ); - K3bCdTextValidator* val = new K3bCdTextValidator( TQT_TQOBJECT(this) ); + K3bCdTextValidator* val = new K3bCdTextValidator( this ); m_editSongwriter->setValidator( val ); m_editArranger->setValidator( val ); m_editComposer->setValidator( val ); m_editMessage->setValidator( val ); m_editTitle->setValidator( val ); m_editPerformer->setValidator( val ); - m_editIsrc->setValidator( K3bValidators::isrcValidator( TQT_TQOBJECT(this) ) ); + m_editIsrc->setValidator( K3bValidators::isrcValidator( this ) ); load(); } diff --git a/src/projects/k3baudiotrackwidget.h b/src/projects/k3baudiotrackwidget.h index 6ef9eb9..ee36ed7 100644 --- a/src/projects/k3baudiotrackwidget.h +++ b/src/projects/k3baudiotrackwidget.h @@ -31,7 +31,7 @@ class K3bAudioTrack; */ class K3bAudioTrackWidget : public base_K3bAudioTrackWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index eb39b90..7c46e04 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -37,7 +37,7 @@ #include <tdeactionclasses.h> #include <k3bprojectplugin.h> -// QT-includes +// TQt includes #include <tqlayout.h> #include <tqstring.h> @@ -59,7 +59,7 @@ K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *nam fillStatusDisplay()->showTime(); // add button for the audio conversion - TDEAction* conversionAction = new TDEAction( i18n("Convert Tracks"), "edit-redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), + TDEAction* conversionAction = new TDEAction( i18n("Convert Tracks"), "edit-redo", 0, this, TQ_SLOT(slotAudioConversion()), actionCollection(), "project_audio_convert" ); conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) ); diff --git a/src/projects/k3baudioview.h b/src/projects/k3baudioview.h index 92052c5..460dba8 100644 --- a/src/projects/k3baudioview.h +++ b/src/projects/k3baudioview.h @@ -33,7 +33,7 @@ class K3bAudioTrackView; */ class K3bAudioView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bbootimagedialog.h b/src/projects/k3bbootimagedialog.h index fa96a97..e89ca89 100644 --- a/src/projects/k3bbootimagedialog.h +++ b/src/projects/k3bbootimagedialog.h @@ -25,7 +25,7 @@ class K3bDataDoc; class K3bBootImageDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 85c00bd..0d7a4a9 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -79,16 +79,16 @@ K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, TQWidget* parent, const cha : base_K3bBootImageView( parent, name ), m_doc(doc) { - connect( m_buttonNew, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewBootImage()) ); - connect( m_buttonDelete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeleteBootImage()) ); - connect( m_buttonToggleOptions, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotToggleOptions()) ); - connect( m_viewImages, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); - connect( m_radioNoEmulation, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotNoEmulationToggled(bool)) ); + connect( m_buttonNew, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewBootImage()) ); + connect( m_buttonDelete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeleteBootImage()) ); + connect( m_buttonToggleOptions, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotToggleOptions()) ); + connect( m_viewImages, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); + connect( m_radioNoEmulation, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotNoEmulationToggled(bool)) ); K3bIntValidator* v = new K3bIntValidator( this ); m_editLoadSegment->setValidator( v ); diff --git a/src/projects/k3bbootimageview.h b/src/projects/k3bbootimageview.h index e10819e..2e2a14e 100644 --- a/src/projects/k3bbootimageview.h +++ b/src/projects/k3bbootimageview.h @@ -25,7 +25,7 @@ class K3bBootItem; class K3bBootImageView : public base_K3bBootImageView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp index cd8af5e..fda6835 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.cpp +++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp @@ -244,14 +244,14 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget miscRoot->setOpen( true ); - m_comboInputCharset->setValidator( new TQRegExpValidator( TQRegExp("[\\w_-]*"), TQT_TQOBJECT(this) ) ); + m_comboInputCharset->setValidator( new TQRegExpValidator( TQRegExp("[\\w_-]*"), this ) ); // fill charset combo for( int i = 0; mkisofsCharacterSets[i]; i++ ) { m_comboInputCharset->insertItem( TQString( mkisofsCharacterSets[i] ) ); } - connect( m_checkJoliet, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotJolietToggled(bool)) ); + connect( m_checkJoliet, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotJolietToggled(bool)) ); } diff --git a/src/projects/k3bdataadvancedimagesettingswidget.h b/src/projects/k3bdataadvancedimagesettingswidget.h index b6b1be2..2cdff85 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.h +++ b/src/projects/k3bdataadvancedimagesettingswidget.h @@ -25,7 +25,7 @@ class TQCheckListItem; class K3bDataAdvancedImageSettingsWidget : public base_K3bAdvancedDataImageSettings { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index 6b0abdd..f330738 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -84,8 +84,8 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c setupSettingsTab(); - connect( m_comboMultisession, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotMultiSessionModeChanged()) ); + connect( m_comboMultisession, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotMultiSessionModeChanged()) ); m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE ); @@ -98,8 +98,8 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c m_tempDirSelectionWidget->setDefaultImageFileName( _doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), - m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQ_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQ_SLOT(setDefaultImageFileName(const TQString&)) ); } K3bDataBurnDialog::~K3bDataBurnDialog() @@ -157,10 +157,10 @@ void K3bDataBurnDialog::setupSettingsTab() frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); - m_groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); + m_groupDataMode = new TQGroupBox( 1, TQt::Vertical, i18n("Datatrack Mode"), frame ); m_dataModeWidget = new K3bDataModeWidget( m_groupDataMode ); - TQGroupBox* groupMultiSession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); + TQGroupBox* groupMultiSession = new TQGroupBox( 1, TQt::Vertical, i18n("Multisession Mode"), frame ); m_comboMultisession = new K3bDataMultiSessionCombobox( groupMultiSession ); frameLayout->addWidget( m_groupDataMode, 0, 0 ); diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h index 749b783..4910869 100644 --- a/src/projects/k3bdataburndialog.h +++ b/src/projects/k3bdataburndialog.h @@ -41,7 +41,7 @@ class K3bDataMultiSessionCombobox; class K3bDataBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index f7ca4ae..64fc412 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -89,15 +89,15 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget m_root = new K3bDataRootViewItem( doc, this ); m_itemMap.insert( doc->root(), m_root ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(TDEListView*,TQListViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( m_doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotDocChanged()) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_doc, TQ_SIGNAL(itemRemoved(K3bDataItem*)), this, TQ_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQ_SIGNAL(itemAdded(K3bDataItem*)), this, TQ_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(showPopupMenu(TDEListView*,TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); setupActions(); } @@ -207,7 +207,7 @@ void K3bDataDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListVie // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } } @@ -280,24 +280,24 @@ void K3bDataDirTreeView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, this, TQ_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, this, TQ_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, this, TQ_SLOT(slotRemoveItem()), actionCollection(), "remove" ); TDEShortcut renameShortCut( Key_F2 ); renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, this, TQ_SLOT(slotRenameItem()), actionCollection(), "rename" ); m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } @@ -393,7 +393,7 @@ void K3bDataDirTreeView::startDropAnimation( K3bDirItem* dir ) d->animationCounter = 0; d->animatedDirItem = vI; d->beforeAniPixmap = TQPixmap( *vI->pixmap(0) ); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotDropAnimate()) ); } } @@ -426,7 +426,7 @@ void K3bDataDirTreeView::slotDropAnimate() } d->animationCounter++; - TQTimer::singleShot( 300, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); + TQTimer::singleShot( 300, this, TQ_SLOT(slotDropAnimate()) ); } } } diff --git a/src/projects/k3bdatadirtreeview.h b/src/projects/k3bdatadirtreeview.h index dd9f543..788613d 100644 --- a/src/projects/k3bdatadirtreeview.h +++ b/src/projects/k3bdatadirtreeview.h @@ -43,7 +43,7 @@ class TQDragLeaveEvent; class K3bDataDirTreeView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 634e26b..69d4a2d 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -79,16 +79,16 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView m_currentDir = doc->root(); checkForNewItems(); - connect( m_treeView, TQT_SIGNAL(dirSelected(K3bDirItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotSetCurrentDir(K3bDirItem*)) ); - connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) ); + connect( m_treeView, TQ_SIGNAL(dirSelected(K3bDirItem*)), this, TQ_SLOT(slotSetCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQ_SIGNAL(itemRemoved(K3bDataItem*)), this, TQ_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQ_SIGNAL(itemAdded(K3bDataItem*)), this, TQ_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)) ); setupActions(); } @@ -289,7 +289,7 @@ void K3bDataFileView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListViewIt // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } } @@ -319,32 +319,32 @@ void K3bDataFileView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, this, TQ_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, this, TQ_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, this, TQ_SLOT(slotRemoveItem()), actionCollection(), "remove" ); TDEShortcut renameShortCut( Key_F2 ); renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, this, TQ_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_actionParentDir = new TDEAction( i18n("Parent Directory"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), + m_actionParentDir = new TDEAction( i18n("Parent Directory"), "go-up", 0, this, TQ_SLOT(slotParentDir()), actionCollection(), "parent_dir" ); - m_actionOpen = new TDEAction( i18n("Open"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), + m_actionOpen = new TDEAction( i18n("Open"), "document-open", 0, this, TQ_SLOT(slotOpen()), actionCollection(), "open" ); m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionParentDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionOpen ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } diff --git a/src/projects/k3bdatafileview.h b/src/projects/k3bdatafileview.h index 8775aba..9c4cd06 100644 --- a/src/projects/k3bdatafileview.h +++ b/src/projects/k3bdatafileview.h @@ -46,7 +46,7 @@ class TQDragLeaveEvent; class K3bDataFileView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 08cda53..5371c89 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -176,12 +176,12 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const m_customFsDlg = new CustomFilesystemsDialog( this ); m_volDescDlg = new VolumeDescDialog( this ); - connect( m_buttonCustomFilesystems, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCustomFilesystems()) ); - connect( m_buttonMoreVolDescFields, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMoreVolDescFields()) ); - connect( m_comboSpaceHandling, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSpaceHandlingChanged(int)) ); + connect( m_buttonCustomFilesystems, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCustomFilesystems()) ); + connect( m_buttonMoreVolDescFields, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMoreVolDescFields()) ); + connect( m_comboSpaceHandling, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSpaceHandlingChanged(int)) ); for( int i = 0; i < FS_MAX; ++i ) m_comboFilesystems->insertItem( i18n( s_fsPresetNames[i] ) ); diff --git a/src/projects/k3bdataimagesettingswidget.h b/src/projects/k3bdataimagesettingswidget.h index 4d54baf..ebb232a 100644 --- a/src/projects/k3bdataimagesettingswidget.h +++ b/src/projects/k3bdataimagesettingswidget.h @@ -24,7 +24,7 @@ class K3bIsoOptions; class K3bDataImageSettingsWidget : public base_K3bDataImageSettings { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h index 704f61c..cbb9142 100644 --- a/src/projects/k3bdatamultisessioncombobox.h +++ b/src/projects/k3bdatamultisessioncombobox.h @@ -24,7 +24,7 @@ class TDEConfigBase; class K3bDataMultiSessionCombobox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 970d607..fdf4faa 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -167,7 +167,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge sortingBoxGrid->setSpacing( spacingHint() ); sortingBoxGrid->setMargin( marginHint() ); m_editSortWeight = new KLineEdit( sortingBox ); - m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) ); + m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, m_editSortWeight ) ); m_editSortWeight->setAlignment( TQt::AlignRight ); sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 ); @@ -222,7 +222,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge "It sorts the order in which the file data is " "written to the image.") ); - m_editName->setValidator( K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ) ); + m_editName->setValidator( K3bValidators::iso9660Validator( false, this ) ); m_editName->setReadOnly( !dataItem->isRenameable() ); m_editName->setFocus(); } diff --git a/src/projects/k3bdatapropertiesdialog.h b/src/projects/k3bdatapropertiesdialog.h index 55b5ec1..24498e7 100644 --- a/src/projects/k3bdatapropertiesdialog.h +++ b/src/projects/k3bdatapropertiesdialog.h @@ -32,7 +32,7 @@ class TQCheckBox; */ class K3bDataPropertiesDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/projects/k3bdatasessionimportdialog.cpp b/src/projects/k3bdatasessionimportdialog.cpp index 6ccaec2..b994841 100644 --- a/src/projects/k3bdatasessionimportdialog.cpp +++ b/src/projects/k3bdatasessionimportdialog.cpp @@ -42,8 +42,8 @@ K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* parent ) m_comboMedia = new K3bMediaSelectionComboBox( this ); setMainWidget( m_comboMedia ); - connect( m_comboMedia, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); + connect( m_comboMedia, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); } diff --git a/src/projects/k3bdatasessionimportdialog.h b/src/projects/k3bdatasessionimportdialog.h index 4cfb6de..2f8416e 100644 --- a/src/projects/k3bdatasessionimportdialog.h +++ b/src/projects/k3bdatasessionimportdialog.h @@ -32,7 +32,7 @@ class K3bMediaSelectionComboBox; class K3bDataSessionImportDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index b110a6d..a3c84be 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -91,9 +91,9 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren grid->addWidget( m_infoLabel, 0, 0 ); grid->addMultiCellWidget( m_progressWidget, 1, 1, 0, 1 ); - m_dirSizeJob = new K3bDirSizeJob( TQT_TQOBJECT(this) ); - connect( m_dirSizeJob, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotDirSizeDone(bool)) ); + m_dirSizeJob = new K3bDirSizeJob( this ); + connect( m_dirSizeJob, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotDirSizeDone(bool)) ); // try to start with a reasonable size resize( (int)( fontMetrics().width( caption() ) * 1.5 ), sizeHint().height() ); @@ -141,7 +141,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, K3bDataUrlAddingDialog dlg( dir->doc(), parent ); dlg.m_urls = urls; for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) - dlg.m_urlQueue.append( tqMakePair( K3b::convertToLocalUrl(*it), dir ) ); + dlg.m_urlQueue.append( qMakePair( K3b::convertToLocalUrl(*it), dir ) ); dlg.slotAddUrls(); int ret = TQDialog::Accepted; @@ -226,7 +226,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& item dlg.m_copyItems = copy; for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { - dlg.m_items.append( tqMakePair( *it, dir ) ); + dlg.m_items.append( qMakePair( *it, dir ) ); ++dlg.m_totalFiles; if( (*it)->isDir() ) { dlg.m_totalFiles += static_cast<K3bDirItem*>( *it )->numFiles(); @@ -568,7 +568,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() dlist.remove( dotdot ); for( TQStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) { - m_urlQueue.append( tqMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) ); + m_urlQueue.append( qMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) ); } } else { @@ -583,7 +583,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() } else { updateProgress(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } @@ -625,7 +625,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() if( oldItem->isDir() && item->isDir() ) { const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children(); for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) - m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); + m_items.append( qMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); // FIXME: we need to remove the old dir item } @@ -736,7 +736,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() } else { updateProgress(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotCopyMoveItems()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotCopyMoveItems()) ); } } @@ -745,7 +745,7 @@ bool K3bDataUrlAddingDialog::getNewName( const TQString& oldName, K3bDirItem* di { bool ok = true; newName = oldName; - TQValidator* validator = K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ); + TQValidator* validator = K3bValidators::iso9660Validator( false, this ); do { newName = KInputDialog::getText( i18n("Enter New Filename"), i18n("A file with that name already exists. Please enter a new name:"), diff --git a/src/projects/k3bdataurladdingdialog.h b/src/projects/k3bdataurladdingdialog.h index 4a6b081..2788428 100644 --- a/src/projects/k3bdataurladdingdialog.h +++ b/src/projects/k3bdataurladdingdialog.h @@ -33,7 +33,7 @@ class K3bDataDoc; class K3bDataUrlAddingDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index e42a966..c3f48ed 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -66,22 +66,22 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) setMainWidget( mainSplitter ); - connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), - m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( m_dataFileView, TQ_SIGNAL(dirSelected(K3bDirItem*)), + m_dataDirTree, TQ_SLOT(setCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotDocChanged()) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); // the data actions - TDEAction* actionImportSession = new TDEAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), + TDEAction* actionImportSession = new TDEAction(i18n("&Import Session..."), "gear", 0, this, TQ_SLOT(importSession()), actionCollection(), "project_data_import_session" ); - TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), - TQT_SLOT(clearImportedSession()), actionCollection(), + TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, this, + TQ_SLOT(clearImportedSession()), actionCollection(), "project_data_clear_imported_session" ); - TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "application-x-cda", 0, TQT_TQOBJECT(this), - TQT_SLOT(editBootImages()), actionCollection(), + TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "application-x-cda", 0, this, + TQ_SLOT(editBootImages()), actionCollection(), "project_data_edit_boot_images" ); actionImportSession->setToolTip( i18n("Import a previously burned session into the current project") ); @@ -100,13 +100,13 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) toolBox()->addStretch(); m_volumeIDEdit = new TQLineEdit( doc->isoOptions().volumeID(), toolBox() ); - m_volumeIDEdit->setValidator( new K3bLatin1Validator( TQT_TQOBJECT(m_volumeIDEdit) ) ); + m_volumeIDEdit->setValidator( new K3bLatin1Validator( m_volumeIDEdit ) ); toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); - connect( m_volumeIDEdit, TQT_SIGNAL(textChanged(const TQString&)), + connect( m_volumeIDEdit, TQ_SIGNAL(textChanged(const TQString&)), m_doc, - TQT_SLOT(setVolumeID(const TQString&)) ); + TQ_SLOT(setVolumeID(const TQString&)) ); // this is just for testing (or not?) // most likely every project type will have it's rc file in the future diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h index 1291643..ad8576a 100644 --- a/src/projects/k3bdataview.h +++ b/src/projects/k3bdataview.h @@ -42,7 +42,7 @@ namespace K3bDevice { */ class K3bDataView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatavolumedescwidget.cpp b/src/projects/k3bdatavolumedescwidget.cpp index 580fed6..1824096 100644 --- a/src/projects/k3bdatavolumedescwidget.cpp +++ b/src/projects/k3bdatavolumedescwidget.cpp @@ -29,7 +29,7 @@ K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* parent, const char* { // the maximal number of characters that can be inserted are set in the ui file! - TQValidator* isoValidator = new K3bLatin1Validator( TQT_TQOBJECT(this) ); + TQValidator* isoValidator = new K3bLatin1Validator( this ); m_editVolumeName->setValidator( isoValidator ); m_editVolumeSetName->setValidator( isoValidator ); @@ -38,8 +38,8 @@ K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* parent, const char* m_editSystem->setValidator( isoValidator ); m_editApplication->setValidator( isoValidator ); - connect( m_spinVolumeSetSize, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotVolumeSetSizeChanged(int)) ); + connect( m_spinVolumeSetSize, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotVolumeSetSizeChanged(int)) ); // for now we hide the volume set size stuff since it's not working anymore in mkisofs 2.01a34 textLabel1->hide(); diff --git a/src/projects/k3bdatavolumedescwidget.h b/src/projects/k3bdatavolumedescwidget.h index 9c94345..3337c18 100644 --- a/src/projects/k3bdatavolumedescwidget.h +++ b/src/projects/k3bdatavolumedescwidget.h @@ -24,7 +24,7 @@ class K3bIsoOptions; class K3bDataVolumeDescWidget : public base_K3bDataVolumeDescWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index 3fccbed..39c64a0 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -77,8 +77,8 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char m_tempDirSelectionWidget->setDefaultImageFileName( doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), - m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQ_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQ_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -96,7 +96,7 @@ void K3bDvdBurnDialog::setupSettingsTab() // Multisession // //////////////////////////////////////////////////////////////////////// - TQGroupBox* groupMultiSession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); + TQGroupBox* groupMultiSession = new TQGroupBox( 1, TQt::Vertical, i18n("Multisession Mode"), frame ); m_comboMultisession = new K3bDataMultiSessionCombobox( groupMultiSession ); frameLayout->addWidget( groupMultiSession, 0, 0 ); @@ -104,8 +104,8 @@ void K3bDvdBurnDialog::setupSettingsTab() addPage( frame, i18n("Misc") ); - connect( m_comboMultisession, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotMultiSessionModeChanged()) ); + connect( m_comboMultisession, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotMultiSessionModeChanged()) ); } diff --git a/src/projects/k3bdvdburndialog.h b/src/projects/k3bdvdburndialog.h index 69387b3..4fdebfd 100644 --- a/src/projects/k3bdvdburndialog.h +++ b/src/projects/k3bdvdburndialog.h @@ -31,7 +31,7 @@ class K3bDataMultiSessionCombobox; class K3bDvdBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdvdview.h b/src/projects/k3bdvdview.h index 8e5804c..9fb5c6f 100644 --- a/src/projects/k3bdvdview.h +++ b/src/projects/k3bdvdview.h @@ -24,7 +24,7 @@ class K3bDvdDoc; class K3bDvdView : public K3bDataView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 3f3f9b8..9dfd1eb 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -118,7 +118,7 @@ TQSize K3bFillStatusDisplayWidget::minimumSizeHint() const void K3bFillStatusDisplayWidget::mousePressEvent( TQMouseEvent* e ) { - if( e->button() == Qt::RightButton ) + if( e->button() == TQt::RightButton ) emit contextMenu( e->globalPos() ); } @@ -129,7 +129,7 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) TQPixmap buffer( size() ); buffer.fill( colorGroup().base() ); TQPainter p; - p.begin( &buffer, TQT_TQOBJECT(this) ); + p.begin( &buffer, this ); p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) long long docSize; @@ -344,7 +344,7 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const // d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom-unmounted") ); // d->buttonMenu->setAutoRaise(true); // TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); -// connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); +// connect( d->buttonMenu, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMenuButtonClicked()) ); TQGridLayout* layout = new TQGridLayout( this ); layout->setSpacing(5); @@ -357,10 +357,10 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const showDvdSizes( false ); - connect( d->doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); - connect( &d->updateTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDisplay()) ); - connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( d->doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotDocChanged()) ); + connect( &d->updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateDisplay()) ); + connect( k3bappcore->mediaCache(), TQ_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } K3bFillStatusDisplay::~K3bFillStatusDisplay() @@ -378,32 +378,32 @@ void K3bFillStatusDisplay::setupPopupMenu() d->popup = new TDEPopupMenu( this, "popup" ); d->dvdPopup = new TDEPopupMenu( this, "dvdpopup" ); - d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), + d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, this, TQ_SLOT(showTime()), d->actionCollection, "fillstatus_show_minutes" ); - d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), + d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, this, TQ_SLOT(showSize()), d->actionCollection, "fillstatus_show_megabytes" ); d->actionShowMegs->setExclusiveGroup( "show_size_in" ); d->actionShowMinutes->setExclusiveGroup( "show_size_in" ); - d->actionAuto = new TDERadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), + d->actionAuto = new TDERadioAction( i18n("Auto"), 0, this, TQ_SLOT(slotAutoSize()), d->actionCollection, "fillstatus_auto" ); - d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), + d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, this, TQ_SLOT(slot74Minutes()), d->actionCollection, "fillstatus_74minutes" ); - d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), + d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, this, TQ_SLOT(slot80Minutes()), d->actionCollection, "fillstatus_80minutes" ); - d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), + d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, this, TQ_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); - d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), + d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, this, TQ_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); d->actionDvdDoubleLayer = new TDERadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()), + 0, this, TQ_SLOT(slotDvdDoubleLayer()), d->actionCollection, "fillstatus_dvd_double_layer" ); - d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), + d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, this, TQ_SLOT(slotCustomSize()), d->actionCollection, "fillstatus_custom_size" ); d->actionCustomSize->setAlwaysEmitActivated(true); d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom-unmounted", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()), + this, TQ_SLOT(slotDetermineSize()), d->actionCollection, "fillstatus_size_from_disk" ); d->actionDetermineSize->setAlwaysEmitActivated(true); @@ -417,14 +417,14 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionDetermineSize->setExclusiveGroup( "cd_size" ); d->actionLoadUserDefaults = new TDEAction( i18n("User Defaults"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()), + this, TQ_SLOT(slotLoadUserDefaults()), d->actionCollection, "load_user_defaults" ); d->actionSaveUserDefaults = new TDEAction( i18n("Save User Defaults"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()), + this, TQ_SLOT(slotSaveUserDefaults()), d->actionCollection, "save_user_defaults" ); TDEAction* dvdSizeInfoAction = new TDEAction( i18n("Why 4.4 instead of 4.7?"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()), + this, TQ_SLOT(slotWhy44()), d->actionCollection, "why_44_gb" ); d->popup->insertTitle( i18n("Show Size In") ); @@ -452,7 +452,7 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionLoadUserDefaults->plug( d->dvdPopup ); d->actionSaveUserDefaults->plug( d->dvdPopup ); - connect( d->displayWidget, TQT_SIGNAL(contextMenu(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotPopupMenu(const TQPoint&)) ); + connect( d->displayWidget, TQ_SIGNAL(contextMenu(const TQPoint&)), this, TQ_SLOT(slotPopupMenu(const TQPoint&)) ); } @@ -551,7 +551,7 @@ void K3bFillStatusDisplay::slotCustomSize() d->showDvdSizes ? TQString("4%14%2").arg(TDEGlobal::locale()->decimalSymbol()).arg(gbS) : (d->showTime ? TQString("74")+minS : TQString("650")+mbS), &ok, this, (const char*)0, - new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) ); + new TQRegExpValidator( rx, this ) ); if( ok ) { // determine size if( rx.exactMatch( size ) ) { diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index 95f0940..2149ce6 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -44,7 +44,7 @@ namespace K3b { */ class K3bFillStatusDisplayWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -75,7 +75,7 @@ class K3bFillStatusDisplayWidget : public TQWidget class K3bFillStatusDisplay : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 43b798d..333a856 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -83,10 +83,10 @@ K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, cons TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); - connect( m_checkNormalize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNormalizeToggled(bool)) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCacheImageToggled(bool)) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkNormalize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotNormalizeToggled(bool)) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCacheImageToggled(bool)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); } @@ -94,13 +94,13 @@ void K3bMixedBurnDialog::setupSettingsPage() { TQWidget* w = new TQWidget( this ); - TQGroupBox* groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), w ); + TQGroupBox* groupDataMode = new TQGroupBox( 1, TQt::Vertical, i18n("Datatrack Mode"), w ); m_dataModeWidget = new K3bDataModeWidget( groupDataMode ); - TQGroupBox* groupNormalize = new TQGroupBox( 1, Qt::Vertical, i18n("Misc"), w ); + TQGroupBox* groupNormalize = new TQGroupBox( 1, TQt::Vertical, i18n("Misc"), w ); m_checkNormalize = K3bStdGuiItems::normalizeCheckBox( groupNormalize ); - TQGroupBox* groupMixedType = new TQGroupBox( 1, Qt::Vertical, i18n("Mixed Mode Type"), w ); + TQGroupBox* groupMixedType = new TQGroupBox( 1, TQt::Vertical, i18n("Mixed Mode Type"), w ); m_comboMixedModeType = new K3bIntMapComboBox( groupMixedType ); m_comboMixedModeType->insertItem( K3bMixedDoc::DATA_SECOND_SESSION, diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h index fc9a229..fafb4b3 100644 --- a/src/projects/k3bmixedburndialog.h +++ b/src/projects/k3bmixedburndialog.h @@ -36,7 +36,7 @@ class K3bIntMapComboBox; */ class K3bMixedBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp index 153ee89..86187c8 100644 --- a/src/projects/k3bmixeddirtreeview.cpp +++ b/src/projects/k3bmixeddirtreeview.cpp @@ -57,9 +57,9 @@ K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWid { m_audioRootItem = new PrivateAudioRootViewItem( doc, this, root() ); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( m_doc->audioDoc(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotNewAudioTracks()) ); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( m_doc->audioDoc(), TQ_SIGNAL(changed()), this, TQ_SLOT(slotNewAudioTracks()) ); } diff --git a/src/projects/k3bmixeddirtreeview.h b/src/projects/k3bmixeddirtreeview.h index 88735b2..958566c 100644 --- a/src/projects/k3bmixeddirtreeview.h +++ b/src/projects/k3bmixeddirtreeview.h @@ -28,7 +28,7 @@ class TQListViewItem; class K3bMixedDirTreeView : public K3bDataDirTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp index ee1b4f4..315b674 100644 --- a/src/projects/k3bmixedview.cpp +++ b/src/projects/k3bmixedview.cpp @@ -56,10 +56,10 @@ K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* parent, const char* name setMainWidget( splitter ); - connect( m_mixedDirTreeView, TQT_SIGNAL(audioTreeSelected()), - this, TQT_SLOT(slotAudioTreeSelected()) ); - connect( m_mixedDirTreeView, TQT_SIGNAL(dataTreeSelected()), - this, TQT_SLOT(slotDataTreeSelected()) ); + connect( m_mixedDirTreeView, TQ_SIGNAL(audioTreeSelected()), + this, TQ_SLOT(slotAudioTreeSelected()) ); + connect( m_mixedDirTreeView, TQ_SIGNAL(dataTreeSelected()), + this, TQ_SLOT(slotDataTreeSelected()) ); m_widgetStack->raiseWidget( m_dataFileView ); diff --git a/src/projects/k3bmixedview.h b/src/projects/k3bmixedview.h index f537334..5d07d2d 100644 --- a/src/projects/k3bmixedview.h +++ b/src/projects/k3bmixedview.h @@ -32,7 +32,7 @@ class K3bAudioTrackPlayer; class K3bMixedView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index a5ae170..1372df0 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -79,8 +79,8 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, cons m_tempDirSelectionWidget->setDefaultImageFileName( m_doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), - m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQ_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQ_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -96,10 +96,10 @@ void K3bMovixBurnDialog::setupSettingsPage() frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); - TQGroupBox* groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); + TQGroupBox* groupDataMode = new TQGroupBox( 1, TQt::Vertical, i18n("Datatrack Mode"), frame ); m_dataModeWidget = new K3bDataModeWidget( groupDataMode ); - TQGroupBox* groupMultisession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession"), frame ); + TQGroupBox* groupMultisession = new TQGroupBox( 1, TQt::Vertical, i18n("Multisession"), frame ); m_checkStartMultiSesssion = K3bStdGuiItems::startMultisessionCheckBox( groupMultisession ); frameLayout->addWidget( groupDataMode, 0, 0 ); diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h index 1be5d69..52601c7 100644 --- a/src/projects/k3bmovixburndialog.h +++ b/src/projects/k3bmovixburndialog.h @@ -29,7 +29,7 @@ class K3bDataModeWidget; class K3bMovixBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index c17bc7d..60652be 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -79,8 +79,8 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* par m_tempDirSelectionWidget->setDefaultImageFileName( m_doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), - m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQ_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQ_SLOT(setDefaultImageFileName(const TQString&)) ); } diff --git a/src/projects/k3bmovixdvdburndialog.h b/src/projects/k3bmovixdvdburndialog.h index 7210389..8ea5b9c 100644 --- a/src/projects/k3bmovixdvdburndialog.h +++ b/src/projects/k3bmovixdvdburndialog.h @@ -28,7 +28,7 @@ class TQCheckBox; class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixdvdview.h b/src/projects/k3bmovixdvdview.h index c2c8b50..9ea56c5 100644 --- a/src/projects/k3bmovixdvdview.h +++ b/src/projects/k3bmovixdvdview.h @@ -24,7 +24,7 @@ class K3bMovixDvdDoc; class K3bMovixDvdView : public K3bMovixView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 2c9deda..2376260 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -189,12 +189,12 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const ch + i18n("To remove or rename files use the context menu.") + "\n" + i18n("After that press the burn button to write the CD.") ); - connect( m_doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); - connect( m_doc, TQT_SIGNAL(newMovixFileItems()), this, TQT_SLOT(slotNewFileItems()) ); - connect( m_doc, TQT_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); - connect( m_doc, TQT_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); - connect( this, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*, TQDropEvent*, TQListViewItem*)) ); + connect( m_doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotChanged()) ); + connect( m_doc, TQ_SIGNAL(newMovixFileItems()), this, TQ_SLOT(slotNewFileItems()) ); + connect( m_doc, TQ_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQ_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); + connect( m_doc, TQ_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQ_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); + connect( this, TQ_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*, TQDropEvent*, TQListViewItem*)) ); // let's see what the doc already has slotNewFileItems(); diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index c2b4005..8ac9bf9 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -73,7 +73,7 @@ class K3bMovixSubTitleViewItem : public K3bMovixListViewItem, public KFileItem class K3bMovixListView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h index d589622..43aa833 100644 --- a/src/projects/k3bmovixoptionswidget.h +++ b/src/projects/k3bmovixoptionswidget.h @@ -26,7 +26,7 @@ class TDEConfigBase; class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 959c3d7..45abf19 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -45,22 +45,22 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name m_listView = new K3bMovixListView( m_doc, this ); setMainWidget( m_listView ); - connect( m_listView, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint& , int )), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint& , int )) ); + connect( m_listView, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint& , int )), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint& , int )) ); // setup actions m_actionProperties = new TDEAction( i18n("Properties"), "misc", - 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), + 0, this, TQ_SLOT(showPropertiesDialog()), actionCollection(), "movix_show_props" ); m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()), + Key_Delete, this, TQ_SLOT(slotRemoveItems()), actionCollection(), "movix_remove_item" ); m_actionRemoveSubTitle = new TDEAction( i18n( "Remove Subtitle File" ), "edit-delete", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()), + 0, this, TQ_SLOT(slotRemoveSubTitleItems()), actionCollection(), "movix_remove_subtitle_item" ); m_actionAddSubTitle = new TDEAction( i18n("Add Subtitle File..."), "", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTitleFile()), + 0, this, TQ_SLOT(slotAddSubTitleFile()), actionCollection(), "movix_add_subtitle" ); m_popupMenu = new TDEPopupMenu( this ); @@ -81,11 +81,11 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); - connect( m_volumeIDEdit, TQT_SIGNAL(textChanged(const TQString&)), + connect( m_volumeIDEdit, TQ_SIGNAL(textChanged(const TQString&)), m_doc, - TQT_SLOT(setVolumeID(const TQString&)) ); + TQ_SLOT(setVolumeID(const TQString&)) ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( m_doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotDocChanged()) ); } diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h index 4f29c91..7fba393 100644 --- a/src/projects/k3bmovixview.h +++ b/src/projects/k3bmovixview.h @@ -31,7 +31,7 @@ class TQLineEdit; class K3bMovixView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index 0a6ca8d..dffc54a 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -154,7 +154,7 @@ void K3bMusicBrainzJob::MusicBrainzThread::run() // cannot use this as parent for the K3bSimpleJobHandler since this has not been constructed yet K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* parent, const char* name ) - : K3bJob( new K3bSimpleJobHandler( 0 ), TQT_TQOBJECT(parent), name ), + : K3bJob( new K3bSimpleJobHandler( 0 ), parent, name ), m_canceled( false ) { m_trmThread = new TRMThread(); @@ -162,10 +162,10 @@ K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* parent, const char* name ) m_trmJob = new K3bThreadJob( m_trmThread, this, this ); m_mbJob = new K3bThreadJob( m_mbThread, this, this ); - connect( m_trmJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); - connect( m_trmJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotTrmPercent(int)) ); - connect( m_trmJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotTrmJobFinished(bool)) ); - connect( m_mbJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMbJobFinished(bool)) ); + connect( m_trmJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_trmJob, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotTrmPercent(int)) ); + connect( m_trmJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotTrmJobFinished(bool)) ); + connect( m_mbJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotMbJobFinished(bool)) ); } diff --git a/src/projects/k3bmusicbrainzjob.h b/src/projects/k3bmusicbrainzjob.h index 797c62c..f69266a 100644 --- a/src/projects/k3bmusicbrainzjob.h +++ b/src/projects/k3bmusicbrainzjob.h @@ -20,10 +20,6 @@ #include <config.h> #endif -#ifdef Q_MOC_RUN -#define HAVE_MUSICBRAINZ -#endif // Q_MOC_RUN - #ifdef HAVE_MUSICBRAINZ #include <k3bjob.h> @@ -40,7 +36,7 @@ class TQWidget; */ class K3bMusicBrainzJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index e03b175..a565c4c 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -264,11 +264,11 @@ void K3bProjectBurnDialog::prepareGui() TQWidget* w = new TQWidget( m_tabWidget ); m_tabWidget->addTab( w, i18n("Writing") ); - TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), w ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, TQt::Vertical, i18n("Writing Mode"), w ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); + m_optionGroup = new TQGroupBox( 0, TQt::Vertical, i18n("Settings"), w ); m_optionGroup->layout()->setMargin(0); m_optionGroup->layout()->setSpacing(0); m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->layout() ); @@ -286,7 +286,7 @@ void K3bProjectBurnDialog::prepareGui() m_optionGroupLayout->addWidget(m_checkOnlyCreateImage); m_optionGroupLayout->addWidget(m_checkRemoveBufferFiles); - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), w ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), w ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -321,14 +321,14 @@ void K3bProjectBurnDialog::prepareGui() setTabOrder( groupCopies, m_optionGroup ); // some default connections that should always be useful - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, TQT_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotWritingAppChanged(int)) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQ_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), this, TQ_SLOT(slotWritingAppChanged(int)) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkSimulate, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); } diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h index 1dcaca3..e98a3be 100644 --- a/src/projects/k3bprojectburndialog.h +++ b/src/projects/k3bprojectburndialog.h @@ -38,7 +38,7 @@ class TDEConfigBase; */ class K3bProjectBurnDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bprojectplugindialog.h b/src/projects/k3bprojectplugindialog.h index cd87e10..fa9745c 100644 --- a/src/projects/k3bprojectplugindialog.h +++ b/src/projects/k3bprojectplugindialog.h @@ -26,7 +26,7 @@ class TDEConfigBase; class K3bProjectPluginDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 11a93d3..0dd4531 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -86,11 +86,11 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha setupLabelTab(); setupAdvancedTab(); - connect( m_spinVolumeCount, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotSpinVolumeCount() ) ); - connect( m_groupVcdFormat, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotVcdTypeClicked( int ) ) ); - connect( m_checkCdiSupport, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotCdiSupportChecked( bool ) ) ); - connect( m_checkAutoDetect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotAutoDetect( bool ) ) ); - connect( m_checkGaps, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotGapsChecked( bool ) ) ); + connect( m_spinVolumeCount, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotSpinVolumeCount() ) ); + connect( m_groupVcdFormat, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotVcdTypeClicked( int ) ) ); + connect( m_checkCdiSupport, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotCdiSupportChecked( bool ) ) ); + connect( m_checkAutoDetect, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotAutoDetect( bool ) ) ); + connect( m_checkGaps, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotGapsChecked( bool ) ) ); // ToolTips // ------------------------------------------------------------------------- @@ -296,7 +296,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() TQWidget * w = new TQWidget( this ); // ---------------------------------------------------- generic group ---- - m_groupGeneric = new TQGroupBox( 5, Qt::Vertical, i18n( "Generic" ), w ); + m_groupGeneric = new TQGroupBox( 5, TQt::Vertical, i18n( "Generic" ), w ); m_checkPbc = new TQCheckBox( i18n( "Playback Control (PBC)" ), m_groupGeneric ); m_checkSegmentFolder = new TQCheckBox( i18n( "SEGMENT Folder must always be present" ), m_groupGeneric ); @@ -306,7 +306,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() // -------------------------------------------- gaps & margins group ---- - m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); + m_groupGaps = new TQGroupBox( 0, TQt::Vertical, i18n( "Gaps" ), w ); m_groupGaps->layout() ->setSpacing( spacingHint() ); m_groupGaps->layout() ->setMargin( marginHint() ); @@ -402,7 +402,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() groupGapsLayout->setRowStretch( 4, 0 ); // ------------------------------------------------------- misc group ---- - m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); + m_groupMisc = new TQGroupBox( 0, TQt::Vertical, i18n( "Misc" ), w ); m_groupMisc->layout() ->setSpacing( spacingHint() ); m_groupMisc->layout() ->setMargin( marginHint() ); @@ -434,7 +434,7 @@ void K3bVcdBurnDialog::setupVideoCdTab() TQWidget * w = new TQWidget( this ); // ---------------------------------------------------- Format group ---- - m_groupVcdFormat = new TQButtonGroup( 4, Qt::Vertical, i18n( "Type" ), w ); + m_groupVcdFormat = new TQButtonGroup( 4, TQt::Vertical, i18n( "Type" ), w ); m_radioVcd11 = new TQRadioButton( i18n( "VideoCD 1.1" ), m_groupVcdFormat ); m_radioVcd20 = new TQRadioButton( i18n( "VideoCD 2.0" ), m_groupVcdFormat ); m_radioSvcd10 = new TQRadioButton( i18n( "Super-VideoCD" ), m_groupVcdFormat ); @@ -443,7 +443,7 @@ void K3bVcdBurnDialog::setupVideoCdTab() // ---------------------------------------------------- Options group --- - m_groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n( "Settings" ), w ); + m_groupOptions = new TQGroupBox( 5, TQt::Vertical, i18n( "Settings" ), w ); m_checkAutoDetect = new TQCheckBox( i18n( "Autodetect VideoCD type" ), m_groupOptions ); m_checkNonCompliant = new TQCheckBox( i18n( "Enable broken SVCD mode" ), m_groupOptions ); @@ -461,7 +461,7 @@ void K3bVcdBurnDialog::setupVideoCdTab() m_checkCdiSupport = new TQCheckBox( i18n( "Enable CD-i support" ), m_groupOptions ); // ------------------------------------------------- CD-i Application --- - m_groupCdi = new TQGroupBox( 4, Qt::Vertical, i18n( "VideoCD on CD-i" ), w ); + m_groupCdi = new TQGroupBox( 4, TQt::Vertical, i18n( "VideoCD on CD-i" ), w ); m_editCdiCfg = new TQMultiLineEdit( m_groupCdi, "m_editCdiCfg" ); m_editCdiCfg->setFrameShape( TQTextEdit::NoFrame ); @@ -511,13 +511,13 @@ void K3bVcdBurnDialog::setupLabelTab() m_editPublisher = new TQLineEdit( w, "m_editPublisher" ); // only ISO646 d-Characters - m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); - m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); + m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); + m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); m_editVolumeId->setMaxLength( 32 ); m_editAlbumId->setMaxLength( 16 ); // only ISO646 a-Characters - m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, TQT_TQOBJECT(m_editVolumeId) ) ); + m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, m_editVolumeId ) ); m_editPublisher->setMaxLength( 128 ); m_spinVolumeNumber->setMinValue( 1 ); diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h index c43ac19..f0a0909 100644 --- a/src/projects/k3bvcdburndialog.h +++ b/src/projects/k3bvcdburndialog.h @@ -35,7 +35,7 @@ class K3bVcdOptions; class K3bVcdBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index 289e858..e9ebdc2 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -60,15 +60,15 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, setupColumns(); header() ->setClickEnabled( false ); - connect( this, TQT_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), - this, TQT_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( showPopupMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( showPropertiesDialog() ) ); + connect( this, TQ_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), + this, TQ_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( showPopupMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( showPropertiesDialog() ) ); - connect( m_doc, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateItems() ) ); - connect( m_doc, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), TQT_TQOBJECT(this), TQT_SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); + connect( m_doc, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotUpdateItems() ) ); + connect( m_doc, TQ_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQ_SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); slotUpdateItems(); } @@ -94,8 +94,8 @@ void K3bVcdListView::setupColumns() void K3bVcdListView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); - m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); + m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, this, TQ_SLOT( showPropertiesDialog() ), actionCollection() ); + m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", Key_Delete, this, TQ_SLOT( slotRemoveTracks() ), actionCollection() ); // disabled by default m_actionRemove->setEnabled( false ); diff --git a/src/projects/k3bvcdlistview.h b/src/projects/k3bvcdlistview.h index 4693a5b..6a8df1d 100644 --- a/src/projects/k3bvcdlistview.h +++ b/src/projects/k3bvcdlistview.h @@ -37,7 +37,7 @@ class TQPainter; class K3bVcdListView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index ef200e9..1db26c7 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// TQt Includes +// TQt includes #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqcombobox.h> @@ -374,7 +374,7 @@ void K3bVcdTrackDialog::prepareGui() /////////////////////////////////////////////////// // FILE-INFO BOX /////////////////////////////////////////////////// - TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); + TQGroupBox* groupFileInfo = new TQGroupBox( 0, TQt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); groupFileInfo->layout() ->setSpacing( 0 ); groupFileInfo->layout() ->setMargin( 0 ); @@ -449,7 +449,7 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// - TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); + TQGroupBox* groupOptions = new TQGroupBox( 3, TQt::Vertical, i18n( "Settings" ), w ); groupOptions->layout() ->setSpacing( spacingHint() ); groupOptions->layout() ->setMargin( marginHint() ); @@ -462,7 +462,7 @@ void K3bVcdTrackDialog::setupPbcTab() m_check_reactivity->setEnabled( false ); ////////////////////////////////////////////////////////////////////////////////////////// - m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); + m_groupPlay = new TQGroupBox( 0, TQt::Vertical, i18n( "Playing" ), w ); m_groupPlay->layout() ->setSpacing( spacingHint() ); m_groupPlay->layout() ->setMargin( marginHint() ); @@ -498,7 +498,7 @@ void K3bVcdTrackDialog::setupPbcTab() groupPlayLayout->addMultiCellWidget( m_comboAfterTimeout, 3, 3, 1, 3 ); ////////////////////////////////////////////////////////////////////////////////////////// - m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); + m_groupPbc = new TQGroupBox( 0, TQt::Vertical, i18n( "Key Pressed Interaction" ), w ); m_groupPbc->layout() ->setSpacing( spacingHint() ); m_groupPbc->layout() ->setMargin( marginHint() ); @@ -539,10 +539,10 @@ void K3bVcdTrackDialog::setupPbcTab() m_groupPlay->setEnabled( false ); m_groupPbc->setEnabled( false ); - connect( m_check_pbc, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPbcToggled( bool ) ) ); - connect( m_spin_times, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotPlayTimeChanged( int ) ) ); - connect( m_spin_waittime, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotWaitTimeChanged( int ) ) ); - connect( m_check_usekeys, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseKeysToggled( bool ) ) ); + connect( m_check_pbc, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPbcToggled( bool ) ) ); + connect( m_spin_times, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotPlayTimeChanged( int ) ) ); + connect( m_spin_waittime, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWaitTimeChanged( int ) ) ); + connect( m_check_usekeys, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseKeysToggled( bool ) ) ); } void K3bVcdTrackDialog::setupPbcKeyTab() @@ -557,7 +557,7 @@ void K3bVcdTrackDialog::setupPbcKeyTab() grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); + m_groupKey = new TQGroupBox( 3, TQt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); m_groupKey->setEnabled( false ); m_groupKey->layout() ->setSpacing( spacingHint() ); m_groupKey->layout() ->setMargin( marginHint() ); @@ -578,7 +578,7 @@ void K3bVcdTrackDialog::setupPbcKeyTab() m_mainTabbed->addTab( m_widgetnumkeys, i18n( "Numeric Keys" ) ); - connect( m_check_overwritekeys, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotGroupkeyToggled( bool ) ) ); + connect( m_check_overwritekeys, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotGroupkeyToggled( bool ) ) ); } diff --git a/src/projects/k3bvcdtrackdialog.h b/src/projects/k3bvcdtrackdialog.h index 70c015c..6e59832 100644 --- a/src/projects/k3bvcdtrackdialog.h +++ b/src/projects/k3bvcdtrackdialog.h @@ -36,7 +36,7 @@ class K3bCutComboBox; class K3bVcdTrackDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index 2df5c70..ac562b3 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// QT-includes +// TQt includes #include <tqlayout.h> #include <tqstring.h> @@ -45,8 +45,8 @@ K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, TQWidget* parent, const char *name ) setMainWidget( m_vcdlist ); fillStatusDisplay() ->showSize(); - connect( m_vcdlist, TQT_SIGNAL( lengthReady() ), fillStatusDisplay(), TQT_SLOT( update() ) ); - connect( m_doc, TQT_SIGNAL( newTracks() ), fillStatusDisplay(), TQT_SLOT( update() ) ); + connect( m_vcdlist, TQ_SIGNAL( lengthReady() ), fillStatusDisplay(), TQ_SLOT( update() ) ); + connect( m_doc, TQ_SIGNAL( newTracks() ), fillStatusDisplay(), TQ_SLOT( update() ) ); } K3bVcdView::~K3bVcdView() diff --git a/src/projects/k3bvcdview.h b/src/projects/k3bvcdview.h index 0dcbe87..39014ca 100644 --- a/src/projects/k3bvcdview.h +++ b/src/projects/k3bvcdview.h @@ -35,7 +35,7 @@ class K3bProjectBurnDialog; class K3bVcdView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h index 185c84b..008a930 100644 --- a/src/projects/k3bvideodvdburndialog.h +++ b/src/projects/k3bvideodvdburndialog.h @@ -27,7 +27,7 @@ class TQCheckBox; class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp index ae70fa0..2dd268c 100644 --- a/src/projects/k3bvideodvdview.cpp +++ b/src/projects/k3bvideodvdview.cpp @@ -44,7 +44,7 @@ K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *parent, const c m_dataDirTree->setFileView( m_dataFileView ); setMainWidget( mainSplitter ); - connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); + connect( m_dataFileView, TQ_SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, TQ_SLOT(setCurrentDir(K3bDirItem*)) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); diff --git a/src/projects/k3bvideodvdview.h b/src/projects/k3bvideodvdview.h index f4b8980..5dd330a 100644 --- a/src/projects/k3bvideodvdview.h +++ b/src/projects/k3bvideodvdview.h @@ -26,7 +26,7 @@ class K3bDataFileView; class K3bVideoDvdView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index df3384d..26caffa 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -57,10 +57,10 @@ K3bView::K3bView( K3bDoc* pDoc, TQWidget *parent, const char* name ) grid->setSpacing( 5 ); grid->setMargin( 2 ); - TDEAction* burnAction = new TDEAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), + TDEAction* burnAction = new TDEAction( i18n("&Burn"), "cdburn", CTRL + Key_B, this, TQ_SLOT(slotBurn()), actionCollection(), "project_burn"); burnAction->setToolTip( i18n("Open the burn dialog for the current project") ); - TDEAction* propAction = new TDEAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + TDEAction* propAction = new TDEAction( i18n("&Properties"), "edit", CTRL + Key_P, this, TQ_SLOT(slotProperties()), actionCollection(), "project_properties"); propAction->setToolTip( i18n("Open the properties dialog") ); @@ -139,8 +139,8 @@ void K3bView::addPluginButtons( int projectType ) pp->icon(), pp->toolTip(), pp->whatsThis(), - TQT_TQOBJECT(this), - TQT_SLOT(slotPluginButtonClicked()) ); + this, + TQ_SLOT(slotPluginButtonClicked()) ); m_plugins.insert( static_cast<void*>(button), pp ); } } @@ -149,7 +149,7 @@ void K3bView::addPluginButtons( int projectType ) void K3bView::slotPluginButtonClicked() { - TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + TQObject* o = const_cast<TQObject*>(sender()); if( K3bProjectPlugin* p = m_plugins[static_cast<void*>(o)] ) { if( p->hasGUI() ) { K3bProjectPluginDialog dlg( p, doc(), this ); diff --git a/src/projects/k3bview.h b/src/projects/k3bview.h index 7c9ab9a..a7c1ade 100644 --- a/src/projects/k3bview.h +++ b/src/projects/k3bview.h @@ -41,7 +41,7 @@ class K3bProjectPlugin; */ class K3bView : public TQWidget, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/kostore/koStore.cpp b/src/projects/kostore/koStore.cpp index 24fc737..c59ab0f 100644 --- a/src/projects/kostore/koStore.cpp +++ b/src/projects/kostore/koStore.cpp @@ -69,7 +69,7 @@ KoStore* KoStore::createStore( const TQString& fileName, Mode mode, const TQCStr { TQFile file( fileName ); if ( file.open( IO_ReadOnly ) ) - backend = determineBackend( TQT_TQIODEVICE(&file) ); + backend = determineBackend( &file ); else backend = DefaultFormat; // will create a "bad" store (bad()==true) } @@ -143,7 +143,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con TQFile file( tmpFile ); if ( file.open( IO_ReadOnly ) ) { - backend = determineBackend( TQT_TQIODEVICE(&file) ); + backend = determineBackend( &file ); file.close(); } } diff --git a/src/projects/kostore/koStoreDevice.h b/src/projects/kostore/koStoreDevice.h index df8cebf..2684cb6 100644 --- a/src/projects/kostore/koStoreDevice.h +++ b/src/projects/kostore/koStoreDevice.h @@ -46,16 +46,7 @@ public: void close() { } void flush() { } -#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 - -#ifdef USE_QT4 - qint64 size() const { -#else // USE_QT4 Offset size() const { -#endif // USE_QT4 if ( m_store->mode() == KoStore::Read ) return m_store->size(); else diff --git a/src/rip/k3baudiocdlistview.h b/src/rip/k3baudiocdlistview.h index bb7c7ea..7a546e1 100644 --- a/src/rip/k3baudiocdlistview.h +++ b/src/rip/k3baudiocdlistview.h @@ -26,7 +26,7 @@ class K3bAudioCdView; */ class K3bAudioCdListView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index abe5224..e9b1b34 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -119,21 +119,21 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name ) // ---------------------------------------------------------------------------------- m_trackView = new K3bAudioCdListView( this, mainWidget() ); - connect( m_trackView, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)) ); - connect( m_trackView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); -// connect( m_trackView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), -// this, TQT_SLOT(slotTrackSelectionChanged(TQListViewItem*)) ); + connect( m_trackView, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)) ); + connect( m_trackView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); +// connect( m_trackView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), +// this, TQ_SLOT(slotTrackSelectionChanged(TQListViewItem*)) ); mainGrid->addLayout( toolBoxLayout, 0, 0 ); mainGrid->addWidget( m_trackView, 1, 0 ); - m_cddb = new K3bCddb( TQT_TQOBJECT(this) ); + m_cddb = new K3bCddb( this ); - connect( m_cddb, TQT_SIGNAL(queryFinished(int)), - this, TQT_SLOT(slotCddbQueryFinished(int)) ); + connect( m_cddb, TQ_SIGNAL(queryFinished(int)), + this, TQ_SLOT(slotCddbQueryFinished(int)) ); initActions(); // slotTrackSelectionChanged(0); @@ -226,33 +226,33 @@ void K3bAudioCdView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCheckAll()), actionCollection(), + TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, this, + TQ_SLOT(slotCheckAll()), actionCollection(), "check_all" ); - TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUncheckAll()), actionCollection(), + TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, this, + TQ_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); - TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelect()), actionCollection(), + TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, this, + TQ_SLOT(slotSelect()), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotDeselect()), actionCollection(), + TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, this, + TQ_SLOT(slotDeselect()), actionCollection(), "deselect_track" ); - TDEAction* actionEditTrackCddbInfo = new TDEAction( i18n("Edit Track cddb Info"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditTrackCddb()), actionCollection(), + TDEAction* actionEditTrackCddbInfo = new TDEAction( i18n("Edit Track cddb Info"), "edit", 0, this, + TQ_SLOT(slotEditTrackCddb()), actionCollection(), "edit_track_cddb" ); - TDEAction* actionEditAlbumCddbInfo = new TDEAction( i18n("Edit Album cddb Info"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditAlbumCddb()), actionCollection(), + TDEAction* actionEditAlbumCddbInfo = new TDEAction( i18n("Edit Album cddb Info"), "edit", 0, this, + TQ_SLOT(slotEditAlbumCddb()), actionCollection(), "edit_album_cddb" ); - TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "cddarip", 0, TQT_TQOBJECT(this), - TQT_SLOT(startRip()), actionCollection(), "start_rip" ); + TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "cddarip", 0, this, + TQ_SLOT(startRip()), actionCollection(), "start_rip" ); - TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, TQT_TQOBJECT(this), - TQT_SLOT(queryCddb()), actionCollection(), "query_cddb" ); + TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, this, + TQ_SLOT(queryCddb()), actionCollection(), "query_cddb" ); - TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "document-save", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); + TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "document-save", 0, this, + TQ_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); // TODO: set the actions tooltips and whatsthis infos diff --git a/src/rip/k3baudiocdview.h b/src/rip/k3baudiocdview.h index b86135a..bdc45cf 100644 --- a/src/rip/k3baudiocdview.h +++ b/src/rip/k3baudiocdview.h @@ -43,7 +43,7 @@ namespace K3bDevice { class K3bAudioCdView : public K3bMediaContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp index 11f5146..1fa892b 100644 --- a/src/rip/k3baudioconvertingoptionwidget.cpp +++ b/src/rip/k3baudioconvertingoptionwidget.cpp @@ -82,18 +82,18 @@ K3bAudioConvertingOptionWidget::K3bAudioConvertingOptionWidget( TQWidget* parent { d = new Private(); - connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotUpdateFreeTempSpace()) ); - connect( m_comboFileType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEncoderChanged()) ); - connect( &d->freeSpaceUpdateTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateFreeTempSpace()) ); - connect( m_checkCreatePlaylist, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); - connect( m_checkSingleFile, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); - connect( m_checkWriteCueFile, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); - connect( m_comboFileType, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()) ); - connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(changed()) ); - connect( m_buttonConfigurePlugin, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigurePlugin()) ); + connect( m_editBaseDir, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_comboFileType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEncoderChanged()) ); + connect( &d->freeSpaceUpdateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_checkCreatePlaylist, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()) ); + connect( m_checkSingleFile, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()) ); + connect( m_checkWriteCueFile, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()) ); + connect( m_comboFileType, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()) ); + connect( m_editBaseDir, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(changed()) ); + connect( m_buttonConfigurePlugin, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigurePlugin()) ); m_editBaseDir->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); m_buttonConfigurePlugin->setIconSet( SmallIconSet( "gear" ) ); diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h index 4c702aa..8a6e886 100644 --- a/src/rip/k3baudioconvertingoptionwidget.h +++ b/src/rip/k3baudioconvertingoptionwidget.h @@ -30,7 +30,7 @@ class TDEConfigBase; */ class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index 748f6fc..24a6325 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -116,13 +116,13 @@ void K3bAudioProjectConvertingDialog::setupGui() // ------------------------------------------------------------------------------------------- m_patternWidget = new K3bCddbPatternWidget( mainTab ); mainTab->addTab( m_patternWidget, i18n("File Naming") ); - connect( m_patternWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); + connect( m_patternWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(refresh()) ); Form1Layout->addWidget( m_viewTracks, 0, 0 ); Form1Layout->addWidget( mainTab, 1, 0 ); Form1Layout->setRowStretch( 0, 1 ); - connect( m_optionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); + connect( m_optionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(refresh()) ); } @@ -175,7 +175,7 @@ void K3bAudioProjectConvertingDialog::slotStartClicked() int i = 0; K3bAudioTrack* track = m_doc->firstTrack(); while( track ) { - tracksToRip.append( tqMakePair( i+1, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); + tracksToRip.append( qMakePair( i+1, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); ++i; track = track->next(); } @@ -196,7 +196,7 @@ void K3bAudioProjectConvertingDialog::slotStartClicked() K3bJobProgressDialog progressDialog( parentWidget() ); - K3bThreadJob job( thread, &progressDialog, TQT_TQOBJECT(this) ); + K3bThreadJob job( thread, &progressDialog, this ); hide(); progressDialog.startJob(&job); diff --git a/src/rip/k3baudioprojectconvertingdialog.h b/src/rip/k3baudioprojectconvertingdialog.h index e04e5ca..fd37ae0 100644 --- a/src/rip/k3baudioprojectconvertingdialog.h +++ b/src/rip/k3baudioprojectconvertingdialog.h @@ -41,7 +41,7 @@ class K3bAudioDoc; */ class K3bAudioProjectConvertingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudioripjob.cpp b/src/rip/k3baudioripjob.cpp index eded9aa..81f4742 100644 --- a/src/rip/k3baudioripjob.cpp +++ b/src/rip/k3baudioripjob.cpp @@ -29,11 +29,11 @@ K3bAudioRipJob::K3bAudioRipJob( K3bJobHandler* hdl, TQObject* parent ) m_thread = new K3bAudioRipThread(); m_threadJob = new K3bThreadJob( m_thread, this, this ); connectSubJob( m_threadJob, - TQT_SLOT(slotRippingFinished(bool)), - TQT_SIGNAL(newTask(const TQString&)), - TQT_SIGNAL(newSubTask(const TQString&)), - TQT_SIGNAL(percent(int)), - TQT_SIGNAL(subPercent(int)) ); + TQ_SLOT(slotRippingFinished(bool)), + TQ_SIGNAL(newTask(const TQString&)), + TQ_SIGNAL(newSubTask(const TQString&)), + TQ_SIGNAL(percent(int)), + TQ_SIGNAL(subPercent(int)) ); } diff --git a/src/rip/k3baudioripjob.h b/src/rip/k3baudioripjob.h index df0182a..65d9d16 100644 --- a/src/rip/k3baudioripjob.h +++ b/src/rip/k3baudioripjob.h @@ -31,7 +31,7 @@ class K3bThreadJob; class K3bAudioRipJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index e3116ab..2826441 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -142,7 +142,7 @@ void K3bAudioRippingDialog::setupGui() // ------------------------------------------------------------------------------------------- m_patternWidget = new K3bCddbPatternWidget( mainTab ); mainTab->addTab( m_patternWidget, i18n("File Naming") ); - connect( m_patternWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); + connect( m_patternWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(refresh()) ); // setup advanced page @@ -176,8 +176,8 @@ void K3bAudioRippingDialog::setupGui() setStartButtonText( i18n( "Start Ripping" ), i18n( "Starts copying the selected tracks") ); - connect( m_checkUseIndex0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(refresh()) ); - connect( m_optionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); + connect( m_checkUseIndex0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(refresh()) ); + connect( m_optionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(refresh()) ); } @@ -250,14 +250,14 @@ void K3bAudioRippingDialog::slotStartClicked() unsigned int i = 0; for( TQValueList<int>::const_iterator trackIt = m_trackNumbers.begin(); trackIt != m_trackNumbers.end(); ++trackIt ) { - tracksToRip.append( tqMakePair( *trackIt, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); + tracksToRip.append( qMakePair( *trackIt, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); ++i; } K3bJobProgressDialog ripDialog( parentWidget(), "Ripping" ); K3bAudioEncoder* encoder = m_optionWidget->encoder(); - K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, TQT_TQOBJECT(this) ); + K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, this ); job->setDevice( m_device ); job->setCddbEntry( m_cddbEntry ); job->setTracksToRip( tracksToRip ); diff --git a/src/rip/k3baudiorippingdialog.h b/src/rip/k3baudiorippingdialog.h index 2a77d3f..c04e315 100644 --- a/src/rip/k3baudiorippingdialog.h +++ b/src/rip/k3baudiorippingdialog.h @@ -43,7 +43,7 @@ class K3bAudioConvertingOptionWidget; */ class K3bAudioRippingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp index cd04976..751b4fa 100644 --- a/src/rip/k3baudioripthread.cpp +++ b/src/rip/k3baudioripthread.cpp @@ -409,7 +409,7 @@ void K3bAudioRipThread::cancel() // wait for 1 second. I the thread still is working terminate it // and trigger the finished slot manually emitInfoMessage( i18n("Cancellation could take a while..."), K3bJob::INFO ); - TQTimer::singleShot( 1000, this, TQT_SLOT(slotCheckIfThreadStillRunning()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(slotCheckIfThreadStillRunning()) ); } diff --git a/src/rip/k3baudioripthread.h b/src/rip/k3baudioripthread.h index d9b0b1b..9b49fc3 100644 --- a/src/rip/k3baudioripthread.h +++ b/src/rip/k3baudioripthread.h @@ -34,7 +34,7 @@ namespace K3bDevice { class K3bAudioRipThread : public TQObject, public K3bThread { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index 2c8e533..04dfa0d 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -41,7 +41,7 @@ K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name ) // additional the filename can never contain a slash / // and the dir should never start with a slash since it should always be a relative path - TQRegExpValidator* dirValidator = new TQRegExpValidator( TQRegExp( "[^/][^?\\*\\\"]*" ), TQT_TQOBJECT(this) ); + TQRegExpValidator* dirValidator = new TQRegExpValidator( TQRegExp( "[^/][^?\\*\\\"]*" ), this ); m_comboFilenamePattern->setValidator( dirValidator ); m_comboPlaylistPattern->setValidator( dirValidator ); m_editBlankReplace->setValidator( dirValidator ); @@ -56,18 +56,18 @@ K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name ) m_comboPlaylistPattern->insertItem( i18n( "Playlist" ) ); m_comboPlaylistPattern->insertItem( i18n( "playlists/%{albumartist}/%{albumtitle }" ) ); - connect( m_comboFilenamePattern, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_comboPlaylistPattern, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_editBlankReplace, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_checkBlankReplace, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed()) ); - connect( m_specialStringsLabel, TQT_SIGNAL(leftClickedURL()), - this, TQT_SLOT(slotSeeSpecialStrings()) ); - connect( m_conditionalInclusionLabel, TQT_SIGNAL(leftClickedURL()), - this, TQT_SLOT(slotSeeConditionalInclusion()) ); + connect( m_comboFilenamePattern, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_comboPlaylistPattern, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_editBlankReplace, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_checkBlankReplace, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed()) ); + connect( m_specialStringsLabel, TQ_SIGNAL(leftClickedURL()), + this, TQ_SLOT(slotSeeSpecialStrings()) ); + connect( m_conditionalInclusionLabel, TQ_SIGNAL(leftClickedURL()), + this, TQ_SLOT(slotSeeConditionalInclusion()) ); } diff --git a/src/rip/k3bcddbpatternwidget.h b/src/rip/k3bcddbpatternwidget.h index 5c8dca5..956bfe7 100644 --- a/src/rip/k3bcddbpatternwidget.h +++ b/src/rip/k3bcddbpatternwidget.h @@ -24,7 +24,7 @@ class TDEConfigBase; class K3bCddbPatternWidget : public base_K3bCddbPatternWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index b996d1b..d37db1d 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -67,12 +67,12 @@ void K3bVideoCdInfo::info( const TQString& device ) *m_process << "-q" << "--norip" << "-i" << device << "-o" << "-"; - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotInfoFinished() ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotInfoFinished() ) ); if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdDebug() << "(K3bVideoCdInfo::info) could not start vcdxrip" << endl; diff --git a/src/rip/k3bvideocdinfo.h b/src/rip/k3bvideocdinfo.h index d6efd0a..70675e2 100644 --- a/src/rip/k3bvideocdinfo.h +++ b/src/rip/k3bvideocdinfo.h @@ -70,7 +70,7 @@ class K3bVideoCdInfoResult class K3bVideoCdInfo : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index 8a09301..06193af 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -150,12 +150,12 @@ void K3bVideoCdRip::vcdxRip() *m_process << "-o" << "/dev/null"; - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotVcdXRipFinished() ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotVcdXRipFinished() ) ); m_process->setWorkingDirectory( TQUrl( m_videooptions ->getVideoCdDestination() ).dirPath() ); diff --git a/src/rip/k3bvideocdrip.h b/src/rip/k3bvideocdrip.h index a6d4582..5c4b08d 100644 --- a/src/rip/k3bvideocdrip.h +++ b/src/rip/k3bvideocdrip.h @@ -26,7 +26,7 @@ class TQDataStream; class K3bVideoCdRip : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index 9eafedb..00f52f3 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -23,7 +23,7 @@ #include <tdemessagebox.h> #include <kstandarddirs.h> -// qt includes +// TQt includes #include <tqgroupbox.h> #include <tqcheckbox.h> #include <tqlabel.h> @@ -72,7 +72,7 @@ void K3bVideoCdRippingDialog::setupGui() MainLayout->setMargin( 0 ); // ---------------------------------------------------- Directory group --- - TQGroupBox* groupDirectory = new TQGroupBox( 0, Qt::Vertical, i18n( "Destination Directory" ), frame ); + TQGroupBox* groupDirectory = new TQGroupBox( 0, TQt::Vertical, i18n( "Destination Directory" ), frame ); groupDirectory->layout() ->setSpacing( KDialog::spacingHint() ); groupDirectory->layout() ->setMargin( KDialog::marginHint() ); @@ -105,7 +105,7 @@ void K3bVideoCdRippingDialog::setupGui() groupDirectoryLayout->addWidget( necessarySizeBox, 2, 1 ); // ---------------------------------------------------- Options group --- - TQGroupBox* groupOptions = new TQGroupBox( 4, Qt::Vertical, i18n( "Settings" ), frame ); + TQGroupBox* groupOptions = new TQGroupBox( 4, TQt::Vertical, i18n( "Settings" ), frame ); m_ignoreExt = new TQCheckBox( i18n( "Ignore /EXT/PSD_X.VCD" ), groupOptions ); @@ -124,7 +124,7 @@ void K3bVideoCdRippingDialog::setupGui() setStartButtonText( i18n( "Start Ripping" ), i18n( "Starts extracting the selected VideoCd tracks" ) ); // ---------------------------------------------------------------------------------- - connect( m_editDirectory, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateFreeSpace()) ); + connect( m_editDirectory, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUpdateFreeSpace()) ); m_labelNecessarySize ->setText( TDEIO::convertSize( m_videooptions ->getVideoCdSize() ) ); } @@ -211,7 +211,7 @@ void K3bVideoCdRippingDialog::slotFreeSpace(const TQString&, else m_labelNecessarySize->setPaletteForegroundColor( m_labelFreeSpace->paletteForegroundColor() ); - TQTimer::singleShot( 1000, this, TQT_SLOT(slotUpdateFreeSpace()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(slotUpdateFreeSpace()) ); } diff --git a/src/rip/k3bvideocdrippingdialog.h b/src/rip/k3bvideocdrippingdialog.h index 454f4c3..a51682a 100644 --- a/src/rip/k3bvideocdrippingdialog.h +++ b/src/rip/k3bvideocdrippingdialog.h @@ -34,7 +34,7 @@ class K3bTempDirSelectionWidget; class K3bVideoCdRippingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp index 52549e6..2e5595c 100644 --- a/src/rip/k3bvideocdview.cpp +++ b/src/rip/k3bvideocdview.cpp @@ -24,7 +24,7 @@ #include <kstandarddirs.h> #include <kstdaction.h> -// qt includes +// TQt includes #include <tqfont.h> #include <tqframe.h> #include <tqheader.h> @@ -173,14 +173,14 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name ) m_trackView->setItemsRenameable( false ); m_trackView->setRootIsDecorated( true ); - connect( m_trackView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - connect( m_trackView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotTrackSelectionChanged( TQListViewItem* ) ) ); - connect( m_trackView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( slotStateChanged( TQListViewItem* ) ) ); - connect( m_trackView, TQT_SIGNAL( spacePressed( TQListViewItem* ) ), - this, TQT_SLOT( slotStateChanged( TQListViewItem* ) ) ); + connect( m_trackView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_trackView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotTrackSelectionChanged( TQListViewItem* ) ) ); + connect( m_trackView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( slotStateChanged( TQListViewItem* ) ) ); + connect( m_trackView, TQ_SIGNAL( spacePressed( TQListViewItem* ) ), + this, TQ_SLOT( slotStateChanged( TQListViewItem* ) ) ); mainGrid->addLayout( toolBoxLayout, 0, 0 ); @@ -248,11 +248,11 @@ void K3bVideoCdView::reloadMedium() m_videooptions ->setVideoCdSource( device()->devicename() ); - m_videocdinfo = new K3bVideoCdInfo( TQT_TQOBJECT(this) ); + m_videocdinfo = new K3bVideoCdInfo( this ); m_videocdinfo->info( device()->devicename() ); - connect( m_videocdinfo, TQT_SIGNAL( infoFinished( bool ) ), - this, TQT_SLOT( slotVideoCdInfoFinished( bool ) ) ); + connect( m_videocdinfo, TQ_SIGNAL( infoFinished( bool ) ), + this, TQ_SLOT( slotVideoCdInfoFinished( bool ) ) ); } @@ -322,20 +322,20 @@ void K3bVideoCdView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), + TDEAction* actionSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), m_actionCollection, "select_all" ); - TDEAction* actionDeselectAll = KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( slotDeselectAll() ), + TDEAction* actionDeselectAll = KStdAction::deselect( this, TQ_SLOT( slotDeselectAll() ), m_actionCollection, "deselect_all" ); actionDeselectAll->setText( i18n( "Dese&lect All" ) ); - TDEAction* actionSelect = new TDEAction( i18n( "Select Track" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotSelect() ), actionCollection(), + TDEAction* actionSelect = new TDEAction( i18n( "Select Track" ), 0, 0, this, + TQ_SLOT( slotSelect() ), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n( "Deselect Track" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotDeselect() ), actionCollection(), + TDEAction* actionDeselect = new TDEAction( i18n( "Deselect Track" ), 0, 0, this, + TQ_SLOT( slotDeselect() ), actionCollection(), "deselect_track" ); - TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "system-run", 0, TQT_TQOBJECT(this), - TQT_SLOT( startRip() ), actionCollection(), "start_rip" ); + TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "system-run", 0, this, + TQ_SLOT( startRip() ), actionCollection(), "start_rip" ); // TODO: set the actions tooltips and whatsthis infos @@ -368,14 +368,6 @@ void K3bVideoCdView::slotTrackSelectionChanged( TQListViewItem* item ) void K3bVideoCdView::slotStateChanged( TQListViewItem* item ) { - /* > QT 3.1 - if ( !item == 0 && item ->isSelectable() ) { - if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == TQCheckListItem::On) - slotSelect(); - else if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == TQCheckListItem::Off) - slotDeselect(); - } - */ if ( !item == 0 && item ->isSelectable() ) { if ( ( ( VideoTrackViewCheckItem* ) item) ->isOn() ) slotSelect(); diff --git a/src/rip/k3bvideocdview.h b/src/rip/k3bvideocdview.h index 7e8a992..20e887f 100644 --- a/src/rip/k3bvideocdview.h +++ b/src/rip/k3bvideocdview.h @@ -45,7 +45,7 @@ namespace K3bDevice class K3bVideoCdView : public K3bMediaContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 1025f30..778b1af 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -163,12 +163,12 @@ K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& frameLayout->setAutoAdd( true ); m_w = new K3bVideoDVDRippingWidget( frame ); - connect( m_w, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateFilesizes()) ); - connect( m_w, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateFilenames()) ); - connect( m_w, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateVideoSizes()) ); + connect( m_w, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateFilesizes()) ); + connect( m_w, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateFilenames()) ); + connect( m_w, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateVideoSizes()) ); setTitle( i18n("Video DVD Ripping"), i18n("1 title from %1", "%n titles from %1", titles.count()) @@ -612,7 +612,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked() // start the job K3bJobProgressDialog dlg( parentWidget() ); - K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, TQT_TQOBJECT(&dlg) ); + K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg ); job->setVideoDVD( m_dvd ); job->setTitles( titles ); diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.h b/src/rip/videodvd/k3bvideodvdrippingdialog.h index 7180a2b..4606384 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.h +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.h @@ -29,7 +29,7 @@ class TQCheckListItem; class K3bVideoDVDRippingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp index b448fa0..cc0ee1c 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp @@ -89,11 +89,11 @@ K3bVideoDVDRippingJob::K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* pare m_transcodingJob = new K3bVideoDVDTitleTranscodingJob( this, this ); connectSubJob( m_transcodingJob, - TQT_SLOT(slotTranscodingJobFinished(bool)), - TQT_SIGNAL(newTask(const TQString&)), - TQT_SIGNAL(newSubTask(const TQString&)), - TQT_SLOT(slotTranscodingProgress(int)), - TQT_SIGNAL(subPercent(int)), + TQ_SLOT(slotTranscodingJobFinished(bool)), + TQ_SIGNAL(newTask(const TQString&)), + TQ_SIGNAL(newSubTask(const TQString&)), + TQ_SLOT(slotTranscodingProgress(int)), + TQ_SIGNAL(subPercent(int)), 0, 0 ); m_detectClippingJob = 0; @@ -234,11 +234,11 @@ void K3bVideoDVDRippingJob::startDetectClipping( int ripInfoIndex ) if( !m_detectClippingJob ) { m_detectClippingJob = new K3bVideoDVDTitleDetectClippingJob( this, this ); connectSubJob( m_detectClippingJob, - TQT_SLOT(slotDetectClippingJobFinished(bool)), - TQT_SIGNAL(newTask(const TQString&)), - TQT_SIGNAL(newSubTask(const TQString&)), - TQT_SLOT(slotDetectClippingProgress(int)), - TQT_SIGNAL(subPercent(int)), + TQ_SLOT(slotDetectClippingJobFinished(bool)), + TQ_SIGNAL(newTask(const TQString&)), + TQ_SIGNAL(newSubTask(const TQString&)), + TQ_SLOT(slotDetectClippingProgress(int)), + TQ_SIGNAL(subPercent(int)), 0, 0 ); } diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.h b/src/rip/videodvd/k3bvideodvdrippingjob.h index 171ae35..750b5e3 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.h +++ b/src/rip/videodvd/k3bvideodvdrippingjob.h @@ -31,7 +31,7 @@ class K3bVideoDVDTitleDetectClippingJob; */ class K3bVideoDVDRippingJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp index 2f2b38e..7aae321 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp @@ -85,8 +85,8 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv *m_process << "-Z" << "x200"; *m_process << "-o" << m_tempDir->name(); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotTranscodeFinished(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotTranscodeFinished(TDEProcess*)) ); if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout // something went wrong when starting the program // it "should" be the executable diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h index 92706dc..31ab15d 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.h +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h @@ -27,7 +27,7 @@ class TDEProcess; class K3bVideoDVDRippingPreview : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index b0106a3..6cb67e2 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -352,9 +352,9 @@ K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( TQWidget* pare m_toolTip = new TitleToolTip( this ); - m_previewGen = new K3bVideoDVDRippingPreview( TQT_TQOBJECT(this) ); - connect( m_previewGen, TQT_SIGNAL(previewDone(bool)), - this, TQT_SLOT(slotPreviewDone(bool)) ); + m_previewGen = new K3bVideoDVDRippingPreview( this ); + connect( m_previewGen, TQ_SIGNAL(previewDone(bool)), + this, TQ_SLOT(slotPreviewDone(bool)) ); } diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h index e144120..1d75f95 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h @@ -28,7 +28,7 @@ class TQHideEvent; class K3bVideoDVDRippingTitleListView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index c524fa6..83736d3 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -62,8 +62,8 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n // ---------------------------------------------------------------------------------- m_titleView = new K3bVideoDVDRippingTitleListView( mainWidget() ); - connect( m_titleView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_titleView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); // general layout // ---------------------------------------------------------------------------------- @@ -218,20 +218,20 @@ void K3bVideoDVDRippingView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCheckAll()), actionCollection(), + TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, this, + TQ_SLOT(slotCheckAll()), actionCollection(), "check_all" ); - TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUncheckAll()), actionCollection(), + TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, this, + TQ_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); - TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCheck()), actionCollection(), + TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, this, + TQ_SLOT(slotCheck()), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUncheck()), actionCollection(), + TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, this, + TQ_SLOT(slotUncheck()), actionCollection(), "deselect_track" ); - TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "gear", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); + TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "gear", 0, this, + TQ_SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") ); diff --git a/src/rip/videodvd/k3bvideodvdrippingview.h b/src/rip/videodvd/k3bvideodvdrippingview.h index a7820ca..7b5fe25 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.h +++ b/src/rip/videodvd/k3bvideodvdrippingview.h @@ -30,7 +30,7 @@ class TQListViewItem; class K3bVideoDVDRippingView : public K3bMediaContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 649ac7b..82e6c3a 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -118,32 +118,32 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent ) slotAudioCodecChanged( m_comboAudioCodec->selectedValue() ); - connect( m_comboAudioBitrate, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_spinVideoBitrate, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(changed()) ); - connect( m_checkBlankReplace, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed()) ); - connect( m_editBlankReplace, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_comboFilenamePattern, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - - connect( m_comboAudioCodec, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAudioCodecChanged(int)) ); - connect( m_specialStringsLabel, TQT_SIGNAL(leftClickedURL()), - this, TQT_SLOT(slotSeeSpecialStrings()) ); - connect( m_buttonCustomPictureSize, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCustomPictureSize()) ); - connect( m_comboVideoSize, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotVideoSizeChanged(int)) ); + connect( m_comboAudioBitrate, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_spinVideoBitrate, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(changed()) ); + connect( m_checkBlankReplace, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed()) ); + connect( m_editBlankReplace, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_comboFilenamePattern, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_editBaseDir, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + + connect( m_comboAudioCodec, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAudioCodecChanged(int)) ); + connect( m_specialStringsLabel, TQ_SIGNAL(leftClickedURL()), + this, TQ_SLOT(slotSeeSpecialStrings()) ); + connect( m_buttonCustomPictureSize, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCustomPictureSize()) ); + connect( m_comboVideoSize, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotVideoSizeChanged(int)) ); // refresh every 2 seconds m_freeSpaceUpdateTimer = new TQTimer( this ); - connect( m_freeSpaceUpdateTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_freeSpaceUpdateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateFreeTempSpace()) ); m_freeSpaceUpdateTimer->start(2000); slotUpdateFreeTempSpace(); } diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h index 812a5d8..101db33 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.h +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h @@ -29,7 +29,7 @@ class TQTimer; class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h index 114a4d9..3b32d59 100644 --- a/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h +++ b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h @@ -25,7 +25,7 @@ class TQStringList; class K3bProjectFilePlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/translations/desktop_files/eventsrc/it.po b/translations/desktop_files/eventsrc/it.po index 4eb5fde..e09bea6 100644 --- a/translations/desktop_files/eventsrc/it.po +++ b/translations/desktop_files/eventsrc/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-27 17:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-01-16 04:06+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/k3b-events/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "K3b" -msgstr "" +msgstr "K3b" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/eventsrc/nl.po b/translations/desktop_files/eventsrc/nl.po index 124184a..cd673f3 100644 --- a/translations/desktop_files/eventsrc/nl.po +++ b/translations/desktop_files/eventsrc/nl.po @@ -1,52 +1,53 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <vistausss@outlook.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-27 17:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-04-09 19:15+0000\n" +"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"applications/k3b-events/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.16.1\n" #. Comment #: eventsrc:3 msgid "K3b" -msgstr "" +msgstr "K3b" #. Name #: eventsrc:6 msgid "Process successful" -msgstr "Proces was succesvol" +msgstr "Proces afgerond" #. Comment #: eventsrc:7 msgid "Process successfully finished" -msgstr "Proces met succes voltooid" +msgstr "Het proces is afgerond" #. Name #: eventsrc:13 msgid "Process error" -msgstr "Procesfout" +msgstr "Foutmelding" #. Comment #: eventsrc:14 msgid "Process finished with errors" -msgstr "Proces voltooid met fouten" +msgstr "Het proces is afgerond, maar met foutmeldingen" #. Name #: eventsrc:19 msgid "Waiting for medium" -msgstr "Wacht op medium" +msgstr "Bezig met wachten op medium…" #. Comment #: eventsrc:20 msgid "The user needs to insert a medium" -msgstr "De gebruiker dient een medium in te voeren" +msgstr "Voer een medium in" diff --git a/translations/desktop_files/eventsrc/pt.po b/translations/desktop_files/eventsrc/pt.po index 6aa30cb..a4a9af1 100644 --- a/translations/desktop_files/eventsrc/pt.po +++ b/translations/desktop_files/eventsrc/pt.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Hugo Carvalho <hugokarvalho@hotmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-27 17:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-05-10 15:15+0000\n" +"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n" +"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/k3b-events/pt/>\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "K3b" -msgstr "" +msgstr "K3b" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/eventsrc/ru.po b/translations/desktop_files/eventsrc/ru.po index 64d2929..82195fc 100644 --- a/translations/desktop_files/eventsrc/ru.po +++ b/translations/desktop_files/eventsrc/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-27 17:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-01 10:13+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/k3b-events/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "K3b" -msgstr "" +msgstr "K3b" #. Name #: eventsrc:6 @@ -34,7 +36,7 @@ msgstr "Процесс завершён успешно" #. Name #: eventsrc:13 msgid "Process error" -msgstr "Ошибка" +msgstr "Ошибка при выполнении процесса" #. Comment #: eventsrc:14 diff --git a/translations/desktop_files/eventsrc/uk.po b/translations/desktop_files/eventsrc/uk.po index 7728b91..8b1629e 100644 --- a/translations/desktop_files/eventsrc/uk.po +++ b/translations/desktop_files/eventsrc/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-27 17:13+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-04-02 21:50+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/k3b-events/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.16.1\n" #. Comment #: eventsrc:3 msgid "K3b" -msgstr "" +msgstr "K3b" #. Name #: eventsrc:6 diff --git a/translations/desktop_files/it.po b/translations/desktop_files/it.po index 5028501..12ee95f 100644 --- a/translations/desktop_files/it.po +++ b/translations/desktop_files/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-31 18:33+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-01-22 07:06+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/k3b-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: src/k3b-cue.desktop:2 src/k3b.desktop:2 msgid "K3b" -msgstr "" +msgstr "K3b" #. GenericName #: src/k3b.desktop:4 @@ -92,172 +93,177 @@ msgstr "Progetto K3b" #. Comment #: src/pics/73lab/k3b.theme:4 msgid "Ayo's original K3b theme" -msgstr "" +msgstr "Il tema K3b originale di Ayo" #. Comment #: src/pics/RobsTheme/k3b.theme:4 msgid "A semitransparent theme that uses your system colors. " -msgstr "" +msgstr "Un tema semitrasparente che utilizza i colori del tuo sistema. " #. Comment #: src/pics/crystal/k3b.theme:4 msgid "The cool crystal theme" -msgstr "" +msgstr "Il fantastico tema Cristallo" #. Comment #: src/pics/quant/k3b.theme:4 msgid "New official theme for K3b. Enjoy! " -msgstr "" +msgstr "Nuovo tema ufficiale per K3b. Goditelo! " #. Name #: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:2 msgid "K3b Alsa Audio Output Plugin" -msgstr "" +msgstr "Plug-in di uscita per audio Alsa K3b" #. Comment #: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:3 msgid "Audio Output plugin which plays through alsa" -msgstr "" +msgstr "Plugin di uscita audio che riproduce tramite alsa" #. Name #: plugins/audiooutput/arts/k3bartsoutputplugin.plugin:2 msgid "K3b Arts Audio Output Plugin" -msgstr "" +msgstr "Plug-in di uscita audio Arts K3b" #. Comment #: plugins/audiooutput/arts/k3bartsoutputplugin.plugin:3 msgid "Audio Output plugin which plays through arts" -msgstr "" +msgstr "Plugin di uscita audio che riproduce attraverso arts" #. Name #: plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin:2 msgid "K3b FFMpeg Decoder" -msgstr "" +msgstr "Decodificatore K3b FFMpeg" #. Comment #: plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin:3 msgid "Decoding module to decode wma files" -msgstr "" +msgstr "Modulo di decodifica per decodificare i file wma" #. Name #: plugins/decoder/flac/k3bflacdecoder.plugin:2 msgid "K3b FLAC Decoder" -msgstr "" +msgstr "Decodificatore FLAC K3b" #. Comment #: plugins/decoder/flac/k3bflacdecoder.plugin:3 msgid "Decoding module to decode FLAC files" -msgstr "" +msgstr "Modulo di decodifica per decodificare i file FLAC" #. Name #: plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin:2 msgid "K3b Libsndfile Decoder" -msgstr "" +msgstr "Decodificatore K3b Libsndfile" #. Comment #: plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin:3 msgid "Decoding module to decode audio files supported by libsndfile" msgstr "" +"Modulo di decodifica per decodificare file audio supportati da libsndfile" #. Name #: plugins/decoder/mp3/k3bmaddecoder.plugin:2 msgid "K3b MAD Decoder" -msgstr "" +msgstr "Decodificatore K3b MAD" #. Comment #: plugins/decoder/mp3/k3bmaddecoder.plugin:3 msgid "Decoding module to decode MPEG 1 Layer III files" -msgstr "" +msgstr "Modulo di decodifica per decodificare file MPEG 1 Layer III" #. Name #: plugins/decoder/musepack/k3bmpcdecoder.plugin:2 msgid "K3b Musepack Decoder" -msgstr "" +msgstr "Decodificatore K3b Musepack" #. Comment #: plugins/decoder/musepack/k3bmpcdecoder.plugin:3 msgid "Decoding module to decode Musepack audio files" -msgstr "" +msgstr "Modulo di decodifica per decodificare i file audio Musepack" #. Name #: plugins/decoder/ogg/k3boggvorbisdecoder.plugin:2 msgid "K3b Ogg Vorbis Decoder" -msgstr "" +msgstr "Decodificatore K3b Ogg Vorbis" #. Comment #: plugins/decoder/ogg/k3boggvorbisdecoder.plugin:3 msgid "Decoding module to decode Ogg Vorbis files" -msgstr "" +msgstr "Modulo di decodifica per decodificare file Ogg Vorbis" #. Name #: plugins/decoder/wave/k3bwavedecoder.plugin:2 msgid "K3b Wave Decoder" -msgstr "" +msgstr "Decodificatore d'onda K3b" #. Comment #: plugins/decoder/wave/k3bwavedecoder.plugin:3 msgid "Decoding module to decode wave files" -msgstr "" +msgstr "Modulo di decodifica per decodificare file wave" #. Name #: plugins/encoder/external/k3bexternalencoder.plugin:2 msgid "K3b External Audio Encoder" -msgstr "" +msgstr "Codificatore audio esterno K3b" #. Comment #: plugins/encoder/external/k3bexternalencoder.plugin:3 msgid "Encoding module that allows specifying an encoding commmand" -msgstr "" +msgstr "Modulo di codifica che consente di specificare un comando di codifica" #. Name #: plugins/encoder/lame/k3blameencoder.plugin:2 msgid "K3b Lame Mp3 Encoder" -msgstr "" +msgstr "Codificatore Mp3 K3b Lame" #. Comment #: plugins/encoder/lame/k3blameencoder.plugin:3 msgid "Encoding module to encode MPEG1 Layer III (mp3) files" -msgstr "" +msgstr "Modulo di codifica per codificare file MPEG1 Layer III (mp3)" #. Name #: plugins/encoder/ogg/k3boggvorbisencoder.plugin:2 msgid "K3b Ogg Vorbis Encoder" -msgstr "" +msgstr "Codificatore K3b Ogg Vorbis" #. Comment #: plugins/encoder/ogg/k3boggvorbisencoder.plugin:3 msgid "Encoding module to encode Ogg Vorbis files" -msgstr "" +msgstr "Modulo di codifica per codificare file Ogg Vorbis" #. Name #: plugins/encoder/sox/k3bsoxencoder.plugin:2 msgid "K3b SoX Audio Encoder" -msgstr "" +msgstr "Codificatore audio K3b SoX" #. Comment #: plugins/encoder/sox/k3bsoxencoder.plugin:3 msgid "Encoding module to encode many file formats using SoX" msgstr "" +"Modulo di codifica per codificare molti formati di file utilizzando SoX" #. Name #: plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.plugin:2 msgid "K3b Audio Metainfo Renamer" -msgstr "" +msgstr "Rinominatore metainfo audio K3b" #. Comment #: plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.plugin:3 msgid "Plugin to rename audio files in a data project based on the meta info." msgstr "" +"Plugin per rinominare i file audio in un progetto di dati basato sulle meta " +"informazioni." #. Name #: plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.plugin:2 msgid "K3b Cddb Audio Plugin" -msgstr "" +msgstr "Plug-in audio K3b CDDB" #. Comment #: plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.plugin:3 msgid "Plugin to query a cddb server for information about an audio project." msgstr "" +"Plugin per interrogare un server cddb per informazioni su un progetto audio." #. Name #: tdefile-plugins/k3bproject/tdefile_k3b.desktop:2 @@ -297,4 +303,4 @@ msgstr "" #. Keywords #: k3bsetup/k3bsetup2.desktop:8 msgid "K3bSetup2;k3bsetup2;" -msgstr "" +msgstr "K3bSetup2;k3bsetup2;" diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po index 93de49e..6bb900a 100644 --- a/translations/desktop_files/ru.po +++ b/translations/desktop_files/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-31 18:33+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-11-26 14:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/k3b-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: src/k3b-cue.desktop:2 src/k3b.desktop:2 msgid "K3b" -msgstr "" +msgstr "K3b" #. GenericName #: src/k3b.desktop:4 @@ -33,9 +35,8 @@ msgstr "Программа записи на CD" #. Name #: src/konqi/k3b_audiocd_rip.desktop:7 -#, fuzzy msgid "Extract Digital Audio with K3b" -msgstr "Записать аудио компакт-диск, используя K3b..." +msgstr "Извлечь цифровое аудио через K3b" #. Name #: src/konqi/k3b_cd_copy.desktop:7 @@ -72,9 +73,8 @@ msgstr "Копировать DVD/BLURAY, используя K3b..." #. Name #: src/konqi/k3b_videodvd_rip.desktop:7 -#, fuzzy msgid "Rip Video DVD/BLURAY Titles with K3b" -msgstr "Копировать DVD/BLURAY, используя K3b..." +msgstr "Вытянуть заголовки видео DVD/BLURAY через K3b" #. Name #: src/konqi/k3b_write_bin_image.desktop:6 @@ -94,172 +94,174 @@ msgstr "Проект K3b" #. Comment #: src/pics/73lab/k3b.theme:4 msgid "Ayo's original K3b theme" -msgstr "" +msgstr "Оригинальная тема Айо для K3b" #. Comment #: src/pics/RobsTheme/k3b.theme:4 msgid "A semitransparent theme that uses your system colors. " -msgstr "" +msgstr "Полупрозрачная тема с использованием системных цветов. " #. Comment #: src/pics/crystal/k3b.theme:4 msgid "The cool crystal theme" -msgstr "" +msgstr "Прохладная хрустальная тема" #. Comment #: src/pics/quant/k3b.theme:4 msgid "New official theme for K3b. Enjoy! " -msgstr "" +msgstr "Новая официальная тема для K3b. Наслаждайтесь! " #. Name #: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:2 msgid "K3b Alsa Audio Output Plugin" -msgstr "" +msgstr "Модуль вывода аудио через ALSA для K3b" #. Comment #: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:3 msgid "Audio Output plugin which plays through alsa" -msgstr "" +msgstr "Модуль вывода аудио для воспроизведения через ALSA" #. Name #: plugins/audiooutput/arts/k3bartsoutputplugin.plugin:2 msgid "K3b Arts Audio Output Plugin" -msgstr "" +msgstr "Модуль вывода аудио через Arts для K3b" #. Comment #: plugins/audiooutput/arts/k3bartsoutputplugin.plugin:3 msgid "Audio Output plugin which plays through arts" -msgstr "" +msgstr "Модуль вывода аудио для воспроизведения через Arts" #. Name #: plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin:2 msgid "K3b FFMpeg Decoder" -msgstr "" +msgstr "Декодер FFMpeg для K3b" #. Comment #: plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin:3 msgid "Decoding module to decode wma files" -msgstr "" +msgstr "Модуль декодирования файлов WMA" #. Name #: plugins/decoder/flac/k3bflacdecoder.plugin:2 msgid "K3b FLAC Decoder" -msgstr "" +msgstr "Декордер FLAC для K3b" #. Comment #: plugins/decoder/flac/k3bflacdecoder.plugin:3 msgid "Decoding module to decode FLAC files" -msgstr "" +msgstr "Модуль декодирования файлов FLAC" #. Name #: plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin:2 msgid "K3b Libsndfile Decoder" -msgstr "" +msgstr "Декордер Libsndfile для K3b" #. Comment #: plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin:3 msgid "Decoding module to decode audio files supported by libsndfile" -msgstr "" +msgstr "Модуль декодирования файлов аудио, поддерживаемых libsndfile" #. Name #: plugins/decoder/mp3/k3bmaddecoder.plugin:2 msgid "K3b MAD Decoder" -msgstr "" +msgstr "Декордер MAD для K3b" #. Comment #: plugins/decoder/mp3/k3bmaddecoder.plugin:3 msgid "Decoding module to decode MPEG 1 Layer III files" -msgstr "" +msgstr "Модуль декодирования файлов MPEG 1 Layer III" #. Name #: plugins/decoder/musepack/k3bmpcdecoder.plugin:2 msgid "K3b Musepack Decoder" -msgstr "" +msgstr "Декодер Musepack для K3b" #. Comment #: plugins/decoder/musepack/k3bmpcdecoder.plugin:3 msgid "Decoding module to decode Musepack audio files" -msgstr "" +msgstr "Модуль декодирования аудиофайлов Musepack" #. Name #: plugins/decoder/ogg/k3boggvorbisdecoder.plugin:2 msgid "K3b Ogg Vorbis Decoder" -msgstr "" +msgstr "Декодер Ogg Vorbis для K3b" #. Comment #: plugins/decoder/ogg/k3boggvorbisdecoder.plugin:3 msgid "Decoding module to decode Ogg Vorbis files" -msgstr "" +msgstr "Модуль декодирования файлов Ogg Vorbis" #. Name #: plugins/decoder/wave/k3bwavedecoder.plugin:2 msgid "K3b Wave Decoder" -msgstr "" +msgstr "Декордер Wave для K3b" #. Comment #: plugins/decoder/wave/k3bwavedecoder.plugin:3 msgid "Decoding module to decode wave files" -msgstr "" +msgstr "Модуль декодирования файлов Wave" #. Name #: plugins/encoder/external/k3bexternalencoder.plugin:2 msgid "K3b External Audio Encoder" -msgstr "" +msgstr "Внешний кодировщик аудио K3b" #. Comment #: plugins/encoder/external/k3bexternalencoder.plugin:3 msgid "Encoding module that allows specifying an encoding commmand" -msgstr "" +msgstr "Модуль кодирования, позволяющий задавать команду для кодировщика" #. Name #: plugins/encoder/lame/k3blameencoder.plugin:2 msgid "K3b Lame Mp3 Encoder" -msgstr "" +msgstr "Кодировщик Lame Mp3 для K3b" #. Comment #: plugins/encoder/lame/k3blameencoder.plugin:3 msgid "Encoding module to encode MPEG1 Layer III (mp3) files" -msgstr "" +msgstr "Модуль кодирования файлов MPEG 1 Layer III (mp3)" #. Name #: plugins/encoder/ogg/k3boggvorbisencoder.plugin:2 msgid "K3b Ogg Vorbis Encoder" -msgstr "" +msgstr "Кодировщик Ogg Vorbis для K3b" #. Comment #: plugins/encoder/ogg/k3boggvorbisencoder.plugin:3 msgid "Encoding module to encode Ogg Vorbis files" -msgstr "" +msgstr "Модуль кодирования файлов Ogg Vorbis" #. Name #: plugins/encoder/sox/k3bsoxencoder.plugin:2 msgid "K3b SoX Audio Encoder" -msgstr "" +msgstr "Кодировщик аудио SoX для K3b" #. Comment #: plugins/encoder/sox/k3bsoxencoder.plugin:3 msgid "Encoding module to encode many file formats using SoX" -msgstr "" +msgstr "Модуль кодирования множества форматов файлов через SoX" #. Name #: plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.plugin:2 msgid "K3b Audio Metainfo Renamer" -msgstr "" +msgstr "Переименователь метаданных аудио K3b" #. Comment #: plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.plugin:3 msgid "Plugin to rename audio files in a data project based on the meta info." msgstr "" +"Плагин для переименования аудиофайлов в проекте данных на основе " +"метаинформации." #. Name #: plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.plugin:2 msgid "K3b Cddb Audio Plugin" -msgstr "" +msgstr "Плагин аудио Cddb для K3b" #. Comment #: plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.plugin:3 msgid "Plugin to query a cddb server for information about an audio project." -msgstr "" +msgstr "Плагин для запроса информации об аудиопроекте с сервера CDDB." #. Name #: tdefile-plugins/k3bproject/tdefile_k3b.desktop:2 @@ -269,7 +271,7 @@ msgstr "Свдения о проекте K3b" #. Name #: tdeioslaves/videodvd/videodvd.desktop:2 msgid "Video DVD Browser" -msgstr "" +msgstr "Навигатор DVD-видео" #. Description #: tdeioslaves/videodvd/videodvd.protocol:2 @@ -281,7 +283,7 @@ msgstr "Позволяет копировать файлы с Video DVD (с де #. Name #: k3bsetup/k3bsetup2.desktop:2 msgid "K3bSetup" -msgstr "" +msgstr "K3bSetup" #. GenericName #: k3bsetup/k3bsetup2.desktop:4 @@ -296,4 +298,4 @@ msgstr "K3bSetup 2 - настроить права для записи при п #. Keywords #: k3bsetup/k3bsetup2.desktop:8 msgid "K3bSetup2;k3bsetup2;" -msgstr "" +msgstr "K3bSetup2;k3bsetup2;" diff --git a/translations/desktop_files/uk.po b/translations/desktop_files/uk.po index 1b58a0a..045ba76 100644 --- a/translations/desktop_files/uk.po +++ b/translations/desktop_files/uk.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Roman Savochenko <roman@oscada.org>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-31 18:33+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-10-22 16:59+0000\n" +"Last-Translator: Roman Savochenko <roman@oscada.org>\n" +"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/k3b-desktop-files/uk/>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: src/k3b-cue.desktop:2 src/k3b.desktop:2 msgid "K3b" -msgstr "" +msgstr "K3b" #. GenericName #: src/k3b.desktop:4 @@ -92,172 +94,174 @@ msgstr "Проект K3b" #. Comment #: src/pics/73lab/k3b.theme:4 msgid "Ayo's original K3b theme" -msgstr "" +msgstr "Оригінальна K3b тема Айо" #. Comment #: src/pics/RobsTheme/k3b.theme:4 msgid "A semitransparent theme that uses your system colors. " -msgstr "" +msgstr "Напівпрозора тема із використанням системних кольорів. " #. Comment #: src/pics/crystal/k3b.theme:4 msgid "The cool crystal theme" -msgstr "" +msgstr "Чудова кришталева тема" #. Comment #: src/pics/quant/k3b.theme:4 msgid "New official theme for K3b. Enjoy! " -msgstr "" +msgstr "Нова офіційна тема для K3b. Насолоджуйтеся! " #. Name #: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:2 msgid "K3b Alsa Audio Output Plugin" -msgstr "" +msgstr "K3b Alsa Втулок Аудіо Виводу" #. Comment #: plugins/audiooutput/alsa/k3balsaoutputplugin.plugin:3 msgid "Audio Output plugin which plays through alsa" -msgstr "" +msgstr "Втулок Аудіо Виводу із програвання через alsa" #. Name #: plugins/audiooutput/arts/k3bartsoutputplugin.plugin:2 msgid "K3b Arts Audio Output Plugin" -msgstr "" +msgstr "K3b Arts Втулок Аудіо Виводу" #. Comment #: plugins/audiooutput/arts/k3bartsoutputplugin.plugin:3 msgid "Audio Output plugin which plays through arts" -msgstr "" +msgstr "Втулок Аудіо Виводу із програвання через arts" #. Name #: plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin:2 msgid "K3b FFMpeg Decoder" -msgstr "" +msgstr "K3b FFMpeg Декодер" #. Comment #: plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin:3 msgid "Decoding module to decode wma files" -msgstr "" +msgstr "Модуль декодування wma файлів" #. Name #: plugins/decoder/flac/k3bflacdecoder.plugin:2 msgid "K3b FLAC Decoder" -msgstr "" +msgstr "K3b FLAC Декодер" #. Comment #: plugins/decoder/flac/k3bflacdecoder.plugin:3 msgid "Decoding module to decode FLAC files" -msgstr "" +msgstr "Модуль декодування FLAC файлів" #. Name #: plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin:2 msgid "K3b Libsndfile Decoder" -msgstr "" +msgstr "K3b Libsndfile Декодер" #. Comment #: plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin:3 msgid "Decoding module to decode audio files supported by libsndfile" -msgstr "" +msgstr "Модуль декодування аудіо файлів підтримуваних libsndfile" #. Name #: plugins/decoder/mp3/k3bmaddecoder.plugin:2 msgid "K3b MAD Decoder" -msgstr "" +msgstr "K3b MAD Декодер" #. Comment #: plugins/decoder/mp3/k3bmaddecoder.plugin:3 msgid "Decoding module to decode MPEG 1 Layer III files" -msgstr "" +msgstr "Модуль декодування файлів MPEG 1 Рівня III" #. Name #: plugins/decoder/musepack/k3bmpcdecoder.plugin:2 msgid "K3b Musepack Decoder" -msgstr "" +msgstr "K3b Musepack Декодер" #. Comment #: plugins/decoder/musepack/k3bmpcdecoder.plugin:3 msgid "Decoding module to decode Musepack audio files" -msgstr "" +msgstr "Модуль декодування Musepack аудіофайлів" #. Name #: plugins/decoder/ogg/k3boggvorbisdecoder.plugin:2 msgid "K3b Ogg Vorbis Decoder" -msgstr "" +msgstr "K3b Ogg Vorbis Декодер" #. Comment #: plugins/decoder/ogg/k3boggvorbisdecoder.plugin:3 msgid "Decoding module to decode Ogg Vorbis files" -msgstr "" +msgstr "Модуль декодування Ogg Vorbis файлів" #. Name #: plugins/decoder/wave/k3bwavedecoder.plugin:2 msgid "K3b Wave Decoder" -msgstr "" +msgstr "K3b Wave Декодер" #. Comment #: plugins/decoder/wave/k3bwavedecoder.plugin:3 msgid "Decoding module to decode wave files" -msgstr "" +msgstr "Модуль декодування wave файлів" #. Name #: plugins/encoder/external/k3bexternalencoder.plugin:2 msgid "K3b External Audio Encoder" -msgstr "" +msgstr "K3b Зовнішній Кодувальник Аудіо" #. Comment #: plugins/encoder/external/k3bexternalencoder.plugin:3 msgid "Encoding module that allows specifying an encoding commmand" -msgstr "" +msgstr "Модуль кодування, що дозволяє визначати команди кодування" #. Name #: plugins/encoder/lame/k3blameencoder.plugin:2 msgid "K3b Lame Mp3 Encoder" -msgstr "" +msgstr "K3b Кодувальник Lame Mp3" #. Comment #: plugins/encoder/lame/k3blameencoder.plugin:3 msgid "Encoding module to encode MPEG1 Layer III (mp3) files" -msgstr "" +msgstr "Модуль кодування файлів MPEG1 Рівень III (mp3)" #. Name #: plugins/encoder/ogg/k3boggvorbisencoder.plugin:2 msgid "K3b Ogg Vorbis Encoder" -msgstr "" +msgstr "K3b Кодувальник Ogg Vorbis" #. Comment #: plugins/encoder/ogg/k3boggvorbisencoder.plugin:3 msgid "Encoding module to encode Ogg Vorbis files" -msgstr "" +msgstr "Модуль кодування файлів Ogg Vorbis" #. Name #: plugins/encoder/sox/k3bsoxencoder.plugin:2 msgid "K3b SoX Audio Encoder" -msgstr "" +msgstr "K3b Кодувальник Аудіо SoX" #. Comment #: plugins/encoder/sox/k3bsoxencoder.plugin:3 msgid "Encoding module to encode many file formats using SoX" -msgstr "" +msgstr "Модуль кодування багатьох форматів файлів використовуючи SoX" #. Name #: plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.plugin:2 msgid "K3b Audio Metainfo Renamer" -msgstr "" +msgstr "K3b Перейменовувач Метаінформації Аудіо" #. Comment #: plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.plugin:3 msgid "Plugin to rename audio files in a data project based on the meta info." msgstr "" +"Втулок перейменування аудіофайлів у даних проєкту, які засновано на " +"метаінформації." #. Name #: plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.plugin:2 msgid "K3b Cddb Audio Plugin" -msgstr "" +msgstr "K3b Втулок Аудіо Cddb" #. Comment #: plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.plugin:3 msgid "Plugin to query a cddb server for information about an audio project." -msgstr "" +msgstr "Втулок запиту cddb серверу щодо інформації про аудіопроєкт." #. Name #: tdefile-plugins/k3bproject/tdefile_k3b.desktop:2 @@ -281,7 +285,7 @@ msgstr "" #. Name #: k3bsetup/k3bsetup2.desktop:2 msgid "K3bSetup" -msgstr "" +msgstr "K3bSetup" #. GenericName #: k3bsetup/k3bsetup2.desktop:4 @@ -296,4 +300,4 @@ msgstr "K3bSetup 2 - зміна прав доступу для запису КД #. Keywords #: k3bsetup/k3bsetup2.desktop:8 msgid "K3bSetup2;k3bsetup2;" -msgstr "" +msgstr "K3bSetup2;k3bsetup2;" |