From d8cc8bdfa7fa624a526d5aa1626974e1444cb799 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 27 May 2011 19:21:21 +0000 Subject: TQt4 port k3b This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libk3b/projects/movixdvd/k3bmovixdvddoc.cpp | 8 ++--- libk3b/projects/movixdvd/k3bmovixdvddoc.h | 7 +++-- libk3b/projects/movixdvd/k3bmovixdvdjob.cpp | 46 ++++++++++++++--------------- libk3b/projects/movixdvd/k3bmovixdvdjob.h | 7 +++-- 4 files changed, 35 insertions(+), 33 deletions(-) (limited to 'libk3b/projects/movixdvd') diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp index 80b8ec2..d05c75a 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp @@ -19,8 +19,8 @@ #include -K3bMovixDvdDoc::K3bMovixDvdDoc( QObject* parent ) - : K3bMovixDoc( parent ) +K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* tqparent ) + : K3bMovixDoc( tqparent ) { } @@ -28,9 +28,9 @@ K3bMovixDvdDoc::~K3bMovixDvdDoc() { } -K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bMovixDvdJob( this, hdl, parent ); + return new K3bMovixDvdJob( this, hdl, tqparent ); } #include "k3bmovixdvddoc.moc" diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.h b/libk3b/projects/movixdvd/k3bmovixdvddoc.h index 85943f0..cd19cc8 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.h +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.h @@ -24,17 +24,18 @@ class KConfig; class LIBK3B_EXPORT K3bMovixDvdDoc : public K3bMovixDoc { Q_OBJECT + TQ_OBJECT public: - K3bMovixDvdDoc( QObject* parent = 0 ); + K3bMovixDvdDoc( TQObject* tqparent = 0 ); ~K3bMovixDvdDoc(); int type() const { return MOVIX_DVD; } - K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent ); + K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); protected: - QString typeString() const { return "movixdvd"; } + TQString typeString() const { return "movixdvd"; } }; #endif diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp index b556997..d97f42a 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp @@ -27,33 +27,33 @@ #include -K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, QObject* parent ) - : K3bBurnJob( jh, parent ), +K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) + : K3bBurnJob( jh, tqparent ), m_doc(doc) { m_dvdJob = new K3bDvdJob( doc, this, this ); m_movixDocPreparer = new K3bMovixDocPreparer( doc, this, this ); // pipe signals - connect( m_dvdJob, SIGNAL(percent(int)), this, SIGNAL(percent(int)) ); - connect( m_dvdJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_dvdJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_dvdJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_dvdJob, SIGNAL(bufferStatus(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_dvdJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_dvdJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_dvdJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_dvdJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( m_dvdJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_dvdJob, SIGNAL(burning(bool)), this, SIGNAL(burning(bool)) ); + 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(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(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)) ); // we need to clean up here - connect( m_dvdJob, SIGNAL(finished(bool)), this, SLOT(slotDvdJobFinished(bool)) ); + connect( m_dvdJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDvdJobFinished(bool)) ); - connect( m_movixDocPreparer, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); + connect( m_movixDocPreparer, TQT_SIGNAL(infoMessage(const TQString&, int)), + this, TQT_SIGNAL(infoMessage(const TQString&, int)) ); } @@ -109,23 +109,23 @@ void K3bMovixDvdJob::slotDvdJobFinished( bool success ) } -QString K3bMovixDvdJob::jobDescription() const +TQString K3bMovixDvdJob::jobDescription() const { if( m_doc->isoOptions().volumeID().isEmpty() ) return i18n("Writing eMovix DVD"); else - return i18n("Writing eMovix DVD (%1)").arg(m_doc->isoOptions().volumeID()); + return i18n("Writing eMovix DVD (%1)").tqarg(m_doc->isoOptions().volumeID()); } -QString K3bMovixDvdJob::jobDetails() const +TQString K3bMovixDvdJob::jobDetails() const { return ( i18n("1 file (%1) and about 8 MB eMovix data", "%n files (%1) and about 8 MB eMovix data", - m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) + m_doc->movixFileItems().count()).tqarg(KIO::convertSize(m_doc->size())) + ( m_doc->copies() > 1 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3bmovixdvdjob.moc" diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.h b/libk3b/projects/movixdvd/k3bmovixdvdjob.h index 2b9ce10..a803b75 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.h +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.h @@ -31,16 +31,17 @@ class K3bFileItem; class K3bMovixDvdJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, QObject* parent = 0 ); + K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bMovixDvdJob(); K3bDoc* doc() const; K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); -- cgit v1.2.1