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/audiocd/k3baudiocdtrackdrag.cpp | 30 +-- libk3b/projects/audiocd/k3baudiocdtrackdrag.h | 20 +- libk3b/projects/audiocd/k3baudiocdtracksource.cpp | 26 +-- libk3b/projects/audiocd/k3baudiocdtracksource.h | 8 +- libk3b/projects/audiocd/k3baudiodatasource.h | 6 +- .../projects/audiocd/k3baudiodatasourceiterator.h | 2 +- libk3b/projects/audiocd/k3baudiodoc.cpp | 174 +++++++-------- libk3b/projects/audiocd/k3baudiodoc.h | 75 +++---- libk3b/projects/audiocd/k3baudiofile.cpp | 6 +- libk3b/projects/audiocd/k3baudiofile.h | 6 +- libk3b/projects/audiocd/k3baudioimager.cpp | 18 +- libk3b/projects/audiocd/k3baudioimager.h | 5 +- libk3b/projects/audiocd/k3baudiojob.cpp | 136 ++++++------ libk3b/projects/audiocd/k3baudiojob.h | 11 +- libk3b/projects/audiocd/k3baudiojobtempdata.cpp | 46 ++-- libk3b/projects/audiocd/k3baudiojobtempdata.h | 21 +- libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp | 14 +- libk3b/projects/audiocd/k3baudiomaxspeedjob.h | 3 +- libk3b/projects/audiocd/k3baudionormalizejob.cpp | 34 +-- libk3b/projects/audiocd/k3baudionormalizejob.h | 11 +- libk3b/projects/audiocd/k3baudiotrack.cpp | 46 ++-- libk3b/projects/audiocd/k3baudiotrack.h | 42 ++-- libk3b/projects/audiocd/k3baudiozerodata.cpp | 6 +- libk3b/projects/audiocd/k3baudiozerodata.h | 4 +- libk3b/projects/datacd/k3bbootitem.cpp | 4 +- libk3b/projects/datacd/k3bbootitem.h | 8 +- libk3b/projects/datacd/k3bdatadoc.cpp | 236 ++++++++++----------- libk3b/projects/datacd/k3bdatadoc.h | 75 +++---- libk3b/projects/datacd/k3bdataitem.cpp | 46 ++-- libk3b/projects/datacd/k3bdataitem.h | 46 ++-- libk3b/projects/datacd/k3bdatajob.cpp | 128 +++++------ libk3b/projects/datacd/k3bdatajob.h | 13 +- libk3b/projects/datacd/k3bdatapreparationjob.cpp | 38 ++-- libk3b/projects/datacd/k3bdatapreparationjob.h | 3 +- libk3b/projects/datacd/k3bdiritem.cpp | 104 ++++----- libk3b/projects/datacd/k3bdiritem.h | 34 +-- .../datacd/k3bfilecompilationsizehandler.cpp | 16 +- libk3b/projects/datacd/k3bfileitem.cpp | 48 ++--- libk3b/projects/datacd/k3bfileitem.h | 18 +- libk3b/projects/datacd/k3bisoimager.cpp | 218 +++++++++---------- libk3b/projects/datacd/k3bisoimager.h | 37 ++-- libk3b/projects/datacd/k3bisooptions.cpp | 14 +- libk3b/projects/datacd/k3bisooptions.h | 70 +++--- libk3b/projects/datacd/k3bmkisofshandler.cpp | 20 +- libk3b/projects/datacd/k3bmkisofshandler.h | 8 +- libk3b/projects/datacd/k3bmsinfofetcher.cpp | 58 ++--- libk3b/projects/datacd/k3bmsinfofetcher.h | 9 +- libk3b/projects/datacd/k3bsessionimportitem.cpp | 10 +- libk3b/projects/datacd/k3bspecialdataitem.h | 20 +- libk3b/projects/datadvd/k3bdvdbooktypejob.cpp | 44 ++-- libk3b/projects/datadvd/k3bdvdbooktypejob.h | 9 +- libk3b/projects/datadvd/k3bdvddoc.cpp | 8 +- libk3b/projects/datadvd/k3bdvddoc.h | 6 +- libk3b/projects/datadvd/k3bdvdjob.cpp | 42 ++-- libk3b/projects/datadvd/k3bdvdjob.h | 9 +- libk3b/projects/datadvd/k3bdvdview.cpp | 8 +- libk3b/projects/datadvd/k3bdvdview.h | 5 +- libk3b/projects/k3babstractwriter.cpp | 12 +- libk3b/projects/k3babstractwriter.h | 5 +- libk3b/projects/k3bcdrdaowriter.cpp | 218 +++++++++---------- libk3b/projects/k3bcdrdaowriter.h | 35 +-- libk3b/projects/k3bcdrecordwriter.cpp | 122 +++++------ libk3b/projects/k3bcdrecordwriter.h | 19 +- libk3b/projects/k3bcuefileparser.cpp | 86 ++++---- libk3b/projects/k3bcuefileparser.h | 8 +- libk3b/projects/k3bdoc.cpp | 32 +-- libk3b/projects/k3bdoc.h | 43 ++-- libk3b/projects/k3bdvdrecordwriter.cpp | 26 +-- libk3b/projects/k3bdvdrecordwriter.h | 3 +- libk3b/projects/k3bgrowisofshandler.cpp | 68 +++--- libk3b/projects/k3bgrowisofshandler.h | 15 +- libk3b/projects/k3bgrowisofswriter.cpp | 116 +++++----- libk3b/projects/k3bgrowisofswriter.h | 11 +- libk3b/projects/k3bimagefilereader.cpp | 18 +- libk3b/projects/k3bimagefilereader.h | 10 +- libk3b/projects/k3binffilewriter.cpp | 20 +- libk3b/projects/k3binffilewriter.h | 50 ++--- libk3b/projects/k3bpipebuffer.cpp | 10 +- libk3b/projects/k3bpipebuffer.h | 2 +- libk3b/projects/k3btocfilewriter.cpp | 28 +-- libk3b/projects/k3btocfilewriter.h | 22 +- libk3b/projects/mixedcd/k3bmixeddoc.cpp | 52 ++--- libk3b/projects/mixedcd/k3bmixeddoc.h | 19 +- libk3b/projects/mixedcd/k3bmixedjob.cpp | 186 ++++++++-------- libk3b/projects/mixedcd/k3bmixedjob.h | 15 +- libk3b/projects/movixcd/k3bmovixdoc.cpp | 90 ++++---- libk3b/projects/movixcd/k3bmovixdoc.h | 67 +++--- libk3b/projects/movixcd/k3bmovixdocpreparer.cpp | 100 ++++----- libk3b/projects/movixcd/k3bmovixdocpreparer.h | 9 +- libk3b/projects/movixcd/k3bmovixfileitem.cpp | 18 +- libk3b/projects/movixcd/k3bmovixfileitem.h | 6 +- libk3b/projects/movixcd/k3bmovixjob.cpp | 48 ++--- libk3b/projects/movixcd/k3bmovixjob.h | 7 +- libk3b/projects/movixcd/k3bmovixprogram.cpp | 112 +++++----- libk3b/projects/movixcd/k3bmovixprogram.h | 54 ++--- libk3b/projects/movixdvd/k3bmovixdvddoc.cpp | 8 +- libk3b/projects/movixdvd/k3bmovixdvddoc.h | 7 +- libk3b/projects/movixdvd/k3bmovixdvdjob.cpp | 46 ++-- libk3b/projects/movixdvd/k3bmovixdvdjob.h | 7 +- libk3b/projects/videocd/cdi/cdi_imag.rtf | Bin 1314877 -> 1314875 bytes libk3b/projects/videocd/cdi/cdi_vcd.app | Bin 102400 -> 102402 bytes libk3b/projects/videocd/cdi/icdia.htm | 4 +- libk3b/projects/videocd/k3bvcddoc.cpp | 166 +++++++-------- libk3b/projects/videocd/k3bvcddoc.h | 55 ++--- libk3b/projects/videocd/k3bvcdjob.cpp | 204 +++++++++--------- libk3b/projects/videocd/k3bvcdjob.h | 21 +- libk3b/projects/videocd/k3bvcdoptions.cpp | 24 +-- libk3b/projects/videocd/k3bvcdoptions.h | 52 ++--- libk3b/projects/videocd/k3bvcdtrack.cpp | 106 ++++----- libk3b/projects/videocd/k3bvcdtrack.h | 72 +++---- libk3b/projects/videocd/k3bvcdxmlview.cpp | 174 +++++++-------- libk3b/projects/videocd/k3bvcdxmlview.h | 26 +-- libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp | 40 ++-- libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h | 6 +- libk3b/projects/videodvd/k3bvideodvddoc.cpp | 8 +- libk3b/projects/videodvd/k3bvideodvddoc.h | 6 +- libk3b/projects/videodvd/k3bvideodvdimager.cpp | 46 ++-- libk3b/projects/videodvd/k3bvideodvdimager.h | 7 +- libk3b/projects/videodvd/k3bvideodvdjob.cpp | 18 +- libk3b/projects/videodvd/k3bvideodvdjob.h | 7 +- 120 files changed, 2533 insertions(+), 2501 deletions(-) (limited to 'libk3b/projects') diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp index 8429f25..f8a5b71 100644 --- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp +++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.cpp @@ -21,28 +21,28 @@ #include #include -#include -#include +#include +#include // FIXME: multiple tracks -K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValueList& cdTrackNumbers, +K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const TQValueList& cdTrackNumbers, const K3bCddbResultEntry& cddb, - K3bDevice::Device* lastDev, QWidget* dragSource, const char* name ) - : QStoredDrag( "k3b/audio_track_drag", dragSource, name ), + K3bDevice::Device* lastDev, TQWidget* dragSource, const char* name ) + : TQStoredDrag( "k3b/audio_track_drag", dragSource, name ), m_toc(toc), m_cdTrackNumbers(cdTrackNumbers), m_cddb(cddb), m_device(lastDev) { - QByteArray data; - QDataStream s( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream s( data, IO_WriteOnly ); s << (unsigned int)toc.count(); for( K3bDevice::Toc::const_iterator it = toc.begin(); it != toc.end(); ++it ) { const K3bDevice::Track& track = *it; s << track.firstSector().lba() << track.lastSector().lba(); } - QTextStream t( s.device() ); + TQTextStream t( s.device() ); t << cddb.cdArtist << endl << cddb.cdTitle << endl; for( unsigned int i = 0; i < toc.count(); ++i ) { @@ -52,7 +52,7 @@ K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValu s << (unsigned int)cdTrackNumbers.count(); - for( QValueList::const_iterator it = cdTrackNumbers.begin(); + for( TQValueList::const_iterator it = cdTrackNumbers.begin(); it != cdTrackNumbers.end(); ++it ) s << *it; @@ -66,13 +66,13 @@ K3bAudioCdTrackDrag::K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValu } -bool K3bAudioCdTrackDrag::decode( const QMimeSource* e, - K3bDevice::Toc& toc, QValueList& trackNumbers, +bool K3bAudioCdTrackDrag::decode( const TQMimeSource* e, + K3bDevice::Toc& toc, TQValueList& trackNumbers, K3bCddbResultEntry& cddb, K3bDevice::Device** dev ) { - QByteArray data = e->encodedData( "k3b/audio_track_drag" ); + TQByteArray data = e->tqencodedData( "k3b/audio_track_drag" ); - QDataStream s( data, IO_ReadOnly ); + TQDataStream s( data, IO_ReadOnly ); unsigned int trackCnt; s >> trackCnt; @@ -83,7 +83,7 @@ bool K3bAudioCdTrackDrag::decode( const QMimeSource* e, toc.append( K3bDevice::Track( fs, ls, K3bDevice::Track::AUDIO ) ); } - QTextStream t( s.device() ); + TQTextStream t( s.device() ); cddb.artists.clear(); cddb.titles.clear(); cddb.cdArtist = t.readLine(); @@ -101,7 +101,7 @@ bool K3bAudioCdTrackDrag::decode( const QMimeSource* e, trackNumbers.append( trackNumber ); } - QString devName = t.readLine(); + TQString devName = t.readLine(); if( dev && !devName.isEmpty() ) *dev = k3bcore->deviceManager()->findDevice( devName ); diff --git a/libk3b/projects/audiocd/k3baudiocdtrackdrag.h b/libk3b/projects/audiocd/k3baudiocdtrackdrag.h index 3148466..f88c4e5 100644 --- a/libk3b/projects/audiocd/k3baudiocdtrackdrag.h +++ b/libk3b/projects/audiocd/k3baudiocdtrackdrag.h @@ -16,33 +16,33 @@ #ifndef _K3B_AUDIO_CDTRACK_DRAG_H_ #define _K3B_AUDIO_CDTRACK_DRAG_H_ -#include -#include -#include +#include +#include +#include #include #include #include #include "k3b_export.h" -class LIBK3B_EXPORT K3bAudioCdTrackDrag : public QStoredDrag +class LIBK3B_EXPORT K3bAudioCdTrackDrag : public TQStoredDrag { public: - K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const QValueList& cdTrackNumbers, const K3bCddbResultEntry& cddb, - K3bDevice::Device* lastDev = 0, QWidget* dragSource = 0, const char* name = 0 ); + K3bAudioCdTrackDrag( const K3bDevice::Toc& toc, const TQValueList& cdTrackNumbers, const K3bCddbResultEntry& cddb, + K3bDevice::Device* lastDev = 0, TQWidget* dragSource = 0, const char* name = 0 ); const K3bDevice::Toc& toc() const { return m_toc; } - const QValueList& cdTrackNumbers() const { return m_cdTrackNumbers; } + const TQValueList& cdTrackNumbers() const { return m_cdTrackNumbers; } const K3bCddbResultEntry& cddbEntry() const { return m_cddb; } bool provides( const char* mimetype ) const { return !qstrcmp( mimetype, "k3b/audio_track_drag" ); } - static bool canDecode( const QMimeSource* s ) { return s->provides( "k3b/audio_track_drag" ); } - static bool decode( const QMimeSource* s, K3bDevice::Toc&, QValueList& trackNumbers, K3bCddbResultEntry&, K3bDevice::Device** dev = 0 ); + static bool canDecode( const TQMimeSource* s ) { return s->provides( "k3b/audio_track_drag" ); } + static bool decode( const TQMimeSource* s, K3bDevice::Toc&, TQValueList& trackNumbers, K3bCddbResultEntry&, K3bDevice::Device** dev = 0 ); private: K3bDevice::Toc m_toc; - QValueList m_cdTrackNumbers; + TQValueList m_cdTrackNumbers; K3bCddbResultEntry m_cddb; K3bDevice::Device* m_device; }; diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp index b61e865..6319086 100644 --- a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp +++ b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp @@ -45,8 +45,8 @@ K3bAudioCdTrackSource::K3bAudioCdTrackSource( const K3bDevice::Toc& toc, int cdT K3bAudioCdTrackSource::K3bAudioCdTrackSource( unsigned int discid, const K3b::Msf& length, int cdTrackNumber, - const QString& artist, const QString& title, - const QString& cdArtist, const QString& cdTitle ) + const TQString& artist, const TQString& title, + const TQString& cdArtist, const TQString& cdTitle ) : K3bAudioDataSource(), m_discId( discid ), m_length( length ), @@ -56,8 +56,8 @@ K3bAudioCdTrackSource::K3bAudioCdTrackSource( unsigned int discid, const K3b::Ms m_initialized( false ) { for( int i = 1; i < cdTrackNumber; ++i ) { - m_cddbEntry.titles.append( QString::null ); - m_cddbEntry.artists.append( QString::null ); + m_cddbEntry.titles.append( TQString() ); + m_cddbEntry.artists.append( TQString() ); } m_cddbEntry.titles.append( title ); m_cddbEntry.artists.append( artist ); @@ -98,10 +98,10 @@ bool K3bAudioCdTrackSource::initParanoia() // ask here for the cd since searchForAudioCD() may also be called from outside if( !m_lastUsedDevice ) { // could not find the CD, so ask for it - QString s = i18n("Please insert Audio CD %1%2") - .arg(m_discId, 0, 16) - .arg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty() - ? QString::null + TQString s = i18n("Please insert Audio CD %1%2") + .tqarg(m_discId, 0, 16) + .tqarg(m_cddbEntry.cdTitle.isEmpty() || m_cddbEntry.cdArtist.isEmpty() + ? TQString() : " (" + m_cddbEntry.cdArtist + " - " + m_cddbEntry.cdTitle + ")"); while( K3bDevice::Device* dev = K3bThreadWidget::selectDevice( track()->doc()->view(), s ) ) { @@ -163,8 +163,8 @@ K3bDevice::Device* K3bAudioCdTrackSource::searchForAudioCD() const if( m_lastUsedDevice && searchForAudioCD( m_lastUsedDevice ) ) return m_lastUsedDevice; - const QPtrList& devices = k3bcore->deviceManager()->readingDevices(); - for( QPtrListIterator it(devices); *it; ++it ) { + const TQPtrList& devices = k3bcore->deviceManager()->readingDevices(); + for( TQPtrListIterator it(devices); *it; ++it ) { if( searchForAudioCD( *it ) ) { return *it; } @@ -244,15 +244,15 @@ int K3bAudioCdTrackSource::read( char* data, unsigned int ) } -QString K3bAudioCdTrackSource::type() const +TQString K3bAudioCdTrackSource::type() const { return i18n("CD Track"); } -QString K3bAudioCdTrackSource::sourceComment() const +TQString K3bAudioCdTrackSource::sourceComment() const { - return i18n("Track %1 from Audio CD %2").arg(m_cdTrackNumber).arg(m_discId,0,16); + return i18n("Track %1 from Audio CD %2").tqarg(m_cdTrackNumber).tqarg(m_discId,0,16); } diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.h b/libk3b/projects/audiocd/k3baudiocdtracksource.h index 6eaaa5b..b6e4ea4 100644 --- a/libk3b/projects/audiocd/k3baudiocdtracksource.h +++ b/libk3b/projects/audiocd/k3baudiocdtracksource.h @@ -50,8 +50,8 @@ class LIBK3B_EXPORT K3bAudioCdTrackSource : public K3bAudioDataSource * Constructor to create sources when loading from a project file without toc information */ K3bAudioCdTrackSource( unsigned int discid, const K3b::Msf& length, int cdTrackNumber, - const QString& artist, const QString& title, - const QString& cdartist, const QString& cdtitle ); + const TQString& artist, const TQString& title, + const TQString& cdartist, const TQString& cdtitle ); K3bAudioCdTrackSource( const K3bAudioCdTrackSource& ); ~K3bAudioCdTrackSource(); @@ -62,8 +62,8 @@ class LIBK3B_EXPORT K3bAudioCdTrackSource : public K3bAudioDataSource K3b::Msf originalLength() const; bool seek( const K3b::Msf& ); int read( char* data, unsigned int max ); - QString type() const; - QString sourceComment() const; + TQString type() const; + TQString sourceComment() const; K3bAudioDataSource* copy() const; /** diff --git a/libk3b/projects/audiocd/k3baudiodatasource.h b/libk3b/projects/audiocd/k3baudiodatasource.h index d12fd10..5ac7336 100644 --- a/libk3b/projects/audiocd/k3baudiodatasource.h +++ b/libk3b/projects/audiocd/k3baudiodatasource.h @@ -79,12 +79,12 @@ class LIBK3B_EXPORT K3bAudioDataSource /** * Type of the data in readable form. */ - virtual QString type() const = 0; + virtual TQString type() const = 0; /** * The source in readable form (this is the filename for files) */ - virtual QString sourceComment() const = 0; + virtual TQString sourceComment() const = 0; /** * Used in case an error occurred. For now this is used if the @@ -150,7 +150,7 @@ class LIBK3B_EXPORT K3bAudioDataSource protected: /** - * Informs the parent track about changes. + * Informs the tqparent track about changes. */ void emitChange(); diff --git a/libk3b/projects/audiocd/k3baudiodatasourceiterator.h b/libk3b/projects/audiocd/k3baudiodatasourceiterator.h index 7a0ce59..f340fce 100644 --- a/libk3b/projects/audiocd/k3baudiodatasourceiterator.h +++ b/libk3b/projects/audiocd/k3baudiodatasourceiterator.h @@ -26,7 +26,7 @@ class K3bAudioDoc; * * Be aware that this iterator does not properly update when the doc * changes. A manual update can be issued with first(). This is becasue - * an update would either involve slots (this being a QObject) which is + * an update would either involve slots (this being a TQObject) which is * too much overhead or the AudioDoc would need to have knowledge of all * the iterators which is also overhead that would be overkill. */ diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index e7661ba..817d5fa 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -29,16 +29,16 @@ // QT-includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // KDE-includes #include @@ -69,8 +69,8 @@ public: }; -K3bAudioDoc::K3bAudioDoc( QObject* parent ) - : K3bDoc( parent ), +K3bAudioDoc::K3bAudioDoc( TQObject* tqparent ) + : K3bDoc( tqparent ), m_firstTrack(0), m_lastTrack(0) { @@ -111,7 +111,7 @@ bool K3bAudioDoc::newDocument() } -QString K3bAudioDoc::name() const +TQString K3bAudioDoc::name() const { if( !m_cdTextData.title().isEmpty() ) return m_cdTextData.title(); @@ -212,7 +212,7 @@ KURL::List K3bAudioDoc::extractUrlList( const KURL::List& urls ) while( it != allUrls.end() ) { const KURL& url = *it; - QFileInfo fi( url.path() ); + TQFileInfo fi( url.path() ); if( !url.isLocalFile() ) { kdDebug() << url.path() << " no local file" << endl; @@ -227,11 +227,11 @@ KURL::List K3bAudioDoc::extractUrlList( const KURL::List& urls ) else if( fi.isDir() ) { it = allUrls.remove( it ); // add all files in the dir - QDir dir(fi.filePath()); - QStringList entries = dir.entryList( QDir::Files ); + TQDir dir(fi.filePath()); + TQStringList entries = dir.entryList( TQDir::Files ); KURL::List::iterator oldIt = it; // add all files into the list after the current item - for( QStringList::iterator dirIt = entries.begin(); + for( TQStringList::iterator dirIt = entries.begin(); dirIt != entries.end(); ++dirIt ) it = allUrls.insert( oldIt, KURL::fromPathOrURL( dir.absPath() + "/" + *dirIt ) ); } @@ -256,14 +256,14 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) // check if the file is a m3u playlist // and if so add all listed files - QFile f( url.path() ); + TQFile f( url.path() ); if( !f.open( IO_ReadOnly ) ) return false; - QTextStream t( &f ); + TQTextStream t( &f ); char buf[7]; t.readRawBytes( buf, 7 ); - if( QString::fromLatin1( buf, 7 ) != "#EXTM3U" ) + if( TQString::tqfromLatin1( buf, 7 ) != "#EXTM3U" ) return false; // skip the first line @@ -271,7 +271,7 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) // read the file while( !t.atEnd() ) { - QString line = t.readLine(); + TQString line = t.readLine(); if( line[0] != '#' ) { KURL mp3url; // relative paths @@ -288,11 +288,11 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) } -void K3bAudioDoc::addSources( K3bAudioTrack* parent, +void K3bAudioDoc::addSources( K3bAudioTrack* tqparent, const KURL::List& urls, K3bAudioDataSource* sourceAfter ) { - kdDebug() << "(K3bAudioDoc::addSources( " << parent << ", " + kdDebug() << "(K3bAudioDoc::addSources( " << tqparent << ", " << urls.first().path() << ", " << sourceAfter << " )" << endl; KURL::List allUrls = extractUrlList( urls ); @@ -302,7 +302,7 @@ void K3bAudioDoc::addSources( K3bAudioTrack* parent, if( sourceAfter ) file->moveAfter( sourceAfter ); else - file->moveAhead( parent->firstSource() ); + file->moveAhead( tqparent->firstSource() ); sourceAfter = file; } } @@ -312,7 +312,7 @@ void K3bAudioDoc::addSources( K3bAudioTrack* parent, } -K3bAudioTrack* K3bAudioDoc::importCueFile( const QString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder ) +K3bAudioTrack* K3bAudioDoc::importCueFile( const TQString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder ) { if( !after ) after = m_lastTrack; @@ -382,7 +382,7 @@ K3bAudioDecoder* K3bAudioDoc::getDecoderForUrl( const KURL& url, bool* reused ) K3bAudioDecoder* decoder = 0; // check if we already have a proper decoder - if( m_decoderPresenceMap.contains( url.path() ) ) { + if( m_decoderPresenceMap.tqcontains( url.path() ) ) { decoder = m_decoderPresenceMap[url.path()]; *reused = true; } @@ -400,7 +400,7 @@ K3bAudioDecoder* K3bAudioDoc::getDecoderForUrl( const KURL& url, bool* reused ) K3bAudioFile* K3bAudioDoc::createAudioFile( const KURL& url ) { - if( !QFile::exists( url.path() ) ) { + if( !TQFile::exists( url.path() ) ) { m_notFoundFiles.append( url.path() ); kdDebug() << "(K3bAudioDoc) could not find file " << url.path() << endl; return 0; @@ -488,24 +488,24 @@ void K3bAudioDoc::moveTrack( K3bAudioTrack* track, K3bAudioTrack* after ) } -QString K3bAudioDoc::typeString() const +TQString K3bAudioDoc::typeString() const { return "audio"; } -bool K3bAudioDoc::loadDocumentData( QDomElement* root ) +bool K3bAudioDoc::loadDocumentData( TQDomElement* root ) { newDocument(); // we will parse the dom-tree and create a K3bAudioTrack for all entries immediately // this should not take long and so not block the gui - QDomNodeList nodes = root->childNodes(); + TQDomNodeList nodes = root->childNodes(); for( uint i = 0; i < nodes.count(); i++ ) { - QDomElement e = nodes.item(i).toElement(); + TQDomElement e = nodes.item(i).toElement(); if( e.isNull() ) return false; @@ -522,7 +522,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) setHideFirstTrack( e.text() == "yes" ); else if( e.nodeName() == "audio_ripping" ) { - QDomNodeList ripNodes = e.childNodes(); + TQDomNodeList ripNodes = e.childNodes(); for( uint j = 0; j < ripNodes.length(); j++ ) { if( ripNodes.item(j).nodeName() == "paranoia_mode" ) setAudioRippingParanoiaMode( ripNodes.item(j).toElement().text().toInt() ); @@ -540,7 +540,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) writeCdText( e.attributeNode( "activated" ).value() == "yes" ); - QDomNodeList cdTextNodes = e.childNodes(); + TQDomNodeList cdTextNodes = e.childNodes(); for( uint j = 0; j < cdTextNodes.length(); j++ ) { if( cdTextNodes.item(j).nodeName() == "title" ) setTitle( cdTextNodes.item(j).toElement().text() ); @@ -570,11 +570,11 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) else if( e.nodeName() == "contents" ) { - QDomNodeList contentNodes = e.childNodes(); + TQDomNodeList contentNodes = e.childNodes(); for( uint j = 0; j< contentNodes.length(); j++ ) { - QDomElement trackElem = contentNodes.item(j).toElement(); + TQDomElement trackElem = contentNodes.item(j).toElement(); // first of all we need a track K3bAudioTrack* track = new K3bAudioTrack(); @@ -582,7 +582,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) // backwards compatibility // ----------------------------------------------------------------------------------------------------- - QDomAttr oldUrlAttr = trackElem.attributeNode( "url" ); + TQDomAttr oldUrlAttr = trackElem.attributeNode( "url" ); if( !oldUrlAttr.isNull() ) { if( K3bAudioFile* file = createAudioFile( KURL::fromPathOrURL( oldUrlAttr.value() ) ) ) { @@ -592,13 +592,13 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) // ----------------------------------------------------------------------------------------------------- - QDomNodeList trackNodes = trackElem.childNodes(); + TQDomNodeList trackNodes = trackElem.childNodes(); for( uint trackJ = 0; trackJ < trackNodes.length(); trackJ++ ) { if( trackNodes.item(trackJ).nodeName() == "sources" ) { - QDomNodeList sourcesNodes = trackNodes.item(trackJ).childNodes(); + TQDomNodeList sourcesNodes = trackNodes.item(trackJ).childNodes(); for( unsigned int sourcesIndex = 0; sourcesIndex < sourcesNodes.length(); sourcesIndex++ ) { - QDomElement sourceElem = sourcesNodes.item(sourcesIndex).toElement(); + TQDomElement sourceElem = sourcesNodes.item(sourcesIndex).toElement(); if( sourceElem.nodeName() == "file" ) { if( K3bAudioFile* file = createAudioFile( KURL::fromPathOrURL( sourceElem.attributeNode( "url" ).value() ) ) ) { @@ -616,11 +616,11 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) K3b::Msf length = K3b::Msf::fromString( sourceElem.attributeNode( "length" ).value() ); int titlenum = 0; unsigned int discid = 0; - QString title, artist, cdTitle, cdArtist; + TQString title, artist, cdTitle, cdArtist; - QDomNodeList cdTrackSourceNodes = sourceElem.childNodes(); + TQDomNodeList cdTrackSourceNodes = sourceElem.childNodes(); for( unsigned int cdTrackSourceIndex = 0; cdTrackSourceIndex < cdTrackSourceNodes.length(); ++cdTrackSourceIndex ) { - QDomElement cdTrackSourceItemElem = cdTrackSourceNodes.item(cdTrackSourceIndex).toElement(); + TQDomElement cdTrackSourceItemElem = cdTrackSourceNodes.item(cdTrackSourceIndex).toElement(); if( cdTrackSourceItemElem.nodeName() == "title_number" ) titlenum = cdTrackSourceItemElem.text().toInt(); else if( cdTrackSourceItemElem.nodeName() == "disc_id" ) @@ -657,7 +657,7 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) // load cd-text else if( trackNodes.item(trackJ).nodeName() == "cd-text" ) { - QDomNodeList cdTextNodes = trackNodes.item(trackJ).childNodes(); + TQDomNodeList cdTextNodes = trackNodes.item(trackJ).childNodes(); for( uint trackCdTextJ = 0; trackCdTextJ < cdTextNodes.length(); trackCdTextJ++ ) { if( cdTextNodes.item(trackCdTextJ).nodeName() == "title" ) track->setTitle( cdTextNodes.item(trackCdTextJ).toElement().text() ); @@ -713,33 +713,33 @@ bool K3bAudioDoc::loadDocumentData( QDomElement* root ) return true; } -bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) +bool K3bAudioDoc::saveDocumentData( TQDomElement* docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); // add normalize - QDomElement normalizeElem = doc.createElement( "normalize" ); + TQDomElement normalizeElem = doc.createElement( "normalize" ); normalizeElem.appendChild( doc.createTextNode( normalize() ? "yes" : "no" ) ); docElem->appendChild( normalizeElem ); // add hide track - QDomElement hideFirstTrackElem = doc.createElement( "hide_first_track" ); + TQDomElement hideFirstTrackElem = doc.createElement( "hide_first_track" ); hideFirstTrackElem.appendChild( doc.createTextNode( hideFirstTrack() ? "yes" : "no" ) ); docElem->appendChild( hideFirstTrackElem ); // save the audio cd ripping settings // paranoia mode, read retries, and ignore read errors // ------------------------------------------------------------ - QDomElement ripMain = doc.createElement( "audio_ripping" ); + TQDomElement ripMain = doc.createElement( "audio_ripping" ); docElem->appendChild( ripMain ); - QDomElement ripElem = doc.createElement( "paranoia_mode" ); - ripElem.appendChild( doc.createTextNode( QString::number( audioRippingParanoiaMode() ) ) ); + TQDomElement ripElem = doc.createElement( "paranoia_mode" ); + ripElem.appendChild( doc.createTextNode( TQString::number( audioRippingParanoiaMode() ) ) ); ripMain.appendChild( ripElem ); ripElem = doc.createElement( "read_retries" ); - ripElem.appendChild( doc.createTextNode( QString::number( audioRippingRetries() ) ) ); + ripElem.appendChild( doc.createTextNode( TQString::number( audioRippingRetries() ) ) ); ripMain.appendChild( ripElem ); ripElem = doc.createElement( "ignore_read_errors" ); @@ -749,9 +749,9 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) // save disc cd-text // ------------------------------------------------------------- - QDomElement cdTextMain = doc.createElement( "cd-text" ); + TQDomElement cdTextMain = doc.createElement( "cd-text" ); cdTextMain.setAttribute( "activated", cdText() ? "yes" : "no" ); - QDomElement cdTextElem = doc.createElement( "title" ); + TQDomElement cdTextElem = doc.createElement( "title" ); cdTextElem.appendChild( doc.createTextNode( (title())) ); cdTextMain.appendChild( cdTextElem ); @@ -788,42 +788,42 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) // save the tracks // ------------------------------------------------------------- - QDomElement contentsElem = doc.createElement( "contents" ); + TQDomElement contentsElem = doc.createElement( "contents" ); for( K3bAudioTrack* track = firstTrack(); track != 0; track = track->next() ) { - QDomElement trackElem = doc.createElement( "track" ); + TQDomElement trackElem = doc.createElement( "track" ); // add sources - QDomElement sourcesParent = doc.createElement( "sources" ); + TQDomElement sourcesParent = doc.createElement( "sources" ); for( K3bAudioDataSource* source = track->firstSource(); source; source = source->next() ) { // TODO: save a source element with a type attribute and start- and endoffset // then distict between the different source types. if( K3bAudioFile* file = dynamic_cast(source) ) { - QDomElement sourceElem = doc.createElement( "file" ); + TQDomElement sourceElem = doc.createElement( "file" ); sourceElem.setAttribute( "url", file->filename() ); sourceElem.setAttribute( "start_offset", file->startOffset().toString() ); sourceElem.setAttribute( "end_offset", file->endOffset().toString() ); sourcesParent.appendChild( sourceElem ); } else if( K3bAudioZeroData* zero = dynamic_cast(source) ) { - QDomElement sourceElem = doc.createElement( "silence" ); + TQDomElement sourceElem = doc.createElement( "silence" ); sourceElem.setAttribute( "length", zero->length().toString() ); sourcesParent.appendChild( sourceElem ); } else if( K3bAudioCdTrackSource* cdTrack = dynamic_cast(source) ) { - QDomElement sourceElem = doc.createElement( "cdtrack" ); + TQDomElement sourceElem = doc.createElement( "cdtrack" ); sourceElem.setAttribute( "length", cdTrack->originalLength().toString() ); sourceElem.setAttribute( "start_offset", cdTrack->startOffset().toString() ); sourceElem.setAttribute( "end_offset", cdTrack->endOffset().toString() ); - QDomElement subElem = doc.createElement( "title_number" ); - subElem.appendChild( doc.createTextNode( QString::number(cdTrack->cdTrackNumber()) ) ); + TQDomElement subElem = doc.createElement( "title_number" ); + subElem.appendChild( doc.createTextNode( TQString::number(cdTrack->cdTrackNumber()) ) ); sourceElem.appendChild( subElem ); subElem = doc.createElement( "disc_id" ); - subElem.appendChild( doc.createTextNode( QString::number(cdTrack->discId(), 16) ) ); + subElem.appendChild( doc.createTextNode( TQString::number(cdTrack->discId(), 16) ) ); sourceElem.appendChild( subElem ); subElem = doc.createElement( "title" ); @@ -852,7 +852,7 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) trackElem.appendChild( sourcesParent ); // index 0 - QDomElement index0Elem = doc.createElement( "index0" ); + TQDomElement index0Elem = doc.createElement( "index0" ); index0Elem.appendChild( doc.createTextNode( track->index0().toString() ) ); trackElem.appendChild( index0Elem ); @@ -891,7 +891,7 @@ bool K3bAudioDoc::saveDocumentData( QDomElement* docElem ) trackElem.appendChild( cdTextMain ); // add copy protection - QDomElement copyElem = doc.createElement( "copy_protection" ); + TQDomElement copyElem = doc.createElement( "copy_protection" ); copyElem.appendChild( doc.createTextNode( track->copyProtection() ? "yes" : "no" ) ); trackElem.appendChild( copyElem ); @@ -916,20 +916,20 @@ int K3bAudioDoc::numOfTracks() const } -K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bAudioJob( this, hdl, parent ); + return new K3bAudioJob( this, hdl, tqparent ); } void K3bAudioDoc::informAboutNotFoundFiles() { if( !m_notFoundFiles.isEmpty() ) { - QStringList l; + TQStringList l; for( KURL::List::const_iterator it = m_notFoundFiles.begin(); it != m_notFoundFiles.end(); ++it ) l.append( (*it).path() ); - KMessageBox::informationList( qApp->activeWindow(), + KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("Could not find the following files:"), l, i18n("Not Found") ); @@ -937,11 +937,11 @@ void K3bAudioDoc::informAboutNotFoundFiles() m_notFoundFiles.clear(); } if( !m_unknownFileFormatFiles.isEmpty() ) { - QStringList l; + TQStringList l; for( KURL::List::const_iterator it = m_unknownFileFormatFiles.begin(); it != m_unknownFileFormatFiles.end(); ++it ) l.append( (*it).path() ); - KMessageBox::informationList( qApp->activeWindow(), + KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("

Unable to handle the following files due to an unsupported format:" "

You may manually convert these audio files to wave using another " "application supporting the audio format and then add the wave files " @@ -997,7 +997,7 @@ void K3bAudioDoc::slotTrackRemoved( K3bAudioTrack* track ) void K3bAudioDoc::increaseDecoderUsage( K3bAudioDecoder* decoder ) { kdDebug() << "(K3bAudioDoc::increaseDecoderUsage)" << endl; - if( !m_decoderUsageCounterMap.contains( decoder ) ) { + if( !m_decoderUsageCounterMap.tqcontains( decoder ) ) { m_decoderUsageCounterMap[decoder] = 1; m_decoderPresenceMap[decoder->filename()] = decoder; } @@ -1049,76 +1049,76 @@ K3bDevice::Toc K3bAudioDoc::toToc() const } -void K3bAudioDoc::setTitle( const QString& v ) +void K3bAudioDoc::setTitle( const TQString& v ) { m_cdTextData.setTitle( v ); emit changed(); } -void K3bAudioDoc::setArtist( const QString& v ) +void K3bAudioDoc::setArtist( const TQString& v ) { setPerformer( v ); } -void K3bAudioDoc::setPerformer( const QString& v ) +void K3bAudioDoc::setPerformer( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setPerformer( s ); emit changed(); } -void K3bAudioDoc::setDisc_id( const QString& v ) +void K3bAudioDoc::setDisc_id( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setDiscId( s ); emit changed(); } -void K3bAudioDoc::setArranger( const QString& v ) +void K3bAudioDoc::setArranger( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setArranger( s ); emit changed(); } -void K3bAudioDoc::setSongwriter( const QString& v ) +void K3bAudioDoc::setSongwriter( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setSongwriter( s ); emit changed(); } -void K3bAudioDoc::setComposer( const QString& v ) +void K3bAudioDoc::setComposer( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setComposer( s ); emit changed(); } -void K3bAudioDoc::setUpc_ean( const QString& v ) +void K3bAudioDoc::setUpc_ean( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setUpcEan( s ); emit changed(); } -void K3bAudioDoc::setCdTextMessage( const QString& v ) +void K3bAudioDoc::setCdTextMessage( const TQString& v ) { - QString s( v ); + TQString s( v ); d->cdTextValidator->fixup( s ); m_cdTextData.setMessage( s ); emit changed(); diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h index 87a512e..943bf14 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.h +++ b/libk3b/projects/audiocd/k3baudiodoc.h @@ -22,21 +22,21 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "k3b_export.h" #include class K3bApp; class K3bAudioTrack; -class QWidget; -class QTimer; -class QDomDocument; -class QDomElement; +class TQWidget; +class TQTimer; +class TQDomDocument; +class TQDomElement; class K3bThreadJob; class KConfig; class K3bAudioDataSource; @@ -50,16 +50,17 @@ class K3bAudioFile; class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc { Q_OBJECT + TQ_OBJECT friend class K3bMixedDoc; friend class K3bAudioTrack; friend class K3bAudioFile; public: - K3bAudioDoc( QObject* ); + K3bAudioDoc( TQObject* ); ~K3bAudioDoc(); - QString name() const; + TQString name() const; bool newDocument(); @@ -88,14 +89,14 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc // CD-Text bool cdText() const { return m_cdText; } - const QString& title() const { return m_cdTextData.title(); } - const QString& artist() const { return m_cdTextData.performer(); } - const QString& disc_id() const { return m_cdTextData.discId(); } - const QString& arranger() const { return m_cdTextData.arranger(); } - const QString& songwriter() const { return m_cdTextData.songwriter(); } - const QString& composer() const { return m_cdTextData.composer(); } - const QString& upc_ean() const { return m_cdTextData.upcEan(); } - const QString& cdTextMessage() const { return m_cdTextData.message(); } + const TQString& title() const { return m_cdTextData.title(); } + const TQString& artist() const { return m_cdTextData.performer(); } + const TQString& disc_id() const { return m_cdTextData.discId(); } + const TQString& arranger() const { return m_cdTextData.arranger(); } + const TQString& songwriter() const { return m_cdTextData.songwriter(); } + const TQString& composer() const { return m_cdTextData.composer(); } + const TQString& upc_ean() const { return m_cdTextData.upcEan(); } + const TQString& cdTextMessage() const { return m_cdTextData.message(); } /** * Create complete CD-Text including the tracks' data. @@ -111,7 +112,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc */ K3bDevice::Toc toToc() const; - K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 ); + K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ); /** * Shows dialogs. @@ -130,7 +131,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc * * BE AWARE THAT THE DECODER HAS TO FIT THE AUDIO FILE IN THE CUE. */ - K3bAudioTrack* importCueFile( const QString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder = 0 ); + K3bAudioTrack* importCueFile( const TQString& cuefile, K3bAudioTrack* after, K3bAudioDecoder* decoder = 0 ); /** * Create a decoder for a specific url. If another AudioFileSource with this @@ -158,7 +159,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc */ void addTrack( K3bAudioTrack* track, uint position = 0 ); - void addSources( K3bAudioTrack* parent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 ); + void addSources( K3bAudioTrack* tqparent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 ); void removeTrack( K3bAudioTrack* ); void moveTrack( K3bAudioTrack* track, K3bAudioTrack* after ); @@ -168,15 +169,15 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc // CD-Text void writeCdText( bool b ) { m_cdText = b; } - void setTitle( const QString& v ); - void setArtist( const QString& v ); - void setPerformer( const QString& v ); - void setDisc_id( const QString& v ); - void setArranger( const QString& v ); - void setSongwriter( const QString& v ); - void setComposer( const QString& v ); - void setUpc_ean( const QString& v ); - void setCdTextMessage( const QString& v ); + void setTitle( const TQString& v ); + void setArtist( const TQString& v ); + void setPerformer( const TQString& v ); + void setDisc_id( const TQString& v ); + void setArranger( const TQString& v ); + void setSongwriter( const TQString& v ); + void setComposer( const TQString& v ); + void setUpc_ean( const TQString& v ); + void setCdTextMessage( const TQString& v ); // Audio-CD Ripping void setAudioRippingParanoiaMode( int i ) { m_audioRippingParanoiaMode = i; } @@ -195,11 +196,11 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc protected: /** reimplemented from K3bDoc */ - bool loadDocumentData( QDomElement* ); + bool loadDocumentData( TQDomElement* ); /** reimplemented from K3bDoc */ - bool saveDocumentData( QDomElement* ); + bool saveDocumentData( TQDomElement* ); - QString typeString() const; + TQString typeString() const; private: // the stuff for adding files @@ -251,9 +252,9 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc // decoder housekeeping // -------------------------------------------------- // used to check if we may delete a decoder - QMap m_decoderUsageCounterMap; + TQMap m_decoderUsageCounterMap; // used to check if we already have a decoder for a specific file - QMap m_decoderPresenceMap; + TQMap m_decoderPresenceMap; class Private; Private* d; diff --git a/libk3b/projects/audiocd/k3baudiofile.cpp b/libk3b/projects/audiocd/k3baudiofile.cpp index 2011e73..955dab0 100644 --- a/libk3b/projects/audiocd/k3baudiofile.cpp +++ b/libk3b/projects/audiocd/k3baudiofile.cpp @@ -47,19 +47,19 @@ K3bAudioFile::~K3bAudioFile() } -QString K3bAudioFile::type() const +TQString K3bAudioFile::type() const { return m_decoder->fileType(); } -QString K3bAudioFile::sourceComment() const +TQString K3bAudioFile::sourceComment() const { return m_decoder->filename().section( "/", -1 ); } -const QString& K3bAudioFile::filename() const +const TQString& K3bAudioFile::filename() const { return m_decoder->filename(); } diff --git a/libk3b/projects/audiocd/k3baudiofile.h b/libk3b/projects/audiocd/k3baudiofile.h index 83f75eb..74d0a12 100644 --- a/libk3b/projects/audiocd/k3baudiofile.h +++ b/libk3b/projects/audiocd/k3baudiofile.h @@ -55,15 +55,15 @@ class LIBK3B_EXPORT K3bAudioFile : public K3bAudioDataSource */ ~K3bAudioFile(); - const QString& filename() const; + const TQString& filename() const; /** * The complete length of the file used by this source. */ K3b::Msf originalLength() const; - QString type() const; - QString sourceComment() const; + TQString type() const; + TQString sourceComment() const; bool isValid() const; diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp index b8a7a11..0a385e9 100644 --- a/libk3b/projects/audiocd/k3baudioimager.cpp +++ b/libk3b/projects/audiocd/k3baudioimager.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include @@ -40,7 +40,7 @@ public: bool m_canceled; int m_fd; - QStringList m_imageNames; + TQStringList m_imageNames; K3bAudioImager::ErrorType lastError; private: @@ -68,7 +68,7 @@ void K3bAudioImager::WorkThread::run() // // // - QStringList::iterator imageFileIt = m_imageNames.begin(); + TQStringList::iterator imageFileIt = m_imageNames.begin(); K3bWaveFileWriter waveFileWriter; K3bAudioTrack* track = m_doc->firstTrack(); @@ -85,7 +85,7 @@ void K3bAudioImager::WorkThread::run() // Seek to the beginning of the track // if( !track->seek(0) ) { - emitInfoMessage( i18n("Unable to seek in track %1.").arg(trackNumber), K3bJob::ERROR ); + emitInfoMessage( i18n("Unable to seek in track %1.").tqarg(trackNumber), K3bJob::ERROR ); emitFinished(false); return; } @@ -101,7 +101,7 @@ void K3bAudioImager::WorkThread::run() // if( m_fd == -1 ) { if( !waveFileWriter.open( *imageFileIt ) ) { - emitInfoMessage( i18n("Could not open %1 for writing").arg(*imageFileIt), K3bJob::ERROR ); + emitInfoMessage( i18n("Could not open %1 for writing").tqarg(*imageFileIt), K3bJob::ERROR ); emitFinished(false); return; } @@ -142,7 +142,7 @@ void K3bAudioImager::WorkThread::run() } if( read < 0 ) { - emitInfoMessage( i18n("Error while decoding track %1.").arg(trackNumber), K3bJob::ERROR ); + emitInfoMessage( i18n("Error while decoding track %1.").tqarg(trackNumber), K3bJob::ERROR ); kdDebug() << "(K3bAudioImager::WorkThread) read error on track " << trackNumber << " at pos " << K3b::Msf(trackRead/2352) << endl; lastError = K3bAudioImager::ERROR_DECODING_TRACK; @@ -167,8 +167,8 @@ void K3bAudioImager::WorkThread::cancel() -K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ), +K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ), m_doc(doc) { m_thread = new WorkThread(doc); @@ -188,7 +188,7 @@ void K3bAudioImager::writeToFd( int fd ) } -void K3bAudioImager::setImageFilenames( const QStringList& p ) +void K3bAudioImager::setImageFilenames( const TQStringList& p ) { m_thread->m_imageNames = p; m_thread->m_fd = -1; diff --git a/libk3b/projects/audiocd/k3baudioimager.h b/libk3b/projects/audiocd/k3baudioimager.h index df4ae7a..bfa1d83 100644 --- a/libk3b/projects/audiocd/k3baudioimager.h +++ b/libk3b/projects/audiocd/k3baudioimager.h @@ -23,9 +23,10 @@ class K3bAudioDoc; class K3bAudioImager : public K3bThreadJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioImager(); /** @@ -39,7 +40,7 @@ class K3bAudioImager : public K3bThreadJob * Image path. Should be an empty directory or a non-existing * directory in which case it will be created. */ - void setImageFilenames( const QStringList& p ); + void setImageFilenames( const TQStringList& p ); enum ErrorType { ERROR_FD_WRITE, diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp index c2e62c2..ddf15a3 100644 --- a/libk3b/projects/audiocd/k3baudiojob.cpp +++ b/libk3b/projects/audiocd/k3baudiojob.cpp @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -48,11 +48,11 @@ -static QString createNonExistingFilesString( const QValueList& items, unsigned int max ) +static TQString createNonExistingFilesString( const TQValueList& items, unsigned int max ) { - QString s; + TQString s; unsigned int cnt = 0; - for( QValueList::const_iterator it = items.begin(); + for( TQValueList::const_iterator it = items.begin(); it != items.end(); ++it ) { s += KStringHandler::csqueeze( (*it)->filename(), 60 ); @@ -92,8 +92,8 @@ class K3bAudioJob::Private }; -K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ), +K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ), m_doc( doc ), m_normalizeJob(0), m_maxSpeedJob(0) @@ -101,16 +101,16 @@ K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, QObject* parent d = new Private; m_audioImager = new K3bAudioImager( m_doc, this, this ); - connect( m_audioImager, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_audioImager, SIGNAL(percent(int)), - this, SLOT(slotAudioDecoderPercent(int)) ); - connect( m_audioImager, SIGNAL(subPercent(int)), - this, SLOT(slotAudioDecoderSubPercent(int)) ); - connect( m_audioImager, SIGNAL(finished(bool)), - this, SLOT(slotAudioDecoderFinished(bool)) ); - connect( m_audioImager, SIGNAL(nextTrack(int, int)), - this, SLOT(slotAudioDecoderNextTrack(int, int)) ); + 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)) ); m_writer = 0; m_tempData = new K3bAudioJobTempData( m_doc, this ); @@ -159,13 +159,13 @@ void K3bAudioJob::start() // // Check if all files exist // - QValueList nonExistingFiles; + TQValueList nonExistingFiles; K3bAudioTrack* track = m_doc->firstTrack(); while( track ) { K3bAudioDataSource* source = track->firstSource(); while( source ) { if( K3bAudioFile* file = dynamic_cast( source ) ) { - if( !QFile::exists( file->filename() ) ) + if( !TQFile::exists( file->filename() ) ) nonExistingFiles.append( file ); } source = source->next(); @@ -179,7 +179,7 @@ void K3bAudioJob::start() i18n("Warning"), i18n("Remove missing files and continue"), i18n("Cancel and go back") ) ) { - for( QValueList::const_iterator it = nonExistingFiles.begin(); + for( TQValueList::const_iterator it = nonExistingFiles.begin(); it != nonExistingFiles.end(); ++it ) { delete *it; } @@ -297,7 +297,7 @@ void K3bAudioJob::start() d->useCdText ) { if( !cdrecordCdText ) { emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.") - .arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); + .tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); d->useCdText = false; } else if( m_usedWritingMode == K3b::TAO ) { @@ -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, SIGNAL(percent(int)), - this, SIGNAL(subPercent(int)) ); - connect( m_maxSpeedJob, SIGNAL(finished(bool)), - this, SLOT(slotMaxSpeedJobFinished(bool)) ); + connect( m_maxSpeedJob, TQT_SIGNAL(percent(int)), + this, TQT_SIGNAL(subPercent(int)) ); + connect( m_maxSpeedJob, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotMaxSpeedJobFinished(bool)) ); } m_maxSpeedJob->start(); return; @@ -346,10 +346,10 @@ void K3bAudioJob::start() } else { emit burning(false); - emit infoMessage( i18n("Creating image files in %1").arg(m_doc->tempDir()), INFO ); + emit infoMessage( i18n("Creating image files in %1").tqarg(m_doc->tempDir()), INFO ); emit newTask( i18n("Creating image files") ); m_tempData->prepareTempFileNames( doc()->tempDir() ); - QStringList filenames; + TQStringList filenames; for( int i = 1; i <= m_doc->numOfTracks(); ++i ) filenames += m_tempData->bufferFileName( i ); m_audioImager->setImageFilenames( filenames ); @@ -480,10 +480,10 @@ void K3bAudioJob::slotAudioDecoderNextTrack( int t, int tt ) if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) { K3bAudioTrack* track = m_doc->getTrack(t); emit newSubTask( i18n("Decoding audio track %1 of %2%3") - .arg(t) - .arg(tt) - .arg( track->title().isEmpty() || track->artist().isEmpty() - ? QString::null + .tqarg(t) + .tqarg(tt) + .tqarg( track->title().isEmpty() || track->artist().isEmpty() + ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } } @@ -533,10 +533,10 @@ bool K3bAudioJob::prepareWriter() while( track ) { if( m_doc->onTheFly() ) { // this is only supported by cdrecord versions >= 2.01a13 - writer->addArgument( QFile::encodeName( m_tempData->infFileName( track ) ) ); + writer->addArgument( TQFile::encodeName( m_tempData->infFileName( track ) ) ); } else { - writer->addArgument( QFile::encodeName( m_tempData->bufferFileName( track ) ) ); + writer->addArgument( TQFile::encodeName( m_tempData->bufferFileName( track ) ) ); } track = track->next(); } @@ -562,20 +562,20 @@ bool K3bAudioJob::prepareWriter() m_writer = writer; } - connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writer, SIGNAL(percent(int)), this, SLOT(slotWriterJobPercent(int)) ); - connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_writer, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_writer, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writer, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) ); - // connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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(buffertqStatus(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&)) ); return true; } @@ -588,10 +588,10 @@ void K3bAudioJob::slotWriterNextTrack( int t, int tt ) if( m_doc->hideFirstTrack() ) track = m_doc->getTrack(t+1); emit newSubTask( i18n("Writing track %1 of %2%3") - .arg(t) - .arg(tt) - .arg( track->title().isEmpty() || track->artist().isEmpty() - ? QString::null + .tqarg(t) + .tqarg(tt) + .tqarg( track->title().isEmpty() || track->artist().isEmpty() + ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } @@ -650,7 +650,7 @@ bool K3bAudioJob::startWriting() if( m_doc->dummy() ) emit newTask( i18n("Simulating") ); else if( d->copies > 1 ) - emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); else emit newTask( i18n("Writing") ); @@ -706,19 +706,19 @@ void K3bAudioJob::normalizeFiles() if( !m_normalizeJob ) { m_normalizeJob = new K3bAudioNormalizeJob( this, this ); - connect( m_normalizeJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_normalizeJob, SIGNAL(percent(int)), this, SLOT(slotNormalizeProgress(int)) ); - connect( m_normalizeJob, SIGNAL(subPercent(int)), this, SLOT(slotNormalizeSubProgress(int)) ); - connect( m_normalizeJob, SIGNAL(finished(bool)), this, SLOT(slotNormalizeJobFinished(bool)) ); - connect( m_normalizeJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_normalizeJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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&)) ); } // add all the files // TODO: we may need to split the wave files and put them back together! - QValueVector files; + TQValueVector files; K3bAudioTrack* track = m_doc->firstTrack(); while( track ) { files.append( m_tempData->bufferFileName(track) ); @@ -779,7 +779,7 @@ bool K3bAudioJob::writeTocFile() if( d->useCdText ) tocWriter.setCdText( m_doc->cdTextData() ); if( !m_doc->onTheFly() ) { - QStringList filenames; + TQStringList filenames; for( int i = 1; i <= m_doc->numOfTracks(); ++i ) filenames += m_tempData->bufferFileName( i ); tocWriter.setFilenames( filenames ); @@ -842,23 +842,23 @@ bool K3bAudioJob::checkAudioSources() } -QString K3bAudioJob::jobDescription() const +TQString K3bAudioJob::jobDescription() const { return i18n("Writing Audio CD") + ( m_doc->title().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->title()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->title()) ); } -QString K3bAudioJob::jobDetails() const +TQString K3bAudioJob::jobDetails() const { return ( i18n( "1 track (%1 minutes)", "%n tracks (%1 minutes)", - m_doc->numOfTracks() ).arg(m_doc->length().toString()) + m_doc->numOfTracks() ).tqarg(m_doc->length().toString()) + ( m_doc->copies() > 1 && !m_doc->dummy() ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3baudiojob.moc" diff --git a/libk3b/projects/audiocd/k3baudiojob.h b/libk3b/projects/audiocd/k3baudiojob.h index af37639..309d3f3 100644 --- a/libk3b/projects/audiocd/k3baudiojob.h +++ b/libk3b/projects/audiocd/k3baudiojob.h @@ -22,8 +22,8 @@ class K3bAudioDoc; class K3bAudioImager; -class QFile; -class QDataStream; +class TQFile; +class TQDataStream; class K3bAbstractWriter; class KTempFile; class K3bCdrecordWriter; @@ -38,16 +38,17 @@ class K3bAudioMaxSpeedJob; class K3bAudioJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bAudioJob(); K3bDoc* doc() const; K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void cancel(); diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp index af98c2e..538d454 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include @@ -35,16 +35,16 @@ public: : doc(_doc) { } - QValueVector bufferFiles; - QValueVector infFiles; - QString tocFile; + TQValueVector bufferFiles; + TQValueVector infFiles; + TQString tocFile; K3bAudioDoc* doc; }; -K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, QObject* parent, const char* name ) - : QObject( parent, name ) +K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private( doc ); } @@ -56,20 +56,20 @@ K3bAudioJobTempData::~K3bAudioJobTempData() } -const QString& K3bAudioJobTempData::bufferFileName( int track ) +const TQString& K3bAudioJobTempData::bufferFileName( int track ) { if( (int)d->bufferFiles.count() < track ) prepareTempFileNames(); return d->bufferFiles.at(track-1); } -const QString& K3bAudioJobTempData::bufferFileName( K3bAudioTrack* track ) +const TQString& K3bAudioJobTempData::bufferFileName( K3bAudioTrack* track ) { return bufferFileName( track->trackNumber() ); } -const QString& K3bAudioJobTempData::tocFileName() +const TQString& K3bAudioJobTempData::tocFileName() { if( d->tocFile.isEmpty() ) prepareTempFileNames(); @@ -77,14 +77,14 @@ const QString& K3bAudioJobTempData::tocFileName() } -const QString& K3bAudioJobTempData::infFileName( int track ) +const TQString& K3bAudioJobTempData::infFileName( int track ) { if( (int)d->infFiles.count() < track ) prepareTempFileNames(); return d->infFiles.at( track - 1 ); } -const QString& K3bAudioJobTempData::infFileName( K3bAudioTrack* track ) +const TQString& K3bAudioJobTempData::infFileName( K3bAudioTrack* track ) { return infFileName( track->trackNumber() ); } @@ -96,16 +96,16 @@ K3bAudioDoc* K3bAudioJobTempData::doc() const } -void K3bAudioJobTempData::prepareTempFileNames( const QString& path ) +void K3bAudioJobTempData::prepareTempFileNames( const TQString& path ) { d->bufferFiles.clear(); d->infFiles.clear(); - QString prefix = K3b::findUniqueFilePrefix( "k3b_audio_", path ) + "_"; + TQString prefix = K3b::findUniqueFilePrefix( "k3b_audio_", path ) + "_"; for( int i = 0; i < d->doc->numOfTracks(); i++ ) { - d->bufferFiles.append( prefix + QString::number( i+1 ).rightJustify( 2, '0' ) + ".wav" ); - d->infFiles.append( prefix + QString::number( i+1 ).rightJustify( 2, '0' ) + ".inf" ); + d->bufferFiles.append( prefix + TQString::number( i+1 ).rightJustify( 2, '0' ) + ".wav" ); + d->infFiles.append( prefix + TQString::number( i+1 ).rightJustify( 2, '0' ) + ".inf" ); } d->tocFile = prefix + ".toc"; @@ -115,17 +115,17 @@ void K3bAudioJobTempData::prepareTempFileNames( const QString& path ) void K3bAudioJobTempData::cleanup() { for( uint i = 0; i < d->infFiles.count(); ++i ) { - if( QFile::exists( d->infFiles[i] ) ) - QFile::remove( d->infFiles[i] ); + if( TQFile::exists( d->infFiles[i] ) ) + TQFile::remove( d->infFiles[i] ); } for( uint i = 0; i < d->bufferFiles.count(); ++i ) { - if( QFile::exists( d->bufferFiles[i] ) ) - QFile::remove( d->bufferFiles[i] ); + if( TQFile::exists( d->bufferFiles[i] ) ) + TQFile::remove( d->bufferFiles[i] ); } - if( QFile::exists( d->tocFile ) ) - QFile::remove( d->tocFile ); + if( TQFile::exists( d->tocFile ) ) + TQFile::remove( d->tocFile ); } diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.h b/libk3b/projects/audiocd/k3baudiojobtempdata.h index 72b753f..62bc7e7 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.h +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.h @@ -17,29 +17,30 @@ #ifndef _K3B_AUDIO_JOB_TEMPDATA_H_ #define _K3B_AUDIO_JOB_TEMPDATA_H_ -#include +#include #include class K3bAudioTrack; class K3bAudioDoc; -class QTextStream; +class TQTextStream; -class K3bAudioJobTempData : public QObject +class K3bAudioJobTempData : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bAudioJobTempData( K3bAudioDoc* doc, QObject* parent = 0, const char* name = 0 ); + K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioJobTempData(); - const QString& bufferFileName( int track ); - const QString& bufferFileName( K3bAudioTrack* track ); + const TQString& bufferFileName( int track ); + const TQString& bufferFileName( K3bAudioTrack* track ); - const QString& infFileName( int track ); - const QString& infFileName( K3bAudioTrack* track ); + const TQString& infFileName( int track ); + const TQString& infFileName( K3bAudioTrack* track ); - const QString& tocFileName(); + const TQString& tocFileName(); K3bAudioDoc* doc() const; @@ -48,7 +49,7 @@ class K3bAudioJobTempData : public QObject * a specific directory * it defaults to the default K3b temp dir */ - void prepareTempFileNames( const QString& path = QString::null ); + void prepareTempFileNames( const TQString& path = TQString() ); /** * remove all temp files (this does not include the audio buffer files diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp index 975ab89..cde09c9 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include class K3bAudioMaxSpeedJob::WorkThread : public K3bThread @@ -106,7 +106,7 @@ void K3bAudioMaxSpeedJob::WorkThread::run() } else if( speed > 0 ) { // update the max speed - maxSpeed = QMIN( maxSpeed, speed ); + maxSpeed = TQMIN( maxSpeed, speed ); } it.next(); @@ -142,7 +142,7 @@ int K3bAudioMaxSpeedJob::WorkThread::speedTest( K3bAudioDataSource* source ) } } - QTime t; + TQTime t; int dataRead = 0; int r = 0; @@ -183,11 +183,11 @@ int K3bAudioMaxSpeedJob::WorkThread::maxSpeedByMedia() const { int s = 0; - QValueList speeds = m_doc->burner()->determineSupportedWriteSpeeds(); + TQValueList speeds = m_doc->burner()->determineSupportedWriteSpeeds(); // simply use what we have and let the writer decide if the speeds are empty if( !speeds.isEmpty() ) { // start with the highest speed and go down the list until we are below our max - QValueListIterator it = speeds.end(); + TQValueListIterator it = speeds.end(); --it; while( *it > maxSpeed && it != speeds.begin() ) --it; @@ -203,8 +203,8 @@ int K3bAudioMaxSpeedJob::WorkThread::maxSpeedByMedia() const -K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ) +K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ) { m_thread = new WorkThread( doc ); setThread( m_thread ); diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h index 876bc7f..9526d4a 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h @@ -24,9 +24,10 @@ class K3bAudioDoc; class K3bAudioMaxSpeedJob : public K3bThreadJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioMaxSpeedJob(); /** diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index 782712b..a732bb5 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -23,8 +23,8 @@ #include -K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, QObject* parent, const char* name ) - : K3bJob( hdl, parent, name ), +K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) + : K3bJob( hdl, tqparent, name ), m_process(0) { } @@ -49,8 +49,8 @@ void K3bAudioNormalizeJob::start() delete m_process; m_process = new K3bProcess(); - connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" ); @@ -61,14 +61,14 @@ void K3bAudioNormalizeJob::start() } if( !bin->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(bin->name()).arg(bin->version).arg(bin->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(bin->name()).tqarg(bin->version).tqarg(bin->copyright), INFO ); // create the commandline *m_process << bin; // additional user parameters from config - const QStringList& params = bin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = bin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; // end the options @@ -100,11 +100,11 @@ void K3bAudioNormalizeJob::cancel() } -void K3bAudioNormalizeJob::slotStdLine( const QString& line ) +void K3bAudioNormalizeJob::slotStdLine( const TQString& line ) { // percent, subPercent, newTask (compute level and adjust) - // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) ); + // emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").tqarg(t).tqarg(tt).tqarg(m_files.at(t-1)) ); emit debuggingOutput( "normalize-audio", line ); @@ -121,15 +121,15 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line ) } } - else if( line.contains( "already normalized" ) ) { + else if( line.tqcontains( "already normalized" ) ) { // no normalization necessary for the current track - emit infoMessage( i18n("Track %1 is already normalized.").arg(m_currentTrack), INFO ); + emit infoMessage( i18n("Track %1 is already normalized.").tqarg(m_currentTrack), INFO ); m_currentTrack++; } - else if( line.contains( "--% done") ) { + else if( line.tqcontains( "--% done") ) { if( m_currentAction == ADJUSTING_LEVELS ) { - emit newTask( i18n("Adjusting volume level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) ); + emit newTask( i18n("Adjusting volume level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) ); kdDebug() << "(K3bAudioNormalizeJob) adjusting level for track " << m_currentTrack << " " @@ -137,7 +137,7 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line ) << endl; } else { - emit newTask( i18n("Computing level for track %1 of %2").arg(m_currentTrack).arg(m_files.count()) ); + emit newTask( i18n("Computing level for track %1 of %2").tqarg(m_currentTrack).tqarg(m_files.count()) ); kdDebug() << "(K3bAudioNormalizeJob) computing level for track " << m_currentTrack << " " @@ -148,7 +148,7 @@ void K3bAudioNormalizeJob::slotStdLine( const QString& line ) m_currentTrack++; } - else if( int pos = line.find( "% done" ) > 0 ) { + else if( int pos = line.tqfind( "% done" ) > 0 ) { // parse progress: "XXX% done" and "batch XXX% done" pos -= 3; bool ok; @@ -185,7 +185,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p ) break; default: if( !m_canceled ) { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("normalize-audio").tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); emit infoMessage( i18n("Error while normalizing tracks."), ERROR ); @@ -197,7 +197,7 @@ void K3bAudioNormalizeJob::slotProcessExited( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg("Normalize"), K3bJob::ERROR ); + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("Normalize"), K3bJob::ERROR ); jobFinished( false ); } } diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h index e56086b..b623a41 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.h +++ b/libk3b/projects/audiocd/k3baudionormalizejob.h @@ -20,7 +20,7 @@ #include -#include +#include class K3bProcess; class KProcess; @@ -29,25 +29,26 @@ class KProcess; class K3bAudioNormalizeJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bAudioNormalizeJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bAudioNormalizeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioNormalizeJob(); public slots: void start(); void cancel(); - void setFilesToNormalize( const QValueVector& files ) { m_files = files; } + void setFilesToNormalize( const TQValueVector& files ) { m_files = files; } private slots: - void slotStdLine( const QString& line ); + void slotStdLine( const TQString& line ); void slotProcessExited( KProcess* p ); private: K3bProcess* m_process; - QValueVector m_files; + TQValueVector m_files; bool m_canceled; enum Action { diff --git a/libk3b/projects/audiocd/k3baudiotrack.cpp b/libk3b/projects/audiocd/k3baudiotrack.cpp index a1d12e4..53d1d34 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.cpp +++ b/libk3b/projects/audiocd/k3baudiotrack.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include @@ -59,8 +59,8 @@ K3bAudioTrack::K3bAudioTrack() } -K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* parent ) - : m_parent(parent), +K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* tqparent ) + : m_parent(tqparent), m_copy(false), m_preEmp(false), m_index0Offset(150), @@ -106,67 +106,67 @@ void K3bAudioTrack::emitChanged() } -void K3bAudioTrack::setArtist( const QString& a ) +void K3bAudioTrack::setArtist( const TQString& a ) { setPerformer( a ); } -void K3bAudioTrack::setPerformer( const QString& a ) +void K3bAudioTrack::setPerformer( const TQString& a ) { - QString s( a ); + TQString s( a ); d->cdTextValidator->fixup( s ); m_cdText.setPerformer(s); emitChanged(); } -void K3bAudioTrack::setTitle( const QString& t ) +void K3bAudioTrack::setTitle( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setTitle(s); emitChanged(); } -void K3bAudioTrack::setArranger( const QString& t ) +void K3bAudioTrack::setArranger( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setArranger(s); emitChanged(); } -void K3bAudioTrack::setSongwriter( const QString& t ) +void K3bAudioTrack::setSongwriter( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setSongwriter(s); emitChanged(); } -void K3bAudioTrack::setComposer( const QString& t ) +void K3bAudioTrack::setComposer( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setComposer(s); emitChanged(); } -void K3bAudioTrack::setIsrc( const QString& t ) +void K3bAudioTrack::setIsrc( const TQString& t ) { m_cdText.setIsrc(t); emitChanged(); } -void K3bAudioTrack::setCdTextMessage( const QString& t ) +void K3bAudioTrack::setCdTextMessage( const TQString& t ) { - QString s( t ); + TQString s( t ); d->cdTextValidator->fixup( s ); m_cdText.setMessage(s); emitChanged(); @@ -282,7 +282,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track ) kdDebug() << "(K3bAudioTrack::moveAfter( " << track << " )" << endl; if( !track ) { if( !doc() ) { - kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl; + kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl; return; } @@ -302,7 +302,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track ) // remove this from the list take(); - // set the new parent doc + // set the new tqparent doc m_parent = track->doc(); K3bAudioTrack* oldNext = track->m_next; @@ -330,7 +330,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track ) { if( !track ) { if( !doc() ) { - kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl; + kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl; return; } @@ -350,7 +350,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track ) // remove this from the list take(); - // set the new parent doc + // set the new tqparent doc m_parent = track->doc(); K3bAudioTrack* oldPrev = track->m_prev; @@ -568,7 +568,7 @@ K3bAudioTrack* K3bAudioTrack::split( const K3b::Msf& pos ) splitTrack->addSource( addSource ); } - kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with parent " << doc() << endl; + kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with tqparent " << doc() << endl; splitTrack->moveAfter( this ); return splitTrack; @@ -604,7 +604,7 @@ K3bDevice::Track K3bAudioTrack::toCdTrack() const if( doc()->lastTrack() != this ) cdTrack.setIndex0( index0() ); - // FIXME: convert to QCString + // FIXME: convert to TQCString // cdTrack.setIsrc( isrc() ); return cdTrack; diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h index ab0ee1b..0edef0a 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.h +++ b/libk3b/projects/audiocd/k3baudiotrack.h @@ -17,10 +17,10 @@ #ifndef K3BAUDIOTRACK_H #define K3BAUDIOTRACK_H -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bAudioTrack public: K3bAudioTrack(); - K3bAudioTrack( K3bAudioDoc* parent ); + K3bAudioTrack( K3bAudioDoc* tqparent ); ~K3bAudioTrack(); K3bAudioDoc* doc() const { return m_parent; } @@ -58,14 +58,14 @@ class LIBK3B_EXPORT K3bAudioTrack K3b::Msf length() const; KIO::filesize_t size() const; - const QString& artist() const { return m_cdText.performer(); } - const QString& performer() const { return m_cdText.performer(); } - const QString& title() const { return m_cdText.title(); } - const QString& arranger() const { return m_cdText.arranger(); } - const QString& songwriter() const { return m_cdText.songwriter(); } - const QString& composer() const { return m_cdText.composer(); } - const QString& isrc() const { return m_cdText.isrc(); } - const QString& cdTextMessage() const { return m_cdText.message(); } + const TQString& artist() const { return m_cdText.performer(); } + const TQString& performer() const { return m_cdText.performer(); } + const TQString& title() const { return m_cdText.title(); } + const TQString& arranger() const { return m_cdText.arranger(); } + const TQString& songwriter() const { return m_cdText.songwriter(); } + const TQString& composer() const { return m_cdText.composer(); } + const TQString& isrc() const { return m_cdText.isrc(); } + const TQString& cdTextMessage() const { return m_cdText.message(); } const K3bDevice::TrackCdText& cdText() const { return m_cdText; } bool copyProtection() const { return m_copy; } @@ -74,14 +74,14 @@ class LIBK3B_EXPORT K3bAudioTrack /** * @obsolete use setPerformer **/ - void setArtist( const QString& a ); - void setPerformer( const QString& a ); - void setTitle( const QString& t ); - void setArranger( const QString& t ); - void setSongwriter( const QString& t ); - void setComposer( const QString& t ); - void setIsrc( const QString& t ); - void setCdTextMessage( const QString& t ); + void setArtist( const TQString& a ); + void setPerformer( const TQString& a ); + void setTitle( const TQString& t ); + void setArranger( const TQString& t ); + void setSongwriter( const TQString& t ); + void setComposer( const TQString& t ); + void setIsrc( const TQString& t ); + void setCdTextMessage( const TQString& t ); void setCdText( const K3bDevice::TrackCdText& cdtext ); diff --git a/libk3b/projects/audiocd/k3baudiozerodata.cpp b/libk3b/projects/audiocd/k3baudiozerodata.cpp index f5c985d..aff0cf9 100644 --- a/libk3b/projects/audiocd/k3baudiozerodata.cpp +++ b/libk3b/projects/audiocd/k3baudiozerodata.cpp @@ -55,15 +55,15 @@ void K3bAudioZeroData::setLength( const K3b::Msf& msf ) } -QString K3bAudioZeroData::type() const +TQString K3bAudioZeroData::type() const { return i18n("Silence"); } -QString K3bAudioZeroData::sourceComment() const +TQString K3bAudioZeroData::sourceComment() const { - return QString::null; + return TQString(); } diff --git a/libk3b/projects/audiocd/k3baudiozerodata.h b/libk3b/projects/audiocd/k3baudiozerodata.h index 8cb2911..6475cd1 100644 --- a/libk3b/projects/audiocd/k3baudiozerodata.h +++ b/libk3b/projects/audiocd/k3baudiozerodata.h @@ -29,8 +29,8 @@ class LIBK3B_EXPORT K3bAudioZeroData : public K3bAudioDataSource K3b::Msf originalLength() const { return m_length; } void setLength( const K3b::Msf& msf ); - QString type() const; - QString sourceComment() const; + TQString type() const; + TQString sourceComment() const; bool seek( const K3b::Msf& ); int read( char* data, unsigned int max ); diff --git a/libk3b/projects/datacd/k3bbootitem.cpp b/libk3b/projects/datacd/k3bbootitem.cpp index e94830e..f5a8725 100644 --- a/libk3b/projects/datacd/k3bbootitem.cpp +++ b/libk3b/projects/datacd/k3bbootitem.cpp @@ -19,10 +19,10 @@ #include -#include +#include -K3bBootItem::K3bBootItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName ) +K3bBootItem::K3bBootItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName ) : K3bFileItem( fileName, doc, dir, k3bName, FILE|BOOT_IMAGE ), m_noBoot(false), m_bootInfoTable(false), diff --git a/libk3b/projects/datacd/k3bbootitem.h b/libk3b/projects/datacd/k3bbootitem.h index 9dd8704..78478ea 100644 --- a/libk3b/projects/datacd/k3bbootitem.h +++ b/libk3b/projects/datacd/k3bbootitem.h @@ -21,7 +21,7 @@ class K3bBootItem : public K3bFileItem { public: - K3bBootItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 ); + K3bBootItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 ); K3bBootItem( const K3bBootItem& ); ~K3bBootItem(); @@ -39,7 +39,7 @@ class K3bBootItem : public K3bFileItem void setLoadSize( int s ) { m_loadSize = s; } void setImageType( int t ) { m_imageType = t; } - void setTempPath( const QString& p ) { m_tempPath = p; } + void setTempPath( const TQString& p ) { m_tempPath = p; } bool noBoot() const { return m_noBoot; } bool bootInfoTable() const { return m_bootInfoTable; } @@ -51,7 +51,7 @@ class K3bBootItem : public K3bFileItem * mkisofs changes boot images on disk. That is why the iso imager * buffers them and saves the path to the buffered copy here. */ - const QString& tempPath() const { return m_tempPath; } + const TQString& tempPath() const { return m_tempPath; } private: bool m_noBoot; @@ -60,7 +60,7 @@ class K3bBootItem : public K3bFileItem int m_loadSize; int m_imageType; - QString m_tempPath; + TQString m_tempPath; }; #endif diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index d12c8d2..44b6214 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -34,14 +34,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -67,8 +67,8 @@ * \li or create your own K3bDirItems and K3bFileItems. The doc will be properly updated * by the constructors of the items. */ -K3bDataDoc::K3bDataDoc( QObject* parent ) - : K3bDoc( parent ) +K3bDataDoc::K3bDataDoc( TQObject* tqparent ) + : K3bDoc( tqparent ) { m_root = 0; @@ -92,8 +92,8 @@ bool K3bDataDoc::newDocument() m_bExistingItemsReplaceAll = m_bExistingItemsIgnoreAll = false; if( m_root ) { - while( m_root->children().getFirst() ) - removeItem( m_root->children().getFirst() ); + while( m_root->tqchildren().getFirst() ) + removeItem( m_root->tqchildren().getFirst() ); } else m_root = new K3bRootItem( this ); @@ -109,7 +109,7 @@ bool K3bDataDoc::newDocument() } -QString K3bDataDoc::name() const +TQString K3bDataDoc::name() const { return m_isoOptions.volumeID(); } @@ -122,7 +122,7 @@ void K3bDataDoc::setIsoOptions( const K3bIsoOptions& o ) } -void K3bDataDoc::setVolumeID( const QString& v ) +void K3bDataDoc::setVolumeID( const TQString& v ) { m_isoOptions.setVolumeID( v ); emit changed(); @@ -144,8 +144,8 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) { const KURL& url = *it; - QFileInfo f( url.path() ); - QString k3bname = f.absFilePath().section( "/", -1 ); + TQFileInfo f( url.path() ); + TQString k3bname = f.absFilePath().section( "/", -1 ); // filenames cannot end in backslashes (mkisofs problem. See comments in k3bisoimager.cpp (escapeGraftPoint())) while( k3bname[k3bname.length()-1] == '\\' ) @@ -162,10 +162,10 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) bool ok = false; while( !ok ) { ok = true; - QString name( k3bname ); + TQString name( k3bname ); if( cnt > 0 ) - name += QString("_%1").arg(cnt); - if( K3bDataItem* oldItem = dir->find( name ) ) { + name += TQString("_%1").tqarg(cnt); + if( K3bDataItem* oldItem = dir->tqfind( name ) ) { if( f.isDir() && oldItem->isDir() ) { // ok, just reuse the dir newDirItem = static_cast(oldItem); @@ -182,9 +182,9 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) } } if( cnt > 0 ) - k3bname += QString("_%1").arg(cnt); + k3bname += TQString("_%1").tqarg(cnt); - // QFileInfo::exists and QFileInfo::isReadable return false for broken symlinks :( + // TQFileInfo::exists and TQFileInfo::isReadable return false for broken symlinks :( if( f.isDir() && !f.isSymLink() ) { if( !newDirItem ) { newDirItem = new K3bDirItem( k3bname, this, dir ); @@ -192,11 +192,11 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) } // recursively add all the files in the directory - QStringList dlist = QDir( f.absFilePath() ).entryList( QDir::All|QDir::System|QDir::Hidden ); + TQStringList dlist = TQDir( f.absFilePath() ).entryList( TQDir::All|TQDir::System|TQDir::Hidden ); dlist.remove("."); dlist.remove(".."); KURL::List newUrls; - for( QStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) + for( TQStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) newUrls.append( KURL::fromPathOrURL( f.absFilePath() + "/" + *it ) ); addUrls( newUrls, newDirItem ); } @@ -210,18 +210,18 @@ void K3bDataDoc::addUrls( const KURL::List& l, K3bDirItem* dir ) } -bool K3bDataDoc::nameAlreadyInDir( const QString& name, K3bDirItem* dir ) +bool K3bDataDoc::nameAlreadyInDir( const TQString& name, K3bDirItem* dir ) { if( !dir ) return false; else - return ( dir->find( name ) != 0 ); + return ( dir->tqfind( name ) != 0 ); } -K3bDirItem* K3bDataDoc::addEmptyDir( const QString& name, K3bDirItem* parent ) +K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* tqparent ) { - K3bDirItem* item = new K3bDirItem( name, this, parent ); + K3bDirItem* item = new K3bDirItem( name, this, tqparent ); setModified( true ); @@ -261,21 +261,21 @@ K3b::Msf K3bDataDoc::burningLength() const } -QString K3bDataDoc::typeString() const +TQString K3bDataDoc::typeString() const { - return QString::fromLatin1("data"); + return TQString::tqfromLatin1("data"); } -bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) +bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem ) { if( !root() ) newDocument(); - QDomNodeList nodes = rootElem->childNodes(); + TQDomNodeList nodes = rootElem->childNodes(); if( nodes.item(0).nodeName() != "general" ) { - kdDebug() << "(K3bDataDoc) could not find 'general' section." << endl; + kdDebug() << "(K3bDataDoc) could not tqfind 'general' section." << endl; return false; } if( !readGeneralDocumentData( nodes.item(0).toElement() ) ) @@ -285,7 +285,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) // parse options // ----------------------------------------------------------------- if( nodes.item(1).nodeName() != "options" ) { - kdDebug() << "(K3bDataDoc) could not find 'options' section." << endl; + kdDebug() << "(K3bDataDoc) could not tqfind 'options' section." << endl; return false; } if( !loadDocumentDataOptions( nodes.item(1).toElement() ) ) @@ -297,7 +297,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) // parse header // ----------------------------------------------------------------- if( nodes.item(2).nodeName() != "header" ) { - kdDebug() << "(K3bDataDoc) could not find 'header' section." << endl; + kdDebug() << "(K3bDataDoc) could not tqfind 'header' section." << endl; return false; } if( !loadDocumentDataHeader( nodes.item(2).toElement() ) ) @@ -309,17 +309,17 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) // parse files // ----------------------------------------------------------------- if( nodes.item(3).nodeName() != "files" ) { - kdDebug() << "(K3bDataDoc) could not find 'files' section." << endl; + kdDebug() << "(K3bDataDoc) could not tqfind 'files' section." << endl; return false; } if( m_root == 0 ) m_root = new K3bRootItem( this ); - QDomNodeList filesList = nodes.item(3).childNodes(); + TQDomNodeList filesList = nodes.item(3).childNodes(); for( uint i = 0; i < filesList.count(); i++ ) { - QDomElement e = filesList.item(i).toElement(); + TQDomElement e = filesList.item(i).toElement(); if( !loadDataItem( e, root() ) ) return false; } @@ -332,7 +332,7 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) // file we create a default one here. // if( !m_bootImages.isEmpty() && !m_bootCataloge ) - createBootCatalogeItem( m_bootImages.first()->parent() ); + createBootCatalogeItem( m_bootImages.first()->tqparent() ); informAboutNotFoundFiles(); @@ -341,12 +341,12 @@ bool K3bDataDoc::loadDocumentData( QDomElement* rootElem ) } -bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem ) +bool K3bDataDoc::loadDocumentDataOptions( TQDomElement elem ) { - QDomNodeList headerList = elem.childNodes(); + TQDomNodeList headerList = elem.childNodes(); for( uint i = 0; i < headerList.count(); i++ ) { - QDomElement e = headerList.item(i).toElement(); + TQDomElement e = headerList.item(i).toElement(); if( e.isNull() ) return false; @@ -428,7 +428,7 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem ) else if( e.text() == "extended" ) m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::extended ); else if( e.text() == "extended" ) - m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::replace ); + m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::tqreplace ); else m_isoOptions.setWhiteSpaceTreatment( K3bIsoOptions::noChange ); } @@ -446,7 +446,7 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem ) } else if( e.nodeName() == "multisession" ) { - QString mode = e.text(); + TQString mode = e.text(); if( mode == "start" ) setMultiSessionMode( START ); else if( mode == "continue" ) @@ -470,12 +470,12 @@ bool K3bDataDoc::loadDocumentDataOptions( QDomElement elem ) } -bool K3bDataDoc::loadDocumentDataHeader( QDomElement headerElem ) +bool K3bDataDoc::loadDocumentDataHeader( TQDomElement headerElem ) { - QDomNodeList headerList = headerElem.childNodes(); + TQDomNodeList headerList = headerElem.childNodes(); for( uint i = 0; i < headerList.count(); i++ ) { - QDomElement e = headerList.item(i).toElement(); + TQDomElement e = headerList.item(i).toElement(); if( e.isNull() ) return false; @@ -511,31 +511,31 @@ bool K3bDataDoc::loadDocumentDataHeader( QDomElement headerElem ) } -bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent ) +bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) { K3bDataItem* newItem = 0; if( elem.nodeName() == "file" ) { - QDomElement urlElem = elem.firstChild().toElement(); + TQDomElement urlElem = elem.firstChild().toElement(); if( urlElem.isNull() ) { kdDebug() << "(K3bDataDoc) file-element without url!" << endl; return false; } - QFileInfo f( urlElem.text() ); + TQFileInfo f( urlElem.text() ); // We canot use exists() here since this always disqualifies broken symlinks if( !f.isFile() && !f.isSymLink() ) m_notFoundFiles.append( urlElem.text() ); - // broken symlinks are not readable according to QFileInfo which is wrong in our case + // broken symlinks are not readable according to TQFileInfo which is wrong in our case else if( f.isFile() && !f.isReadable() ) m_noPermissionFiles.append( urlElem.text() ); else if( !elem.attribute( "bootimage" ).isEmpty() ) { K3bBootItem* bootItem = new K3bBootItem( urlElem.text(), this, - parent, + tqparent, elem.attributeNode( "name" ).value() ); if( elem.attribute( "bootimage" ) == "floppy" ) bootItem->setImageType( K3bBootItem::FLOPPY ); @@ -554,18 +554,18 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent ) else { newItem = new K3bFileItem( urlElem.text(), this, - parent, + tqparent, elem.attributeNode( "name" ).value() ); } } else if( elem.nodeName() == "special" ) { if( elem.attributeNode( "type" ).value() == "boot cataloge" ) - createBootCatalogeItem( parent )->setK3bName( elem.attributeNode( "name" ).value() ); + createBootCatalogeItem( tqparent )->setK3bName( elem.attributeNode( "name" ).value() ); } else if( elem.nodeName() == "directory" ) { // This is for the VideoDVD project which already contains the *_TS folders K3bDirItem* newDirItem = 0; - if( K3bDataItem* item = parent->find( elem.attributeNode( "name" ).value() ) ) { + if( K3bDataItem* item = tqparent->tqfind( elem.attributeNode( "name" ).value() ) ) { if( item->isDir() ) { newDirItem = static_cast(item); } @@ -576,11 +576,11 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent ) } if( !newDirItem ) - newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, parent ); - QDomNodeList childNodes = elem.childNodes(); + newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, tqparent ); + TQDomNodeList childNodes = elem.childNodes(); for( uint i = 0; i < childNodes.count(); i++ ) { - QDomElement e = childNodes.item(i).toElement(); + TQDomElement e = childNodes.item(i).toElement(); if( !loadDataItem( e, newDirItem ) ) return false; } @@ -600,31 +600,31 @@ bool K3bDataDoc::loadDataItem( QDomElement& elem, K3bDirItem* parent ) } -bool K3bDataDoc::saveDocumentData( QDomElement* docElem ) +bool K3bDataDoc::saveDocumentData( TQDomElement* docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); // all options // ---------------------------------------------------------------------- - QDomElement optionsElem = doc.createElement( "options" ); + TQDomElement optionsElem = doc.createElement( "options" ); saveDocumentDataOptions( optionsElem ); docElem->appendChild( optionsElem ); // ---------------------------------------------------------------------- // the header stuff // ---------------------------------------------------------------------- - QDomElement headerElem = doc.createElement( "header" ); + TQDomElement headerElem = doc.createElement( "header" ); saveDocumentDataHeader( headerElem ); docElem->appendChild( headerElem ); // now do the "real" work: save the entries // ---------------------------------------------------------------------- - QDomElement topElem = doc.createElement( "files" ); + TQDomElement topElem = doc.createElement( "files" ); - QPtrListIterator it( root()->children() ); + TQPtrListIterator it( root()->tqchildren() ); for( ; it.current(); ++it ) { saveDataItem( it.current(), &doc, &topElem ); } @@ -636,11 +636,11 @@ bool K3bDataDoc::saveDocumentData( QDomElement* docElem ) } -void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem ) +void K3bDataDoc::saveDocumentDataOptions( TQDomElement& optionsElem ) { - QDomDocument doc = optionsElem.ownerDocument(); + TQDomDocument doc = optionsElem.ownerDocument(); - QDomElement topElem = doc.createElement( "rock_ridge" ); + TQDomElement topElem = doc.createElement( "rock_ridge" ); topElem.setAttribute( "activated", isoOptions().createRockRidge() ? "yes" : "no" ); optionsElem.appendChild( topElem ); @@ -709,7 +709,7 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem ) optionsElem.appendChild( topElem ); topElem = doc.createElement( "iso_level" ); - topElem.appendChild( doc.createTextNode( QString::number(isoOptions().ISOLevel()) ) ); + topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().ISOLevel()) ) ); optionsElem.appendChild( topElem ); topElem = doc.createElement( "discard_symlinks" ); @@ -745,8 +745,8 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem ) case K3bIsoOptions::extended: topElem.appendChild( doc.createTextNode( "extended" ) ); break; - case K3bIsoOptions::replace: - topElem.appendChild( doc.createTextNode( "replace" ) ); + case K3bIsoOptions::tqreplace: + topElem.appendChild( doc.createTextNode( "tqreplace" ) ); break; default: topElem.appendChild( doc.createTextNode( "noChange" ) ); @@ -796,11 +796,11 @@ void K3bDataDoc::saveDocumentDataOptions( QDomElement& optionsElem ) } -void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem ) +void K3bDataDoc::saveDocumentDataHeader( TQDomElement& headerElem ) { - QDomDocument doc = headerElem.ownerDocument(); + TQDomDocument doc = headerElem.ownerDocument(); - QDomElement topElem = doc.createElement( "volume_id" ); + TQDomElement topElem = doc.createElement( "volume_id" ); topElem.appendChild( doc.createTextNode( isoOptions().volumeID() ) ); headerElem.appendChild( topElem ); @@ -809,11 +809,11 @@ void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem ) headerElem.appendChild( topElem ); topElem = doc.createElement( "volume_set_size" ); - topElem.appendChild( doc.createTextNode( QString::number(isoOptions().volumeSetSize()) ) ); + topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().volumeSetSize()) ) ); headerElem.appendChild( topElem ); topElem = doc.createElement( "volume_set_number" ); - topElem.appendChild( doc.createTextNode( QString::number(isoOptions().volumeSetNumber()) ) ); + topElem.appendChild( doc.createTextNode( TQString::number(isoOptions().volumeSetNumber()) ) ); headerElem.appendChild( topElem ); topElem = doc.createElement( "system_id" ); @@ -835,23 +835,23 @@ void K3bDataDoc::saveDocumentDataHeader( QDomElement& headerElem ) } -void K3bDataDoc::saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement* parent ) +void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ) { if( K3bFileItem* fileItem = dynamic_cast( item ) ) { - if( m_oldSession.contains( fileItem ) ) { + if( m_oldSession.tqcontains( fileItem ) ) { kdDebug() << "(K3bDataDoc) ignoring fileitem " << fileItem->k3bName() << " from old session while saving..." << endl; } else { - QDomElement topElem = doc->createElement( "file" ); + TQDomElement topElem = doc->createElement( "file" ); topElem.setAttribute( "name", fileItem->k3bName() ); - QDomElement subElem = doc->createElement( "url" ); + TQDomElement subElem = doc->createElement( "url" ); subElem.appendChild( doc->createTextNode( fileItem->localPath() ) ); topElem.appendChild( subElem ); if( item->sortWeight() != 0 ) - topElem.setAttribute( "sort_weight", QString::number(item->sortWeight()) ); + topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) ); - parent->appendChild( topElem ); + tqparent->appendChild( topElem ); // add boot options as attributes to preserve compatibility to older K3b versions if( K3bBootItem* bootItem = dynamic_cast( fileItem ) ) { @@ -864,31 +864,31 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement topElem.setAttribute( "no_boot", bootItem->noBoot() ? "yes" : "no" ); topElem.setAttribute( "boot_info_table", bootItem->bootInfoTable() ? "yes" : "no" ); - topElem.setAttribute( "load_segment", QString::number( bootItem->loadSegment() ) ); - topElem.setAttribute( "load_size", QString::number( bootItem->loadSize() ) ); + topElem.setAttribute( "load_segment", TQString::number( bootItem->loadSegment() ) ); + topElem.setAttribute( "load_size", TQString::number( bootItem->loadSize() ) ); } } } else if( item == m_bootCataloge ) { - QDomElement topElem = doc->createElement( "special" ); + TQDomElement topElem = doc->createElement( "special" ); topElem.setAttribute( "name", m_bootCataloge->k3bName() ); topElem.setAttribute( "type", "boot cataloge" ); - parent->appendChild( topElem ); + tqparent->appendChild( topElem ); } else if( K3bDirItem* dirItem = dynamic_cast( item ) ) { - QDomElement topElem = doc->createElement( "directory" ); + TQDomElement topElem = doc->createElement( "directory" ); topElem.setAttribute( "name", dirItem->k3bName() ); if( item->sortWeight() != 0 ) - topElem.setAttribute( "sort_weight", QString::number(item->sortWeight()) ); + topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) ); - QPtrListIterator it( dirItem->children() ); + TQPtrListIterator it( dirItem->tqchildren() ); for( ; it.current(); ++it ) { saveDataItem( it.current(), doc, &topElem ); } - parent->appendChild( topElem ); + tqparent->appendChild( topElem ); } } @@ -944,7 +944,7 @@ void K3bDataDoc::itemAddedToDir( K3bDirItem*, K3bDataItem* item ) void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent ) { if( !item || !newParent ) { - kdDebug() << "(K3bDataDoc) item or parentitem was NULL while moving." << endl; + kdDebug() << "(K3bDataDoc) item or tqparentitem was NULL while moving." << endl; return; } @@ -957,14 +957,14 @@ void K3bDataDoc::moveItem( K3bDataItem* item, K3bDirItem* newParent ) } -void K3bDataDoc::moveItems( QPtrList itemList, K3bDirItem* newParent ) +void K3bDataDoc::moveItems( TQPtrList itemList, K3bDirItem* newParent ) { if( !newParent ) { kdDebug() << "(K3bDataDoc) tried to move items to nowhere...!" << endl; return; } - QPtrListIterator it( itemList ); + TQPtrListIterator it( itemList ); for( ; it.current(); ++it ) { // check if newParent is subdir of item if( K3bDirItem* dirItem = dynamic_cast( it.current() ) ) { @@ -979,13 +979,13 @@ void K3bDataDoc::moveItems( QPtrList itemList, K3bDirItem* newParen } -K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bDataJob( this, hdl, parent ); + return new K3bDataJob( this, hdl, tqparent ); } -QString K3bDataDoc::treatWhitespace( const QString& path ) +TQString K3bDataDoc::treatWhitespace( const TQString& path ) { // TODO: @@ -996,10 +996,10 @@ QString K3bDataDoc::treatWhitespace( const QString& path ) if( isoOptions().whiteSpaceTreatment() != K3bIsoOptions::noChange ) { - QString result = path; + TQString result = path; - if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::replace ) { - result.replace( ' ', isoOptions().whiteSpaceTreatmentReplaceString() ); + if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::tqreplace ) { + result.tqreplace( ' ', isoOptions().whiteSpaceTreatmentReplaceString() ); } else if( isoOptions().whiteSpaceTreatment() == K3bIsoOptions::strip ) { result.remove( ' ' ); @@ -1064,8 +1064,8 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) if( !dir ) return; - QPtrList sortedChildren; - QPtrListIterator it( dir->children() ); + TQPtrList sortedChildren; + TQPtrListIterator it( dir->tqchildren() ); for( it.toLast(); it.current(); --it ) { K3bDataItem* item = it.current(); @@ -1083,7 +1083,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) if( isoOptions().createJoliet() || isoOptions().createRockRidge() ) { - QPtrList sameNameList; + TQPtrList sameNameList; while( !sortedChildren.isEmpty() ) { sameNameList.clear(); @@ -1105,7 +1105,7 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) } int cnt = 1; - for( QPtrListIterator it( sameNameList ); + for( TQPtrListIterator it( sameNameList ); it.current(); ++it ) { it.current()->setWrittenName( K3b::appendNumberToFilename( it.current()->writtenName(), cnt++, maxlen ) ); } @@ -1118,13 +1118,13 @@ void K3bDataDoc::prepareFilenamesInDir( K3bDirItem* dir ) void K3bDataDoc::informAboutNotFoundFiles() { if( !m_notFoundFiles.isEmpty() ) { - KMessageBox::informationList( qApp->activeWindow(), i18n("Could not find the following files:"), + KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("Could not find the following files:"), m_notFoundFiles, i18n("Not Found") ); m_notFoundFiles.clear(); } if( !m_noPermissionFiles.isEmpty() ) { - KMessageBox::informationList( qApp->activeWindow(), i18n("No permission to read the following files:"), + KMessageBox::informationList( TQT_TQWIDGET(tqApp->activeWindow()), i18n("No permission to read the following files:"), m_noPermissionFiles, i18n("No Read Permission") ); m_noPermissionFiles.clear(); @@ -1188,7 +1188,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device ) // TODO: also import some other pd fields const K3bIso9660Directory* rootDir = iso.firstRRDirEntry(); - // Jörg Schilling says that it is impossible to import the joliet tree for multisession + // J�rg Schilling says that it is impossible to import the joliet tree for multisession // if( !rootDir ) // rootDir = iso.firstJolietDirEntry(); if( !rootDir ) @@ -1211,16 +1211,16 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device ) } -void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* parent ) +void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* tqparent ) { Q_ASSERT(importDir); - QStringList entries = importDir->entries(); + TQStringList entries = importDir->entries(); entries.remove( "." ); entries.remove( ".." ); - for( QStringList::const_iterator it = entries.begin(); + for( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { const K3bIso9660Entry* entry = importDir->entry( *it ); - K3bDataItem* oldItem = parent->find( entry->name() ); + K3bDataItem* oldItem = tqparent->tqfind( entry->name() ); if( entry->isDirectory() ) { K3bDirItem* dir = 0; if( oldItem && oldItem->isDir() ) { @@ -1230,7 +1230,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, // we overwrite without warning! if( oldItem ) removeItem( oldItem ); - dir = new K3bDirItem( entry->name(), this, parent ); + dir = new K3bDirItem( entry->name(), this, tqparent ); } dir->setRemoveable(false); @@ -1250,7 +1250,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, if( oldItem ) removeItem( oldItem ); - K3bSessionImportItem* item = new K3bSessionImportItem( file, this, parent ); + K3bSessionImportItem* item = new K3bSessionImportItem( file, this, tqparent ); item->setExtraInfo( i18n("From previous session") ); m_oldSession.append( item ); } @@ -1277,8 +1277,8 @@ void K3bDataDoc::clearImportedSession() delete dir; } else { - for( QPtrListIterator it( dir->children() ); it.current(); ++it ) { - if( !m_oldSession.contains(it.current()) ) { + for( TQPtrListIterator it( dir->tqchildren() ); it.current(); ++it ) { + if( !m_oldSession.tqcontains(it.current()) ) { m_oldSession.remove(); // now the dir becomes a totally normal dir dir->setRemoveable(true); @@ -1308,7 +1308,7 @@ void K3bDataDoc::clearImportedSession() K3bDirItem* K3bDataDoc::bootImageDir() { - K3bDataItem* b = m_root->find( "boot" ); + K3bDataItem* b = m_root->tqfind( "boot" ); if( !b ) { b = new K3bDirItem( "boot", this, m_root ); setModified( true ); @@ -1322,7 +1322,7 @@ K3bDirItem* K3bDataDoc::bootImageDir() } -K3bBootItem* K3bDataDoc::createBootItem( const QString& filename, K3bDirItem* dir ) +K3bBootItem* K3bDataDoc::createBootItem( const TQString& filename, K3bDirItem* dir ) { if( !dir ) dir = bootImageDir(); @@ -1339,11 +1339,11 @@ K3bBootItem* K3bDataDoc::createBootItem( const QString& filename, K3bDirItem* di K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir ) { if( !m_bootCataloge ) { - QString newName = "boot.catalog"; + TQString newName = "boot.catalog"; int i = 0; while( dir->alreadyInDirectory( "boot.catalog" ) ) { ++i; - newName = QString( "boot%1.catalog" ).arg(i); + newName = TQString( "boot%1.catalog" ).tqarg(i); } K3bSpecialDataItem* b = new K3bSpecialDataItem( this, 0, dir, newName ); @@ -1361,10 +1361,10 @@ K3bDataItem* K3bDataDoc::createBootCatalogeItem( K3bDirItem* dir ) } -QValueList K3bDataDoc::findItemByLocalPath( const QString& path ) const +TQValueList K3bDataDoc::findItemByLocalPath( const TQString& path ) const { Q_UNUSED( path ); - return QValueList(); + return TQValueList(); } diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h index e09177a..eccbde9 100644 --- a/libk3b/projects/datacd/k3bdatadoc.h +++ b/libk3b/projects/datacd/k3bdatadoc.h @@ -22,9 +22,9 @@ #include "k3bisooptions.h" -#include -#include -#include +#include +#include +#include #include #include @@ -41,11 +41,11 @@ class K3bFileCompilationSizeHandler; class KProgressDialog; //class K3bView; class KConfig; -class QString; -class QStringList; -class QWidget; -class QDomDocument; -class QDomElement; +class TQString; +class TQStringList; +class TQWidget; +class TQDomDocument; +class TQDomElement; class K3bIso9660Directory; namespace K3bDevice { @@ -61,15 +61,16 @@ namespace K3bDevice { class LIBK3B_EXPORT K3bDataDoc : public K3bDoc { Q_OBJECT + TQ_OBJECT public: - K3bDataDoc( QObject* parent = 0 ); + K3bDataDoc( TQObject* tqparent = 0 ); virtual ~K3bDataDoc(); virtual int type() const { return DATA; } - virtual QString typeString() const; + virtual TQString typeString() const; - virtual QString name() const; + virtual TQString name() const; enum MultiSessionMode { /** @@ -108,13 +109,13 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc * Simply calls reparent. */ void moveItem( K3bDataItem* item, K3bDirItem* newParent ); - void moveItems( QPtrList itemList, K3bDirItem* newParent ); + void moveItems( TQPtrList itemList, K3bDirItem* newParent ); - K3bDirItem* addEmptyDir( const QString& name, K3bDirItem* parent ); + K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* tqparent ); - QString treatWhitespace( const QString& ); + TQString treatWhitespace( const TQString& ); - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent = 0 ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); MultiSessionMode multiSessionMode() const { return m_multisessionMode; } void setMultiSessionMode( MultiSessionMode mode ); @@ -125,7 +126,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc void setVerifyData( bool b ) { m_verifyData = b; } bool verifyData() const { return m_verifyData; } - static bool nameAlreadyInDir( const QString&, K3bDirItem* ); + static bool nameAlreadyInDir( const TQString&, K3bDirItem* ); /** * Most of the options that map to the mkisofs parameters are grouped @@ -135,7 +136,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc const K3bIsoOptions& isoOptions() const { return m_isoOptions; } void setIsoOptions( const K3bIsoOptions& ); - const QPtrList& bootImages() { return m_bootImages; } + const TQPtrList& bootImages() { return m_bootImages; } K3bDataItem* bootCataloge() { return m_bootCataloge; } K3bDirItem* bootImageDir(); @@ -150,7 +151,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc * \return The new boot item on success or 0 in case a file with the same * name already exists. */ - K3bBootItem* createBootItem( const QString& filename, K3bDirItem* bootDir = 0 ); + K3bBootItem* createBootItem( const TQString& filename, K3bDirItem* bootDir = 0 ); /** * Create a new boot catalog item. @@ -178,7 +179,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc */ bool needToCutFilenames() const { return m_needToCutFilenames; } - const QValueList& needToCutFilenameItems() const { return m_needToCutFilenameItems; } + const TQValueList& needToCutFilenameItems() const { return m_needToCutFilenameItems; } /** * Imports a session into the project. This will create K3bSessionImportItems @@ -203,7 +204,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc * * \return The items that correspond to the specified local path. */ - QValueList findItemByLocalPath( const QString& path ) const; + TQValueList findItemByLocalPath( const TQString& path ) const; public slots: virtual void addUrls( const KURL::List& urls ); @@ -221,7 +222,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc * Just a convience method to prevent using setIsoOptions for this * often used value. */ - void setVolumeID( const QString& ); + void setVolumeID( const TQString& ); signals: void itemRemoved( K3bDataItem* ); @@ -229,14 +230,14 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc protected: /** reimplemented from K3bDoc */ - virtual bool loadDocumentData( QDomElement* root ); + virtual bool loadDocumentData( TQDomElement* root ); /** reimplemented from K3bDoc */ - virtual bool saveDocumentData( QDomElement* ); + virtual bool saveDocumentData( TQDomElement* ); - void saveDocumentDataOptions( QDomElement& optionsElem ); - void saveDocumentDataHeader( QDomElement& headerElem ); - bool loadDocumentDataOptions( QDomElement optionsElem ); - bool loadDocumentDataHeader( QDomElement optionsElem ); + void saveDocumentDataOptions( TQDomElement& optionsElem ); + void saveDocumentDataHeader( TQDomElement& headerElem ); + bool loadDocumentDataOptions( TQDomElement optionsElem ); + bool loadDocumentDataHeader( TQDomElement optionsElem ); K3bFileCompilationSizeHandler* m_sizeHandler; @@ -245,27 +246,27 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc private: void prepareFilenamesInDir( K3bDirItem* dir ); - void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* parent ); + void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* tqparent ); /** * used by K3bDirItem to inform about removed items. */ - void itemRemovedFromDir( K3bDirItem* parent, K3bDataItem* removedItem ); - void itemAddedToDir( K3bDirItem* parent, K3bDataItem* addedItem ); + void itemRemovedFromDir( K3bDirItem* tqparent, K3bDataItem* removedItem ); + void itemAddedToDir( K3bDirItem* tqparent, K3bDataItem* addedItem ); /** * load recursivly */ - bool loadDataItem( QDomElement& e, K3bDirItem* parent ); + bool loadDataItem( TQDomElement& e, K3bDirItem* tqparent ); /** * save recursivly */ - void saveDataItem( K3bDataItem* item, QDomDocument* doc, QDomElement* parent ); + void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ); void informAboutNotFoundFiles(); - QStringList m_notFoundFiles; - QStringList m_noPermissionFiles; + TQStringList m_notFoundFiles; + TQStringList m_noPermissionFiles; K3bRootItem* m_root; @@ -278,17 +279,17 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc K3bIsoOptions m_isoOptions; MultiSessionMode m_multisessionMode; - QPtrList m_oldSession; + TQPtrList m_oldSession; // boot cd stuff K3bDataItem* m_bootCataloge; - QPtrList m_bootImages; + TQPtrList m_bootImages; bool m_bExistingItemsReplaceAll; bool m_bExistingItemsIgnoreAll; bool m_needToCutFilenames; - QValueList m_needToCutFilenameItems; + TQValueList m_needToCutFilenameItems; friend class K3bMixedDoc; friend class K3bDirItem; diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp index 6f2a861..ff6aa61 100644 --- a/libk3b/projects/datacd/k3bdataitem.cpp +++ b/libk3b/projects/datacd/k3bdataitem.cpp @@ -29,7 +29,7 @@ public: }; -K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags ) +K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags ) : m_bHideOnRockRidge(false), m_bHideOnJoliet(false), m_bRemoveable(true), @@ -45,8 +45,8 @@ K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags ) m_doc = doc; m_bHideOnRockRidge = m_bHideOnJoliet = false; - if( parent ) - m_parentDir = parent->getDirItem(); + if( tqparent ) + m_parentDir = tqparent->getDirItem(); else m_parentDir = 0; } @@ -113,16 +113,16 @@ K3b::Msf K3bDataItem::itemBlocks( bool followSymbolicLinks ) const } -void K3bDataItem::setK3bName( const QString& name ) { +void K3bDataItem::setK3bName( const TQString& name ) { if ( name != m_k3bName ) { // test for not-allowed characters - if( name.contains('/') ) { + if( name.tqcontains('/') ) { kdDebug() << "(K3bDataItem) name contained invalid characters!" << endl; return; } - if( parent() ) { - K3bDataItem* item = parent()->find( name ); + if( tqparent() ) { + K3bDataItem* item = tqparent()->tqfind( name ); if( item && item != this ) { kdDebug() << "(K3bDataItem) item with that name already exists." << endl; return; @@ -135,7 +135,7 @@ void K3bDataItem::setK3bName( const QString& name ) { } -const QString& K3bDataItem::k3bName() const +const TQString& K3bDataItem::k3bName() const { return m_k3bName; } @@ -143,17 +143,17 @@ const QString& K3bDataItem::k3bName() const K3bDataItem* K3bDataItem::take() { - if( parent() ) - parent()->takeDataItem( this ); + if( tqparent() ) + tqparent()->takeDataItem( this ); return this; } -QString K3bDataItem::k3bPath() const +TQString K3bDataItem::k3bPath() const { if( !getParent() ) - return QString::null; // the root item is the only one not having a parent + return TQString(); // the root item is the only one not having a tqparent else if( isDir() ) return getParent()->k3bPath() + k3bName() + "/"; else @@ -161,10 +161,10 @@ QString K3bDataItem::k3bPath() const } -QString K3bDataItem::writtenPath() const +TQString K3bDataItem::writtenPath() const { if( !getParent() ) - return QString::null; // the root item is the only one not having a parent + return TQString(); // the root item is the only one not having a tqparent else if( isDir() ) return getParent()->writtenPath() + writtenName() + "/"; else @@ -172,10 +172,10 @@ QString K3bDataItem::writtenPath() const } -QString K3bDataItem::iso9660Path() const +TQString K3bDataItem::iso9660Path() const { if( !getParent() ) - return QString::null; // the root item is the only one not having a parent + return TQString(); // the root item is the only one not having a tqparent else if( isDir() ) return getParent()->iso9660Path() + iso9660Name() + "/"; else @@ -186,14 +186,14 @@ QString K3bDataItem::iso9660Path() const K3bDataItem* K3bDataItem::nextSibling() const { K3bDataItem* item = const_cast(this); // urg, but we know that we don't mess with it, so... - K3bDirItem* parentItem = getParent(); + K3bDirItem* tqparentItem = getParent(); - while( parentItem ) { - if( K3bDataItem* i = parentItem->nextChild( item ) ) + while( tqparentItem ) { + if( K3bDataItem* i = tqparentItem->nextChild( item ) ) return i; - item = parentItem; - parentItem = item->getParent(); + item = tqparentItem; + tqparentItem = item->getParent(); } return 0; @@ -232,7 +232,7 @@ bool K3bDataItem::hideOnJoliet() const void K3bDataItem::setHideOnRockRidge( bool b ) { // there is no use in changing the value if - // it is already set by the parent + // it is already set by the tqparent if( ( !getParent() || !getParent()->hideOnRockRidge() ) && b != m_bHideOnRockRidge ) { m_bHideOnRockRidge = b; @@ -245,7 +245,7 @@ void K3bDataItem::setHideOnRockRidge( bool b ) void K3bDataItem::setHideOnJoliet( bool b ) { // there is no use in changing the value if - // it is already set by the parent + // it is already set by the tqparent if( ( !getParent() || !getParent()->hideOnJoliet() ) && b != m_bHideOnJoliet ) { m_bHideOnJoliet = b; diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h index 36cdf05..db7452b 100644 --- a/libk3b/projects/datacd/k3bdataitem.h +++ b/libk3b/projects/datacd/k3bdataitem.h @@ -21,7 +21,7 @@ class K3bDirItem; class K3bDataDoc; -#include +#include #include @@ -35,12 +35,12 @@ class K3bDataDoc; class LIBK3B_EXPORT K3bDataItem { public: - K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent = 0, int flags = 0 ); + K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent = 0, int flags = 0 ); /** * Default copy constructor. * - * The result is an exact copy except that no parent dir it set and, thus, also no doc. + * The result is an exact copy except that no tqparent dir it set and, thus, also no doc. */ K3bDataItem( const K3bDataItem& ); @@ -49,44 +49,44 @@ class LIBK3B_EXPORT K3bDataItem /** * Return an exact copy of this data item. * - * The result is an exact copy except that no parent dir it set and, thus, also no doc. + * The result is an exact copy except that no tqparent dir it set and, thus, also no doc. * * Implementations should use the default constructor. */ virtual K3bDataItem* copy() const = 0; - K3bDirItem* parent() { return m_parentDir; } + K3bDirItem* tqparent() { return m_parentDir; } K3bDirItem* getParent() const { return m_parentDir; } /** - * Remove this item from it's parent and return a pointer to it. + * Remove this item from it's tqparent and return a pointer to it. */ K3bDataItem* take(); K3bDataDoc* doc() const { return m_doc; } - virtual const QString& k3bName() const; - virtual void setK3bName( const QString& ); + virtual const TQString& k3bName() const; + virtual void setK3bName( const TQString& ); /** * returns the path as defined by the k3b-hierachy, NOT starting with a slash * (since this is used for graft-points!) * directories have a trailing "/" */ - virtual QString k3bPath() const; + virtual TQString k3bPath() const; /** * Returns the name of the item as used on the CD or DVD image. * * This is only valid after a call to @p K3bDataDoc::prepareFilenames() */ - const QString& writtenName() const { return m_writtenName; } + const TQString& writtenName() const { return m_writtenName; } /** * \return the pure name used in the Iso9660 tree. * * This is only valid after a call to @p K3bDataDoc::prepareFilenames() */ - const QString& iso9660Name() const { return m_rawIsoName; } + const TQString& iso9660Name() const { return m_rawIsoName; } /** * Returns the path of the item as written to the CD or DVD image. @@ -95,24 +95,24 @@ class LIBK3B_EXPORT K3bDataItem * * This is only valid after a call to @p K3bDataDoc::prepareFilenames() */ - virtual QString writtenPath() const; + virtual TQString writtenPath() const; - virtual QString iso9660Path() const; + virtual TQString iso9660Path() const; /** * Used to set the written name by @p K3bDataDoc::prepareFilenames() */ - void setWrittenName( const QString& s ) { m_writtenName = s; } + void setWrittenName( const TQString& s ) { m_writtenName = s; } /** * Used to set the pure Iso9660 name by @p K3bDataDoc::prepareFilenames() */ - void setIso9660Name( const QString& s ) { m_rawIsoName = s; } + void setIso9660Name( const TQString& s ) { m_rawIsoName = s; } virtual K3bDataItem* nextSibling() const; /** returns the path to the file on the local filesystem */ - virtual QString localPath() const { return QString::null; } + virtual TQString localPath() const { return TQString(); } /** * The size of the item @@ -133,7 +133,7 @@ class LIBK3B_EXPORT K3bDataItem virtual void reparent( K3bDirItem* ); // FIXME: use all these flags and make the isXXX methods - // non-virtual. Then move the parent()->addDataItem call + // non-virtual. Then move the tqparent()->addDataItem call // to the K3bDataItem constructor enum ItemFlags { DIR = 0x1, @@ -173,14 +173,14 @@ class LIBK3B_EXPORT K3bDataItem virtual bool isRenameable() const { return m_bRenameable; } virtual bool isHideable() const { return m_bHideable; } virtual bool writeToCd() const { return m_bWriteToCd; } - virtual const QString& extraInfo() const { return m_extraInfo; } + virtual const TQString& extraInfo() const { return m_extraInfo; } void setRenameable( bool b ) { m_bRenameable = b; } void setMoveable( bool b ) { m_bMovable = b; } void setRemoveable( bool b ) { m_bRemoveable = b; } void setHideable( bool b ) { m_bHideable = b; } void setWriteToCd( bool b ) { m_bWriteToCd = b; } - void setExtraInfo( const QString& i ) { m_extraInfo = i; } + void setExtraInfo( const TQString& i ) { m_extraInfo = i; } protected: virtual KIO::filesize_t itemSize( bool followSymlinks ) const = 0; @@ -194,7 +194,7 @@ class LIBK3B_EXPORT K3bDataItem */ virtual K3b::Msf itemBlocks( bool followSymlinks ) const; - QString m_k3bName; + TQString m_k3bName; void setFlags( int flags ); @@ -202,8 +202,8 @@ class LIBK3B_EXPORT K3bDataItem class Private; Private* d; - QString m_writtenName; - QString m_rawIsoName; + TQString m_writtenName; + TQString m_rawIsoName; K3bDataDoc* m_doc; K3bDirItem* m_parentDir; @@ -215,7 +215,7 @@ class LIBK3B_EXPORT K3bDataItem bool m_bMovable; bool m_bHideable; bool m_bWriteToCd; - QString m_extraInfo; + TQString m_extraInfo; long m_sortWeight; diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index 7009a43..abceb3a 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -43,11 +43,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -83,8 +83,8 @@ public: }; -K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ) +K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ) { d = new Private; @@ -95,10 +95,10 @@ K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ) m_isoImager = 0; m_msInfoFetcher = new K3bMsInfoFetcher( this, this ); - connect( m_msInfoFetcher, SIGNAL(finished(bool)), this, SLOT(slotMsInfoFetched(bool)) ); - connect( m_msInfoFetcher, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_msInfoFetcher, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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&)) ); d->imageFinished = true; } @@ -179,7 +179,7 @@ void K3bDataJob::prepareWriting() m_msInfoFetcher->start(); } else { - m_isoImager->setMultiSessionInfo( QString::null ); + m_isoImager->setMultiSessionInfo( TQString() ); prepareData(); d->initializingImager = true; @@ -196,7 +196,7 @@ void K3bDataJob::slotMsInfoFetched(bool success) prepareData(); if( d->usedWritingApp == K3b::CDRDAO ) // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord - m_isoImager->setMultiSessionInfo( QString("%1,%2").arg(m_msInfoFetcher->lastSessionStart()).arg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() ); + m_isoImager->setMultiSessionInfo( TQString("%1,%2").tqarg(m_msInfoFetcher->lastSessionStart()).tqarg(m_msInfoFetcher->nextSessionStart()+150), d->doc->burner() ); else m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo(), d->doc->burner() ); @@ -226,7 +226,7 @@ void K3bDataJob::writeImage() emit newTask( i18n("Creating image file") ); emit newSubTask( i18n("Track 1 of 1") ); - emit infoMessage( i18n("Creating image file in %1").arg(d->doc->tempDir()), INFO ); + emit infoMessage( i18n("Creating image file in %1").tqarg(d->doc->tempDir()), INFO ); m_isoImager->writeToImageFile( d->doc->tempDir() ); m_isoImager->start(); @@ -324,7 +324,7 @@ void K3bDataJob::slotIsoImagerFinished( bool success ) d->doc->onlyCreateImages() ) { if( success ) { - emit infoMessage( i18n("Image successfully created in %1").arg(d->doc->tempDir()), K3bJob::SUCCESS ); + emit infoMessage( i18n("Image successfully created in %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS ); d->imageFinished = true; if( d->doc->onlyCreateImages() ) { @@ -370,7 +370,7 @@ bool K3bDataJob::startWriterJob() if( d->doc->dummy() ) emit newTask( i18n("Simulating") ); else if( d->copies > 1 ) - emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); else emit newTask( i18n("Writing") ); @@ -408,7 +408,7 @@ void K3bDataJob::slotWriterJobPercent( int p ) void K3bDataJob::slotWriterNextTrack( int t, int tt ) { - emit newSubTask( i18n("Writing Track %1 of %2").arg(t).arg(tt) ); + emit newSubTask( i18n("Writing Track %1 of %2").tqarg(t).tqarg(tt) ); } @@ -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, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( d->verificationJob, SIGNAL(newTask(const QString&)), - this, SIGNAL(newSubTask(const QString&)) ); - connect( d->verificationJob, SIGNAL(newSubTask(const QString&)), - this, SIGNAL(newSubTask(const QString&)) ); - connect( d->verificationJob, SIGNAL(percent(int)), - this, SLOT(slotVerificationProgress(int)) ); - connect( d->verificationJob, SIGNAL(percent(int)), - this, SIGNAL(subPercent(int)) ); - connect( d->verificationJob, SIGNAL(finished(bool)), - this, SLOT(slotVerificationFinished(bool)) ); - connect( d->verificationJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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&)) ); } d->verificationJob->clear(); @@ -541,19 +541,19 @@ void K3bDataJob::setWriterJob( K3bAbstractWriter* writer ) { // FIXME: progressedsize for multiple copies m_writerJob = writer; - connect( m_writerJob, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writerJob, SIGNAL(percent(int)), this, SLOT(slotWriterJobPercent(int)) ); - connect( m_writerJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_writerJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_writerJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_writerJob, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writerJob, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writerJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writerJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writerJob, SIGNAL(finished(bool)), this, SLOT(slotWriterJobFinished(bool)) ); - connect( m_writerJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writerJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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(buffertqStatus(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&)) ); } @@ -572,11 +572,11 @@ void K3bDataJob::setImager( K3bIsoImager* imager ) void K3bDataJob::connectImager() { m_isoImager->disconnect( this ); - connect( m_isoImager, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_isoImager, SIGNAL(percent(int)), this, SLOT(slotIsoImagerPercent(int)) ); - connect( m_isoImager, SIGNAL(finished(bool)), this, SLOT(slotIsoImagerFinished(bool)) ); - connect( m_isoImager, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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&)) ); } @@ -632,7 +632,7 @@ bool K3bDataJob::prepareWriterJob() writer->addArgument( "-xa1" ); } - writer->addArgument( QString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-"); + writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-"); setWriterJob( writer ); } @@ -648,10 +648,10 @@ bool K3bDataJob::prepareWriterJob() // now write the tocfile if( d->tocFile ) delete d->tocFile; - d->tocFile = new KTempFile( QString::null, "toc" ); + d->tocFile = new KTempFile( TQString(), "toc" ); d->tocFile->setAutoDelete(true); - if( QTextStream* s = d->tocFile->textStream() ) { + if( TQTextStream* s = d->tocFile->textStream() ) { if( d->usedDataMode == K3b::MODE1 ) { *s << "CD_ROM" << "\n"; *s << "\n"; @@ -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() ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); } } else { @@ -905,7 +905,7 @@ bool K3bDataJob::waitForMedium() } -QString K3bDataJob::jobDescription() const +TQString K3bDataJob::jobDescription() const { if( d->doc->onlyCreateImages() ) { return i18n("Creating Data Image File"); @@ -914,19 +914,19 @@ QString K3bDataJob::jobDescription() const d->doc->multiSessionMode() == K3bDataDoc::AUTO ) { return i18n("Writing Data CD") + ( d->doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) ); } else { return i18n("Writing Multisession CD") + ( d->doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(d->doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(d->doc->isoOptions().volumeID()) ); } } -QString K3bDataJob::jobDetails() const +TQString K3bDataJob::jobDetails() const { if( d->doc->copies() > 1 && !d->doc->dummy() && @@ -935,10 +935,10 @@ QString K3bDataJob::jobDetails() const return i18n("ISO9660 Filesystem (Size: %1) - %n copy", "ISO9660 Filesystem (Size: %1) - %n copies", d->doc->copies() ) - .arg(KIO::convertSize( d->doc->size() )); + .tqarg(KIO::convertSize( d->doc->size() )); else return i18n("ISO9660 Filesystem (Size: %1)") - .arg(KIO::convertSize( d->doc->size() )); + .tqarg(KIO::convertSize( d->doc->size() )); } @@ -951,9 +951,9 @@ K3bDataDoc::MultiSessionMode K3bDataJob::usedMultiSessionMode() const void K3bDataJob::cleanup() { if( !d->doc->onTheFly() && d->doc->removeImages() ) { - if( QFile::exists( d->doc->tempDir() ) ) { + if( TQFile::exists( d->doc->tempDir() ) ) { d->imageFile.remove(); - emit infoMessage( i18n("Removed image file %1").arg(d->doc->tempDir()), K3bJob::SUCCESS ); + emit infoMessage( i18n("Removed image file %1").tqarg(d->doc->tempDir()), K3bJob::SUCCESS ); } } diff --git a/libk3b/projects/datacd/k3bdatajob.h b/libk3b/projects/datacd/k3bdatajob.h index 58de969..a55e2d9 100644 --- a/libk3b/projects/datacd/k3bdatajob.h +++ b/libk3b/projects/datacd/k3bdatajob.h @@ -20,10 +20,10 @@ #include #include -#include +#include -class QString; -class QDataStream; +class TQString; +class TQDataStream; class K3bAbstractWriter; class K3bIsoImager; class KTempFile; @@ -40,9 +40,10 @@ namespace K3bDevice { class K3bDataJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bDataJob( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); virtual ~K3bDataJob(); K3bDoc* doc() const; @@ -50,8 +51,8 @@ class K3bDataJob : public K3bBurnJob virtual bool hasBeenCanceled() const; - virtual QString jobDescription() const; - virtual QString jobDetails() const; + virtual TQString jobDescription() const; + virtual TQString jobDetails() const; public slots: void cancel(); diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp index dd29d6d..d9d4893 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp +++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include class K3bDataPreparationJob::Private : public K3bThread @@ -40,9 +40,9 @@ public: K3bDataDoc* doc; - QValueList nonExistingItems; - QString listOfRenamedItems; - QValueList folderSymLinkItems; + TQValueList nonExistingItems; + TQString listOfRenamedItems; + TQValueList folderSymLinkItems; K3bThreadJob* threadJob; @@ -71,14 +71,14 @@ void K3bDataPreparationJob::Private::run() // create the message string for the renamed files if( doc->needToCutFilenames() ) { int maxlines = 10; - QValueList::const_iterator it; + TQValueList::const_iterator it; for( it = doc->needToCutFilenameItems().begin(); maxlines > 0 && it != doc->needToCutFilenameItems().end(); ++it, --maxlines ) { K3bDataItem* item = *it; listOfRenamedItems += i18n("%1 renamed to %2") - .arg( KStringHandler::csqueeze( item->k3bName(), 30 ) ) - .arg( KStringHandler::csqueeze( item->writtenName(), 30 ) ); + .tqarg( KStringHandler::csqueeze( item->k3bName(), 30 ) ) + .tqarg( KStringHandler::csqueeze( item->writtenName(), 30 ) ); listOfRenamedItems += "
"; } if( it != doc->needToCutFilenameItems().end() ) @@ -93,7 +93,7 @@ void K3bDataPreparationJob::Private::run() if( item->isSymLink() ) { if( doc->isoOptions().followSymbolicLinks() ) { - QFileInfo f( K3b::resolveLink( item->localPath() ) ); + TQFileInfo f( K3b::resolveLink( item->localPath() ) ); if( !f.exists() ) { nonExistingItems.append( item ); } @@ -102,7 +102,7 @@ void K3bDataPreparationJob::Private::run() } } } - else if( item->isFile() && !QFile::exists( item->localPath() ) ) { + else if( item->isFile() && !TQFile::exists( item->localPath() ) ) { nonExistingItems.append( item ); } @@ -126,11 +126,11 @@ void K3bDataPreparationJob::Private::cancel() -static QString createItemsString( const QValueList& items, unsigned int max ) +static TQString createItemsString( const TQValueList& items, unsigned int max ) { - QString s; + TQString s; unsigned int cnt = 0; - for( QValueList::const_iterator it = items.begin(); + for( TQValueList::const_iterator it = items.begin(); it != items.end(); ++it ) { s += KStringHandler::csqueeze( (*it)->localPath(), 60 ); @@ -149,12 +149,12 @@ static QString createItemsString( const QValueList& items, unsigne } -K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bJob( hdl, parent ) +K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bJob( hdl, tqparent ) { d = new Private( doc ); d->threadJob = new K3bThreadJob( d, this, this ); - connectSubJob( d->threadJob, SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION ); + connectSubJob( d->threadJob, TQT_SLOT(slotWorkDone(bool)), K3bJob::DEFAULT_SIGNAL_CONNECTION ); } @@ -182,7 +182,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success ) "of the Joliet extensions. If the Joliet extensions are disabled filenames " "do not have to be shortened but long filenames will not be available on " "Windows systems.") - .arg( d->doc->isoOptions().jolietLong() ? 103 : 64 ) + .tqarg( d->doc->isoOptions().jolietLong() ? 103 : 64 ) + "

" + d->listOfRenamedItems, i18n("Warning"), i18n("Shorten Filenames"), @@ -207,7 +207,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success ) "restrict the length of the volume descriptior (the name of the filesystem) " "to %1 characters. The selected descriptor '%2' is longer than that. Do you " "want it to be cut or do you want to go back and change it manually?") - .arg( 16 ).arg( d->doc->isoOptions().volumeID() ), + .tqarg( 16 ).tqarg( d->doc->isoOptions().volumeID() ), i18n("Warning"), i18n("Cut volume descriptor in the Joliet tree"), i18n("Cancel and go back") ) ) { @@ -228,7 +228,7 @@ void K3bDataPreparationJob::slotWorkDone( bool success ) i18n("Warning"), i18n("Remove missing files and continue"), i18n("Cancel and go back") ) ) { - for( QValueList::const_iterator it = d->nonExistingItems.begin(); + for( TQValueList::const_iterator it = d->nonExistingItems.begin(); it != d->nonExistingItems.end(); ++it ) { delete *it; } diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.h b/libk3b/projects/datacd/k3bdatapreparationjob.h index 1c83a42..3ac7d7d 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.h +++ b/libk3b/projects/datacd/k3bdatapreparationjob.h @@ -29,9 +29,10 @@ class K3bJobHandler; class K3bDataPreparationJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ); + K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ); ~K3bDataPreparationJob(); bool hasBeenCanceled() const; diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp index 3ea3236..c36595e 100644 --- a/libk3b/projects/datacd/k3bdiritem.cpp +++ b/libk3b/projects/datacd/k3bdiritem.cpp @@ -19,14 +19,14 @@ #include "k3bsessionimportitem.h" #include "k3bfileitem.h" -#include -#include +#include +#include #include -K3bDirItem::K3bDirItem(const QString& name, K3bDataDoc* doc, K3bDirItem* parentDir) - : K3bDataItem( doc, parentDir ), +K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* tqparentDir) + : K3bDataItem( doc, tqparentDir ), m_size(0), m_followSymlinksSize(0), m_blocks(0), @@ -37,8 +37,8 @@ K3bDirItem::K3bDirItem(const QString& name, K3bDataDoc* doc, K3bDirItem* parentD m_k3bName = name; // add automagically like a qlistviewitem - if( parent() ) - parent()->addDataItem( this ); + if( tqparent() ) + tqparent()->addDataItem( this ); } @@ -52,26 +52,26 @@ K3bDirItem::K3bDirItem( const K3bDirItem& item ) m_dirs(0), m_localPath( item.m_localPath ) { - for( QPtrListIterator it( item.children() ); *it; ++it ) + for( TQPtrListIterator it( item.tqchildren() ); *it; ++it ) addDataItem( (*it)->copy() ); } K3bDirItem::~K3bDirItem() { - // delete all children + // delete all tqchildren // doing this by hand is much saver than using the // auto-delete feature since some of the items' destructors // may change the list - K3bDataItem* i = m_children.first(); + K3bDataItem* i = m_tqchildren.first(); while( i ) { // it is important to use takeDataItem here to be sure // the size gets updated properly takeDataItem(i); delete i; - i = m_children.first(); + i = m_tqchildren.first(); } - // this has to be done after deleting the children + // this has to be done after deleting the tqchildren // because the directory itself has a size of 0 in K3b // and all it's files' sizes have already been substracted take(); @@ -99,14 +99,14 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) } } - if( m_children.findRef( item ) == -1 ) { + if( m_tqchildren.tqfindRef( item ) == -1 ) { if( item->isFile() ) { // do we replace an old item? - QString name = item->k3bName(); + TQString name = item->k3bName(); int cnt = 1; - while( K3bDataItem* oldItem = find( name ) ) { + while( K3bDataItem* oldItem = tqfind( name ) ) { if( !oldItem->isDir() && oldItem->isFromOldSession() ) { - // in this case we remove this item from it's parent and save it in the new one + // in this case we remove this item from it's tqparent and save it in the new one // to be able to recover it oldItem->take(); static_cast(oldItem)->setReplaceItem( static_cast(item) ); @@ -118,15 +118,15 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) // add a counter to the filename // if( item->k3bName()[item->k3bName().length()-4] == '.' ) - name = item->k3bName().left( item->k3bName().length()-4 ) + QString::number(cnt++) + item->k3bName().right(4); + name = item->k3bName().left( item->k3bName().length()-4 ) + TQString::number(cnt++) + item->k3bName().right(4); else - name = item->k3bName() + QString::number(cnt++); + name = item->k3bName() + TQString::number(cnt++); } } item->setK3bName( name ); } - m_children.append( item->take() ); + m_tqchildren.append( item->take() ); updateSize( item, false ); if( item->isDir() ) updateFiles( ((K3bDirItem*)item)->numFiles(), ((K3bDirItem*)item)->numDirs()+1 ); @@ -146,9 +146,9 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item ) { - int x = m_children.findRef( item ); + int x = m_tqchildren.tqfindRef( item ); if( x > -1 ) { - K3bDataItem* item = m_children.take(); + K3bDataItem* item = m_tqchildren.take(); updateSize( item, true ); if( item->isDir() ) updateFiles( -1*((K3bDirItem*)item)->numFiles(), -1*((K3bDirItem*)item)->numDirs()-1 ); @@ -176,8 +176,8 @@ K3bDataItem* K3bDirItem::takeDataItem( K3bDataItem* item ) K3bDataItem* K3bDirItem::nextSibling() const { - if( !m_children.isEmpty() ) - return m_children.getFirst(); + if( !m_tqchildren.isEmpty() ) + return m_tqchildren.getFirst(); else return K3bDataItem::nextSibling(); } @@ -185,24 +185,24 @@ K3bDataItem* K3bDirItem::nextSibling() const K3bDataItem* K3bDirItem::nextChild( K3bDataItem* prev ) const { - // search for prev in children - if( m_children.findRef( prev ) < 0 ) { + // search for prev in tqchildren + if( m_tqchildren.tqfindRef( prev ) < 0 ) { return 0; } else - return m_children.next(); + return m_tqchildren.next(); } -bool K3bDirItem::alreadyInDirectory( const QString& filename ) const +bool K3bDirItem::alreadyInDirectory( const TQString& filename ) const { - return (find( filename ) != 0); + return (tqfind( filename ) != 0); } -K3bDataItem* K3bDirItem::find( const QString& filename ) const +K3bDataItem* K3bDirItem::tqfind( const TQString& filename ) const { - for( QPtrListIterator it( m_children ); it.current(); ++it ) { + for( TQPtrListIterator it( m_tqchildren ); it.current(); ++it ) { if( it.current()->k3bName() == filename ) return it.current(); } @@ -210,20 +210,20 @@ K3bDataItem* K3bDirItem::find( const QString& filename ) const } -K3bDataItem* K3bDirItem::findByPath( const QString& p ) +K3bDataItem* K3bDirItem::findByPath( const TQString& p ) { if( p.isEmpty() || p == "/" ) return this; - QString path = p; + TQString path = p; if( path.startsWith("/") ) path = path.mid(1); - int pos = path.find( "/" ); + int pos = path.tqfind( "/" ); if( pos < 0 ) - return find( path ); + return tqfind( path ); else { // do it recursivly - K3bDataItem* item = find( path.left(pos) ); + K3bDataItem* item = tqfind( path.left(pos) ); if( item && item->isDir() ) return ((K3bDirItem*)item)->findByPath( path.mid( pos+1 ) ); else @@ -232,14 +232,14 @@ K3bDataItem* K3bDirItem::findByPath( const QString& p ) } -bool K3bDirItem::mkdir( const QString& dirPath ) +bool K3bDirItem::mkdir( const TQString& dirPath ) { // // An absolut path always starts at the root item // if( dirPath[0] == '/' ) { - if( parent() ) - return parent()->mkdir( dirPath ); + if( tqparent() ) + return tqparent()->mkdir( dirPath ); else return mkdir( dirPath.mid( 1 ) ); } @@ -247,9 +247,9 @@ bool K3bDirItem::mkdir( const QString& dirPath ) if( findByPath( dirPath ) ) return false; - QString restPath; - QString dirName; - int pos = dirPath.find( '/' ); + TQString restPath; + TQString dirName; + int pos = dirPath.tqfind( '/' ); if( pos == -1 ) { dirName = dirPath; } @@ -258,7 +258,7 @@ bool K3bDirItem::mkdir( const QString& dirPath ) restPath = dirPath.mid( pos+1 ); } - K3bDataItem* dir = find( dirName ); + K3bDataItem* dir = tqfind( dirName ); if( !dir ) dir = new K3bDirItem( dirName, doc(), this ); else if( !dir->isDir() ) @@ -294,12 +294,12 @@ bool K3bDirItem::isSubItem( K3bDataItem* item ) const if( dynamic_cast(item) == this ) return true; - K3bDirItem* d = item->parent(); + K3bDirItem* d = item->tqparent(); while( d ) { if( d == this ) { return true; } - d = d->parent(); + d = d->tqparent(); } return false; @@ -323,7 +323,7 @@ bool K3bDirItem::isRemoveable() const if( !K3bDataItem::isRemoveable() ) return false; - for( QPtrListIterator it( m_children ); it.current(); ++it ) { + for( TQPtrListIterator it( m_tqchildren ); it.current(); ++it ) { if( !it.current()->isRemoveable() ) return false; } @@ -349,22 +349,22 @@ void K3bDirItem::updateSize( K3bDataItem* item, bool removed ) } } - if( parent() ) - parent()->updateSize( item, removed ); + if( tqparent() ) + tqparent()->updateSize( item, removed ); } void K3bDirItem::updateFiles( long files, long dirs ) { m_files += files; m_dirs += dirs; - if( parent() ) - parent()->updateFiles( files, dirs ); + if( tqparent() ) + tqparent()->updateFiles( files, dirs ); } bool K3bDirItem::isFromOldSession() const { - for( QPtrListIterator it( m_children ); it.current(); ++it ) { + for( TQPtrListIterator it( m_tqchildren ); it.current(); ++it ) { if( (*it)->isFromOldSession() ) return true; } @@ -375,7 +375,7 @@ bool K3bDirItem::isFromOldSession() const bool K3bDirItem::writeToCd() const { // check if this dir contains items to write - for( QPtrListIterator it( m_children ); it.current(); ++it ) { + for( TQPtrListIterator it( m_tqchildren ); it.current(); ++it ) { if( (*it)->writeToCd() ) return true; } @@ -394,13 +394,13 @@ K3bRootItem::~K3bRootItem() } -const QString& K3bRootItem::k3bName() const +const TQString& K3bRootItem::k3bName() const { return doc()->isoOptions().volumeID(); } -void K3bRootItem::setK3bName( const QString& text ) +void K3bRootItem::setK3bName( const TQString& text ) { doc()->setVolumeID( text ); } diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index a64b4fd..61b6c8a 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -18,8 +18,8 @@ #define K3BDIRITEM_H -#include -#include +#include +#include #include @@ -34,11 +34,11 @@ class K3bDataDoc; class LIBK3B_EXPORT K3bDirItem : public K3bDataItem { public: - K3bDirItem( const QString& name, K3bDataDoc*, K3bDirItem* parentDir = 0 ); + K3bDirItem( const TQString& name, K3bDataDoc*, K3bDirItem* tqparentDir = 0 ); /** - * Default copy constructor. Copies the dir including all children. However, none of the - * children will have set a doc and the copy dir will not have set a parent dir. + * Default copy constructor. Copies the dir including all tqchildren. However, none of the + * tqchildren will have set a doc and the copy dir will not have set a tqparent dir. */ K3bDirItem( const K3bDirItem& ); @@ -48,16 +48,16 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem K3bDirItem* getDirItem() const; - const QPtrList& children() const { return m_children; } + const TQPtrList& tqchildren() const { return m_tqchildren; } K3bDirItem* addDataItem( K3bDataItem* item ); K3bDataItem* takeDataItem( K3bDataItem* item ); K3bDataItem* nextSibling() const; K3bDataItem* nextChild( K3bDataItem* ) const; - bool alreadyInDirectory( const QString& fileName ) const; - K3bDataItem* find( const QString& filename ) const; - K3bDataItem* findByPath( const QString& ); + bool alreadyInDirectory( const TQString& fileName ) const; + K3bDataItem* tqfind( const TQString& filename ) const; + K3bDataItem* findByPath( const TQString& ); long numFiles() const; long numDirs() const; @@ -83,10 +83,10 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem /** * Recursively creates a directory. */ - bool mkdir( const QString& dir ); + bool mkdir( const TQString& dir ); - void setLocalPath( const QString& p ) { m_localPath = p; } - QString localPath() const { return m_localPath; } + void setLocalPath( const TQString& p ) { m_localPath = p; } + TQString localPath() const { return m_localPath; } /** * \reimplemented @@ -111,7 +111,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem private: /** * this recursivly updates the size of the directories. - * The size of this dir and the parent dir is updated. + * The size of this dir and the tqparent dir is updated. * These values are just used for user information. */ void updateSize( K3bDataItem*, bool removed = false ); @@ -121,7 +121,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem */ void updateFiles( long files, long dirs ); - mutable QPtrList m_children; + mutable TQPtrList m_tqchildren; // size of the items simply added KIO::filesize_t m_size; @@ -136,7 +136,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem // HACK: store the original path to be able to use it's permissions // ´remove this once we have a backup project - QString m_localPath; + TQString m_localPath; }; @@ -146,8 +146,8 @@ class K3bRootItem : public K3bDirItem K3bRootItem( K3bDataDoc* ); ~K3bRootItem(); - const QString& k3bName() const; - void setK3bName( const QString& ); + const TQString& k3bName() const; + void setK3bName( const TQString& ); bool isMoveable() const { return false; } bool isRemoveable() const { return false; } diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp index 0ddab76..7d92e7e 100644 --- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp +++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.cpp @@ -18,9 +18,9 @@ #include -#include -#include -#include +#include +#include +#include // TODO: remove the items from the project if the savedSize differs @@ -71,7 +71,7 @@ public: */ K3b::Msf blocks() const { return K3b::Msf( usedBlocks(savedSize) ); } - QPtrList items; + TQPtrList items; }; @@ -114,7 +114,7 @@ public: void removeFile( K3bFileItem* item, bool followSymlinks ) { InodeInfo& inodeInfo = inodeMap[item->localId(followSymlinks)]; - if( inodeInfo.items.findRef( item ) == -1 ) { + if( inodeInfo.items.tqfindRef( item ) == -1 ) { kdError() << "(K3bFileCompilationSizeHandler) " << item->localPath() << " has been removed without being added!" << endl; @@ -136,7 +136,7 @@ public: void removeSpecialItem( K3bDataItem* item ) { // special files do not have a corresponding local file // so we just substract their k3bSize - if( specialItems.findRef( item ) == -1 ) { + if( specialItems.tqfindRef( item ) == -1 ) { kdError() << "(K3bFileCompilationSizeHandler) Special item " << item->k3bName() << " has been removed without being added!" << endl; @@ -152,12 +152,12 @@ public: /** * This maps from inodes to the number of occurrences of the inode. */ - QMap inodeMap; + TQMap inodeMap; KIO::filesize_t size; K3b::Msf blocks; - QPtrList specialItems; + TQPtrList specialItems; }; diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp index d9e288f..cc71b3a 100644 --- a/libk3b/projects/datacd/k3bfileitem.cpp +++ b/libk3b/projects/datacd/k3bfileitem.cpp @@ -22,11 +22,11 @@ #include "k3bisooptions.h" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -57,7 +57,7 @@ bool operator>( const K3bFileItem::Id& id1, const K3bFileItem::Id& id2 ) -K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName, int flags ) +K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName, int flags ) : K3bDataItem( doc, dir, flags ), m_replacedItemFromOldSession(0), m_localPath(filePath) @@ -71,7 +71,7 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* // we need to use lstat here since for symlinks both KDE and QT return the size of the file pointed to // instead the size of the link. k3b_struct_stat statBuf; - if( k3b_lstat( QFile::encodeName(filePath), &statBuf ) ) { + if( k3b_lstat( TQFile::encodeName(filePath), &statBuf ) ) { m_size = K3b::filesize( filePath ); m_id.inode = 0; m_id.device = 0; @@ -104,7 +104,7 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* if( isSymLink() ) { k3b_struct_stat statBuf; - if( k3b_stat( QFile::encodeName(filePath), &statBuf ) == 0 ) { + if( k3b_stat( TQFile::encodeName(filePath), &statBuf ) == 0 ) { m_idFollowed.inode = statBuf.st_ino; m_idFollowed.device = statBuf.st_dev; @@ -113,14 +113,14 @@ K3bFileItem::K3bFileItem( const QString& filePath, K3bDataDoc* doc, K3bDirItem* } // add automagically like a qlistviewitem - if( parent() ) - parent()->addDataItem( this ); + if( tqparent() ) + tqparent()->addDataItem( this ); } K3bFileItem::K3bFileItem( const k3b_struct_stat* stat, const k3b_struct_stat* followedStat, - const QString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName ) + const TQString& filePath, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName ) : K3bDataItem( doc, dir ), m_replacedItemFromOldSession(0), m_localPath(filePath) @@ -151,8 +151,8 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat, m_sizeFollowed = m_size; } - if( parent() ) - parent()->addDataItem( this ); + if( tqparent() ) + tqparent()->addDataItem( this ); } @@ -171,7 +171,7 @@ K3bFileItem::K3bFileItem( const K3bFileItem& item ) K3bFileItem::~K3bFileItem() { - // remove this from parentdir + // remove this from tqparentdir take(); } @@ -211,14 +211,14 @@ bool K3bFileItem::exists() const return true; } -QString K3bFileItem::absIsoPath() +TQString K3bFileItem::absIsoPath() { // return m_dir->absIsoPath() + m_isoName; - return QString::null; + return TQString(); } -QString K3bFileItem::localPath() const +TQString K3bFileItem::localPath() const { return m_localPath; } @@ -235,9 +235,9 @@ bool K3bFileItem::isSymLink() const } -QString K3bFileItem::linkDest() const +TQString K3bFileItem::linkDest() const { - return QFileInfo( localPath() ).readLink(); + return TQFileInfo( localPath() ).readLink(); } @@ -247,10 +247,10 @@ bool K3bFileItem::isValid() const // this link is not valid if we cannot follow it if we want to if( doc()->isoOptions().followSymbolicLinks() ) { - return QFile::exists( K3b::resolveLink( localPath() ) ); + return TQFile::exists( K3b::resolveLink( localPath() ) ); } - QString dest = linkDest(); + TQString dest = linkDest(); if( dest[0] == '/' ) return false; // absolut links can never be part of the compilation! @@ -258,7 +258,7 @@ bool K3bFileItem::isValid() const // parse the link K3bDirItem* dir = getParent(); - QStringList tokens = QStringList::split( QRegExp("/+"), dest ); // two slashes or more do the same as one does! + TQStringList tokens = TQStringList::split( TQRegExp("/+"), dest ); // two slashes or more do the same as one does! unsigned int i = 0; while( i < tokens.size() ) { @@ -267,13 +267,13 @@ bool K3bFileItem::isValid() const } else if( tokens[i] == ".." ) { // change the directory - dir = dir->parent(); + dir = dir->tqparent(); if( dir == 0 ) return false; } else { // search for the item in dir - K3bDataItem* d = dir->find( tokens[i] ); + K3bDataItem* d = dir->tqfind( tokens[i] ); if( d == 0 ) return false; diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h index f23644f..68ee49d 100644 --- a/libk3b/projects/datacd/k3bfileitem.h +++ b/libk3b/projects/datacd/k3bfileitem.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "k3b_export.h" @@ -39,7 +39,7 @@ public: /** * Creates a new K3bFileItem */ - K3bFileItem( const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0, int flags = 0 ); + K3bFileItem( const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0, int flags = 0 ); /** * Constructor for optimized file item creation which does no additional stat. @@ -48,12 +48,12 @@ public: */ K3bFileItem( const k3b_struct_stat* stat, const k3b_struct_stat* followedStat, - const QString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 ); + const TQString& fileName, K3bDataDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 ); /** * Default copy constructor * Creates a copy of the fileitem. The copy, however, is not an exact duplicate of this item. - * The copy does not have a parent dir set and any old session items are set to 0. + * The copy does not have a tqparent dir set and any old session items are set to 0. */ K3bFileItem( const K3bFileItem& ); @@ -63,10 +63,10 @@ public: bool exists() const; - QString absIsoPath(); + TQString absIsoPath(); /** reimplemented from K3bDataItem */ - QString localPath() const; + TQString localPath() const; /** * Identification of the files on the local device. @@ -77,7 +77,7 @@ public: }; /** - * This is not the normal inode number but it also contains + * This is not the normal inode number but it also tqcontains * the device number. */ Id localId() const; @@ -90,7 +90,7 @@ public: K3bDirItem* getDirItem() const; bool isSymLink() const; - QString linkDest() const; + TQString linkDest() const; bool isFile() const { return true; } /** returns true if the item is not a link or @@ -113,7 +113,7 @@ public: Id m_id; Id m_idFollowed; - QString m_localPath; + TQString m_localPath; bool m_bSymLink; }; diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index f44d3ab..b7ff5ad 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -39,11 +39,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -65,7 +65,7 @@ public: delete pipe; } - QString imagePath; + TQString imagePath; K3bFileSplitter imageFile; const K3bExternalBin* mkisofsBin; @@ -85,8 +85,8 @@ public: }; -K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent, const char* name ) - : K3bJob( hdl, parent, name ), +K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent, const char* name ) + : K3bJob( hdl, tqparent, name ), m_pathSpecFile(0), m_rrHideFile(0), m_jolietHideFile(0), @@ -103,7 +103,7 @@ K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent d = new Private(); d->dataPreparationJob = new K3bDataPreparationJob( doc, this, this ); connectSubJob( d->dataPreparationJob, - SLOT(slotDataPreparationDone(bool)), + TQT_SLOT(slotDataPreparationDone(bool)), DEFAULT_SIGNAL_CONNECTION ); } @@ -127,14 +127,14 @@ void K3bIsoImager::writeToFd( int fd ) } -void K3bIsoImager::writeToImageFile( const QString& path ) +void K3bIsoImager::writeToImageFile( const TQString& path ) { d->imagePath = path; m_fdToWriteTo = -1; } -void K3bIsoImager::slotReceivedStderr( const QString& line ) +void K3bIsoImager::slotReceivedStderr( const TQString& line ) { parseMkisofsOutput( line ); emit debuggingOutput( "mkisofs", line ); @@ -147,7 +147,7 @@ void K3bIsoImager::handleMkisofsProgress( int p ) } -void K3bIsoImager::handleMkisofsInfoMessage( const QString& line, int type ) +void K3bIsoImager::handleMkisofsInfoMessage( const TQString& line, int type ) { emit infoMessage( line, type ); if( type == ERROR ) @@ -164,15 +164,15 @@ void K3bIsoImager::slotProcessExited( KProcess* p ) d->pipe->close(); emit debuggingOutput( "K3bIsoImager", - QString("Pipe throughput: %1 bytes read, %2 bytes written.") - .arg(d->pipe->bytesRead()).arg(d->pipe->bytesWritten()) ); + TQString("Pipe throughput: %1 bytes read, %2 bytes written.") + .tqarg(d->pipe->bytesRead()).tqarg(d->pipe->bytesWritten()) ); if( d->imageFile.isOpen() ) { d->imageFile.close(); if( m_canceled || p->exitStatus() != 0 ) { d->imageFile.remove(); - emit infoMessage( i18n("Removed incomplete image file %1.").arg(d->imageFile.name()), WARNING ); + emit infoMessage( i18n("Removed incomplete image file %1.").tqarg(d->imageFile.name()), WARNING ); } } @@ -210,7 +210,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p ) default: if( !d->knownError && !mkisofsReadError() ) { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("mkisofs").arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg("mkisofs").tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); } @@ -220,7 +220,7 @@ void K3bIsoImager::slotProcessExited( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg("mkisofs"), ERROR ); + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("mkisofs"), ERROR ); jobFinished( false ); } } @@ -238,9 +238,9 @@ void K3bIsoImager::cleanup() delete m_sortWeightFile; // remove boot-images-temp files - for( QStringList::iterator it = m_tempFiles.begin(); + for( TQStringList::iterator it = m_tempFiles.begin(); it != m_tempFiles.end(); ++it ) - QFile::remove( *it ); + TQFile::remove( *it ); m_tempFiles.clear(); m_pathSpecFile = m_jolietHideFile = m_rrHideFile = m_sortWeightFile = 0; @@ -319,9 +319,9 @@ void K3bIsoImager::startSizeCalculation() // *m_process << dummyDir(); kdDebug() << "***** mkisofs calculate size parameters:\n"; - const QValueList& args = m_process->args(); - QString s; - for( QValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList& args = m_process->args(); + TQString s; + for( TQValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << endl << flush; @@ -340,23 +340,23 @@ void K3bIsoImager::startSizeCalculation() // TODO: use K3bProcess::OutputCollector instead iof our own two slots. - connect( m_process, SIGNAL(receivedStderr(KProcess*, char*, int)), - this, SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) ); - connect( m_process, SIGNAL(stdoutLine(const QString&)), - this, SLOT(slotCollectMkisofsPrintSizeStdout(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotMkisofsPrintSizeFinished()) ); + connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)), + this, TQT_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotMkisofsPrintSizeFinished()) ); // we also want error messages - connect( m_process, SIGNAL(stderrLine( const QString& )), - this, SLOT(slotReceivedStderr( const QString& )) ); + connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )), + this, TQT_SLOT(slotReceivedStderr( const TQString& )) ); - m_collectedMkisofsPrintSizeStdout = QString::null; - m_collectedMkisofsPrintSizeStderr = QString::null; + m_collectedMkisofsPrintSizeStdout = TQString(); + m_collectedMkisofsPrintSizeStderr = TQString(); m_mkisofsPrintSizeResult = 0; if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { - emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR ); cleanup(); jobFinished( false ); @@ -367,12 +367,12 @@ void K3bIsoImager::startSizeCalculation() void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(KProcess*, char* data , int len) { - emit debuggingOutput( "mkisofs", QString::fromLocal8Bit( data, len ) ); - m_collectedMkisofsPrintSizeStderr.append( QString::fromLocal8Bit( data, len ) ); + emit debuggingOutput( "mkisofs", TQString::fromLocal8Bit( data, len ) ); + m_collectedMkisofsPrintSizeStderr.append( TQString::fromLocal8Bit( data, len ) ); } -void K3bIsoImager::slotCollectMkisofsPrintSizeStdout( const QString& line ) +void K3bIsoImager::slotCollectMkisofsPrintSizeStdout( const TQString& line ) { // newer versions of mkisofs outut additional lines of junk before the size :( // so we only use the last line @@ -400,7 +400,7 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished() else { // parse the stderr output // I hope parsing the last line is enough! - int pos = m_collectedMkisofsPrintSizeStderr.findRev( "extents scheduled to be written" ); + int pos = m_collectedMkisofsPrintSizeStderr.tqfindRev( "extents scheduled to be written" ); if( pos == -1 ) success = false; @@ -409,9 +409,9 @@ void K3bIsoImager::slotMkisofsPrintSizeFinished() } emit debuggingOutput( "K3bIsoImager", - QString("mkisofs print size result: %1 (%2 bytes)") - .arg(m_mkisofsPrintSizeResult) - .arg(Q_UINT64(m_mkisofsPrintSizeResult)*2048ULL) ); + TQString("mkisofs print size result: %1 (%2 bytes)") + .tqarg(m_mkisofsPrintSizeResult) + .tqarg(TQ_UINT64(m_mkisofsPrintSizeResult)*2048ULL) ); cleanup(); @@ -485,18 +485,18 @@ void K3bIsoImager::start() return; } - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*)) ); - connect( m_process, SIGNAL(stderrLine( const QString& )), - this, SLOT(slotReceivedStderr( const QString& )) ); + connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )), + this, TQT_SLOT(slotReceivedStderr( const TQString& )) ); // // Check the image file if( m_fdToWriteTo == -1 ) { d->imageFile.setName( d->imagePath ); if( !d->imageFile.open( IO_WriteOnly ) ) { - emit infoMessage( i18n("Could not open %1 for writing").arg(d->imagePath), ERROR ); + emit infoMessage( i18n("Could not open %1 for writing").tqarg(d->imagePath), ERROR ); cleanup(); jobFinished(false); return; @@ -520,9 +520,9 @@ void K3bIsoImager::start() kdDebug() << "***** mkisofs parameters:\n"; - const QValueList& args = m_process->args(); - QString s; - for( QValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList& args = m_process->args(); + TQString s; + for( TQValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << endl << flush; @@ -532,7 +532,7 @@ void K3bIsoImager::start() // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bIsoImager) could not start mkisofs" << endl; - emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg("mkisofs"), K3bJob::ERROR ); jobFinished( false ); cleanup(); } @@ -553,7 +553,7 @@ void K3bIsoImager::cancel() } -void K3bIsoImager::setMultiSessionInfo( const QString& info, K3bDevice::Device* dev ) +void K3bIsoImager::setMultiSessionInfo( const TQString& info, K3bDevice::Device* dev ) { m_multiSessionInfo = info; m_device = dev; @@ -563,11 +563,11 @@ void K3bIsoImager::setMultiSessionInfo( const QString& info, K3bDevice::Device* // iso9660 + RR use some latin1 variant. So we need to cut the desc fields // counting 8bit chars. The GUI should take care of restricting the length // and the charset -static void truncateTheHardWay( QString& s, int max ) +static void truncateTheHardWay( TQString& s, int max ) { - QCString cs = s.utf8(); + TQCString cs = s.utf8(); cs.truncate(max); - s = QString::fromUtf8( cs ); + s = TQString::fromUtf8( cs ); } @@ -588,7 +588,7 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) *m_process << "-print-size" << "-quiet"; if( !m_doc->isoOptions().volumeID().isEmpty() ) { - QString s = m_doc->isoOptions().volumeID(); + TQString s = m_doc->isoOptions().volumeID(); truncateTheHardWay(s, 32); // ensure max length *m_process << "-volid" << s; } @@ -597,7 +597,7 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) *m_process << "-volid" << "CDROM"; } - QString s = m_doc->isoOptions().volumeSetId(); + TQString s = m_doc->isoOptions().volumeSetId(); truncateTheHardWay(s, 128); // ensure max length *m_process << "-volset" << s; @@ -639,8 +639,8 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) << " with volume set size: " << volsetSize << endl; volsetSeqNo = volsetSize; } - *m_process << "-volset-size" << QString::number(volsetSize); - *m_process << "-volset-seqno" << QString::number(volsetSeqNo); + *m_process << "-volset-size" << TQString::number(volsetSize); + *m_process << "-volset-seqno" << TQString::number(volsetSeqNo); if( m_sortWeightFile ) { *m_process << "-sort" << m_sortWeightFile->name(); @@ -733,18 +733,18 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) if( m_doc->isoOptions().hideTRANS_TBL() ) *m_process << "-hide-joliet-trans-tbl"; - *m_process << "-iso-level" << QString::number(m_doc->isoOptions().ISOLevel()); + *m_process << "-iso-level" << TQString::number(m_doc->isoOptions().ISOLevel()); if( m_doc->isoOptions().forceInputCharset() ) *m_process << "-input-charset" << m_doc->isoOptions().inputCharset(); - *m_process << "-path-list" << QFile::encodeName(m_pathSpecFile->name()); + *m_process << "-path-list" << TQFile::encodeName(m_pathSpecFile->name()).data(); // boot stuff if( !m_doc->bootImages().isEmpty() ) { bool first = true; - for( QPtrListIterator it( m_doc->bootImages() ); + for( TQPtrListIterator it( m_doc->bootImages() ); *it; ++it ) { if( !first ) *m_process << "-eltorito-alt-boot"; @@ -760,9 +760,9 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) else if( bootItem->imageType() == K3bBootItem::NONE ) { *m_process << "-no-emul-boot"; if( bootItem->loadSegment() > 0 ) - *m_process << "-boot-load-seg" << QString::number(bootItem->loadSegment()); + *m_process << "-boot-load-seg" << TQString::number(bootItem->loadSegment()); if( bootItem->loadSize() > 0 ) - *m_process << "-boot-load-size" << QString::number(bootItem->loadSize()); + *m_process << "-boot-load-size" << TQString::number(bootItem->loadSize()); } if( bootItem->imageType() != K3bBootItem::NONE && bootItem->noBoot() ) @@ -778,8 +778,8 @@ bool K3bIsoImager::addMkisofsParameters( bool printSize ) // additional parameters from config - const QStringList& params = k3bcore->externalBinManager()->binObject( "mkisofs" )->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = k3bcore->externalBinManager()->binObject( "mkisofs" )->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; return true; @@ -792,7 +792,7 @@ int K3bIsoImager::writePathSpec() m_pathSpecFile = new KTempFile(); m_pathSpecFile->setAutoDelete(true); - if( QTextStream* t = m_pathSpecFile->textStream() ) { + if( TQTextStream* t = m_pathSpecFile->textStream() ) { // recursive path spec writing int num = writePathSpecForDir( m_doc->root(), *t ); @@ -805,7 +805,7 @@ int K3bIsoImager::writePathSpec() } -int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream ) +int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream ) { if( !m_noDeepDirectoryRelocation && dirItem->depth() > 7 ) { kdDebug() << "(K3bIsoImager) found directory depth > 7. Enabling no deep directory relocation." << endl; @@ -814,7 +814,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream // now create the graft points int num = 0; - for( QPtrListIterator it( dirItem->children() ); it.current(); ++it ) { + for( TQPtrListIterator it( dirItem->tqchildren() ); it.current(); ++it ) { K3bDataItem* item = it.current(); bool writeItem = item->writeToCd(); @@ -825,29 +825,29 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream writeItem = false; else if( d->usedLinkHandling == Private::FOLLOW ) { - QFileInfo f( K3b::resolveLink( item->localPath() ) ); + TQFileInfo f( K3b::resolveLink( item->localPath() ) ); if( !f.exists() ) { emit infoMessage( i18n("Could not follow link %1 to non-existing file %2. Skipping...") - .arg(item->k3bName()) - .arg(f.filePath()), WARNING ); + .tqarg(item->k3bName()) + .tqarg(f.filePath()), WARNING ); writeItem = false; } else if( f.isDir() ) { emit infoMessage( i18n("Ignoring link %1 to folder %2. K3b is unable to follow links to folders.") - .arg(item->k3bName()) - .arg(f.filePath()), WARNING ); + .tqarg(item->k3bName()) + .tqarg(f.filePath()), WARNING ); writeItem = false; } } } else if( item->isFile() ) { - QFileInfo f( item->localPath() ); + TQFileInfo f( item->localPath() ); if( !f.exists() ) { - emit infoMessage( i18n("Could not find file %1. Skipping...").arg(item->localPath()), WARNING ); + emit infoMessage( i18n("Could not find file %1. Skipping...").tqarg(item->localPath()), WARNING ); writeItem = false; } else if( !f.isReadable() ) { - emit infoMessage( i18n("Could not read file %1. Skipping...").arg(item->localPath()), WARNING ); + emit infoMessage( i18n("Could not read file %1. Skipping...").tqarg(item->localPath()), WARNING ); writeItem = false; } } @@ -857,7 +857,7 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream // some versions of mkisofs seem to have a bug that prevents to use filenames // that contain one or more backslashes - if( item->writtenPath().contains("\\") ) + if( item->writtenPath().tqcontains("\\") ) m_containsFilesWithMultibleBackslashes = true; @@ -882,20 +882,20 @@ int K3bIsoImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream } -void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, QTextStream& stream ) +void K3bIsoImager::writePathSpecForFile( K3bFileItem* item, TQTextStream& stream ) { stream << escapeGraftPoint( item->writtenPath() ) << "="; - if( m_doc->bootImages().containsRef( dynamic_cast(item) ) ) { // boot-image-backup-hack + if( m_doc->bootImages().tqcontainsRef( dynamic_cast(item) ) ) { // boot-image-backup-hack // create temp file KTempFile temp; - QString tempPath = temp.name(); + TQString tempPath = temp.name(); temp.unlink(); if( !KIO::NetAccess::copy( KURL(item->localPath()), KURL::fromPathOrURL(tempPath) ) ) { - emit infoMessage( i18n("Failed to backup boot image file %1").arg(item->localPath()), ERROR ); + emit infoMessage( i18n("Failed to backup boot image file %1").tqarg(item->localPath()), ERROR ); return; } @@ -917,7 +917,7 @@ bool K3bIsoImager::writeRRHideFile() m_rrHideFile = new KTempFile(); m_rrHideFile->setAutoDelete(true); - if( QTextStream* t = m_rrHideFile->textStream() ) { + if( TQTextStream* t = m_rrHideFile->textStream() ) { K3bDataItem* item = m_doc->root(); while( item ) { @@ -942,7 +942,7 @@ bool K3bIsoImager::writeJolietHideFile() m_jolietHideFile = new KTempFile(); m_jolietHideFile->setAutoDelete(true); - if( QTextStream* t = m_jolietHideFile->textStream() ) { + if( TQTextStream* t = m_jolietHideFile->textStream() ) { K3bDataItem* item = m_doc->root(); while( item ) { @@ -967,7 +967,7 @@ bool K3bIsoImager::writeSortWeightFile() m_sortWeightFile = new KTempFile(); m_sortWeightFile->setAutoDelete(true); - if( QTextStream* t = m_sortWeightFile->textStream() ) { + if( TQTextStream* t = m_sortWeightFile->textStream() ) { // // We need to write the local path in combination with the sort weight // mkisofs will take care of multiple entries for one local file and always @@ -976,7 +976,7 @@ bool K3bIsoImager::writeSortWeightFile() K3bDataItem* item = m_doc->root(); while( (item = item->nextSibling()) ) { // we skip the root here if( item->sortWeight() != 0 ) { - if( m_doc->bootImages().containsRef( dynamic_cast(item) ) ) { // boot-image-backup-hack + if( m_doc->bootImages().tqcontainsRef( dynamic_cast(item) ) ) { // boot-image-backup-hack *t << escapeGraftPoint( static_cast(item)->tempPath() ) << " " << item->sortWeight() << endl; } else if( item->isDir() ) { @@ -999,9 +999,9 @@ bool K3bIsoImager::writeSortWeightFile() } -QString K3bIsoImager::escapeGraftPoint( const QString& str ) +TQString K3bIsoImager::escapeGraftPoint( const TQString& str ) { - QString enc = str; + TQString enc = str; // // mkisofs manpage (-graft-points) is incorrect (as of mkisofs 2.01.01) @@ -1018,8 +1018,8 @@ QString K3bIsoImager::escapeGraftPoint( const QString& str ) // // - // we do not use QString::replace to have full control - // this might be slow since QString::insert is slow but we don't care + // we do not use TQString::replace to have full control + // this might be slow since TQString::insert is slow but we don't care // since this is only called to prepare the iso creation which is not // time critical. :) // @@ -1049,8 +1049,8 @@ QString K3bIsoImager::escapeGraftPoint( const QString& str ) ++pos; } -// enc.replace( "\\\\", "\\\\\\\\" ); -// enc.replace( "=", "\\=" ); +// enc.tqreplace( "\\\\", "\\\\\\\\" ); +// enc.tqreplace( "=", "\\=" ); return enc; } @@ -1093,43 +1093,43 @@ bool K3bIsoImager::prepareMkisofsFiles() } -QString K3bIsoImager::dummyDir( K3bDirItem* dir ) +TQString K3bIsoImager::dummyDir( K3bDirItem* dir ) { // // since we use virtual folders in order to have folders with different weight factors and different // permissions we create different dummy dirs to be passed to mkisofs // - QDir _appDir( locateLocal( "appdata", "temp/" ) ); + TQDir _appDir( locateLocal( "appdata", "temp/" ) ); // // create a unique isoimager session id // This might become important in case we will allow multiple instances of the isoimager // to run at the same time. // - QString jobId = qApp->sessionId() + "_" + QString::number( m_sessionNumber ); + TQString jobId = tqApp->sessionId() + "_" + TQString::number( m_sessionNumber ); if( !_appDir.cd( jobId ) ) { _appDir.mkdir( jobId ); _appDir.cd( jobId ); } - QString name( "dummydir_" ); - name += QString::number( dir->sortWeight() ); + TQString name( "dummydir_" ); + name += TQString::number( dir->sortWeight() ); bool perm = false; k3b_struct_stat statBuf; if( !dir->localPath().isEmpty() ) { // permissions - if( k3b_stat( QFile::encodeName(dir->localPath()), &statBuf ) == 0 ) { + if( k3b_stat( TQFile::encodeName(dir->localPath()), &statBuf ) == 0 ) { name += "_"; - name += QString::number( statBuf.st_uid ); + name += TQString::number( statBuf.st_uid ); name += "_"; - name += QString::number( statBuf.st_gid ); + name += TQString::number( statBuf.st_gid ); name += "_"; - name += QString::number( statBuf.st_mode ); + name += TQString::number( statBuf.st_mode ); name += "_"; - name += QString::number( statBuf.st_mtime ); + name += TQString::number( statBuf.st_mtime ); perm = true; } @@ -1144,11 +1144,11 @@ QString K3bIsoImager::dummyDir( K3bDirItem* dir ) _appDir.cd( name ); if( perm ) { - ::chmod( QFile::encodeName( _appDir.absPath() ), statBuf.st_mode ); - ::chown( QFile::encodeName( _appDir.absPath() ), statBuf.st_uid, statBuf.st_gid ); + ::chmod( TQFile::encodeName( _appDir.absPath() ), statBuf.st_mode ); + ::chown( TQFile::encodeName( _appDir.absPath() ), statBuf.st_uid, statBuf.st_gid ); struct utimbuf tb; tb.actime = tb.modtime = statBuf.st_mtime; - ::utime( QFile::encodeName( _appDir.absPath() ), &tb ); + ::utime( TQFile::encodeName( _appDir.absPath() ), &tb ); } } @@ -1158,11 +1158,11 @@ QString K3bIsoImager::dummyDir( K3bDirItem* dir ) void K3bIsoImager::clearDummyDirs() { - QString jobId = qApp->sessionId() + "_" + QString::number( m_sessionNumber ); - QDir appDir( locateLocal( "appdata", "temp/" ) ); + TQString jobId = tqApp->sessionId() + "_" + TQString::number( m_sessionNumber ); + TQDir appDir( locateLocal( "appdata", "temp/" ) ); if( appDir.cd( jobId ) ) { - QStringList dummyDirEntries = appDir.entryList( "dummydir*", QDir::Dirs ); - for( QStringList::iterator it = dummyDirEntries.begin(); it != dummyDirEntries.end(); ++it ) + TQStringList dummyDirEntries = appDir.entryList( "dummydir*", TQDir::Dirs ); + for( TQStringList::iterator it = dummyDirEntries.begin(); it != dummyDirEntries.end(); ++it ) appDir.rmdir( *it ); appDir.cdUp(); appDir.rmdir( jobId ); @@ -1170,12 +1170,12 @@ void K3bIsoImager::clearDummyDirs() } -QCString K3bIsoImager::checksum() const +TQCString K3bIsoImager::checksum() const { if( K3bChecksumPipe* p = dynamic_cast( d->pipe ) ) return p->checksum(); else - return QCString(); + return TQCString(); } diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h index 82501ba..446fef8 100644 --- a/libk3b/projects/datacd/k3bisoimager.h +++ b/libk3b/projects/datacd/k3bisoimager.h @@ -19,14 +19,14 @@ #include #include "k3bmkisofshandler.h" -#include -#include +#include +#include class K3bDataDoc; class K3bDirItem; class K3bDataItem; class K3bFileItem; -class QTextStream; +class TQTextStream; class K3bProcess; class KProcess; class K3bDevice::Device; @@ -36,9 +36,10 @@ class KTempFile; class K3bIsoImager : public K3bJob, public K3bMkisofsHandler { Q_OBJECT + TQ_OBJECT public: - K3bIsoImager( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bIsoImager(); virtual bool active() const; @@ -50,7 +51,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler /** * Get the checksum calculated during the creation of the image. */ - QCString checksum() const; + TQCString checksum() const; public slots: /** @@ -86,20 +87,20 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler */ void writeToFd( int fd ); - void writeToImageFile( const QString& path ); + void writeToImageFile( const TQString& path ); /** * If dev == 0 K3bIsoImager will ignore the data in the previous session. * This is usable for CD-Extra. */ - void setMultiSessionInfo( const QString&, K3bDevice::Device* dev = 0 ); + void setMultiSessionInfo( const TQString&, K3bDevice::Device* dev = 0 ); K3bDevice::Device* device() const { return m_device; } K3bDataDoc* doc() const { return m_doc; } protected: virtual void handleMkisofsProgress( int ); - virtual void handleMkisofsInfoMessage( const QString&, int ); + virtual void handleMkisofsInfoMessage( const TQString&, int ); virtual bool addMkisofsParameters( bool printSize = false ); @@ -113,7 +114,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler * * @return an empty dummy dir for use with K3bDirItems. */ - QString dummyDir( K3bDirItem* ); + TQString dummyDir( K3bDirItem* ); void outputData(); void initVariables(); @@ -129,9 +130,9 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler bool writeSortWeightFile(); // used by writePathSpec - virtual int writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream ); - virtual void writePathSpecForFile( K3bFileItem*, QTextStream& stream ); - QString escapeGraftPoint( const QString& str ); + virtual int writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream ); + virtual void writePathSpecForFile( K3bFileItem*, TQTextStream& stream ); + TQString escapeGraftPoint( const TQString& str ); KTempFile* m_pathSpecFile; KTempFile* m_rrHideFile; @@ -144,12 +145,12 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler bool m_canceled; protected slots: - virtual void slotReceivedStderr( const QString& ); + virtual void slotReceivedStderr( const TQString& ); virtual void slotProcessExited( KProcess* ); private slots: void slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int); - void slotCollectMkisofsPrintSizeStdout( const QString& ); + void slotCollectMkisofsPrintSizeStdout( const TQString& ); void slotMkisofsPrintSizeFinished(); void slotDataPreparationDone( bool success ); @@ -164,15 +165,15 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler bool m_noDeepDirectoryRelocation; bool m_importSession; - QString m_multiSessionInfo; + TQString m_multiSessionInfo; K3bDevice::Device* m_device; // used for mkisofs -print-size parsing - QString m_collectedMkisofsPrintSizeStdout; - QString m_collectedMkisofsPrintSizeStderr; + TQString m_collectedMkisofsPrintSizeStdout; + TQString m_collectedMkisofsPrintSizeStderr; int m_mkisofsPrintSizeResult; - QStringList m_tempFiles; + TQStringList m_tempFiles; int m_fdToWriteTo; diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp index bd7314d..5adca1a 100644 --- a/libk3b/projects/datacd/k3bisooptions.cpp +++ b/libk3b/projects/datacd/k3bisooptions.cpp @@ -20,12 +20,12 @@ #include #include -#include +#include K3bIsoOptions::K3bIsoOptions() : m_volumeID( "K3b data project" ), - m_applicationID( QString("K3B THE CD KREATOR (C) 1998-2006 SEBASTIAN TRUEG AND THE K3B TEAM") ), + m_applicationID( TQString("K3B THE CD KREATOR (C) 1998-2006 SEBASTIAN TRUEG AND THE K3B TEAM") ), m_systemId( K3b::systemName().upper() ), m_inputCharset( "iso8859-1" ), m_whiteSpaceTreatmentReplaceString( "_" ) @@ -118,8 +118,8 @@ void K3bIsoOptions::save( KConfigBase* c, bool saveVolumeDesc ) case extended: c->writeEntry( "white_space_treatment", "extended" ); break; - case replace: - c->writeEntry( "white_space_treatment", "replace" ); + case tqreplace: + c->writeEntry( "white_space_treatment", "tqreplace" ); break; default: c->writeEntry( "white_space_treatment", "noChange" ); @@ -188,9 +188,9 @@ K3bIsoOptions K3bIsoOptions::load( KConfigBase* c, bool loadVolumeDesc ) options.setDoNotCacheInodes( c->readBoolEntry( "do not cache inodes", options.doNotCacheInodes() ) ); - QString w = c->readEntry( "white_space_treatment", "noChange" ); - if( w == "replace" ) - options.setWhiteSpaceTreatment( replace ); + TQString w = c->readEntry( "white_space_treatment", "noChange" ); + if( w == "tqreplace" ) + options.setWhiteSpaceTreatment( tqreplace ); else if( w == "strip" ) options.setWhiteSpaceTreatment( strip ); else if( w == "extended" ) diff --git a/libk3b/projects/datacd/k3bisooptions.h b/libk3b/projects/datacd/k3bisooptions.h index 254c998..570f3d3 100644 --- a/libk3b/projects/datacd/k3bisooptions.h +++ b/libk3b/projects/datacd/k3bisooptions.h @@ -16,7 +16,7 @@ #ifndef K3B_ISO_OPTIONS_H #define K3B_ISO_OPTIONS_H -#include +#include #include "k3b_export.h" class KConfigBase; @@ -28,10 +28,10 @@ class LIBK3B_EXPORT K3bIsoOptions K3bIsoOptions(); bool forceInputCharset() const { return m_bForceInputCharset; } - const QString& inputCharset() const { return m_inputCharset; } + const TQString& inputCharset() const { return m_inputCharset; } void setForceInputCharset( bool b ) { m_bForceInputCharset = b; } - void setInputCharset( const QString& cs ) { m_inputCharset = cs; } + void setInputCharset( const TQString& cs ) { m_inputCharset = cs; } // -- mkisofs-options ---------------------------------------------------------------------- @@ -56,17 +56,17 @@ class LIBK3B_EXPORT K3bIsoOptions bool preserveFilePermissions() const { return m_preserveFilePermissions; } int ISOLevel() const { return m_isoLevel; } - const QString& systemId() const { return m_systemId; } - const QString& applicationID() const { return m_applicationID; } - const QString& volumeID() const { return m_volumeID; } - const QString& volumeSetId() const { return m_volumeSetId; } + const TQString& systemId() const { return m_systemId; } + const TQString& applicationID() const { return m_applicationID; } + const TQString& volumeID() const { return m_volumeID; } + const TQString& volumeSetId() const { return m_volumeSetId; } int volumeSetSize() const { return m_volumeSetSize; } int volumeSetNumber() const { return m_volumeSetNumber; } - const QString& publisher() const { return m_publisher; } - const QString& preparer() const { return m_preparer; } - const QString& abstractFile() const { return m_abstractFile; } - const QString& copyrightFile() const { return m_copyrightFile; } - const QString& bibliographFile() const { return m_bibliographFile; } + const TQString& publisher() const { return m_publisher; } + const TQString& preparer() const { return m_preparer; } + const TQString& abstractFile() const { return m_abstractFile; } + const TQString& copyrightFile() const { return m_copyrightFile; } + const TQString& bibliographFile() const { return m_bibliographFile; } void setCreateRockRidge( bool b ) { m_createRockRidge = b; } void setCreateJoliet( bool b ) { m_createJoliet = b; } @@ -87,33 +87,33 @@ class LIBK3B_EXPORT K3bIsoOptions void setJolietLong( bool b ) { m_jolietLong = b; } void setISOLevel( int i ) { m_isoLevel = i; } - void setSystemId( const QString& s ) { m_systemId = s; } - void setApplicationID( const QString& s ) { m_applicationID = s; } + void setSystemId( const TQString& s ) { m_systemId = s; } + void setApplicationID( const TQString& s ) { m_applicationID = s; } /** * Set the filesystems volume id. * * max length for this field is 32 chars. */ - void setVolumeID( const QString& s ) { m_volumeID = s; } - void setVolumeSetId( const QString& s ) { m_volumeSetId = s; } + void setVolumeID( const TQString& s ) { m_volumeID = s; } + void setVolumeSetId( const TQString& s ) { m_volumeSetId = s; } void setVolumeSetSize( int size ) { m_volumeSetSize = size; } void setVolumeSetNumber( int n ) { m_volumeSetNumber = n; } - void setPublisher( const QString& s ) { m_publisher = s; } - void setPreparer( const QString& s ) { m_preparer = s; } - void setAbstractFile( const QString& s ) { m_abstractFile = s; } - void setCoprightFile( const QString& s ) { m_copyrightFile = s; } - void setBibliographFile( const QString& s ) { m_bibliographFile = s; } + void setPublisher( const TQString& s ) { m_publisher = s; } + void setPreparer( const TQString& s ) { m_preparer = s; } + void setAbstractFile( const TQString& s ) { m_abstractFile = s; } + void setCoprightFile( const TQString& s ) { m_copyrightFile = s; } + void setBibliographFile( const TQString& s ) { m_bibliographFile = s; } void setPreserveFilePermissions( bool b ) { m_preserveFilePermissions = b; } // ----------------------------------------------------------------- mkisofs-options ----------- - enum whiteSpaceTreatments { noChange = 0, replace = 1, strip = 2, extended = 3 }; + enum whiteSpaceTreatments { noChange = 0, tqreplace = 1, strip = 2, extended = 3 }; void setWhiteSpaceTreatment( int i ) { m_whiteSpaceTreatment = i; } int whiteSpaceTreatment() const { return m_whiteSpaceTreatment; } - const QString& whiteSpaceTreatmentReplaceString() const { return m_whiteSpaceTreatmentReplaceString; } - void setWhiteSpaceTreatmentReplaceString( const QString& s ) { m_whiteSpaceTreatmentReplaceString = s; } + const TQString& whiteSpaceTreatmentReplaceString() const { return m_whiteSpaceTreatmentReplaceString; } + void setWhiteSpaceTreatmentReplaceString( const TQString& s ) { m_whiteSpaceTreatmentReplaceString = s; } bool discardSymlinks() const { return m_discardSymlinks; } void setDiscardSymlinks( bool b ) { m_discardSymlinks = b; } @@ -131,21 +131,21 @@ class LIBK3B_EXPORT K3bIsoOptions private: // volume descriptor - QString m_volumeID; - QString m_applicationID; - QString m_preparer; - QString m_publisher; - QString m_systemId; - QString m_volumeSetId; - QString m_abstractFile; - QString m_copyrightFile; - QString m_bibliographFile; + TQString m_volumeID; + TQString m_applicationID; + TQString m_preparer; + TQString m_publisher; + TQString m_systemId; + TQString m_volumeSetId; + TQString m_abstractFile; + TQString m_copyrightFile; + TQString m_bibliographFile; int m_volumeSetSize; int m_volumeSetNumber; bool m_bForceInputCharset; - QString m_inputCharset; + TQString m_inputCharset; // mkisofs options ------------------------------------- bool m_createRockRidge; // -r or -R @@ -174,7 +174,7 @@ class LIBK3B_EXPORT K3bIsoOptions int m_whiteSpaceTreatment; - QString m_whiteSpaceTreatmentReplaceString; + TQString m_whiteSpaceTreatmentReplaceString; bool m_discardSymlinks; bool m_discardBrokenSymlinks; diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp index a3579ec..5fdb526 100644 --- a/libk3b/projects/datacd/k3bmkisofshandler.cpp +++ b/libk3b/projects/datacd/k3bmkisofshandler.cpp @@ -61,7 +61,7 @@ const K3bExternalBin* K3bMkisofsHandler::initMkisofs() if( d->mkisofsBin ) { if( !d->mkisofsBin->copyright.isEmpty() ) handleMkisofsInfoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .arg("mkisofs").arg(d->mkisofsBin->version).arg(d->mkisofsBin->copyright), + .tqarg("mkisofs").tqarg(d->mkisofsBin->version).tqarg(d->mkisofsBin->copyright), K3bJob::INFO ); d->firstProgressValue = -1; @@ -76,14 +76,14 @@ const K3bExternalBin* K3bMkisofsHandler::initMkisofs() } -void K3bMkisofsHandler::parseMkisofsOutput( const QString& line ) +void K3bMkisofsHandler::parseMkisofsOutput( const TQString& line ) { if( !line.isEmpty() ) { if( line.startsWith( d->mkisofsBin->path ) ) { // error or warning - QString errorLine = line.mid( d->mkisofsBin->path.length() + 2 ); + TQString errorLine = line.mid( d->mkisofsBin->path.length() + 2 ); if( errorLine.startsWith( "Input/output error. Cannot read from" ) ) { - handleMkisofsInfoMessage( i18n("Read error from file '%1'").arg( errorLine.mid( 38, errorLine.length()-40 ) ), + handleMkisofsInfoMessage( i18n("Read error from file '%1'").tqarg( errorLine.mid( 38, errorLine.length()-40 ) ), K3bJob::ERROR ); d->readError = true; } @@ -93,17 +93,17 @@ void K3bMkisofsHandler::parseMkisofsOutput( const QString& line ) d->readError = true; } } - else if( line.contains( "done, estimate" ) ) { + else if( line.tqcontains( "done, estimate" ) ) { int p = parseMkisofsProgress( line ); if( p != -1 ) handleMkisofsProgress( p ); } - else if( line.contains( "extents written" ) ) { + else if( line.tqcontains( "extents written" ) ) { handleMkisofsProgress( 100 ); } else if( line.startsWith( "Incorrectly encoded string" ) ) { handleMkisofsInfoMessage( i18n("Encountered an incorrectly encoded filename '%1'") - .arg(line.section( QRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR ); + .tqarg(line.section( TQRegExp("[\\(\\)]"), 1, 1 )), K3bJob::ERROR ); handleMkisofsInfoMessage( i18n("This may be caused by a system update which changed the local character set."), K3bJob::ERROR ); handleMkisofsInfoMessage( i18n("You may use convmv (http://j3e.de/linux/convmv/) to fix the filename encoding."), K3bJob::ERROR ); d->readError = true; @@ -124,7 +124,7 @@ void K3bMkisofsHandler::parseMkisofsOutput( const QString& line ) } -int K3bMkisofsHandler::parseMkisofsProgress( const QString& line ) +int K3bMkisofsHandler::parseMkisofsProgress( const TQString& line ) { // // in multisession mode mkisofs' progress does not start at 0 but at (X+Y)/X @@ -133,8 +133,8 @@ int K3bMkisofsHandler::parseMkisofsProgress( const QString& line ) // We just save the first emitted progress value and to some math ;) // - QString perStr = line; - perStr.truncate( perStr.find('%') ); + TQString perStr = line; + perStr.truncate( perStr.tqfind('%') ); bool ok; double p = perStr.toDouble( &ok ); if( !ok ) { diff --git a/libk3b/projects/datacd/k3bmkisofshandler.h b/libk3b/projects/datacd/k3bmkisofshandler.h index 32576bc..0692b4e 100644 --- a/libk3b/projects/datacd/k3bmkisofshandler.h +++ b/libk3b/projects/datacd/k3bmkisofshandler.h @@ -16,7 +16,7 @@ #ifndef _K3B_MKISOfS_HANDLER_H_ #define _K3B_MKISOfS_HANDLER_H_ -#include +#include class K3bExternalBin; @@ -45,13 +45,13 @@ class K3bMkisofsHandler */ const K3bExternalBin* initMkisofs(); - void parseMkisofsOutput( const QString& line ); + void parseMkisofsOutput( const TQString& line ); /** * Used internally by handleMkisofsOutput. * May be used in case handleMkisofsOutput is not sufficient. */ - int parseMkisofsProgress( const QString& line ); + int parseMkisofsProgress( const TQString& line ); /** * Called by handleMkisofsOutput @@ -63,7 +63,7 @@ class K3bMkisofsHandler * * Uses K3bJob::MessageType */ - virtual void handleMkisofsInfoMessage( const QString&, int ) = 0; + virtual void handleMkisofsInfoMessage( const TQString&, int ) = 0; private: class Private; diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index c30d0ff..14eca4f 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -27,11 +27,11 @@ #include #include -#include +#include -K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_process(0), m_device(0), m_dvd(false) @@ -53,7 +53,7 @@ void K3bMsInfoFetcher::start() if( !k3bcore->externalBinManager()->foundBin( "cdrecord" ) ) { kdDebug() << "(K3bMsInfoFetcher) could not find cdrecord executable" << endl; - emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), K3bJob::ERROR ); jobFinished(false); return; } @@ -70,9 +70,9 @@ void K3bMsInfoFetcher::start() // connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotMediaDetectionFinished(K3bDevice::DeviceHandler*)) ); } @@ -89,7 +89,7 @@ void K3bMsInfoFetcher::getMsInfo() bin = k3bcore->externalBinManager()->binObject( "cdrecord" ); if( !bin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg( m_dvd ? "dvdrecord" : "cdrecord" ), ERROR ); jobFinished(false); return; } @@ -97,38 +97,38 @@ void K3bMsInfoFetcher::getMsInfo() *m_process << bin->path; // add the device (e.g. /dev/sg1) - *m_process << QString("dev=%1").arg( K3b::externalBinDeviceParameter(m_device, bin) ); + *m_process << TQString("dev=%1").tqarg( K3b::externalBinDeviceParameter(m_device, bin) ); *m_process << "-msinfo"; // additional user parameters from config - const QStringList& params = bin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = bin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; kdDebug() << "***** " << bin->name() << " parameters:\n"; - const QValueList& args = m_process->args(); - QString s; - for( QValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList& args = m_process->args(); + TQString s; + for( TQValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; emit debuggingOutput( "msinfo command:", s ); - // connect( m_process, SIGNAL(receivedStderr(KProcess*, char*, int)), - // this, SLOT(slotCollectOutput(KProcess*, char*, int)) ); - connect( m_process, SIGNAL(receivedStdout(KProcess*, char*, int)), - this, SLOT(slotCollectOutput(KProcess*, char*, int)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited()) ); + // connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), + // this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), + this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited()) ); - m_msInfo = QString::null; - m_collectedOutput = QString::null; + m_msInfo = TQString(); + m_collectedOutput = TQString(); m_canceled = false; if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { - emit infoMessage( i18n("Could not start %1.").arg(bin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(bin->name()), K3bJob::ERROR ); jobFinished(false); } } @@ -161,7 +161,7 @@ void K3bMsInfoFetcher::slotMediaDetectionFinished( K3bDevice::DeviceHandler* h ) } else { emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.") - .arg( m_device->vendor() + " " + m_device->description() ), ERROR ); + .tqarg( m_device->vendor() + " " + m_device->description() ), ERROR ); jobFinished( false ); } } @@ -190,8 +190,8 @@ void K3bMsInfoFetcher::slotProcessExited() kdDebug() << "(K3bMsInfoFetcher) msinfo fetched" << endl; // now parse the output - QString firstLine = m_collectedOutput.left( m_collectedOutput.find("\n") ); - QStringList list = QStringList::split( ",", firstLine ); + TQString firstLine = m_collectedOutput.left( m_collectedOutput.tqfind("\n") ); + TQStringList list = TQStringList::split( ",", firstLine ); if( list.count() == 2 ) { bool ok1, ok2; m_lastSessionStart = list.first().toInt( &ok1 ); @@ -199,10 +199,10 @@ void K3bMsInfoFetcher::slotProcessExited() if( ok1 && ok2 ) m_msInfo = firstLine.stripWhiteSpace(); else - m_msInfo = QString::null; + m_msInfo = TQString(); } else { - m_msInfo = QString::null; + m_msInfo = TQString(); } kdDebug() << "(K3bMsInfoFetcher) msinfo parsed: " << m_msInfo << endl; @@ -220,9 +220,9 @@ void K3bMsInfoFetcher::slotProcessExited() void K3bMsInfoFetcher::slotCollectOutput( KProcess*, char* output, int len ) { - emit debuggingOutput( "msinfo", QString::fromLocal8Bit( output, len ) ); + emit debuggingOutput( "msinfo", TQString::fromLocal8Bit( output, len ) ); - m_collectedOutput += QString::fromLocal8Bit( output, len ); + m_collectedOutput += TQString::fromLocal8Bit( output, len ); } diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h index 593664f..da609cb 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.h +++ b/libk3b/projects/datacd/k3bmsinfofetcher.h @@ -27,12 +27,13 @@ class KProcess; class K3bMsInfoFetcher : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bMsInfoFetcher( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bMsInfoFetcher( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bMsInfoFetcher(); - const QString& msInfo() const { return m_msInfo; } + const TQString& msInfo() const { return m_msInfo; } int lastSessionStart() const { return m_lastSessionStart; } int nextSessionStart() const { return m_nextSessionStart; } @@ -49,10 +50,10 @@ class K3bMsInfoFetcher : public K3bJob void getMsInfo(); private: - QString m_msInfo; + TQString m_msInfo; int m_lastSessionStart; int m_nextSessionStart; - QString m_collectedOutput; + TQString m_collectedOutput; KProcess* m_process; K3bDevice::Device* m_device; diff --git a/libk3b/projects/datacd/k3bsessionimportitem.cpp b/libk3b/projects/datacd/k3bsessionimportitem.cpp index 35f7936..9173d5e 100644 --- a/libk3b/projects/datacd/k3bsessionimportitem.cpp +++ b/libk3b/projects/datacd/k3bsessionimportitem.cpp @@ -29,8 +29,8 @@ K3bSessionImportItem::K3bSessionImportItem( const K3bIso9660File* isoF, K3bDataD setK3bName( isoF->name() ); // add automagically like a qlistviewitem - if( parent() ) - parent()->addDataItem( this ); + if( tqparent() ) + tqparent()->addDataItem( this ); } @@ -47,9 +47,9 @@ K3bSessionImportItem::~K3bSessionImportItem() if( m_replaceItem ) m_replaceItem->setReplacedItemFromOldSession(0); - // remove this from parentdir - if( parent() ) - parent()->takeDataItem( this ); + // remove this from tqparentdir + if( tqparent() ) + tqparent()->takeDataItem( this ); } diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h index 05005ed..e2efa6c 100644 --- a/libk3b/projects/datacd/k3bspecialdataitem.h +++ b/libk3b/projects/datacd/k3bspecialdataitem.h @@ -29,15 +29,15 @@ class K3bSpecialDataItem : public K3bDataItem { public: - K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* parent = 0, const QString& k3bName = QString::null ) - : K3bDataItem( doc, parent ), + K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* tqparent = 0, const TQString& k3bName = TQString() ) + : K3bDataItem( doc, tqparent ), m_size( size ) { setK3bName( k3bName ); // add automagically like a qlistviewitem - if( parent ) - parent->addDataItem( this ); + if( tqparent ) + tqparent->addDataItem( this ); } K3bSpecialDataItem( const K3bSpecialDataItem& item ) @@ -47,17 +47,17 @@ class K3bSpecialDataItem : public K3bDataItem } ~K3bSpecialDataItem() { - // remove this from parentdir - if( parent() ) - parent()->takeDataItem( this ); + // remove this from tqparentdir + if( tqparent() ) + tqparent()->takeDataItem( this ); } K3bDataItem* copy() const { return new K3bSpecialDataItem( *this ); } - void setMimeType( const QString& s ) { m_mimeType = s; } - const QString& mimeType() const { return m_mimeType; } + void setMimeType( const TQString& s ) { m_mimeType = s; } + const TQString& mimeType() const { return m_mimeType; } bool isSpecialFile() const { return true; } @@ -68,7 +68,7 @@ class K3bSpecialDataItem : public K3bDataItem KIO::filesize_t itemSize( bool ) const { return m_size; } private: - QString m_mimeType; + TQString m_mimeType; KIO::filesize_t m_size; }; diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp index f703452..f5dea6b 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -61,8 +61,8 @@ public: }; -K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_action(0) { d = new Private; @@ -82,15 +82,15 @@ void K3bDvdBooktypeJob::setForceNoEject( bool b ) } -QString K3bDvdBooktypeJob::jobDescription() const +TQString K3bDvdBooktypeJob::jobDescription() const { return i18n("Changing DVD Booktype"); // Changing DVD±R(W) Booktype } -QString K3bDvdBooktypeJob::jobDetails() const +TQString K3bDvdBooktypeJob::jobDetails() const { - return QString::null; + return TQString(); } @@ -118,7 +118,7 @@ void K3bDvdBooktypeJob::start() K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_EMPTY, K3bDevice::MEDIA_DVD_PLUS_RW|K3bDevice::MEDIA_DVD_PLUS_R, i18n("Please insert an empty DVD+R or a DVD+RW medium into drive

%1 %2 (%3).") - .arg(d->device->vendor()).arg(d->device->description()).arg(d->device->devicename()) ) == -1 ) { + .tqarg(d->device->vendor()).tqarg(d->device->description()).tqarg(d->device->devicename()) ) == -1 ) { emit canceled(); jobFinished(false); d->running = false; @@ -129,9 +129,9 @@ void K3bDvdBooktypeJob::start() emit newTask( i18n("Checking media") ); connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDeviceHandlerFinished(K3bDevice::DeviceHandler*)) ); } else { // change writer defaults @@ -170,7 +170,7 @@ void K3bDvdBooktypeJob::setDevice( K3bDevice::Device* dev ) } -void K3bDvdBooktypeJob::slotStderrLine( const QString& line ) +void K3bDvdBooktypeJob::slotStderrLine( const TQString& line ) { emit debuggingOutput( "dvd+rw-booktype", line ); // FIXME @@ -189,7 +189,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) d->success = true; } else { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(d->dvdBooktypeBin->name()).arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(d->dvdBooktypeBin->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR ); @@ -197,7 +197,7 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg(d->dvdBooktypeBin->name()), + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(d->dvdBooktypeBin->name()), ERROR ); d->success = false; } @@ -216,9 +216,9 @@ void K3bDvdBooktypeJob::slotProcessFinished( KProcess* p ) else { emit infoMessage( i18n("Ejecting DVD..."), INFO ); connect( K3bDevice::eject( d->device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); } } else { @@ -280,12 +280,12 @@ void K3bDvdBooktypeJob::startBooktypeChange() d->process = new K3bProcess(); d->process->setRunPrivileged(true); d->process->setSuppressEmptyLines(true); - connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStderrLine(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), this, TQT_SLOT(slotStderrLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessFinished(KProcess*)) ); d->dvdBooktypeBin = k3bcore->externalBinManager()->binObject( "dvd+rw-booktype" ); if( !d->dvdBooktypeBin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("dvd+rw-booktype"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("dvd+rw-booktype"), ERROR ); d->running = false; jobFinished(false); return; @@ -326,9 +326,9 @@ void K3bDvdBooktypeJob::startBooktypeChange() *d->process << d->device->blockDeviceName(); kdDebug() << "***** dvd+rw-booktype parameters:\n"; - const QValueList& args = d->process->args(); - QString s; - for( QValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList& args = d->process->args(); + TQString s; + for( TQValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << endl << flush; @@ -338,7 +338,7 @@ void K3bDvdBooktypeJob::startBooktypeChange() if( !d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { // something went wrong when starting the program // it "should" be the executable - emit infoMessage( i18n("Could not start %1.").arg(d->dvdBooktypeBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(d->dvdBooktypeBin->name()), K3bJob::ERROR ); d->running = false; jobFinished(false); } diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h index b9e7e4b..6605007 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h @@ -34,13 +34,14 @@ namespace K3bDevice { class K3bDvdBooktypeJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bDvdBooktypeJob( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bDvdBooktypeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bDvdBooktypeJob(); - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; /** * @list SET_MEDIA_DVD_ROM Change media identification on current media to DVD-ROM. @@ -81,7 +82,7 @@ class K3bDvdBooktypeJob : public K3bJob void setForceNoEject( bool ); private slots: - void slotStderrLine( const QString& ); + void slotStderrLine( const TQString& ); void slotProcessFinished( KProcess* ); void slotDeviceHandlerFinished( K3bDevice::DeviceHandler* ); void slotEjectingFinished( K3bDevice::DeviceHandler* ); diff --git a/libk3b/projects/datadvd/k3bdvddoc.cpp b/libk3b/projects/datadvd/k3bdvddoc.cpp index 4ab8b9f..2d6ae46 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.cpp +++ b/libk3b/projects/datadvd/k3bdvddoc.cpp @@ -22,8 +22,8 @@ #include -K3bDvdDoc::K3bDvdDoc( QObject* parent ) - : K3bDataDoc( parent ) +K3bDvdDoc::K3bDvdDoc( TQObject* tqparent ) + : K3bDataDoc( tqparent ) { } @@ -31,9 +31,9 @@ K3bDvdDoc::~K3bDvdDoc() { } -K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bDvdJob( this, hdl, parent ); + return new K3bDvdJob( this, hdl, tqparent ); } //#include "k3bdvddoc.moc" diff --git a/libk3b/projects/datadvd/k3bdvddoc.h b/libk3b/projects/datadvd/k3bdvddoc.h index 03b5c3d..20b039e 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.h +++ b/libk3b/projects/datadvd/k3bdvddoc.h @@ -23,15 +23,15 @@ class KConfig; class LIBK3B_EXPORT K3bDvdDoc : public K3bDataDoc { public: - K3bDvdDoc( QObject* parent = 0 ); + K3bDvdDoc( TQObject* tqparent = 0 ); virtual ~K3bDvdDoc(); virtual int type() const { return DVD; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent = 0 ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); protected: - virtual QString typeString() const { return "dvd"; } + virtual TQString typeString() const { return "dvd"; } }; #endif diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp index 3cd1521..d8bb75c 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.cpp +++ b/libk3b/projects/datadvd/k3bdvdjob.cpp @@ -39,8 +39,8 @@ public: }; -K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bDataJob( doc, hdl, parent ), +K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bDataJob( doc, hdl, tqparent ), m_doc( doc ) { d = new Private(); @@ -79,7 +79,7 @@ bool K3bDvdJob::prepareWriterJob() writer->setCloseDvd( usedMultiSessionMode() == K3bDataDoc::NONE || usedMultiSessionMode() == K3bDataDoc::FINISH ); - writer->setImageToWrite( QString::null ); // read from stdin + writer->setImageToWrite( TQString() ); // read from stdin writer->setTrackSize( m_isoImager->size() ); if( usedMultiSessionMode() != K3bDataDoc::NONE ) { @@ -105,9 +105,9 @@ void K3bDvdJob::determineMultiSessionMode() } else { connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::NG_DISKINFO, m_doc->burner() ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotDetermineMultiSessionMode(K3bDevice::DeviceHandler*)) ); } } @@ -243,8 +243,8 @@ bool K3bDvdJob::waitForMedium() if( !questionYesNo( i18n("Your writer (%1 %2) does not support simulation with DVD-R(W) media. " "Do you really want to continue? The media will be written " "for real.") - .arg(m_doc->burner()->vendor()) - .arg(m_doc->burner()->description()), + .tqarg(m_doc->burner()->vendor()) + .tqarg(m_doc->burner()->description()), i18n("No Simulation with DVD-R(W)") ) ) { return false; } @@ -271,7 +271,7 @@ bool K3bDvdJob::waitForMedium() if( m_doc->writingMode() == K3b::DAO ) // || ( m_doc->writingMode() == K3b::WRITING_MODE_AUTO && // usedMultiSessionMode() == K3bDataDoc::NONE ) ) - emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); else { // check if the writer supports writing sequential and thus multisession (on -1 the burner cannot handle @@ -279,14 +279,14 @@ bool K3bDvdJob::waitForMedium() if( m_doc->burner()->featureCurrent( K3bDevice::FEATURE_INCREMENTAL_STREAMING_WRITABLE ) == 0 ) { if( !questionYesNo( i18n("Your writer (%1 %2) does not support Incremental Streaming with %3 " "media. Multisession will not be possible. Continue anyway?") - .arg(m_doc->burner()->vendor()) - .arg(m_doc->burner()->description()) - .arg( K3bDevice::mediaTypeString(foundMedium, true) ), + .tqarg(m_doc->burner()->vendor()) + .tqarg(m_doc->burner()->description()) + .tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), i18n("No Incremental Streaming") ) ) { return false; } else { - emit infoMessage( i18n("Writing %1 in DAO mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in DAO mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); } } else { @@ -294,7 +294,7 @@ bool K3bDvdJob::waitForMedium() m_doc->writingMode() == K3b::WRITING_MODE_RES_OVWR ) emit infoMessage( i18n("Restricted Overwrite is not possible with DVD-R media."), INFO ); - emit infoMessage( i18n("Writing %1 in incremental mode.").arg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); + emit infoMessage( i18n("Writing %1 in incremental mode.").tqarg( K3bDevice::mediaTypeString(foundMedium, true) ), INFO ); } } } @@ -305,7 +305,7 @@ bool K3bDvdJob::waitForMedium() } -QString K3bDvdJob::jobDescription() const +TQString K3bDvdJob::jobDescription() const { if( m_doc->onlyCreateImages() ) { return i18n("Creating Data Image File"); @@ -314,19 +314,19 @@ QString K3bDvdJob::jobDescription() const m_doc->multiSessionMode() == K3bDataDoc::AUTO ) { return i18n("Writing Data DVD") + ( m_doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); } else { return i18n("Writing Multisession DVD") + ( m_doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); } } -QString K3bDvdJob::jobDetails() const +TQString K3bDvdJob::jobDetails() const { if( m_doc->copies() > 1 && !m_doc->dummy() && @@ -335,10 +335,10 @@ QString K3bDvdJob::jobDetails() const return i18n("ISO9660 Filesystem (Size: %1) - %n copy", "ISO9660 Filesystem (Size: %1) - %n copies", m_doc->copies()) - .arg(KIO::convertSize( m_doc->size() )); + .tqarg(KIO::convertSize( m_doc->size() )); else return i18n("ISO9660 Filesystem (Size: %1)") - .arg(KIO::convertSize( m_doc->size() )); + .tqarg(KIO::convertSize( m_doc->size() )); } #include "k3bdvdjob.moc" diff --git a/libk3b/projects/datadvd/k3bdvdjob.h b/libk3b/projects/datadvd/k3bdvdjob.h index 381bc1d..3bdf7b6 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.h +++ b/libk3b/projects/datadvd/k3bdvdjob.h @@ -19,7 +19,7 @@ #include -#include +#include class K3bDataDoc; class K3bGrowisofsWriter; @@ -28,16 +28,17 @@ class K3bGrowisofsWriter; class K3bDvdJob : public K3bDataJob { Q_OBJECT + TQ_OBJECT public: /** * To be more flexible we allow writing of any data doc */ - K3bDvdJob( K3bDataDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bDvdJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); virtual ~K3bDvdJob(); - virtual QString jobDescription() const; - virtual QString jobDetails() const; + virtual TQString jobDescription() const; + virtual TQString jobDetails() const; protected: void prepareData(); diff --git a/libk3b/projects/datadvd/k3bdvdview.cpp b/libk3b/projects/datadvd/k3bdvdview.cpp index 512ec4b..dc5f67a 100644 --- a/libk3b/projects/datadvd/k3bdvdview.cpp +++ b/libk3b/projects/datadvd/k3bdvdview.cpp @@ -22,8 +22,8 @@ #include -K3bDvdView::K3bDvdView( K3bDvdDoc* doc, QWidget *parent, const char *name ) - : K3bDataView( doc, parent, name ) +K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name ) + : K3bDataView( doc, tqparent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView() } -K3bProjectBurnDialog* K3bDvdView::newBurnDialog( QWidget* parent, const char* name ) +K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) { - return new K3bDvdBurnDialog( m_doc, parent, name, true ); + return new K3bDvdBurnDialog( m_doc, tqparent, name, true ); } #include "k3bdvdview.moc" diff --git a/libk3b/projects/datadvd/k3bdvdview.h b/libk3b/projects/datadvd/k3bdvdview.h index d9f30f3..1072cc2 100644 --- a/libk3b/projects/datadvd/k3bdvdview.h +++ b/libk3b/projects/datadvd/k3bdvdview.h @@ -25,13 +25,14 @@ class K3bDvdDoc; class K3bDvdView : public K3bDataView { Q_OBJECT + TQ_OBJECT public: - K3bDvdView( K3bDvdDoc* doc, QWidget *parent = 0, const char *name = 0 ); + K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); ~K3bDvdView(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( QWidget* parent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); private: K3bDvdDoc* m_doc; diff --git a/libk3b/projects/k3babstractwriter.cpp b/libk3b/projects/k3babstractwriter.cpp index df22bc3..61d2ac6 100644 --- a/libk3b/projects/k3babstractwriter.cpp +++ b/libk3b/projects/k3babstractwriter.cpp @@ -26,8 +26,8 @@ -K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ), +K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ), m_burnDevice(dev), m_burnSpeed(1), m_simulate(false), @@ -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() ), SIGNAL(finished(bool)), - this, SLOT(slotUnblockWhileCancellationFinished(bool)) ); + connect( K3bDevice::unblock( burnDevice() ), TQT_SIGNAL(finished(bool)), + this, TQT_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() ), SIGNAL(finished(bool)), - this, SLOT(slotEjectWhileCancellationFinished(bool)) ); + connect( K3bDevice::eject( burnDevice() ), TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotEjectWhileCancellationFinished(bool)) ); } else { emit canceled(); diff --git a/libk3b/projects/k3babstractwriter.h b/libk3b/projects/k3babstractwriter.h index 3f91ee3..b6f4e1d 100644 --- a/libk3b/projects/k3babstractwriter.h +++ b/libk3b/projects/k3babstractwriter.h @@ -20,7 +20,7 @@ #include "k3bjob.h" -#include +#include class K3bDevice::Device; class K3bJobHandler; @@ -29,6 +29,7 @@ class K3bJobHandler; class K3bAbstractWriter : public K3bJob { Q_OBJECT + TQ_OBJECT public: virtual ~K3bAbstractWriter(); @@ -73,7 +74,7 @@ class K3bAbstractWriter : public K3bJob protected: K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); bool wasSourceUnreadable() const { return m_sourceUnreadable; } diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index c49cb4b..3339581 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -27,16 +27,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -124,8 +124,8 @@ public: K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - QObject* parent, const char* name ) - : K3bAbstractWriter( dev, hdl, parent, name ), + TQObject* tqparent, const char* name ) + : K3bAbstractWriter( dev, hdl, tqparent, name ), m_command(WRITE), m_blankMode(MINIMAL), m_sourceDevice(0), @@ -146,8 +146,8 @@ K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, { d = new Private(); d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, SIGNAL(throughput(int)), - this, SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQT_SIGNAL(throughput(int)), + this, TQT_SLOT(slotThroughput(int)) ); m_eject = k3bcore->globalSettings()->ejectMedia(); @@ -161,13 +161,13 @@ K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, else { delete m_comSock; - m_comSock = new QSocket(); + m_comSock = new TQSocket(); m_comSock->setSocket(m_cdrdaoComm[1]); m_comSock->socketDevice()->setReceiveBufferSize(49152); - // magic number from Qt documentation + // magic number from TQt documentation m_comSock->socketDevice()->setBlocking(false); - connect( m_comSock, SIGNAL(readyRead()), - this, SLOT(parseCdrdaoMessage())); + connect( m_comSock, TQT_SIGNAL(readyRead()), + this, TQT_SLOT(parseCdrdaoMessage())); } } @@ -253,7 +253,7 @@ void K3bCdrdaoWriter::setWriteArguments() { *m_process << "--driver"; if( burnDevice()->cdTextCapable() == 1 ) - *m_process << QString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() ); + *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() ); else *m_process << burnDevice()->cdrdaoDriver(); } @@ -264,7 +264,7 @@ void K3bCdrdaoWriter::setWriteArguments() // burn speed if( d->usedSpeed != 0 ) - *m_process << "--speed" << QString("%1").arg(d->usedSpeed); + *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed); //simulate if( simulate() ) @@ -283,7 +283,7 @@ void K3bCdrdaoWriter::setWriteArguments() if( m_cdrdaoBinObject->hasFeature( "disable-burnproof" ) ) *m_process << "--buffer-under-run-protection" << "0"; else - emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").arg(m_cdrdaoBinObject->version), WARNING ); + emit infoMessage( i18n("Cdrdao %1 does not support disabling burnfree.").tqarg(m_cdrdaoBinObject->version), WARNING ); } if( k3bcore->globalSettings()->force() ) { @@ -298,7 +298,7 @@ void K3bCdrdaoWriter::setWriteArguments() // one buffer in cdrdao holds 1 second of audio data = 75 frames = 75 * 2352 bytes // int bufSizeInMb = k3bcore->globalSettings()->bufferSize(); - *m_process << "--buffers" << QString::number( bufSizeInMb*1024*1024/(75*2352) ); + *m_process << "--buffers" << TQString::number( bufSizeInMb*1024*1024/(75*2352) ); } bool overburn = @@ -307,7 +307,7 @@ void K3bCdrdaoWriter::setWriteArguments() if( m_cdrdaoBinObject->hasFeature("overburn") ) *m_process << "--overburn"; else - emit infoMessage( i18n("Cdrdao %1 does not support overburning.").arg(m_cdrdaoBinObject->version), WARNING ); + emit infoMessage( i18n("Cdrdao %1 does not support overburning.").tqarg(m_cdrdaoBinObject->version), WARNING ); } } @@ -342,17 +342,17 @@ void K3bCdrdaoWriter::setReadArguments() // TAO Source Adjust if ( m_taoSourceAdjust != -1 ) *m_process << "--tao-source-adjust" - << QString("%1").arg(m_taoSourceAdjust); + << TQString("%1").tqarg(m_taoSourceAdjust); // paranoia Mode if ( m_paranoiaMode != -1 ) *m_process << "--paranoia-mode" - << QString("%1").arg(m_paranoiaMode); + << TQString("%1").tqarg(m_paranoiaMode); // session if ( m_session != -1 ) *m_process << "--session" - << QString("%1").arg(m_session); + << TQString("%1").tqarg(m_session); // fast TOC if ( m_fastToc ) @@ -386,7 +386,7 @@ void K3bCdrdaoWriter::setBlankArguments() { *m_process << "--driver"; if( burnDevice()->cdTextCapable() == 1 ) - *m_process << QString("%1:0x00000010").arg( burnDevice()->cdrdaoDriver() ); + *m_process << TQString("%1:0x00000010").tqarg( burnDevice()->cdrdaoDriver() ); else *m_process << burnDevice()->cdrdaoDriver(); } @@ -397,7 +397,7 @@ void K3bCdrdaoWriter::setBlankArguments() // burn speed if( d->usedSpeed != 0 ) - *m_process << "--speed" << QString("%1").arg(d->usedSpeed); + *m_process << "--speed" << TQString("%1").tqarg(d->usedSpeed); // blank-mode *m_process << "--blank-mode"; @@ -416,8 +416,8 @@ void K3bCdrdaoWriter::setCommonArguments() { // additional user parameters from config - const QStringList& params = m_cdrdaoBinObject->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = m_cdrdaoBinObject->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; @@ -432,7 +432,7 @@ void K3bCdrdaoWriter::setCommonArguments() *m_process << "--eject"; // remote - *m_process << "--remote" << QString("%1").arg(m_cdrdaoComm[0]); + *m_process << "--remote" << TQString("%1").tqarg(m_cdrdaoComm[0]); // data File if ( ! m_dataFile.isEmpty() ) @@ -446,7 +446,7 @@ void K3bCdrdaoWriter::setCommonArguments() *m_process << m_tocFile; } -K3bCdrdaoWriter* K3bCdrdaoWriter::addArgument( const QString& arg ) +K3bCdrdaoWriter* K3bCdrdaoWriter::addArgument( const TQString& arg ) { *m_process << arg; return this; @@ -464,10 +464,10 @@ void K3bCdrdaoWriter::start() m_process->setRunPrivileged(true); m_process->setSplitStdout(false); m_process->setRawStdin(true); - connect( m_process, SIGNAL(stderrLine(const QString&)), - this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(stderrLine(const TQString&)), + this, TQT_SLOT(slotStdLine(const TQString&)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotProcessExited(KProcess*)) ); m_canceled = false; m_knownError = false; @@ -475,7 +475,7 @@ void K3bCdrdaoWriter::start() m_cdrdaoBinObject = k3bcore->externalBinManager()->binObject("cdrdao"); if( !m_cdrdaoBinObject ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("cdrdao"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrdao"), ERROR ); jobFinished(false); return; } @@ -483,7 +483,7 @@ void K3bCdrdaoWriter::start() emit debuggingOutput( "Used versions", "cdrdao: " + m_cdrdaoBinObject->version ); if( !m_cdrdaoBinObject->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg(m_cdrdaoBinObject->name()).arg(m_cdrdaoBinObject->version).arg(m_cdrdaoBinObject->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg(m_cdrdaoBinObject->name()).tqarg(m_cdrdaoBinObject->version).tqarg(m_cdrdaoBinObject->copyright), INFO ); // the message size changed in cdrdao 1.1.8) @@ -516,7 +516,7 @@ void K3bCdrdaoWriter::start() m_backupTocFile = m_tocFile + ".k3bbak"; // workaround, cdrdao deletes the tocfile when --remote parameter is set - if ( !KIO::NetAccess::copy(KURL(m_tocFile),KURL(m_backupTocFile), (QWidget*) 0) ) + if ( !KIO::NetAccess::copy(KURL(m_tocFile),KURL(m_backupTocFile), (TQWidget*) 0) ) { kdDebug() << "(K3bCdrdaoWriter) could not backup " << m_tocFile << " to " << m_backupTocFile << endl; emit infoMessage( i18n("Could not backup tocfile."), ERROR ); @@ -532,12 +532,12 @@ void K3bCdrdaoWriter::start() } prepareArgumentList(); // set working dir to dir part of toc file (to allow rel names in toc-file) - m_process->setWorkingDirectory(QUrl(m_tocFile).dirPath()); + m_process->setWorkingDirectory(TQUrl(m_tocFile).dirPath()); kdDebug() << "***** cdrdao parameters:\n"; - const QValueList& args = m_process->args(); - QString s; - for( QValueList::const_iterator it = args.begin(); it != args.end(); ++it ) + const TQValueList& args = m_process->args(); + TQString s; + for( TQValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } @@ -582,7 +582,7 @@ void K3bCdrdaoWriter::start() // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bCdrdaoWriter) could not start cdrdao" << endl; - emit infoMessage( i18n("Could not start %1.").arg("cdrdao"), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg("cdrdao"), K3bJob::ERROR ); jobFinished(false); } else @@ -592,13 +592,13 @@ void K3bCdrdaoWriter::start() case WRITE: if( simulate() ) { - emit infoMessage(i18n("Starting DAO simulation at %1x speed...").arg(d->usedSpeed), + emit infoMessage(i18n("Starting DAO simulation at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit newTask( i18n("Simulating") ); } else { - emit infoMessage( i18n("Starting DAO writing at %1x speed...").arg(d->usedSpeed), K3bJob::INFO ); + emit infoMessage( i18n("Starting DAO writing at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit newTask( i18n("Writing") ); } break; @@ -609,12 +609,12 @@ void K3bCdrdaoWriter::start() case COPY: if( simulate() ) { - emit infoMessage(i18n("Starting simulation copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO ); + emit infoMessage(i18n("Starting simulation copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit newTask( i18n("Simulating") ); } else { - emit infoMessage( i18n("Starting copy at %1x speed...").arg(d->usedSpeed), K3bJob::INFO ); + emit infoMessage( i18n("Starting copy at %1x speed...").tqarg(d->usedSpeed), K3bJob::INFO ); emit newTask( i18n("Copying") ); } break; @@ -658,41 +658,41 @@ bool K3bCdrdaoWriter::cueSheet() // TODO: do this in the K3bCueFileParser if ( m_tocFile.lower().endsWith( ".cue" ) ) { - QFile f( m_tocFile ); + TQFile f( m_tocFile ); if ( f.open( IO_ReadOnly ) ) { - QTextStream ts( &f ); + TQTextStream ts( &f ); if ( !ts.eof() ) { - QString line = ts.readLine(); + TQString line = ts.readLine(); f.close(); - int pos = line.find( "FILE \"" ); + int pos = line.tqfind( "FILE \"" ); if( pos < 0 ) return false; pos += 6; - int endPos = line.find( "\" BINARY", pos+1 ); + int endPos = line.tqfind( "\" BINARY", pos+1 ); if( endPos < 0 ) return false; line = line.mid( pos, endPos-pos ); - QFileInfo fi( QFileInfo( m_tocFile ).dirPath() + "/" + QFileInfo( line ).fileName() ); - QString binpath = fi.filePath(); - kdDebug() << QString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").arg( line ) << endl; - kdDebug() << QString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").arg( binpath ) << endl; + TQFileInfo fi( TQFileInfo( m_tocFile ).dirPath() + "/" + TQFileInfo( line ).fileName() ); + TQString binpath = fi.filePath(); + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() BinFilePath from CueFile: %1").tqarg( line ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() absolute BinFilePath: %1").tqarg( binpath ) << endl; if ( !fi.exists() ) return false; KTempFile tempF; - QString tempFile = tempF.name(); + TQString tempFile = tempF.name(); tempF.unlink(); - if ( symlink(QFile::encodeName( binpath ), QFile::encodeName( tempFile + ".bin") ) == -1 ) + if ( symlink(TQFile::encodeName( binpath ), TQFile::encodeName( tempFile + ".bin") ) == -1 ) return false; - if ( symlink(QFile::encodeName( m_tocFile ), QFile::encodeName( tempFile + ".cue") ) == -1 ) + if ( symlink(TQFile::encodeName( m_tocFile ), TQFile::encodeName( tempFile + ".cue") ) == -1 ) return false; - kdDebug() << QString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").arg( tempFile ) << endl; - kdDebug() << QString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").arg( tempFile ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink BinFileName: %1.bin").tqarg( tempFile ) << endl; + kdDebug() << TQString("K3bCdrdaoWriter::cueSheet() symlink CueFileName: %1.cue").tqarg( tempFile ) << endl; m_binFileLnk = tempFile + ".bin"; m_cueFileLnk = tempFile + ".cue"; return true; @@ -703,7 +703,7 @@ bool K3bCdrdaoWriter::cueSheet() return false; } -void K3bCdrdaoWriter::slotStdLine( const QString& line ) +void K3bCdrdaoWriter::slotStdLine( const TQString& line ) { parseCdrdaoLine(line); } @@ -722,20 +722,20 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) case WRITE: case COPY: if ( !m_binFileLnk.isEmpty() ) { - KIO::NetAccess::del(KURL::fromPathOrURL(m_cueFileLnk), (QWidget*) 0); - KIO::NetAccess::del(KURL::fromPathOrURL(m_binFileLnk), (QWidget*) 0); + KIO::NetAccess::del(KURL::fromPathOrURL(m_cueFileLnk), (TQWidget*) 0); + KIO::NetAccess::del(KURL::fromPathOrURL(m_binFileLnk), (TQWidget*) 0); } - else if( (!QFile::exists( m_tocFile ) || K3b::filesize( KURL::fromPathOrURL(m_tocFile) ) == 0 ) && !m_onTheFly ) + else if( (!TQFile::exists( m_tocFile ) || K3b::filesize( KURL::fromPathOrURL(m_tocFile) ) == 0 ) && !m_onTheFly ) { // cdrdao removed the tocfile :( // we need to recover it - if ( !KIO::NetAccess::copy(KURL::fromPathOrURL(m_backupTocFile), KURL::fromPathOrURL(m_tocFile), (QWidget*) 0) ) + if ( !KIO::NetAccess::copy(KURL::fromPathOrURL(m_backupTocFile), KURL::fromPathOrURL(m_tocFile), (TQWidget*) 0) ) { kdDebug() << "(K3bCdrdaoWriter) restoring tocfile " << m_tocFile << " failed." << endl; emit infoMessage( i18n("Due to a bug in cdrdao the toc/cue file %1 has been deleted. " - "K3b was unable to restore it from the backup %2.").arg(m_tocFile).arg(m_backupTocFile), ERROR ); + "K3b was unable to restore it from the backup %2.").tqarg(m_tocFile).tqarg(m_backupTocFile), ERROR ); } - else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (QWidget*) 0) ) + else if ( !KIO::NetAccess::del(KURL::fromPathOrURL(m_backupTocFile), (TQWidget*) 0) ) { kdDebug() << "(K3bCdrdaoWriter) delete tocfile backkup " << m_backupTocFile << " failed." << endl; } @@ -775,7 +775,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) if( m_command == WRITE || m_command == COPY ) { int s = d->speedEst->average(); - emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); + emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); } jobFinished( true ); @@ -783,7 +783,7 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) default: if( !m_knownError && !wasSourceUnreadable() ) { - emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg(m_cdrdaoBinObject->name()).arg(p->exitStatus()), + emit infoMessage( i18n("%1 returned an unknown error (code %2).").tqarg(m_cdrdaoBinObject->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); emit infoMessage( i18n("Please include the debugging output in your problem report."), K3bJob::ERROR ); } @@ -794,24 +794,24 @@ void K3bCdrdaoWriter::slotProcessExited( KProcess* p ) } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg("cdrdao"), K3bJob::ERROR ); + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg("cdrdao"), K3bJob::ERROR ); jobFinished( false ); } } -void K3bCdrdaoWriter::unknownCdrdaoLine( const QString& line ) +void K3bCdrdaoWriter::unknownCdrdaoLine( const TQString& line ) { - if( line.contains( "at speed" ) ) + if( line.tqcontains( "at speed" ) ) { // parse the speed and inform the user if cdrdao switched it down - int pos = line.find( "at speed" ); - int po2 = line.find( QRegExp("\\D"), pos + 9 ); + int pos = line.tqfind( "at speed" ); + int po2 = line.tqfind( TQRegExp("\\D"), pos + 9 ); int speed = line.mid( pos+9, po2-pos-9 ).toInt(); if( speed < d->usedSpeed ) { - emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING ); - emit infoMessage( i18n("Switching down burn speed to %1x").arg(speed), K3bJob::WARNING ); + emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING ); + emit infoMessage( i18n("Switching down burn speed to %1x").tqarg(speed), K3bJob::WARNING ); } } } @@ -825,7 +825,7 @@ void K3bCdrdaoWriter::reinitParser() m_currentTrack=0; } -void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str ) +void K3bCdrdaoWriter::parseCdrdaoLine( const TQString& str ) { emit debuggingOutput( "cdrdao", str ); // kdDebug() << "(cdrdaoparse)" << str << endl; @@ -835,7 +835,7 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str ) { parseCdrdaoError( str ); } - else if( (str).startsWith( "Wrote" ) && !str.contains("blocks") ) + else if( (str).startsWith( "Wrote" ) && !str.tqcontains("blocks") ) { parseCdrdaoWrote( str ); } @@ -870,62 +870,62 @@ void K3bCdrdaoWriter::parseCdrdaoLine( const QString& str ) } else if( str.startsWith( "Found pre-gap" ) ) { - emit infoMessage( i18n("Found pregap: %1").arg( str.mid(str.find(":")+1) ), K3bJob::INFO ); + emit infoMessage( i18n("Found pregap: %1").tqarg( str.mid(str.tqfind(":")+1) ), K3bJob::INFO ); } else unknownCdrdaoLine(str); } -void K3bCdrdaoWriter::parseCdrdaoError( const QString& line ) +void K3bCdrdaoWriter::parseCdrdaoError( const TQString& line ) { int pos = -1; - if( line.contains( "No driver found" ) || - line.contains( "use option --driver" ) ) + if( line.tqcontains( "No driver found" ) || + line.tqcontains( "use option --driver" ) ) { emit infoMessage( i18n("No cdrdao driver found."), K3bJob::ERROR ); emit infoMessage( i18n("Please select one manually in the device settings."), K3bJob::ERROR ); emit infoMessage( i18n("For most current drives this would be 'generic-mmc'."), K3bJob::ERROR ); m_knownError = true; } - else if( line.contains( "Cannot setup device" ) ) + else if( line.tqcontains( "Cannot setup device" ) ) { // no nothing... } - else if( line.contains( "not ready") ) + else if( line.tqcontains( "not ready") ) { emit infoMessage( i18n("Device not ready, waiting."),K3bJob::WARNING ); } - else if( line.contains("Drive does not accept any cue sheet") ) + else if( line.tqcontains("Drive does not accept any cue sheet") ) { emit infoMessage( i18n("Cue sheet not accepted."), K3bJob::ERROR ); m_knownError = true; } - else if( (pos = line.find( "Illegal option" )) > 0 ) { + else if( (pos = line.tqfind( "Illegal option" )) > 0 ) { // ERROR: Illegal option: -wurst - emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrdaoBinObject->name()).arg(line.mid(pos+16)), + emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrdaoBinObject->name()).tqarg(line.mid(pos+16)), ERROR ); m_knownError = true; } - else if( line.contains( "exceeds capacity" ) ) { + else if( line.tqcontains( "exceeds capacity" ) ) { emit infoMessage( i18n("Data does not fit on disk."), ERROR ); if( m_cdrdaoBinObject->hasFeature("overburn") ) emit infoMessage( i18n("Enable overburning in the advanced K3b settings to burn anyway."), INFO ); m_knownError = true; } - // else if( !line.contains( "remote progress message" ) ) + // else if( !line.tqcontains( "remote progress message" ) ) // emit infoMessage( line, K3bJob::ERROR ); } -void K3bCdrdaoWriter::parseCdrdaoWrote( const QString& line ) +void K3bCdrdaoWriter::parseCdrdaoWrote( const TQString& line ) { int pos, po2; - pos = line.find( "Wrote" ); - po2 = line.find( " ", pos + 6 ); + pos = line.tqfind( "Wrote" ); + po2 = line.tqfind( " ", pos + 6 ); int processed = line.mid( pos+6, po2-pos-6 ).toInt(); - pos = line.find( "of" ); - po2 = line.find( " ", pos + 3 ); + pos = line.tqfind( "of" ); + po2 = line.tqfind( " ", pos + 3 ); m_size = line.mid( pos+3, po2-pos-3 ).toInt(); d->speedEst->dataWritten( processed*1024 ); @@ -1035,21 +1035,21 @@ void K3bCdrdaoWriter::slotThroughput( int t ) } -QString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin ) +TQString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin ) { if( !bin ) - return QString::null; + return TQString(); // cdrdao normally in (prefix)/bin and driver table in (prefix)/share/cdrdao - QString path = bin->path; - path.truncate( path.findRev("/") ); - path.truncate( path.findRev("/") ); + TQString path = bin->path; + path.truncate( path.tqfindRev("/") ); + path.truncate( path.tqfindRev("/") ); path += "/share/cdrdao/drivers"; - if( QFile::exists(path) ) + if( TQFile::exists(path) ) return path; else { kdDebug() << "(K3bCdrdaoWriter) could not find cdrdao driver table." << endl; - return QString::null; + return TQString(); } } @@ -1058,15 +1058,15 @@ QString K3bCdrdaoWriter::findDriverFile( const K3bExternalBin* bin ) // TODO: cache the drivers bool K3bCdrdaoWriter::defaultToGenericMMC( K3bDevice::Device* dev, bool writer ) { - QString driverTable = findDriverFile( m_cdrdaoBinObject ); + TQString driverTable = findDriverFile( m_cdrdaoBinObject ); if( !driverTable.isEmpty() ) { - QFile f( driverTable ); + TQFile f( driverTable ); if( f.open( IO_ReadOnly ) ) { // read all drivers - QStringList drivers; - QTextStream fStr( &f ); + TQStringList drivers; + TQTextStream fStr( &f ); while( !fStr.atEnd() ) { - QString line = fStr.readLine(); + TQString line = fStr.readLine(); if( line.isEmpty() ) continue; if( line[0] == '#' ) @@ -1079,7 +1079,7 @@ bool K3bCdrdaoWriter::defaultToGenericMMC( K3bDevice::Device* dev, bool writer ) } // search for the driver - for( QStringList::const_iterator it = drivers.begin(); it != drivers.end(); ++it ) { + for( TQStringList::const_iterator it = drivers.begin(); it != drivers.end(); ++it ) { if( (*it).section( '|', 1, 1 ) == dev->vendor() && (*it).section( '|', 2, 2 ) == dev->description() ) return false; diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h index 94a0c9f..704125d 100644 --- a/libk3b/projects/k3bcdrdaowriter.h +++ b/libk3b/projects/k3bcdrdaowriter.h @@ -25,13 +25,14 @@ class K3bExternalBin; class K3bProcess; class KProcess; class K3bDevice::Device; -class QSocket; +class TQSocket; class K3bCdrdaoWriter : public K3bAbstractWriter { Q_OBJECT + TQ_OBJECT public: @@ -40,13 +41,13 @@ class K3bCdrdaoWriter : public K3bAbstractWriter enum SubMode { None, RW, RW_RAW }; K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler*, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); ~K3bCdrdaoWriter(); /** * to be used in chain: addArgument(x)->addArgument(y) */ - K3bCdrdaoWriter* addArgument( const QString& ); + K3bCdrdaoWriter* addArgument( const TQString& ); K3bDevice::Device* sourceDevice() { return m_sourceDevice; }; int fd() const; @@ -55,9 +56,9 @@ class K3bCdrdaoWriter : public K3bAbstractWriter private: void reinitParser(); - void parseCdrdaoLine( const QString& line ); - void parseCdrdaoWrote( const QString& line ); - void parseCdrdaoError( const QString& line ); + void parseCdrdaoLine( const TQString& line ); + void parseCdrdaoWrote( const TQString& line ); + void parseCdrdaoError( const TQString& line ); public slots: void start(); @@ -70,8 +71,8 @@ class K3bCdrdaoWriter : public K3bAbstractWriter void setMulti( bool b ) { m_multi = b; } void setForce( bool b ) { m_force = b; } void setOnTheFly( bool b ) { m_onTheFly = b; } - void setDataFile( const QString& s ) { m_dataFile = s; } - void setTocFile( const QString& s ) { m_tocFile = s; } + void setDataFile( const TQString& s ) { m_dataFile = s; } + void setTocFile( const TQString& s ) { m_tocFile = s; } void setSourceDevice( K3bDevice::Device* dev ) { m_sourceDevice = dev; } void setFastToc( bool b ) { m_fastToc = b; } @@ -91,13 +92,13 @@ class K3bCdrdaoWriter : public K3bAbstractWriter void setForceNoEject( bool b ) { m_forceNoEject = b; } private slots: - void slotStdLine( const QString& line ); + void slotStdLine( const TQString& line ); void slotProcessExited(KProcess*); void parseCdrdaoMessage(); void slotThroughput( int t ); private: - void unknownCdrdaoLine( const QString& ); + void unknownCdrdaoLine( const TQString& ); void prepareArgumentList(); void setWriteArguments(); void setReadArguments(); @@ -107,7 +108,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter bool cueSheet(); - QString findDriverFile( const K3bExternalBin* bin ); + TQString findDriverFile( const K3bExternalBin* bin ); bool defaultToGenericMMC( K3bDevice::Device* dev, bool writer ); // options @@ -115,11 +116,11 @@ class K3bCdrdaoWriter : public K3bAbstractWriter int m_command; int m_blankMode; K3bDevice::Device* m_sourceDevice; - QString m_dataFile; - QString m_tocFile; - QString m_cueFileLnk; - QString m_binFileLnk; - QString m_backupTocFile; + TQString m_dataFile; + TQString m_tocFile; + TQString m_cueFileLnk; + TQString m_binFileLnk; + TQString m_backupTocFile; bool m_readRaw; bool m_multi; bool m_force; @@ -137,7 +138,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter K3bProcess* m_process; int m_cdrdaoComm[2]; - QSocket *m_comSock; + TQSocket *m_comSock; bool m_canceled; diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp index e87c767..1b02290 100644 --- a/libk3b/projects/k3bcdrecordwriter.cpp +++ b/libk3b/projects/k3bcdrecordwriter.cpp @@ -29,12 +29,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -59,23 +59,23 @@ public: bool audio; }; - QValueList tracks; + TQValueList tracks; KTempFile* cdTextFile; }; K3bCdrecordWriter::K3bCdrecordWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - QObject* parent, const char* name ) - : K3bAbstractWriter( dev, hdl, parent, name ), + TQObject* tqparent, const char* name ) + : K3bAbstractWriter( dev, hdl, tqparent, name ), m_clone(false), m_cue(false), m_forceNoEject(false) { d = new Private(); d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, SIGNAL(throughput(int)), - this, SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQT_SIGNAL(throughput(int)), + this, TQT_SLOT(slotThroughput(int)) ); m_process = 0; m_writingMode = K3b::TAO; @@ -110,7 +110,7 @@ void K3bCdrecordWriter::setDao( bool b ) m_writingMode = ( b ? K3b::DAO : K3b::TAO ); } -void K3bCdrecordWriter::setCueFile( const QString& s) +void K3bCdrecordWriter::setCueFile( const TQString& s) { m_cue = true; m_cueFile = s; @@ -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, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + 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(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord"); @@ -163,7 +163,7 @@ void K3bCdrecordWriter::prepareProcess() *m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?) // Again we assume the device to be set! - *m_process << QString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); + *m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); d->usedSpeed = burnSpeed(); if( d->usedSpeed == 0 ) { @@ -174,7 +174,7 @@ void K3bCdrecordWriter::prepareProcess() } d->usedSpeed /= 175; if( d->usedSpeed != 0 ) - *m_process << QString("speed=%1").arg(d->usedSpeed); + *m_process << TQString("speed=%1").tqarg(d->usedSpeed); if( m_writingMode == K3b::DAO || m_cue ) { if( burnDevice()->dao() ) @@ -226,8 +226,8 @@ void K3bCdrecordWriter::prepareProcess() } if( m_cue ) { - m_process->setWorkingDirectory(QUrl(m_cueFile).dirPath()); - *m_process << QString("cuefile=%1").arg( m_cueFile ); + m_process->setWorkingDirectory(TQUrl(m_cueFile).dirPath()); + *m_process << TQString("cuefile=%1").tqarg( m_cueFile ); } if( m_clone ) @@ -235,7 +235,7 @@ void K3bCdrecordWriter::prepareProcess() if( m_rawCdText.size() > 0 ) { delete d->cdTextFile; - d->cdTextFile = new K3bTempFile( QString::null, ".dat" ); + d->cdTextFile = new K3bTempFile( TQString(), ".dat" ); d->cdTextFile->setAutoDelete(true); d->cdTextFile->file()->writeBlock( m_rawCdText ); d->cdTextFile->close(); @@ -249,7 +249,7 @@ void K3bCdrecordWriter::prepareProcess() bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); if( manualBufferSize ) { - *m_process << QString("fs=%1m").arg( k3bcore->globalSettings()->bufferSize() ); + *m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->bufferSize() ); } bool overburn = k3bcore->globalSettings()->overburn(); @@ -257,20 +257,20 @@ void K3bCdrecordWriter::prepareProcess() if( m_cdrecordBinObject->hasFeature("overburn") ) *m_process << "-overburn"; else - emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), WARNING ); + emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), WARNING ); // additional user parameters from config - const QStringList& params = m_cdrecordBinObject->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = m_cdrecordBinObject->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; // add the user parameters - for( QStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it ) + for( TQStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it ) *m_process << *it; } -K3bCdrecordWriter* K3bCdrecordWriter::addArgument( const QString& arg ) +K3bCdrecordWriter* K3bCdrecordWriter::addArgument( const TQString& arg ) { m_arguments.append( arg ); return this; @@ -293,7 +293,7 @@ void K3bCdrecordWriter::start() prepareProcess(); if( !m_cdrecordBinObject ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("cdrecord"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("cdrecord"), ERROR ); jobFinished(false); return; } @@ -302,15 +302,15 @@ void K3bCdrecordWriter::start() if( !m_cdrecordBinObject->copyright.isEmpty() ) emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3") - .arg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" ) - .arg(m_cdrecordBinObject->version) - .arg(m_cdrecordBinObject->copyright), INFO ); + .tqarg(m_cdrecordBinObject->hasFeature( "wodim" ) ? "Wodim" : "Cdrecord" ) + .tqarg(m_cdrecordBinObject->version) + .tqarg(m_cdrecordBinObject->copyright), INFO ); kdDebug() << "***** " << m_cdrecordBinObject->name() << " parameters:\n"; - const QValueList& args = m_process->args(); - QString s; - for( QValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList& args = m_process->args(); + TQString s; + for( TQValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -343,22 +343,22 @@ void K3bCdrecordWriter::start() // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bCdrecordWriter) could not start " << m_cdrecordBinObject->name() << endl; - emit infoMessage( i18n("Could not start %1.").arg(m_cdrecordBinObject->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(m_cdrecordBinObject->name()), K3bJob::ERROR ); jobFinished(false); } else { if( simulate() ) { emit newTask( i18n("Simulating") ); emit infoMessage( i18n("Starting %1 simulation at %2x speed...") - .arg(K3b::writingModeString(m_writingMode)) - .arg(d->usedSpeed), + .tqarg(K3b::writingModeString(m_writingMode)) + .tqarg(d->usedSpeed), K3bJob::INFO ); } else { emit newTask( i18n("Writing") ); emit infoMessage( i18n("Starting %1 writing at %2x speed...") - .arg(K3b::writingModeString(m_writingMode)) - .arg(d->usedSpeed), + .tqarg(K3b::writingModeString(m_writingMode)) + .tqarg(d->usedSpeed), K3bJob::INFO ); } } @@ -375,17 +375,17 @@ void K3bCdrecordWriter::cancel() } -void K3bCdrecordWriter::slotStdLine( const QString& line ) +void K3bCdrecordWriter::slotStdLine( const TQString& line ) { - static QRegExp s_burnfreeCounterRx( "^BURN\\-Free\\swas\\s(\\d+)\\stimes\\sused" ); - static QRegExp s_burnfreeCounterRxPredict( "^Total\\sof\\s(\\d+)\\s\\spossible\\sbuffer\\sunderruns\\spredicted" ); + static TQRegExp s_burnfreeCounterRx( "^BURN\\-Free\\swas\\s(\\d+)\\stimes\\sused" ); + static TQRegExp s_burnfreeCounterRxPredict( "^Total\\sof\\s(\\d+)\\s\\spossible\\sbuffer\\sunderruns\\spredicted" ); // tracknumber: cap(1) // done: cap(2) // complete: cap(3) // fifo: cap(4) (it seems as if some patched cdrecord versions do not emit the fifo info but only the buf... :( // buffer: cap(5) - static QRegExp s_progressRx( "Track\\s(\\d\\d)\\:\\s*(\\d*)\\sof\\s*(\\d*)\\sMB\\swritten\\s(?:\\(fifo\\s*(\\d*)\\%\\)\\s*)?(?:\\[buf\\s*(\\d*)\\%\\])?.*" ); + static TQRegExp s_progressRx( "Track\\s(\\d\\d)\\:\\s*(\\d*)\\sof\\s*(\\d*)\\sMB\\swritten\\s(?:\\(fifo\\s*(\\d*)\\%\\)\\s*)?(?:\\[buf\\s*(\\d*)\\%\\])?.*" ); emit debuggingOutput( m_cdrecordBinObject->name(), line ); @@ -406,8 +406,8 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) m_totalTracks = tt; - int sizeStart = line.find( QRegExp("\\d"), 10 ); - int sizeEnd = line.find( "MB", sizeStart ); + int sizeStart = line.tqfind( TQRegExp("\\d"), 10 ); + int sizeEnd = line.tqfind( "MB", sizeStart ); track.size = line.mid( sizeStart, sizeEnd-sizeStart ).toInt(&ok); if( ok ) { @@ -474,7 +474,7 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) line.startsWith( m_cdrecordBinObject->path ) || line.startsWith( m_cdrecordBinObject->path.left(m_cdrecordBinObject->path.length()-5) ) ) { // get rid of the path and the following colon and space - QString errStr = line.mid( line.find(':') + 2 ); + TQString errStr = line.mid( line.tqfind(':') + 2 ); if( errStr.startsWith( "Drive does not support SAO" ) ) { emit infoMessage( i18n("DAO (Disk At Once) recording not supported with this writer"), K3bJob::ERROR ); @@ -508,9 +508,9 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) else if( errStr.startsWith("Bad Option") ) { m_cdrecordError = BAD_OPTION; // parse option - int pos = line.find( "Bad Option" ) + 13; + int pos = line.tqfind( "Bad Option" ) + 13; int len = line.length() - pos - 1; - emit infoMessage( i18n("No valid %1 option: %2").arg(m_cdrecordBinObject->name()).arg(line.mid(pos, len)), + emit infoMessage( i18n("No valid %1 option: %2").tqarg(m_cdrecordBinObject->name()).tqarg(line.mid(pos, len)), ERROR ); } else if( errStr.startsWith("Cannot set speed/dummy") ) { @@ -556,17 +556,17 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) // All other messages // - else if( line.contains( "at speed" ) ) { + else if( line.tqcontains( "at speed" ) ) { // parse the speed and inform the user if cdrdao switched it down - int pos = line.find( "at speed" ); - int pos2 = line.find( "in", pos+9 ); + int pos = line.tqfind( "at speed" ); + int pos2 = line.tqfind( "in", pos+9 ); int speed = static_cast( line.mid( pos+9, pos2-pos-10 ).toDouble() ); // cdrecord-dvd >= 2.01a25 uses 8.0 and stuff if( speed != d->usedSpeed ) { - emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").arg(d->usedSpeed), K3bJob::WARNING ); + emit infoMessage( i18n("Medium or burner do not support writing at %1x speed").tqarg(d->usedSpeed), K3bJob::WARNING ); if( speed > d->usedSpeed ) - emit infoMessage( i18n("Switching burn speed up to %1x").arg(speed), K3bJob::WARNING ); + emit infoMessage( i18n("Switching burn speed up to %1x").tqarg(speed), K3bJob::WARNING ); else - emit infoMessage( i18n("Switching burn speed down to %1x").arg(speed), K3bJob::WARNING ); + emit infoMessage( i18n("Switching burn speed down to %1x").tqarg(speed), K3bJob::WARNING ); } } else if( line.startsWith( "Starting new" ) ) { @@ -640,10 +640,10 @@ void K3bCdrecordWriter::slotStdLine( const QString& line ) if( ok ) emit infoMessage( i18n("Buffer was low 1 time.", "Buffer was low %n times.", num), INFO ); } - else if( line.contains("Medium Error") ) { + else if( line.tqcontains("Medium Error") ) { m_cdrecordError = MEDIUM_ERROR; } - else if( line.startsWith( "Error trying to open" ) && line.contains( "(Device or resource busy)" ) ) { + else if( line.startsWith( "Error trying to open" ) && line.tqcontains( "(Device or resource busy)" ) ) { m_cdrecordError = DEVICE_BUSY; } else { @@ -682,7 +682,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) emit infoMessage( i18n("Writing successfully completed"), K3bJob::SUCCESS ); int s = d->speedEst->average(); - emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); + emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)").tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/150.0), 2), INFO ); jobFinished( true ); } @@ -709,14 +709,14 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) // error message has already been emited earlier since we needed the actual line break; case SHMGET_FAILED: - emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").arg(m_cdrecordBinObject->name()), ERROR ); + emit infoMessage( i18n("%1 could not reserve shared memory segment of requested size.").tqarg(m_cdrecordBinObject->name()), ERROR ); emit infoMessage( i18n("Probably you chose a too large buffer size."), ERROR ); break; case OPC_FAILED: emit infoMessage( i18n("OPC failed. Probably the writer does not like the medium."), ERROR ); break; case CANNOT_SET_SPEED: - emit infoMessage( i18n("Unable to set write speed to %1.").arg(d->usedSpeed), ERROR ); + emit infoMessage( i18n("Unable to set write speed to %1.").tqarg(d->usedSpeed), ERROR ); emit infoMessage( i18n("Probably this is lower than your writer's lowest writing speed."), ERROR ); break; case CANNOT_SEND_CUE_SHEET: @@ -734,7 +734,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) emit infoMessage( i18n("Try DAO writing mode."), ERROR ); break; case PERMISSION_DENIED: - emit infoMessage( i18n("%1 has no permission to open the device.").arg("Cdrecord"), ERROR ); + emit infoMessage( i18n("%1 has no permission to open the device.").tqarg("Cdrecord"), ERROR ); #ifdef HAVE_K3BSETUP emit infoMessage( i18n("You may use K3bsetup2 to solve this problem."), ERROR ); #endif @@ -776,7 +776,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) } else if( !wasSourceUnreadable() ) { emit infoMessage( i18n("%1 returned an unknown error (code %2).") - .arg(m_cdrecordBinObject->name()).arg(p->exitStatus()), + .tqarg(m_cdrecordBinObject->name()).tqarg(p->exitStatus()), K3bJob::ERROR ); if( p->exitStatus() >= 254 && m_writingMode == K3b::DAO ) { @@ -795,7 +795,7 @@ void K3bCdrecordWriter::slotProcessExited( KProcess* p ) } } else { - emit infoMessage( i18n("%1 did not exit cleanly.").arg(m_cdrecordBinObject->name()), + emit infoMessage( i18n("%1 did not exit cleanly.").tqarg(m_cdrecordBinObject->name()), ERROR ); jobFinished( false ); } diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h index 9333588..6bb9792 100644 --- a/libk3b/projects/k3bcdrecordwriter.h +++ b/libk3b/projects/k3bcdrecordwriter.h @@ -20,7 +20,7 @@ #include "k3babstractwriter.h" -#include +#include class K3bExternalBin; class K3bProcess; @@ -31,10 +31,11 @@ class K3bDevice::Device; class K3bCdrecordWriter : public K3bAbstractWriter { Q_OBJECT + TQ_OBJECT public: K3bCdrecordWriter( K3bDevice::Device*, K3bJobHandler* hdl, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); ~K3bCdrecordWriter(); bool active() const; @@ -42,7 +43,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter /** * to be used in chain: addArgument(x)->addArgument(y) */ - K3bCdrecordWriter* addArgument( const QString& ); + K3bCdrecordWriter* addArgument( const TQString& ); void clearArguments(); int fd() const; @@ -53,10 +54,10 @@ class K3bCdrecordWriter : public K3bAbstractWriter void setDao( bool b ); void setWritingMode( int ); - void setCueFile( const QString& s); + void setCueFile( const TQString& s); void setClone( bool b ); - void setRawCdText( const QByteArray& a ) { m_rawCdText = a; } + void setRawCdText( const TQByteArray& a ) { m_rawCdText = a; } /** * If set true the job ignores the global K3b setting @@ -65,7 +66,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter void setForceNoEject( bool b ) { m_forceNoEject = b; } protected slots: - void slotStdLine( const QString& line ); + void slotStdLine( const TQString& line ); void slotProcessExited(KProcess*); void slotThroughput( int t ); @@ -80,7 +81,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter bool m_clone; bool m_cue; - QString m_cueFile; + TQString m_cueFile; enum CdrecordError { UNKNOWN, OVERSIZE, @@ -100,7 +101,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter DEVICE_BUSY, BLANK_FAILED }; - QStringList m_arguments; + TQStringList m_arguments; private: unsigned int m_currentTrack; @@ -114,7 +115,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter bool m_forceNoEject; - QByteArray m_rawCdText; + TQByteArray m_rawCdText; class Private; Private* d; diff --git a/libk3b/projects/k3bcuefileparser.cpp b/libk3b/projects/k3bcuefileparser.cpp index 49ca4fc..7e00c5a 100644 --- a/libk3b/projects/k3bcuefileparser.cpp +++ b/libk3b/projects/k3bcuefileparser.cpp @@ -20,29 +20,29 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -// avoid usage of QTextStream since K3b often +// avoid usage of TQTextStream since K3b often // tries to open big files (iso images) in a // cue file parser to test it. -static QString readLine( QFile* f ) +static TQString readLine( TQFile* f ) { - QString s; - Q_LONG r = f->readLine( s, 1024 ); + TQString s; + TQ_LONG r = f->readLine( s, 1024 ); if( r >= 0 ) { // remove the trailing newline return s.stripWhiteSpace(); } else { // end of file or error - return QString::null; + return TQString(); } } @@ -70,7 +70,7 @@ public: -K3bCueFileParser::K3bCueFileParser( const QString& filename ) +K3bCueFileParser::K3bCueFileParser( const TQString& filename ) : K3bImageFileReader() { d = new Private; @@ -94,9 +94,9 @@ void K3bCueFileParser::readFile() d->cdText.clear(); d->currentParsedTrack = 0; - QFile f( filename() ); + TQFile f( filename() ); if( f.open( IO_ReadOnly ) ) { - QString line = readLine( &f ); + TQString line = readLine( &f ); while( !line.isNull() ) { if( !parseLine(line) ) { @@ -136,33 +136,33 @@ void K3bCueFileParser::readFile() } -bool K3bCueFileParser::parseLine( QString& line ) +bool K3bCueFileParser::parseLine( TQString& line ) { // use cap(1) for the filename - static QRegExp fileRx( "FILE\\s\"?([^\"]*)\"?\\s[^\"\\s]*" ); + static TQRegExp fileRx( "FILE\\s\"?([^\"]*)\"?\\s[^\"\\s]*" ); // use cap(1) for the flags - static QRegExp flagsRx( "FLAGS(\\s(DCP|4CH|PRE|SCMS)){1,4}" ); + static TQRegExp flagsRx( "FLAGS(\\s(DCP|4CH|PRE|SCMS)){1,4}" ); // use cap(1) for the tracknumber and cap(2) for the datatype - static QRegExp trackRx( "TRACK\\s(\\d{1,2})\\s(AUDIO|CDG|MODE1/2048|MODE1/2352|MODE2/2336|MODE2/2352|CDI/2336|CDI/2352)" ); + static TQRegExp trackRx( "TRACK\\s(\\d{1,2})\\s(AUDIO|CDG|MODE1/2048|MODE1/2352|MODE2/2336|MODE2/2352|CDI/2336|CDI/2352)" ); // use cap(1) for the index number, cap(3) for the minutes, cap(4) for the seconds, cap(5) for the frames, // and cap(2) for the MSF value string - static QRegExp indexRx( "INDEX\\s(\\d{1,2})\\s((\\d+):([0-5]\\d):((?:[0-6]\\d)|(?:7[0-4])))" ); + static TQRegExp indexRx( "INDEX\\s(\\d{1,2})\\s((\\d+):([0-5]\\d):((?:[0-6]\\d)|(?:7[0-4])))" ); // use cap(1) for the MCN - static QRegExp catalogRx( "CATALOG\\s(\\w{13,13})" ); + static TQRegExp catalogRx( "CATALOG\\s(\\w{13,13})" ); // use cap(1) for the ISRC - static QRegExp isrcRx( "ISRC\\s(\\w{5,5}\\d{7,7})" ); + static TQRegExp isrcRx( "ISRC\\s(\\w{5,5}\\d{7,7})" ); - static QString cdTextRxStr = "\"?([^\"]{0,80})\"?"; + static TQString cdTextRxStr = "\"?([^\"]{0,80})\"?"; // use cap(1) for the string - static QRegExp titleRx( "TITLE\\s" + cdTextRxStr ); - static QRegExp performerRx( "PERFORMER\\s" + cdTextRxStr ); - static QRegExp songwriterRx( "SONGWRITER\\s" + cdTextRxStr ); + static TQRegExp titleRx( "TITLE\\s" + cdTextRxStr ); + static TQRegExp performerRx( "PERFORMER\\s" + cdTextRxStr ); + static TQRegExp songwriterRx( "SONGWRITER\\s" + cdTextRxStr ); // simplify all white spaces except those in filenames and CD-TEXT @@ -235,7 +235,7 @@ bool K3bCueFileParser::parseLine( QString& line ) d->rawData = (trackRx.cap(2) == "MODE2/2352"); } else { - kdDebug() << "(K3bCueFileParser) unsupported track type: " << trackRx.cap(2) << endl; + kdDebug() << "(K3bCueFileParser) unsupported track type: " << TQString(trackRx.cap(2)) << endl; return false; } } @@ -360,7 +360,7 @@ bool K3bCueFileParser::parseLine( QString& line ) } -void K3bCueFileParser::simplifyWhiteSpace( QString& s ) +void K3bCueFileParser::simplifyWhiteSpace( TQString& s ) { s = s.stripWhiteSpace(); @@ -392,7 +392,7 @@ const K3bDevice::CdText& K3bCueFileParser::cdText() const } -bool K3bCueFileParser::findImageFileName( const QString& dataFile ) +bool K3bCueFileParser::findImageFileName( const TQString& dataFile ) { // // CDRDAO does not use this image filename but replaces the extension from the cue file @@ -402,21 +402,21 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile ) m_imageFilenameInCue = true; // first try filename as a hole (absolut) - if( QFile::exists( dataFile ) ) { - setImageFilename( QFileInfo(dataFile).absFilePath() ); + if( TQFile::exists( dataFile ) ) { + setImageFilename( TQFileInfo(dataFile).absFilePath() ); return true; } // try the filename in the cue's directory - if( QFileInfo( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) { - setImageFilename( K3b::parentDir(filename()) + dataFile.section( '/', -1 ) ); + if( TQFileInfo( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ).isFile() ) { + setImageFilename( K3b::tqparentDir(filename()) + dataFile.section( '/', -1 ) ); kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; return true; } // try the filename ignoring case - if( QFileInfo( K3b::parentDir(filename()) + dataFile.section( '/', -1 ).lower() ).isFile() ) { - setImageFilename( K3b::parentDir(filename()) + dataFile.section( '/', -1 ).lower() ); + if( TQFileInfo( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ).isFile() ) { + setImageFilename( K3b::tqparentDir(filename()) + TQString(dataFile.section( '/', -1 )).lower() ); kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; return true; } @@ -424,7 +424,7 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile ) m_imageFilenameInCue = false; // try removing the ending from the cue file (image.bin.cue and image.bin) - if( QFileInfo( filename().left( filename().length()-4 ) ).isFile() ) { + if( TQFileInfo( filename().left( filename().length()-4 ) ).isFile() ) { setImageFilename( filename().left( filename().length()-4 ) ); kdDebug() << "(K3bCueFileParser) found image file: " << imageFilename() << endl; return true; @@ -435,21 +435,21 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile ) // Search for another one having the same filename as the cue but a different extension // - QDir parentDir( K3b::parentDir(filename()) ); - QString filenamePrefix = filename().section( '/', -1 ); + TQDir tqparentDir( K3b::tqparentDir(filename()) ); + TQString filenamePrefix = filename().section( '/', -1 ); filenamePrefix.truncate( filenamePrefix.length() - 3 ); // remove cue extension - kdDebug() << "(K3bCueFileParser) checking folder " << parentDir.path() << " for files: " << filenamePrefix << "*" << endl; + kdDebug() << "(K3bCueFileParser) checking folder " << tqparentDir.path() << " for files: " << filenamePrefix << "*" << endl; // - // we cannot use the nameFilter in QDir because of the spaces that may occur in filenames + // we cannot use the nameFilter in TQDir because of the spaces that may occur in filenames // - QStringList possibleImageFiles = parentDir.entryList( QDir::Files ); + TQStringList possibleImageFiles = tqparentDir.entryList( TQDir::Files ); int cnt = 0; - for( QStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) { - if( (*it).lower() == dataFile.section( '/', -1 ).lower() || + for( TQStringList::const_iterator it = possibleImageFiles.constBegin(); it != possibleImageFiles.constEnd(); ++it ) { + if( (*it).lower() == TQString(dataFile.section( '/', -1 )).lower() || (*it).startsWith( filenamePrefix ) && !(*it).endsWith( "cue" ) ) { ++cnt; - setImageFilename( K3b::parentDir(filename()) + *it ); + setImageFilename( K3b::tqparentDir(filename()) + *it ); } } @@ -457,5 +457,5 @@ bool K3bCueFileParser::findImageFileName( const QString& dataFile ) // we only do this if there is one unique file which fits the requirements. // Otherwise we cannot be certain to have the right file. // - return ( cnt == 1 && QFileInfo( imageFilename() ).isFile() ); + return ( cnt == 1 && TQFileInfo( imageFilename() ).isFile() ); } diff --git a/libk3b/projects/k3bcuefileparser.h b/libk3b/projects/k3bcuefileparser.h index 41a5ee6..112caec 100644 --- a/libk3b/projects/k3bcuefileparser.h +++ b/libk3b/projects/k3bcuefileparser.h @@ -29,7 +29,7 @@ class LIBK3B_EXPORT K3bCueFileParser : public K3bImageFileReader { public: - K3bCueFileParser( const QString& filename = QString::null ); + K3bCueFileParser( const TQString& filename = TQString() ); ~K3bCueFileParser(); /** @@ -44,9 +44,9 @@ class LIBK3B_EXPORT K3bCueFileParser : public K3bImageFileReader private: void readFile(); - bool parseLine( QString& line ); - void simplifyWhiteSpace( QString& s ); - bool findImageFileName( const QString& fileEntry ); + bool parseLine( TQString& line ); + void simplifyWhiteSpace( TQString& s ); + bool findImageFileName( const TQString& fileEntry ); bool m_imageFilenameInCue; diff --git a/libk3b/projects/k3bdoc.cpp b/libk3b/projects/k3bdoc.cpp index ac5346d..29648a7 100644 --- a/libk3b/projects/k3bdoc.cpp +++ b/libk3b/projects/k3bdoc.cpp @@ -14,10 +14,10 @@ */ -// include files for Qt -#include -#include -#include +// include files for TQt +#include +#include +#include // include files for KDE #include @@ -40,12 +40,12 @@ #include -K3bDoc::K3bDoc( QObject* parent ) - : QObject( parent ), +K3bDoc::K3bDoc( TQObject* tqparent ) + : TQObject( tqparent ), m_modified(false), m_view(0) { - connect( this, SIGNAL(changed()), this, SLOT(slotChanged()) ); + connect( this, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); } @@ -107,7 +107,7 @@ const KURL& K3bDoc::URL() const } -QString K3bDoc::name() const +TQString K3bDoc::name() const { return URL().path().section( '/', -1 ); } @@ -132,12 +132,12 @@ bool K3bDoc::newDocument() } -bool K3bDoc::saveGeneralDocumentData( QDomElement* part ) +bool K3bDoc::saveGeneralDocumentData( TQDomElement* part ) { - QDomDocument doc = part->ownerDocument(); - QDomElement mainElem = doc.createElement( "general" ); + TQDomDocument doc = part->ownerDocument(); + TQDomElement mainElem = doc.createElement( "general" ); - QDomElement propElem = doc.createElement( "writing_mode" ); + TQDomElement propElem = doc.createElement( "writing_mode" ); switch( writingMode() ) { case K3b::DAO: propElem.appendChild( doc.createTextNode( "dao" ) ); @@ -176,20 +176,20 @@ bool K3bDoc::saveGeneralDocumentData( QDomElement* part ) } -bool K3bDoc::readGeneralDocumentData( const QDomElement& elem ) +bool K3bDoc::readGeneralDocumentData( const TQDomElement& elem ) { if( elem.nodeName() != "general" ) return false; - QDomNodeList nodes = elem.childNodes(); + TQDomNodeList nodes = elem.childNodes(); for( uint i = 0; i < nodes.count(); i++ ) { - QDomElement e = nodes.item(i).toElement(); + TQDomElement e = nodes.item(i).toElement(); if( e.isNull() ) return false; if( e.nodeName() == "writing_mode") { - QString mode = e.text(); + TQString mode = e.text(); if( mode == "dao" ) setWritingMode( K3b::DAO ); else if( mode == "tao" ) diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index f241487..1cdde4f 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -22,9 +22,9 @@ #endif // include files for QT -#include -#include -#include +#include +#include +#include // include files for KDE @@ -33,11 +33,11 @@ #include "k3b_export.h" // forward declaration of the K3b classes -class QTimer; +class TQTimer; class KTempFile; class K3bBurnJob; -class QDomDocument; -class QDomElement; +class TQDomDocument; +class TQDomElement; class KConfig; class KActionCollection; class K3bJobHandler; @@ -54,12 +54,13 @@ namespace K3b { * K3bDoc is the base document class. * It handles some general settings. */ -class LIBK3B_EXPORT K3bDoc : public QObject +class LIBK3B_EXPORT K3bDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bDoc( QObject* = 0 ); + K3bDoc( TQObject* = 0 ); virtual ~K3bDoc(); enum DocType { @@ -79,22 +80,22 @@ class LIBK3B_EXPORT K3bDoc : public QObject * \return A name for the project which might for example be used as a suggestion for a file name * when saving. The default implementation extracts a name from the URL. */ - virtual QString name() const; + virtual TQString name() const; /** * \return A string representation of the document type. */ - virtual QString typeString() const = 0; + virtual TQString typeString() const = 0; /** * returns the view widget set with setView() or null if none has been set. */ - QWidget* view() const { return m_view; } + TQWidget* view() const { return m_view; } /** * Just for convenience to make an easy mapping from doc to GUI possible. */ - void setView( QWidget* v ) { m_view = v; } + void setView( TQWidget* v ) { m_view = v; } /** * sets the modified flag for the document after a modifying action on the view connected to the document. @@ -118,14 +119,14 @@ class LIBK3B_EXPORT K3bDoc : public QObject * * This is used to load/save k3b projects. */ - virtual bool loadDocumentData( QDomElement* root ) = 0; + virtual bool loadDocumentData( TQDomElement* root ) = 0; /** * Save a project to an xml stream. * * This is used to load/save k3b projects. */ - virtual bool saveDocumentData( QDomElement* docElem ) = 0; + virtual bool saveDocumentData( TQDomElement* docElem ) = 0; /** returns the KURL of the document */ const KURL& URL() const; @@ -144,7 +145,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject virtual K3b::Msf length() const = 0; // FIXME: rename this to something like imagePath - const QString& tempDir() const { return m_tempDir; } + const TQString& tempDir() const { return m_tempDir; } virtual int numOfTracks() const { return 1; } @@ -154,7 +155,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject * easier this way since you don't need to distinguish between the different * project types. */ - virtual K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 ) = 0; + virtual K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ) = 0; int writingApp() const { return m_writingApp; } void setWritingApp( int a ) { m_writingApp = a; } @@ -179,7 +180,7 @@ class LIBK3B_EXPORT K3bDoc : public QObject void setOnTheFly( bool b ) { m_onTheFly = b; } void setSpeed( int speed ); void setBurner( K3bDevice::Device* dev ); - void setTempDir( const QString& dir ) { m_tempDir = dir; } + void setTempDir( const TQString& dir ) { m_tempDir = dir; } void setRemoveImages( bool b ) { m_removeImages = b; } void setOnlyCreateImages( bool b ) { m_onlyCreateImages = b; } void setCopies( int c ) { m_copies = c; } @@ -194,9 +195,9 @@ class LIBK3B_EXPORT K3bDoc : public QObject protected: int m_docType; - bool saveGeneralDocumentData( QDomElement* ); + bool saveGeneralDocumentData( TQDomElement* ); - bool readGeneralDocumentData( const QDomElement& ); + bool readGeneralDocumentData( const TQDomElement& ); private slots: void slotChanged(); @@ -206,9 +207,9 @@ class LIBK3B_EXPORT K3bDoc : public QObject bool m_modified; KURL doc_url; - QWidget* m_view; + TQWidget* m_view; - QString m_tempDir; + TQString m_tempDir; K3bDevice::Device* m_burner; bool m_dummy; bool m_onTheFly; diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp index 0910d4a..ae33599 100644 --- a/libk3b/projects/k3bdvdrecordwriter.cpp +++ b/libk3b/projects/k3bdvdrecordwriter.cpp @@ -26,8 +26,8 @@ #include -K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, QObject* parent, const char* name ) - : K3bCdrecordWriter( dev, parent, name ) +K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* tqparent, const char* name ) + : K3bCdrecordWriter( dev, tqparent, name ) { } @@ -42,10 +42,10 @@ void K3bDvdrecordWriter::prepareProcess() m_process = new K3bProcess(); m_process->setRunPrivileged(true); m_process->setSplitStdout(true); - connect( m_process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) ); - connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); - connect( m_process, SIGNAL(wroteStdin(KProcess*)), this, SIGNAL(dataWritten()) ); + 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(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); + connect( m_process, TQT_SIGNAL(wroteStdin(KProcess*)), this, TQT_SIGNAL(dataWritten()) ); // if( k3bcore->externalBinManager()->binObject("cdrecord")->hasFeature( "dvd-patch" ) ) // m_cdrecordBinObject = k3bcore->externalBinManager()->binObject("cdrecord"); @@ -66,8 +66,8 @@ void K3bDvdrecordWriter::prepareProcess() *m_process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?) // Again we assume the device to be set! - *m_process << QString("dev=%1").arg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); - *m_process << QString("speed=%1").arg(burnSpeed()); + *m_process << TQString("dev=%1").tqarg(K3b::externalBinDeviceParameter(burnDevice(), m_cdrecordBinObject)); + *m_process << TQString("speed=%1").tqarg(burnSpeed()); // DVDs are only written in DAO mode (and Packet, but we do not support that since it does not // make much sense here) @@ -95,7 +95,7 @@ void K3bDvdrecordWriter::prepareProcess() bool manualBufferSize = k3bcore->globalSettings()->manualBufferSize(); if( manualBufferSize ) { - *m_process << QString("fs=%1m").arg( k3bcore->globalSettings()->writingBuffer() ); + *m_process << TQString("fs=%1m").tqarg( k3bcore->globalSettings()->writingBuffer() ); } bool overburn = k3bcore->globalSettings()->overburn(); @@ -103,15 +103,15 @@ void K3bDvdrecordWriter::prepareProcess() if( m_cdrecordBinObject->hasFeature("overburn") ) *m_process << "-overburn"; else - emit infoMessage( i18n("Cdrecord %1 does not support overburning.").arg(m_cdrecordBinObject->version), INFO ); + emit infoMessage( i18n("Cdrecord %1 does not support overburning.").tqarg(m_cdrecordBinObject->version), INFO ); // additional user parameters from config - const QStringList& params = m_cdrecordBinObject->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = m_cdrecordBinObject->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; // add the user parameters - for( QStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it ) + for( TQStringList::const_iterator it = m_arguments.begin(); it != m_arguments.end(); ++it ) *m_process << *it; } diff --git a/libk3b/projects/k3bdvdrecordwriter.h b/libk3b/projects/k3bdvdrecordwriter.h index f9dcf4a..02421bb 100644 --- a/libk3b/projects/k3bdvdrecordwriter.h +++ b/libk3b/projects/k3bdvdrecordwriter.h @@ -28,9 +28,10 @@ class K3bDevice::Device; class K3bDvdrecordWriter : public K3bCdrecordWriter { Q_OBJECT + TQ_OBJECT public: - K3bDvdrecordWriter( K3bDevice::Device*, QObject* parent = 0, const char* name = 0 ); + K3bDvdrecordWriter( K3bDevice::Device*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bDvdrecordWriter(); protected: diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp index 0b582ce..926c959 100644 --- a/libk3b/projects/k3bgrowisofshandler.cpp +++ b/libk3b/projects/k3bgrowisofshandler.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include @@ -39,8 +39,8 @@ public: }; -K3bGrowisofsHandler::K3bGrowisofsHandler( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bGrowisofsHandler::K3bGrowisofsHandler( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private; reset(); @@ -65,18 +65,18 @@ void K3bGrowisofsHandler::reset( K3bDevice::Device* dev, bool dao ) void K3bGrowisofsHandler::handleStart() { -// QTimer::singleShot( 2000, this, SLOT(slotCheckBufferStatus()) ); +// TQTimer::singleShot( 2000, this, TQT_SLOT(slotCheckBuffertqStatus()) ); } -void K3bGrowisofsHandler::handleLine( const QString& line ) +void K3bGrowisofsHandler::handleLine( const TQString& line ) { int pos = 0; if( line.startsWith( ":-[" ) ) { // Error - if( line.contains( "ASC=30h" ) ) + if( line.tqcontains( "ASC=30h" ) ) m_error = ERROR_MEDIA; // :-[ PERFORM OPC failed with SK=3h/ASC=73h/ASCQ=03h @@ -85,7 +85,7 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) // :-[ attempt -blank=full or re-run with -dvd-compat -dvd-compat to engage DAO ] else if( !m_dao && - ( line.contains( "engage DAO" ) || line.contains( "media is not formatted or unsupported" ) ) ) + ( line.tqcontains( "engage DAO" ) || line.tqcontains( "media is not formatted or unsupported" ) ) ) emit infoMessage( i18n("Please try again with writing mode DAO."), K3bJob::ERROR ); else if( line.startsWith( ":-[ Failed to change write speed" ) ) { @@ -93,10 +93,10 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) } } else if( line.startsWith( ":-(" ) ) { - if( line.contains( "No space left on device" ) ) + if( line.tqcontains( "No space left on device" ) ) m_error = ERROR_OVERSIZE; - else if( line.contains( "blocks are free" ) && line.contains( "to be written" ) ) { + else if( line.tqcontains( "blocks are free" ) && line.tqcontains( "to be written" ) ) { m_error = ERROR_OVERSIZE; if( k3bcore->globalSettings()->overburn() ) emit infoMessage( i18n("Trying to write more than the official disk capacity"), K3bJob::WARNING ); @@ -116,7 +116,7 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) else if( line.startsWith( "PERFORM OPC" ) ) { m_error = ERROR_OPC; } - else if( line.contains( "flushing cache" ) ) { + else if( line.tqcontains( "flushing cache" ) ) { // here is where we already should stop queriying the buffer fill // since the device is only used there so far... m_device = 0; @@ -131,34 +131,34 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) // line = line.mid( dev->blockDeviceName().length() ); // if( line.startsWith( "closing..... - else if( line.contains( "closing track" ) ) { + else if( line.tqcontains( "closing track" ) ) { emit newSubTask( i18n("Closing Track") ); } - else if( line.contains( "closing disc" ) ) { + else if( line.tqcontains( "closing disc" ) ) { emit newSubTask( i18n("Closing Disk") ); } - else if( line.contains( "closing session" ) ) { + else if( line.tqcontains( "closing session" ) ) { emit newSubTask( i18n("Closing Session") ); } - else if( line.contains( "updating RMA" ) ) { + else if( line.tqcontains( "updating RMA" ) ) { emit newSubTask( i18n("Updating RMA") ); emit infoMessage( i18n("Updating RMA") + "...", K3bJob::INFO ); } - else if( line.contains( "closing session" ) ) { + else if( line.tqcontains( "closing session" ) ) { emit newSubTask( i18n("Closing Session") ); emit infoMessage( i18n("Closing Session") + "...", K3bJob::INFO ); } - else if( line.contains( "writing lead-out" ) ) { + else if( line.tqcontains( "writing lead-out" ) ) { emit newSubTask( i18n("Writing Lead-out") ); emit infoMessage( i18n("Writing the lead-out may take some time."), K3bJob::INFO ); } - else if( line.contains( "Quick Grow" ) ) { + else if( line.tqcontains( "Quick Grow" ) ) { emit infoMessage( i18n("Removing reference to lead-out."), K3bJob::INFO ); } - else if( line.contains( "copying volume descriptor" ) ) { + else if( line.tqcontains( "copying volume descriptor" ) ) { emit infoMessage( i18n("Modifying ISO9660 volume descriptor"), K3bJob::INFO ); } - else if( line.contains( "FEATURE 21h is not on" ) ) { + else if( line.tqcontains( "FEATURE 21h is not on" ) ) { if( !m_dao ) { // FIXME: it's not only the writer. It may be the media: something like does not support it with this media // da war was mit: wenn einmal formattiert, dann geht nur noch dao oder wenn einmal als overwrite @@ -167,28 +167,28 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) emit infoMessage( i18n("Engaging DAO"), K3bJob::WARNING ); } } - else if( ( pos = line.find( "Current Write Speed" ) ) > 0 ) { + else if( ( pos = line.tqfind( "Current Write Speed" ) ) > 0 ) { // parse write speed // /dev/sr0: "Current Write Speed" is 2.4x1385KBps pos += 24; - int endPos = line.find( 'x', pos+1 ); + int endPos = line.tqfind( 'x', pos+1 ); bool ok = true; double speed = line.mid( pos, endPos-pos ).toDouble(&ok); if( ok ) emit infoMessage( i18n("Writing speed: %1 KB/s (%2x)") - .arg((int)(speed*1385.0)) - .arg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); + .tqarg((int)(speed*1385.0)) + .tqarg(KGlobal::locale()->formatNumber(speed)), K3bJob::INFO ); else kdDebug() << "(K3bGrowisofsHandler) parsing error: '" << line.mid( pos, endPos-pos ) << "'" << endl; } - else if( (pos = line.find( "RBU" )) > 0 ) { + else if( (pos = line.tqfind( "RBU" )) > 0 ) { - // FIXME: use QRegExp + // FIXME: use TQRegExp // parse ring buffer fill for growisofs >= 6.0 pos += 4; - int endPos = line.find( '%', pos+1 ); + int endPos = line.tqfind( '%', pos+1 ); bool ok = true; double val = line.mid( pos, endPos-pos ).toDouble( &ok ); if( ok ) { @@ -199,8 +199,8 @@ void K3bGrowisofsHandler::handleLine( const QString& line ) } // device buffer for growisofs >= 7.0 - pos = line.find( "UBU", pos ); - endPos = line.find( '%', pos+5 ); + pos = line.tqfind( "UBU", pos ); + endPos = line.tqfind( '%', pos+5 ); if( pos > 0 ) { pos += 4; val = line.mid( pos, endPos-pos ).toDouble( &ok ); @@ -274,7 +274,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode ) // for now we just emit a message with the error // in the future when I know more about what kinds of errors may occur // we will enhance this - emit infoMessage( i18n("Fatal error at startup: %1").arg(strerror(exitCode-128)), + emit infoMessage( i18n("Fatal error at startup: %1").tqarg(strerror(exitCode-128)), K3bJob::ERROR ); } else if( exitCode == 1 ) { @@ -286,7 +286,7 @@ void K3bGrowisofsHandler::handleExit( int exitCode ) emit infoMessage( i18n("Most likely mkisofs failed in some way."), K3bJob::ERROR ); } else { - emit infoMessage( i18n("Fatal error during recording: %1").arg(strerror(exitCode)), + emit infoMessage( i18n("Fatal error during recording: %1").tqarg(strerror(exitCode)), K3bJob::ERROR ); } } @@ -295,12 +295,12 @@ void K3bGrowisofsHandler::handleExit( int exitCode ) } -void K3bGrowisofsHandler::slotCheckBufferStatus() +void K3bGrowisofsHandler::slotCheckBuffertqStatus() { connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::BUFFER_CAPACITY, m_device ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotCheckBufferStatusDone(K3bDevice::DeviceHandler*)) ); + TQT_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() ); - QTimer::singleShot( 500, this, SLOT(slotCheckBufferStatus()) ); + TQTimer::singleShot( 500, this, TQT_SLOT(slotCheckBuffertqStatus()) ); } else { kdDebug() << "(K3bGrowisofsHandler) stopping buffer check." << endl; diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h index 42fcd2a..5243ebc 100644 --- a/libk3b/projects/k3bgrowisofshandler.h +++ b/libk3b/projects/k3bgrowisofshandler.h @@ -16,7 +16,7 @@ #ifndef _K3B_GROWISOFS_HANDLER_H_ #define _K3B_GROWISOFS_HANDLER_H_ -#include +#include namespace K3bDevice { class Device; @@ -29,12 +29,13 @@ namespace K3bDevice { * We put it in an extra class since we have two classes * using growisofs: the writer and the imager. */ -class K3bGrowisofsHandler : public QObject +class K3bGrowisofsHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bGrowisofsHandler( QObject* parent = 0, const char* name = 0 ); + K3bGrowisofsHandler( TQObject* tqparent = 0, const char* name = 0 ); ~K3bGrowisofsHandler(); enum ErrorType { @@ -57,12 +58,12 @@ class K3bGrowisofsHandler : public QObject void reset( K3bDevice::Device* = 0, bool dao = false ); void handleStart(); - void handleLine( const QString& ); + void handleLine( const TQString& ); void handleExit( int exitCode ); signals: - void infoMessage( const QString&, int ); - void newSubTask( const QString& ); + void infoMessage( const TQString&, int ); + void newSubTask( const TQString& ); void buffer( int ); void deviceBuffer( int ); @@ -72,7 +73,7 @@ class K3bGrowisofsHandler : public QObject void flushingCache(); private slots: - void slotCheckBufferStatus(); + void slotCheckBuffertqStatus(); void slotCheckBufferStatusDone( K3bDevice::DeviceHandler* ); private: diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp index 3144547..3480711 100644 --- a/libk3b/projects/k3bgrowisofswriter.cpp +++ b/libk3b/projects/k3bgrowisofswriter.cpp @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include @@ -60,13 +60,13 @@ public: bool multiSession; K3bProcess* process; const K3bExternalBin* growisofsBin; - QString image; + TQString image; bool success; bool canceled; bool finished; - QTime lastSpeedCalculationTime; + TQTime lastSpeedCalculationTime; int lastSpeedCalculationBytes; int lastProgress; unsigned int lastProgressed; @@ -85,37 +85,37 @@ public: unsigned long long overallSizeFromOutput; long long firstSizeFromOutput; - QFile inputFile; + TQFile inputFile; bool usingRingBuffer; K3bPipeBuffer* ringBuffer; - QString multiSessionInfo; + TQString multiSessionInfo; bool forceNoEject; }; K3bGrowisofsWriter::K3bGrowisofsWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - QObject* parent, const char* name ) - : K3bAbstractWriter( dev, hdl, parent, name ) + TQObject* tqparent, const char* name ) + : K3bAbstractWriter( dev, hdl, tqparent, name ) { d = new Private; d->speedEst = new K3bThroughputEstimator( this ); - connect( d->speedEst, SIGNAL(throughput(int)), - this, SLOT(slotThroughput(int)) ); + connect( d->speedEst, TQT_SIGNAL(throughput(int)), + this, TQT_SLOT(slotThroughput(int)) ); d->gh = new K3bGrowisofsHandler( this ); - connect( d->gh, SIGNAL(infoMessage(const QString&, int)), - this,SIGNAL(infoMessage(const QString&, int)) ); - connect( d->gh, SIGNAL(newSubTask(const QString&)), - this, SIGNAL(newSubTask(const QString&)) ); - connect( d->gh, SIGNAL(buffer(int)), - this, SIGNAL(buffer(int)) ); - connect( d->gh, SIGNAL(deviceBuffer(int)), - this, SIGNAL(deviceBuffer(int)) ); - connect( d->gh, SIGNAL(flushingCache()), - this, SLOT(slotFlushingCache()) ); + 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()) ); } @@ -155,13 +155,13 @@ bool K3bGrowisofsWriter::prepareProcess() { d->growisofsBin = k3bcore->externalBinManager()->binObject( "growisofs" ); if( !d->growisofsBin ) { - emit infoMessage( i18n("Could not find %1 executable.").arg("growisofs"), ERROR ); + emit infoMessage( i18n("Could not tqfind %1 executable.").tqarg("growisofs"), ERROR ); return false; } if( d->growisofsBin->version < K3bVersion( 5, 10 ) ) { emit infoMessage( i18n("Growisofs version %1 is too old. " - "K3b needs at least version 5.10.").arg(d->growisofsBin->version), + "K3b needs at least version 5.10.").tqarg(d->growisofsBin->version), ERROR ); return false; } @@ -169,8 +169,8 @@ bool K3bGrowisofsWriter::prepareProcess() emit debuggingOutput( "Used versions", "growisofs: " + d->growisofsBin->version ); if( !d->growisofsBin->copyright.isEmpty() ) - emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").arg("growisofs") - .arg(d->growisofsBin->version).arg(d->growisofsBin->copyright), INFO ); + emit infoMessage( i18n("Using %1 %2 - Copyright (C) %3").tqarg("growisofs") + .tqarg(d->growisofsBin->version).tqarg(d->growisofsBin->copyright), INFO ); // @@ -182,9 +182,9 @@ bool K3bGrowisofsWriter::prepareProcess() // d->process->setPriority( KProcess::PrioHighest ); d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotReceivedStderr(const QString&)) ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), this, SLOT(slotReceivedStderr(const QString&)) ); - connect( d->process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) ); + 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(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*)) ); // @@ -212,7 +212,7 @@ bool K3bGrowisofsWriter::prepareProcess() // set this var to true to enable the ringbuffer d->usingRingBuffer = ( d->growisofsBin->version < K3bVersion( 6, 0 ) ); - QString s = burnDevice()->blockDeviceName() + "="; + TQString s = burnDevice()->blockDeviceName() + "="; if( d->usingRingBuffer || d->image.isEmpty() ) { // we always read from stdin since the ringbuffer does the actual reading from the source s += "/dev/fd/0"; @@ -234,7 +234,7 @@ bool K3bGrowisofsWriter::prepareProcess() d->inputFile.setName( d->image ); d->trackSize = (K3b::filesize( d->image ) + 1024) / 2048; if( !d->inputFile.open( IO_ReadOnly ) ) { - emit infoMessage( i18n("Could not open file %1.").arg(d->image), ERROR ); + emit infoMessage( i18n("Could not open file %1.").tqarg(d->image), ERROR ); return false; } } @@ -249,13 +249,13 @@ bool K3bGrowisofsWriter::prepareProcess() // DL writing with forced layer break if( d->layerBreak > 0 ) { - *d->process << "-use-the-force-luke=break:" + QString::number(d->layerBreak); + *d->process << "-use-the-force-luke=break:" + TQString::number(d->layerBreak); dvdCompat = true; } // the tracksize parameter takes priority over the dao:tracksize parameter since growisofs 5.18 else if( d->growisofsBin->version > K3bVersion( 5, 17 ) && d->trackSize > 0 ) - *d->process << "-use-the-force-luke=tracksize:" + QString::number(d->trackSize + trackSizePadding); + *d->process << "-use-the-force-luke=tracksize:" + TQString::number(d->trackSize + trackSizePadding); if( simulate() ) *d->process << "-use-the-force-luke=dummy"; @@ -263,7 +263,7 @@ bool K3bGrowisofsWriter::prepareProcess() if( d->writingMode == K3b::DAO ) { dvdCompat = true; if( d->growisofsBin->version >= K3bVersion( 5, 15 ) && d->trackSize > 0 ) - *d->process << "-use-the-force-luke=dao:" + QString::number(d->trackSize + trackSizePadding); + *d->process << "-use-the-force-luke=dao:" + TQString::number(d->trackSize + trackSizePadding); else *d->process << "-use-the-force-luke=dao"; d->gh->reset( burnDevice(), true ); @@ -299,9 +299,9 @@ bool K3bGrowisofsWriter::prepareProcess() // speed may be a float number. example: DVD+R(W): 2.4x if( speed != 0 ) - *d->process << QString("-speed=%1").arg( speed%1385 > 0 - ? QString::number( (float)speed/1385.0, 'f', 1 ) - : QString::number( speed/1385 ) ); + *d->process << TQString("-speed=%1").tqarg( speed%1385 > 0 + ? TQString::number( (float)speed/1385.0, 'f', 1 ) + : TQString::number( speed/1385 ) ); } if( k3bcore->globalSettings()->overburn() ) @@ -310,12 +310,12 @@ bool K3bGrowisofsWriter::prepareProcess() if( !d->usingRingBuffer && d->growisofsBin->version >= K3bVersion( 6, 0 ) ) { bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize(); int bufSize = ( manualBufferSize ? k3bcore->globalSettings()->bufferSize() : 32 ); - *d->process << QString("-use-the-force-luke=bufsize:%1m").arg(bufSize); + *d->process << TQString("-use-the-force-luke=bufsize:%1m").tqarg(bufSize); } // additional user parameters from config - const QStringList& params = d->growisofsBin->userParameters(); - for( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = d->growisofsBin->userParameters(); + for( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *d->process << *it; emit debuggingOutput( "Burned media", K3bDevice::mediaTypeString(mediaType) ); @@ -332,7 +332,7 @@ void K3bGrowisofsWriter::start() d->lastProgressed = 0; d->lastProgress = 0; d->firstSizeFromOutput = -1; - d->lastSpeedCalculationTime = QTime::currentTime(); + d->lastSpeedCalculationTime = TQTime::currentTime(); d->lastSpeedCalculationBytes = 0; d->writingStarted = false; d->canceled = false; @@ -345,9 +345,9 @@ void K3bGrowisofsWriter::start() else { kdDebug() << "***** " << d->growisofsBin->name() << " parameters:\n"; - const QValueList& args = d->process->args(); - QString s; - for( QValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList& args = d->process->args(); + TQString s; + for( TQValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -374,7 +374,7 @@ void K3bGrowisofsWriter::start() // something went wrong when starting the program // it "should" be the executable kdDebug() << "(K3bGrowisofsWriter) could not start " << d->growisofsBin->path << endl; - emit infoMessage( i18n("Could not start %1.").arg(d->growisofsBin->name()), K3bJob::ERROR ); + emit infoMessage( i18n("Could not start %1.").tqarg(d->growisofsBin->name()), K3bJob::ERROR ); jobFinished(false); } else { @@ -394,8 +394,8 @@ void K3bGrowisofsWriter::start() if( d->usingRingBuffer ) { if( !d->ringBuffer ) { d->ringBuffer = new K3bPipeBuffer( this, this ); - connect( d->ringBuffer, SIGNAL(percent(int)), this, SIGNAL(buffer(int)) ); - connect( d->ringBuffer, SIGNAL(finished(bool)), this, SLOT(slotRingBufferFinished(bool)) ); + connect( d->ringBuffer, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(buffer(int)) ); + connect( d->ringBuffer, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotRingBufferFinished(bool)) ); } d->ringBuffer->writeToFd( d->process->stdinFd() ); @@ -455,17 +455,17 @@ void K3bGrowisofsWriter::setMultiSession( bool b ) } -void K3bGrowisofsWriter::setImageToWrite( const QString& filename ) +void K3bGrowisofsWriter::setImageToWrite( const TQString& filename ) { d->image = filename; } -void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) +void K3bGrowisofsWriter::slotReceivedStderr( const TQString& line ) { emit debuggingOutput( d->growisofsBin->name(), line ); - if( line.contains( "remaining" ) ) { + if( line.tqcontains( "remaining" ) ) { if( !d->writingStarted ) { d->writingStarted = true; @@ -473,10 +473,10 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) } // parse progress - int pos = line.find( "/" ); + int pos = line.tqfind( "/" ); unsigned long long done = line.left( pos ).toULongLong(); bool ok = true; - d->overallSizeFromOutput = line.mid( pos+1, line.find( "(", pos ) - pos - 1 ).toULongLong( &ok ); + d->overallSizeFromOutput = line.mid( pos+1, line.tqfind( "(", pos ) - pos - 1 ).toULongLong( &ok ); if( d->firstSizeFromOutput == -1 ) d->firstSizeFromOutput = done; done -= d->firstSizeFromOutput; @@ -495,10 +495,10 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) } // try parsing write speed (since growisofs 5.11) - pos = line.find( '@' ); + pos = line.tqfind( '@' ); if( pos != -1 ) { pos += 1; - double speed = line.mid( pos, line.find( 'x', pos ) - pos ).toDouble(&ok); + double speed = line.mid( pos, line.tqfind( 'x', pos ) - pos ).toDouble(&ok); if( ok ) { if( d->lastWritingSpeed != speed ) emit writeSpeed( (int)(speed*1385.0), 1385 ); @@ -506,7 +506,7 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) } else kdDebug() << "(K3bGrowisofsWriter) speed parsing failed: '" - << line.mid( pos, line.find( 'x', pos ) - pos ) << "'" << endl; + << line.mid( pos, line.tqfind( 'x', pos ) - pos ) << "'" << endl; } else { d->speedEst->dataWritten( done/1024 ); @@ -514,7 +514,7 @@ void K3bGrowisofsWriter::slotReceivedStderr( const QString& line ) } else kdDebug() << "(K3bGrowisofsWriter) progress parsing failed: '" - << line.mid( pos+1, line.find( "(", pos ) - pos - 1 ).stripWhiteSpace() << "'" << endl; + << line.mid( pos+1, line.tqfind( "(", pos ) - pos - 1 ).stripWhiteSpace() << "'" << endl; } // else @@ -551,7 +551,7 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p ) int s = d->speedEst->average(); if( s > 0 ) emit infoMessage( i18n("Average overall write speed: %1 KB/s (%2x)") - .arg(s).arg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO ); + .tqarg(s).tqarg(KGlobal::locale()->formatNumber((double)s/1385.0), 2), INFO ); if( simulate() ) emit infoMessage( i18n("Simulation successfully completed"), K3bJob::SUCCESS ); @@ -571,9 +571,9 @@ void K3bGrowisofsWriter::slotProcessExited( KProcess* p ) else { emit newSubTask( i18n("Ejecting DVD") ); connect( K3bDevice::eject( burnDevice() ), - SIGNAL(finished(K3bDevice::DeviceHandler*)), + TQT_SIGNAL(finished(K3bDevice::DeviceHandler*)), this, - SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); + TQT_SLOT(slotEjectingFinished(K3bDevice::DeviceHandler*)) ); } } @@ -616,7 +616,7 @@ void K3bGrowisofsWriter::slotFlushingCache() } -void K3bGrowisofsWriter::setMultiSessionInfo( const QString& info ) +void K3bGrowisofsWriter::setMultiSessionInfo( const TQString& info ) { d->multiSessionInfo = info; } diff --git a/libk3b/projects/k3bgrowisofswriter.h b/libk3b/projects/k3bgrowisofswriter.h index ed69923..b65b894 100644 --- a/libk3b/projects/k3bgrowisofswriter.h +++ b/libk3b/projects/k3bgrowisofswriter.h @@ -30,10 +30,11 @@ class KProcess; class K3bGrowisofsWriter : public K3bAbstractWriter { Q_OBJECT + TQ_OBJECT public: K3bGrowisofsWriter( K3bDevice::Device*, K3bJobHandler*, - QObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); ~K3bGrowisofsWriter(); bool active() const; @@ -74,16 +75,16 @@ class K3bGrowisofsWriter : public K3bAbstractWriter void setCloseDvd( bool ); /** - * set this to QString::null or an empty string to let the writer + * set this to TQString() or an empty string to let the writer * read it's data from fd() */ - void setImageToWrite( const QString& ); + void setImageToWrite( const TQString& ); /** * While reading the image from stdin growisofs needs * a valid -C parameter for multisession. */ - void setMultiSessionInfo( const QString& ); + void setMultiSessionInfo( const TQString& ); void setForceNoEject( bool ); @@ -91,7 +92,7 @@ class K3bGrowisofsWriter : public K3bAbstractWriter bool prepareProcess(); protected slots: - void slotReceivedStderr( const QString& ); + void slotReceivedStderr( const TQString& ); void slotProcessExited( KProcess* ); void slotEjectingFinished( K3bDevice::DeviceHandler* dh ); void slotThroughput( int t ); diff --git a/libk3b/projects/k3bimagefilereader.cpp b/libk3b/projects/k3bimagefilereader.cpp index 70ece16..76d8e92 100644 --- a/libk3b/projects/k3bimagefilereader.cpp +++ b/libk3b/projects/k3bimagefilereader.cpp @@ -15,8 +15,8 @@ #include "k3bimagefilereader.h" -#include -#include +#include +#include #include @@ -29,8 +29,8 @@ public: : isValid(false) { } - QString filename; - QString imageFilename; + TQString filename; + TQString imageFilename; bool isValid; }; @@ -47,10 +47,10 @@ K3bImageFileReader::~K3bImageFileReader() } -void K3bImageFileReader::openFile( const QString& filename ) +void K3bImageFileReader::openFile( const TQString& filename ) { d->filename = filename; - d->imageFilename = QString::null; + d->imageFilename = TQString(); setValid(false); if( !filename.isEmpty() ) @@ -64,7 +64,7 @@ void K3bImageFileReader::setValid( bool b ) } -void K3bImageFileReader::setImageFilename( const QString& filename ) +void K3bImageFileReader::setImageFilename( const TQString& filename ) { d->imageFilename = filename; } @@ -76,13 +76,13 @@ bool K3bImageFileReader::isValid() const } -const QString& K3bImageFileReader::filename() const +const TQString& K3bImageFileReader::filename() const { return d->filename; } -const QString& K3bImageFileReader::imageFilename() const +const TQString& K3bImageFileReader::imageFilename() const { return d->imageFilename; } diff --git a/libk3b/projects/k3bimagefilereader.h b/libk3b/projects/k3bimagefilereader.h index 2bf727e..aca0fc5 100644 --- a/libk3b/projects/k3bimagefilereader.h +++ b/libk3b/projects/k3bimagefilereader.h @@ -16,7 +16,7 @@ #ifndef _K3B_IMAGE_FILE_READER_H_ #define _K3B_IMAGE_FILE_READER_H_ -#include +#include #include "k3b_export.h" class LIBK3B_EXPORT K3bImageFileReader @@ -28,24 +28,24 @@ class LIBK3B_EXPORT K3bImageFileReader /** * Open a file. In most cases the TOC file */ - void openFile( const QString& filename ); + void openFile( const TQString& filename ); virtual bool isValid() const; /** * Return the current set filename; */ - const QString& filename() const; + const TQString& filename() const; /** * returns the name of the corresponding image file. */ - virtual const QString& imageFilename() const; + virtual const TQString& imageFilename() const; protected: virtual void readFile() = 0; void setValid( bool ); - void setImageFilename( const QString& ); + void setImageFilename( const TQString& ); private: class Private; diff --git a/libk3b/projects/k3binffilewriter.cpp b/libk3b/projects/k3binffilewriter.cpp index 9395b2a..ecfb912 100644 --- a/libk3b/projects/k3binffilewriter.cpp +++ b/libk3b/projects/k3binffilewriter.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include @@ -39,28 +39,28 @@ K3bInfFileWriter::K3bInfFileWriter() } -bool K3bInfFileWriter::save( const QString& filename ) +bool K3bInfFileWriter::save( const TQString& filename ) { - QFile f( filename ); + TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { kdDebug() << "(K3bInfFileWriter) could not open file " << f.name() << endl; return false; } - QTextStream s( &f ); + TQTextStream s( &f ); return save( s ); } -bool K3bInfFileWriter::save( QTextStream& s ) +bool K3bInfFileWriter::save( TQTextStream& s ) { // now write the inf data // ---------------------- // header s << "# Cdrecord-Inf-File written by K3b " << k3bcore->version() - << ", " << QDateTime::currentDateTime().toString() << endl + << ", " << TQDateTime::tqcurrentDateTime().toString() << endl << "#" << endl; s << "ISRC=\t\t" << m_isrc << endl; @@ -130,7 +130,7 @@ bool K3bInfFileWriter::save( QTextStream& s ) s << "Index0=\t\t" << m_index0 << endl; - return ( s.device()->status() == IO_Ok ); + return ( s.tqdevice()->status() == IO_Ok ); } @@ -141,7 +141,7 @@ void K3bInfFileWriter::setTrack( const K3bDevice::Track& track ) // the first index always has to be a zero (cdrecord manpage) m_indices.append( 0 ); - const QValueVector& indexList = track.indices(); + const TQValueVector& indexList = track.indices(); for( unsigned int i = 0; i < indexList.count(); ++i ) m_indices.append( indexList[i].lba() ); diff --git a/libk3b/projects/k3binffilewriter.h b/libk3b/projects/k3binffilewriter.h index 74e23e4..93164ed 100644 --- a/libk3b/projects/k3binffilewriter.h +++ b/libk3b/projects/k3binffilewriter.h @@ -16,8 +16,8 @@ #ifndef _K3B_INF_FILE_WRITER_H_ #define _K3B_INF_FILE_WRITER_H_ -#include -#include +#include +#include #include @@ -34,8 +34,8 @@ class K3bInfFileWriter public: K3bInfFileWriter(); - bool save( QTextStream& ); - bool save( const QString& filename ); + bool save( TQTextStream& ); + bool save( const TQString& filename ); /** * Use this to set: @@ -76,24 +76,24 @@ class K3bInfFileWriter void setBigEndian( bool b ) { m_bigEndian = b; } void setTrackCdText( const K3bDevice::TrackCdText& ); - void setTrackTitle( const QString& s ) { m_trackTitle = s; } - void setTrackPerformer( const QString& s ) { m_trackPerformer = s; } - void setTrackSongwriter( const QString& s ) { m_trackSongwriter = s; } - void setTrackComposer( const QString& s ) { m_trackComposer = s; } - void setTrackArranger( const QString& s ) { m_trackArranger = s; } - void setTrackMessage( const QString& s ) { m_trackMessage = s; } + void setTrackTitle( const TQString& s ) { m_trackTitle = s; } + void setTrackPerformer( const TQString& s ) { m_trackPerformer = s; } + void setTrackSongwriter( const TQString& s ) { m_trackSongwriter = s; } + void setTrackComposer( const TQString& s ) { m_trackComposer = s; } + void setTrackArranger( const TQString& s ) { m_trackArranger = s; } + void setTrackMessage( const TQString& s ) { m_trackMessage = s; } void setCdText( const K3bDevice::CdText& ); - void setAlbumTitle( const QString& s ) { m_albumTitle = s; } - void setAlbumPerformer( const QString& s ) { m_albumPerformer = s; } + void setAlbumTitle( const TQString& s ) { m_albumTitle = s; } + void setAlbumPerformer( const TQString& s ) { m_albumPerformer = s; } - void setIsrc( const QCString& s ) { m_isrc = s; } - void setMcn( const QCString& s ) { m_mcn = s; } + void setIsrc( const TQCString& s ) { m_isrc = s; } + void setMcn( const TQCString& s ) { m_mcn = s; } private: long m_index0; - QValueVector m_indices; + TQValueVector m_indices; int m_trackNumber; K3b::Msf m_trackStart; @@ -102,18 +102,18 @@ class K3bInfFileWriter bool m_copyPermitted; bool m_bigEndian; - QString m_trackTitle; - QString m_trackPerformer; - QString m_trackSongwriter; - QString m_trackComposer; - QString m_trackArranger; - QString m_trackMessage; + TQString m_trackTitle; + TQString m_trackPerformer; + TQString m_trackSongwriter; + TQString m_trackComposer; + TQString m_trackArranger; + TQString m_trackMessage; - QString m_albumTitle; - QString m_albumPerformer; + TQString m_albumTitle; + TQString m_albumPerformer; - QCString m_isrc; - QCString m_mcn; + TQCString m_isrc; + TQCString m_mcn; }; #endif diff --git a/libk3b/projects/k3bpipebuffer.cpp b/libk3b/projects/k3bpipebuffer.cpp index 3b61116..4dbfd38 100644 --- a/libk3b/projects/k3bpipebuffer.cpp +++ b/libk3b/projects/k3bpipebuffer.cpp @@ -115,7 +115,7 @@ public: // // wait for data // - int ret = select( QMAX(usedInFd, outFd) + 1, &readFds, &writeFds, NULL, NULL); + int ret = select( TQMAX(usedInFd, outFd) + 1, &readFds, &writeFds, NULL, NULL); // // Do the buffering @@ -128,7 +128,7 @@ public: // Read from the buffer and write to the output // if( FD_ISSET(outFd, &writeFds) ) { - unsigned int maxLen = QMIN(bufSize - bufPos, dataLen); + unsigned int maxLen = TQMIN(bufSize - bufPos, dataLen); ret = ::write( outFd, &buffer[bufPos], maxLen ); @@ -155,7 +155,7 @@ public: // else if( FD_ISSET(usedInFd, &readFds) ) { unsigned int readPos = (bufPos + dataLen) % bufSize; - unsigned int maxLen = QMIN(bufSize - readPos, bufSize - dataLen); + unsigned int maxLen = TQMIN(bufSize - readPos, bufSize - dataLen); // // never read more than xxx bytes // This is some tuning to prevent the reading from blocking the whole thread @@ -221,8 +221,8 @@ public: }; -K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bThreadJob( jh, parent, name ) +K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bThreadJob( jh, tqparent, name ) { m_thread = new WorkThread(); setThread( m_thread ); diff --git a/libk3b/projects/k3bpipebuffer.h b/libk3b/projects/k3bpipebuffer.h index 6aae368..7f6ad1b 100644 --- a/libk3b/projects/k3bpipebuffer.h +++ b/libk3b/projects/k3bpipebuffer.h @@ -25,7 +25,7 @@ class K3bPipeBuffer : public K3bThreadJob { public: - K3bPipeBuffer( K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bPipeBuffer( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bPipeBuffer(); /** diff --git a/libk3b/projects/k3btocfilewriter.cpp b/libk3b/projects/k3btocfilewriter.cpp index 77662d6..249ef84 100644 --- a/libk3b/projects/k3btocfilewriter.cpp +++ b/libk3b/projects/k3btocfilewriter.cpp @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include K3bTocFileWriter::K3bTocFileWriter() @@ -32,22 +32,22 @@ K3bTocFileWriter::K3bTocFileWriter() } -bool K3bTocFileWriter::save( const QString& filename ) +bool K3bTocFileWriter::save( const TQString& filename ) { - QFile f( filename ); + TQFile f( filename ); if( !f.open( IO_WriteOnly ) ) { kdDebug() << "(K3bCueFileWriter) could not open file " << f.name() << endl; return false; } - QTextStream s( &f ); + TQTextStream s( &f ); return save( s ); } -bool K3bTocFileWriter::save( QTextStream& t ) +bool K3bTocFileWriter::save( TQTextStream& t ) { writeHeader(t); @@ -149,15 +149,15 @@ bool K3bTocFileWriter::save( QTextStream& t ) trackIndex++; } - return ( t.device()->status() == IO_Ok ); + return ( t.tqdevice()->status() == IO_Ok ); } -void K3bTocFileWriter::writeHeader( QTextStream& t ) +void K3bTocFileWriter::writeHeader( TQTextStream& t ) { // little comment t << "// TOC-file to use with cdrdao created by K3b " << k3bcore->version() - << ", " << QDateTime::currentDateTime().toString() << endl << endl; + << ", " << TQDateTime::tqcurrentDateTime().toString() << endl << endl; t << "// " << m_toc.count() << " tracks" << endl; if( m_toc.back().session() > 0 ) { @@ -193,7 +193,7 @@ void K3bTocFileWriter::writeHeader( QTextStream& t ) } -void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, QTextStream& t ) +void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, TQTextStream& t ) { const K3bDevice::Track& track = m_toc[index]; @@ -305,7 +305,7 @@ void K3bTocFileWriter::writeTrack( unsigned int index, const K3b::Msf& offset, Q } -void K3bTocFileWriter::writeGlobalCdText( QTextStream& t ) +void K3bTocFileWriter::writeGlobalCdText( TQTextStream& t ) { t << "CD_TEXT {" << endl; t << " LANGUAGE_MAP { 0: EN }" << endl; @@ -325,7 +325,7 @@ void K3bTocFileWriter::writeGlobalCdText( QTextStream& t ) } -void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, QTextStream& t ) +void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, TQTextStream& t ) { t << "CD_TEXT {" << endl; t << " LANGUAGE 0 {" << endl; @@ -341,7 +341,7 @@ void K3bTocFileWriter::writeTrackCdText( const K3bDevice::TrackCdText& track, QT } -void K3bTocFileWriter::writeDataSource( unsigned int trackIndex, QTextStream& t ) +void K3bTocFileWriter::writeDataSource( unsigned int trackIndex, TQTextStream& t ) { if( readFromStdin() ) t << "\"-\" "; diff --git a/libk3b/projects/k3btocfilewriter.h b/libk3b/projects/k3btocfilewriter.h index 1c1da47..3127fca 100644 --- a/libk3b/projects/k3btocfilewriter.h +++ b/libk3b/projects/k3btocfilewriter.h @@ -16,8 +16,8 @@ #ifndef _K3B_TOC_FILE_WRITER_H_ #define _K3B_TOC_FILE_WRITER_H_ -#include -#include +#include +#include #include #include @@ -31,12 +31,12 @@ class K3bTocFileWriter public: K3bTocFileWriter(); - bool save( QTextStream& ); - bool save( const QString& filename ); + bool save( TQTextStream& ); + bool save( const TQString& filename ); void setData( const K3bDevice::Toc& toc ) { m_toc = toc; } void setCdText( const K3bDevice::CdText& text ) { m_cdText = text; } - void setFilenames( const QStringList& names ) { m_filenames = names; } + void setFilenames( const TQStringList& names ) { m_filenames = names; } void setHideFirstTrack( bool b ) { m_hideFirstTrack = b; } /** @@ -45,16 +45,16 @@ class K3bTocFileWriter void setSession( int s ) { m_sessionToWrite = s; } private: - void writeHeader( QTextStream& t ); - void writeGlobalCdText( QTextStream& t ); - void writeTrackCdText( const K3bDevice::TrackCdText& track, QTextStream& t ); - void writeTrack( unsigned int index, const K3b::Msf& offset, QTextStream& t ); - void writeDataSource( unsigned int trackNumber, QTextStream& t ); + void writeHeader( TQTextStream& t ); + void writeGlobalCdText( TQTextStream& t ); + void writeTrackCdText( const K3bDevice::TrackCdText& track, TQTextStream& t ); + void writeTrack( unsigned int index, const K3b::Msf& offset, TQTextStream& t ); + void writeDataSource( unsigned int trackNumber, TQTextStream& t ); bool readFromStdin() const; K3bDevice::Toc m_toc; K3bDevice::CdText m_cdText; - QStringList m_filenames; + TQStringList m_filenames; bool m_hideFirstTrack; int m_sessionToWrite; }; diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index a2c76b0..2160581 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -31,16 +31,16 @@ -K3bMixedDoc::K3bMixedDoc( QObject* parent ) - : K3bDoc( parent ) +K3bMixedDoc::K3bMixedDoc( TQObject* tqparent ) + : K3bDoc( tqparent ) { m_dataDoc = new K3bDataDoc( this ); m_audioDoc = new K3bAudioDoc( this ); - connect( m_dataDoc, SIGNAL(changed()), - this, SIGNAL(changed()) ); - connect( m_audioDoc, SIGNAL(changed()), - this, SIGNAL(changed()) ); + connect( m_dataDoc, TQT_SIGNAL(changed()), + this, TQT_SIGNAL(changed()) ); + connect( m_audioDoc, TQT_SIGNAL(changed()), + this, TQT_SIGNAL(changed()) ); } @@ -58,7 +58,7 @@ bool K3bMixedDoc::newDocument() } -QString K3bMixedDoc::name() const +TQString K3bMixedDoc::name() const { return m_dataDoc->name(); } @@ -102,9 +102,9 @@ int K3bMixedDoc::numOfTracks() const } -K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bMixedJob( this, hdl, parent ); + return new K3bMixedJob( this, hdl, tqparent ); } @@ -114,9 +114,9 @@ void K3bMixedDoc::addUrls( const KURL::List& urls ) } -bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem ) +bool K3bMixedDoc::loadDocumentData( TQDomElement* rootElem ) { - QDomNodeList nodes = rootElem->childNodes(); + TQDomNodeList nodes = rootElem->childNodes(); if( nodes.length() < 4 ) return false; @@ -128,23 +128,23 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem ) if( nodes.item(1).nodeName() != "audio" ) return false; - QDomElement audioElem = nodes.item(1).toElement(); + TQDomElement audioElem = nodes.item(1).toElement(); if( !m_audioDoc->loadDocumentData( &audioElem ) ) return false; if( nodes.item(2).nodeName() != "data" ) return false; - QDomElement dataElem = nodes.item(2).toElement(); + TQDomElement dataElem = nodes.item(2).toElement(); if( !m_dataDoc->loadDocumentData( &dataElem ) ) return false; if( nodes.item(3).nodeName() != "mixed" ) return false; - QDomNodeList optionList = nodes.item(3).childNodes(); + TQDomNodeList optionList = nodes.item(3).childNodes(); for( uint i = 0; i < optionList.count(); i++ ) { - QDomElement e = optionList.item(i).toElement(); + TQDomElement e = optionList.item(i).toElement(); if( e.isNull() ) return false; @@ -153,7 +153,7 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem ) else if( e.nodeName() == "image_path" ) setTempDir( e.toElement().text() ); else if( e.nodeName() == "mixed_type" ) { - QString mt = e.toElement().text(); + TQString mt = e.toElement().text(); if( mt == "last_track" ) setMixedType( DATA_LAST_TRACK ); else if( mt == "second_session" ) @@ -167,31 +167,31 @@ bool K3bMixedDoc::loadDocumentData( QDomElement* rootElem ) } -bool K3bMixedDoc::saveDocumentData( QDomElement* docElem ) +bool K3bMixedDoc::saveDocumentData( TQDomElement* docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); - QDomElement audioElem = doc.createElement( "audio" ); + TQDomElement audioElem = doc.createElement( "audio" ); m_audioDoc->saveDocumentData( &audioElem ); docElem->appendChild( audioElem ); - QDomElement dataElem = doc.createElement( "data" ); + TQDomElement dataElem = doc.createElement( "data" ); m_dataDoc->saveDocumentData( &dataElem ); docElem->appendChild( dataElem ); - QDomElement mixedElem = doc.createElement( "mixed" ); + TQDomElement mixedElem = doc.createElement( "mixed" ); docElem->appendChild( mixedElem ); - QDomElement bufferFilesElem = doc.createElement( "remove_buffer_files" ); + TQDomElement bufferFilesElem = doc.createElement( "remove_buffer_files" ); bufferFilesElem.appendChild( doc.createTextNode( removeImages() ? "yes" : "no" ) ); mixedElem.appendChild( bufferFilesElem ); - QDomElement imagePathElem = doc.createElement( "image_path" ); + TQDomElement imagePathElem = doc.createElement( "image_path" ); imagePathElem.appendChild( doc.createTextNode( tempDir() ) ); mixedElem.appendChild( imagePathElem ); - QDomElement mixedTypeElem = doc.createElement( "mixed_type" ); + TQDomElement mixedTypeElem = doc.createElement( "mixed_type" ); switch( mixedType() ) { case DATA_FIRST_TRACK: mixedTypeElem.appendChild( doc.createTextNode( "first_track" ) ); diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h index 7d71b39..b4ebc07 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.h +++ b/libk3b/projects/mixedcd/k3bmixeddoc.h @@ -22,23 +22,24 @@ #include #include "k3b_export.h" -class QDomDocument; -class QDomElement; +class TQDomDocument; +class TQDomElement; class K3bBurnJob; //class K3bView; -class QWidget; +class TQWidget; class KConfig; class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc { Q_OBJECT + TQ_OBJECT public: - K3bMixedDoc( QObject* parent = 0 ); + K3bMixedDoc( TQObject* tqparent = 0 ); ~K3bMixedDoc(); - QString name() const; + TQString name() const; bool newDocument(); @@ -50,7 +51,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc int numOfTracks() const; - K3bBurnJob* newBurnJob( K3bJobHandler*, QObject* parent = 0 ); + K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ); K3bAudioDoc* audioDoc() const { return m_audioDoc; } K3bDataDoc* dataDoc() const { return m_dataDoc; } @@ -80,9 +81,9 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc void addUrls( const KURL::List& urls ); protected: - bool loadDocumentData( QDomElement* ); - bool saveDocumentData( QDomElement* ); - QString typeString() const { return "mixed"; } + bool loadDocumentData( TQDomElement* ); + bool saveDocumentData( TQDomElement* ); + TQString typeString() const { return "mixed"; } private: K3bDataDoc* m_dataDoc; diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index a4be92c..8fbe2ff 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -55,11 +55,11 @@ #include -static QString createNonExistingFilesString( const QValueList& items, unsigned int max ) +static TQString createNonExistingFilesString( const TQValueList& items, unsigned int max ) { - QString s; + TQString s; unsigned int cnt = 0; - for( QValueList::const_iterator it = items.begin(); + for( TQValueList::const_iterator it = items.begin(); it != items.end(); ++it ) { s += KStringHandler::csqueeze( (*it)->filename(), 60 ); @@ -95,31 +95,31 @@ public: }; -K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, QObject* parent ) - : K3bBurnJob( hdl, parent ), +K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) + : K3bBurnJob( hdl, tqparent ), m_doc( doc ), m_normalizeJob(0) { d = new Private; m_isoImager = new K3bIsoImager( doc->dataDoc(), this, this ); - connect( m_isoImager, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_isoImager, SIGNAL(percent(int)), this, SLOT(slotIsoImagerPercent(int)) ); - connect( m_isoImager, SIGNAL(finished(bool)), this, SLOT(slotIsoImagerFinished(bool)) ); - connect( m_isoImager, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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&)) ); m_audioImager = new K3bAudioImager( doc->audioDoc(), this, this ); - connect( m_audioImager, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_audioImager, SIGNAL(percent(int)), this, SLOT(slotAudioDecoderPercent(int)) ); - connect( m_audioImager, SIGNAL(subPercent(int)), this, SLOT(slotAudioDecoderSubPercent(int)) ); - connect( m_audioImager, SIGNAL(finished(bool)), this, SLOT(slotAudioDecoderFinished(bool)) ); - connect( m_audioImager, SIGNAL(nextTrack(int, int)), this, SLOT(slotAudioDecoderNextTrack(int, int)) ); + 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)) ); m_msInfoFetcher = new K3bMsInfoFetcher( this, this ); - connect( m_msInfoFetcher, SIGNAL(finished(bool)), this, SLOT(slotMsInfoFetched(bool)) ); - connect( m_msInfoFetcher, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); + 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)) ); m_writer = 0; m_tocFile = 0; @@ -168,13 +168,13 @@ void K3bMixedJob::start() // // Check if all files exist // - QValueList nonExistingFiles; + TQValueList nonExistingFiles; K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); while( track ) { K3bAudioDataSource* source = track->firstSource(); while( source ) { if( K3bAudioFile* file = dynamic_cast( source ) ) { - if( !QFile::exists( file->filename() ) ) + if( !TQFile::exists( file->filename() ) ) nonExistingFiles.append( file ); } source = source->next(); @@ -188,7 +188,7 @@ void K3bMixedJob::start() i18n("Warning"), i18n("Remove missing files and continue"), i18n("Cancel and go back") ) ) { - for( QValueList::const_iterator it = nonExistingFiles.begin(); + for( TQValueList::const_iterator it = nonExistingFiles.begin(); it != nonExistingFiles.end(); ++it ) { delete *it; } @@ -226,7 +226,7 @@ void K3bMixedJob::start() // we do not have msinfo yet m_currentAction = INITIALIZING_IMAGER; - m_isoImager->setMultiSessionInfo( QString::null ); + m_isoImager->setMultiSessionInfo( TQString() ); m_isoImager->init(); } @@ -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, SIGNAL(percent(int)), - this, SIGNAL(subPercent(int)) ); - connect( d->maxSpeedJob, SIGNAL(finished(bool)), - this, SLOT(slotMaxSpeedJobFinished(bool)) ); + connect( d->maxSpeedJob, TQT_SIGNAL(percent(int)), + this, TQT_SIGNAL(subPercent(int)) ); + connect( d->maxSpeedJob, TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotMaxSpeedJobFinished(bool)) ); } d->maxSpeedJob->start(); } @@ -271,7 +271,7 @@ void K3bMixedJob::startFirstCopy() else { emit burning(false); - emit infoMessage( i18n("Creating audio image files in %1").arg(m_doc->tempDir()), INFO ); + emit infoMessage( i18n("Creating audio image files in %1").tqarg(m_doc->tempDir()), INFO ); m_tempFilePrefix = K3b::findUniqueFilePrefix( ( !m_doc->audioDoc()->title().isEmpty() ? m_doc->audioDoc()->title() @@ -279,7 +279,7 @@ void K3bMixedJob::startFirstCopy() m_doc->tempDir() ); m_tempData->prepareTempFileNames( m_doc->tempDir() ); - QStringList filenames; + TQStringList filenames; for( K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); track; track = track->next() ) filenames += m_tempData->bufferFileName( track ); m_audioImager->setImageFilenames( filenames ); @@ -374,9 +374,9 @@ void K3bMixedJob::slotMsInfoFetched( bool success ) if( m_usedDataWritingApp == K3b::CDRECORD ) m_isoImager->setMultiSessionInfo( m_msInfoFetcher->msInfo() ); else // cdrdao seems to write a 150 blocks pregap that is not used by cdrecord - m_isoImager->setMultiSessionInfo( QString("%1,%2") - .arg(m_msInfoFetcher->lastSessionStart()) - .arg(m_msInfoFetcher->nextSessionStart()+150) ); + m_isoImager->setMultiSessionInfo( TQString("%1,%2") + .tqarg(m_msInfoFetcher->lastSessionStart()) + .tqarg(m_msInfoFetcher->nextSessionStart()+150) ); if( m_doc->onTheFly() ) { m_currentAction = PREPARING_DATA; @@ -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() ), SIGNAL(finished(bool)), - this, SLOT(slotMediaReloadedForSecondSession(bool)) ); + connect( K3bDevice::reload( m_doc->burner() ), TQT_SIGNAL(finished(bool)), + this, TQT_SLOT(slotMediaReloadedForSecondSession(bool)) ); } else { d->copiesDone++; @@ -611,10 +611,10 @@ void K3bMixedJob::slotAudioDecoderNextTrack( int t, int tt ) if( m_doc->onlyCreateImages() || !m_doc->onTheFly() ) { K3bAudioTrack* track = m_doc->audioDoc()->getTrack(t); emit newSubTask( i18n("Decoding audio track %1 of %2%3") - .arg(t) - .arg(tt) - .arg( track->title().isEmpty() || track->artist().isEmpty() - ? QString::null + .tqarg(t) + .tqarg(tt) + .tqarg( track->title().isEmpty() || track->artist().isEmpty() + ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); } } @@ -690,20 +690,20 @@ bool K3bMixedJob::prepareWriter() m_writer = writer; } - connect( m_writer, SIGNAL(infoMessage(const QString&, int)), this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_writer, SIGNAL(percent(int)), this, SLOT(slotWriterJobPercent(int)) ); - connect( m_writer, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_writer, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_writer, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_writer, SIGNAL(nextTrack(int, int)), this, SLOT(slotWriterNextTrack(int, int)) ); - connect( m_writer, SIGNAL(buffer(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_writer, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_writer, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_writer, SIGNAL(finished(bool)), this, SLOT(slotWriterFinished(bool)) ); - // connect( m_writer, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_writer, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_writer, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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(buffertqStatus(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&)) ); return true; } @@ -734,11 +734,11 @@ bool K3bMixedJob::writeTocFile() // FIXME: create the tocfile in the same directory like all the other files. if( m_tocFile ) delete m_tocFile; - m_tocFile = new KTempFile( QString::null, "toc" ); + m_tocFile = new KTempFile( TQString(), "toc" ); m_tocFile->setAutoDelete(true); // write the toc-file - if( QTextStream* s = m_tocFile->textStream() ) { + if( TQTextStream* s = m_tocFile->textStream() ) { K3bTocFileWriter tocFileWriter; @@ -774,7 +774,7 @@ bool K3bMixedJob::writeTocFile() // image filenames // if( !m_doc->onTheFly() ) { - QStringList files; + TQStringList files; K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); while( track ) { files += m_tempData->bufferFileName( track ); @@ -827,10 +827,10 @@ void K3bMixedJob::addAudioTracks( K3bCdrecordWriter* writer ) while( track ) { if( m_doc->onTheFly() ) { // this is only supported by cdrecord versions >= 2.01a13 - writer->addArgument( QFile::encodeName( m_tempData->infFileName( track ) ) ); + writer->addArgument( TQFile::encodeName( m_tempData->infFileName( track ) ) ); } else { - writer->addArgument( QFile::encodeName( m_tempData->bufferFileName( track ) ) ); + writer->addArgument( TQFile::encodeName( m_tempData->bufferFileName( track ) ) ); } track = track->next(); } @@ -850,7 +850,7 @@ void K3bMixedJob::addDataTrack( K3bCdrecordWriter* writer ) writer->addArgument( "-data" ); if( m_doc->onTheFly() ) - writer->addArgument( QString("-tsize=%1s").arg(m_isoImager->size()) )->addArgument("-"); + writer->addArgument( TQString("-tsize=%1s").tqarg(m_isoImager->size()) )->addArgument("-"); else writer->addArgument( m_isoImageFilePath ); } @@ -875,13 +875,13 @@ void K3bMixedJob::slotWriterNextTrack( int t, int ) if( track ) emit newSubTask( i18n("Writing track %1 of %2%3") - .arg(t) - .arg(m_doc->numOfTracks()) - .arg( track->title().isEmpty() || track->artist().isEmpty() - ? QString::null + .tqarg(t) + .tqarg(m_doc->numOfTracks()) + .tqarg( track->title().isEmpty() || track->artist().isEmpty() + ? TQString() : " (" + track->artist() + " - " + track->title() + ")" ) ); else - emit newSubTask( i18n("Writing track %1 of %2 (%3)").arg(t).arg(m_doc->numOfTracks()).arg(i18n("ISO9660 data")) ); + emit newSubTask( i18n("Writing track %1 of %2 (%3)").tqarg(t).tqarg(m_doc->numOfTracks()).tqarg(i18n("ISO9660 data")) ); } @@ -989,7 +989,7 @@ bool K3bMixedJob::startWriting() if( m_doc->dummy() ) emit newTask( i18n("Simulating second session") ); else if( d->copies > 1 ) - emit newTask( i18n("Writing second session of copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing second session of copy %1").tqarg(d->copiesDone+1) ); else emit newTask( i18n("Writing second session") ); } @@ -997,7 +997,7 @@ bool K3bMixedJob::startWriting() if( m_doc->dummy() ) emit newTask( i18n("Simulating first session") ); else if( d->copies > 1 ) - emit newTask( i18n("Writing first session of copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing first session of copy %1").tqarg(d->copiesDone+1) ); else emit newTask( i18n("Writing first session") ); } @@ -1005,7 +1005,7 @@ bool K3bMixedJob::startWriting() else if( m_doc->dummy() ) emit newTask( i18n("Simulating") ); else - emit newTask( i18n("Writing Copy %1").arg(d->copiesDone+1) ); + emit newTask( i18n("Writing Copy %1").tqarg(d->copiesDone+1) ); // if we append the second session the cd is already in the drive @@ -1070,8 +1070,8 @@ void K3bMixedJob::createIsoImage() if( !m_doc->onTheFly() ) emit newTask( i18n("Creating ISO image file") ); - emit newSubTask( i18n("Creating ISO image in %1").arg(m_isoImageFilePath) ); - emit infoMessage( i18n("Creating ISO image in %1").arg(m_isoImageFilePath), INFO ); + emit newSubTask( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath) ); + emit infoMessage( i18n("Creating ISO image in %1").tqarg(m_isoImageFilePath), INFO ); m_isoImager->writeToImageFile( m_isoImageFilePath ); m_isoImager->start(); @@ -1100,9 +1100,9 @@ void K3bMixedJob::removeBufferFiles() emit infoMessage( i18n("Removing buffer files."), INFO ); } - if( QFile::exists( m_isoImageFilePath ) ) - if( !QFile::remove( m_isoImageFilePath ) ) - emit infoMessage( i18n("Could not delete file %1.").arg(m_isoImageFilePath), ERROR ); + if( TQFile::exists( m_isoImageFilePath ) ) + if( !TQFile::remove( m_isoImageFilePath ) ) + emit infoMessage( i18n("Could not delete file %1.").tqarg(m_isoImageFilePath), ERROR ); // removes buffer images and temp toc or inf files m_tempData->cleanup(); @@ -1213,7 +1213,7 @@ void K3bMixedJob::determineWritingMode() if( m_doc->audioDoc()->cdText() ) { if( !cdrecordCdText ) { m_doc->audioDoc()->writeCdText( false ); - emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").arg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); + emit infoMessage( i18n("Cdrecord %1 does not support CD-Text writing.").tqarg(k3bcore->externalBinManager()->binObject("cdrecord")->version), ERROR ); } else if( m_usedAudioWritingMode == K3b::TAO ) { emit infoMessage( i18n("It is not possible to write CD-Text in TAO mode. Try DAO or RAW."), WARNING ); @@ -1228,18 +1228,18 @@ void K3bMixedJob::normalizeFiles() if( !m_normalizeJob ) { m_normalizeJob = new K3bAudioNormalizeJob( this, this ); - connect( m_normalizeJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_normalizeJob, SIGNAL(percent(int)), this, SLOT(slotNormalizeProgress(int)) ); - connect( m_normalizeJob, SIGNAL(subPercent(int)), this, SLOT(slotNormalizeSubProgress(int)) ); - connect( m_normalizeJob, SIGNAL(finished(bool)), this, SLOT(slotNormalizeJobFinished(bool)) ); - connect( m_normalizeJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_normalizeJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); + 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&)) ); } // add all the files - QValueVector files; + TQValueVector files; K3bAudioTrack* track = m_doc->audioDoc()->firstTrack(); while( track ) { files.append( m_tempData->bufferFileName(track) ); @@ -1310,30 +1310,30 @@ void K3bMixedJob::prepareProgressInformation() } -QString K3bMixedJob::jobDescription() const +TQString K3bMixedJob::jobDescription() const { if( m_doc->mixedType() == K3bMixedDoc::DATA_SECOND_SESSION ) return i18n("Writing Enhanced Audio CD") + ( m_doc->audioDoc()->title().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->audioDoc()->title()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) ); else return i18n("Writing Mixed Mode CD") + ( m_doc->audioDoc()->title().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->audioDoc()->title()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->audioDoc()->title()) ); } -QString K3bMixedJob::jobDetails() const +TQString K3bMixedJob::jobDetails() const { return ( i18n("%1 tracks (%2 minutes audio data, %3 ISO9660 data)") - .arg(m_doc->numOfTracks()) - .arg(m_doc->audioDoc()->length().toString()) - .arg(KIO::convertSize(m_doc->dataDoc()->size())) + .tqarg(m_doc->numOfTracks()) + .tqarg(m_doc->audioDoc()->length().toString()) + .tqarg(KIO::convertSize(m_doc->dataDoc()->size())) + ( m_doc->copies() > 1 && !m_doc->dummy() ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3bmixedjob.moc" diff --git a/libk3b/projects/mixedcd/k3bmixedjob.h b/libk3b/projects/mixedcd/k3bmixedjob.h index 50a1dc7..a00a0ce 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.h +++ b/libk3b/projects/mixedcd/k3bmixedjob.h @@ -23,8 +23,8 @@ class K3bMixedDoc; class K3bIsoImager; class K3bAudioImager; -class QFile; -class QDataStream; +class TQFile; +class TQDataStream; class K3bAbstractWriter; class K3bWaveFileWriter; class KTempFile; @@ -40,16 +40,17 @@ class K3bDevice::Device; class K3bMixedJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bMixedJob(); K3bDoc* doc() const; K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void cancel(); @@ -109,7 +110,7 @@ class K3bMixedJob : public K3bBurnJob K3bMsInfoFetcher* m_msInfoFetcher; K3bAudioNormalizeJob* m_normalizeJob; - QString m_isoImageFilePath; + TQString m_isoImageFilePath; KTempFile* m_tocFile; @@ -133,7 +134,7 @@ class K3bMixedJob : public K3bBurnJob int m_usedDataWritingMode; int m_usedAudioWritingMode; - QString m_tempFilePrefix; + TQString m_tempFilePrefix; K3b::Msf m_projectSize; diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index f7b2198..5b5ea82 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -30,15 +30,15 @@ #include #include -#include -#include +#include +#include -K3bMovixDoc::K3bMovixDoc( QObject* parent ) - : K3bDataDoc( parent ) +K3bMovixDoc::K3bMovixDoc( TQObject* tqparent ) + : K3bDataDoc( tqparent ) { - connect( this, SIGNAL(itemRemoved(K3bDataItem*)), - this, SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( this, TQT_SIGNAL(itemRemoved(K3bDataItem*)), + this, TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); } @@ -47,9 +47,9 @@ K3bMovixDoc::~K3bMovixDoc() } -K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bMovixJob( this, hdl, parent ); + return new K3bMovixJob( this, hdl, tqparent ); } @@ -79,11 +79,11 @@ void K3bMovixDoc::addMovixFile( const KURL& _url, int pos ) { KURL url = K3b::convertToLocalUrl( _url ); - QFileInfo f( url.path() ); + TQFileInfo f( url.path() ); if( !f.isFile() || !url.isLocalFile() ) return; - QString newName = f.fileName(); + TQString newName = f.fileName(); if( nameAlreadyInDir( newName, root() ) ) { kapp->config()->setGroup("Data project settings"); bool dropDoubles = kapp->config()->readBoolEntry( "Drop doubles", false ); @@ -113,15 +113,15 @@ void K3bMovixDoc::addMovixFile( const KURL& _url, int pos ) } -bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) +bool K3bMovixDoc::loadDocumentData( TQDomElement* rootElem ) { if( !root() ) newDocument(); - QDomNodeList nodes = rootElem->childNodes(); + TQDomNodeList nodes = rootElem->childNodes(); if( nodes.item(0).nodeName() != "general" ) { - kdDebug() << "(K3bMovixDoc) could not find 'general' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'general' section." << endl; return false; } if( !readGeneralDocumentData( nodes.item(0).toElement() ) ) @@ -131,7 +131,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) // parse options // ----------------------------------------------------------------- if( nodes.item(1).nodeName() != "data_options" ) { - kdDebug() << "(K3bMovixDoc) could not find 'data_options' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'data_options' section." << endl; return false; } if( !loadDocumentDataOptions( nodes.item(1).toElement() ) ) @@ -143,7 +143,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) // parse header // ----------------------------------------------------------------- if( nodes.item(2).nodeName() != "data_header" ) { - kdDebug() << "(K3bMovixDoc) could not find 'data_header' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'data_header' section." << endl; return false; } if( !loadDocumentDataHeader( nodes.item(2).toElement() ) ) @@ -155,15 +155,15 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) // parse movix options // ----------------------------------------------------------------- if( nodes.item(3).nodeName() != "movix_options" ) { - kdDebug() << "(K3bMovixDoc) could not find 'movix_options' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'movix_options' section." << endl; return false; } // load the options - QDomNodeList optionList = nodes.item(3).childNodes(); + TQDomNodeList optionList = nodes.item(3).childNodes(); for( uint i = 0; i < optionList.count(); i++ ) { - QDomElement e = optionList.item(i).toElement(); + TQDomElement e = optionList.item(i).toElement(); if( e.isNull() ) return false; @@ -186,7 +186,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) else if( e.nodeName() == "keyboard_language") setKeyboardLayout( e.text() ); else if( e.nodeName() == "codecs") - setCodecs( QStringList::split( ',', e.text() ) ); + setCodecs( TQStringList::split( ',', e.text() ) ); else if( e.nodeName() == "default_boot_label") setDefaultBootLabel( e.text() ); else if( e.nodeName() == "additional_mplayer_options") @@ -203,15 +203,15 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) // parse files // ----------------------------------------------------------------- if( nodes.item(4).nodeName() != "movix_files" ) { - kdDebug() << "(K3bMovixDoc) could not find 'movix_files' section." << endl; + kdDebug() << "(K3bMovixDoc) could not tqfind 'movix_files' section." << endl; return false; } // load file items - QDomNodeList fileList = nodes.item(4).childNodes(); + TQDomNodeList fileList = nodes.item(4).childNodes(); for( uint i = 0; i < fileList.count(); i++ ) { - QDomElement e = fileList.item(i).toElement(); + TQDomElement e = fileList.item(i).toElement(); if( e.isNull() ) return false; @@ -221,7 +221,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) return false; } - QDomElement urlElem = e.firstChild().toElement(); + TQDomElement urlElem = e.firstChild().toElement(); if( urlElem.isNull() ) { kdDebug() << "(K3bMovixDoc) found file tag without url child." << endl; return false; @@ -235,7 +235,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) m_movixFiles.append( newK3bItem ); // subtitle file? - QDomElement subTitleElem = e.childNodes().item(1).toElement(); + TQDomElement subTitleElem = e.childNodes().item(1).toElement(); if( !subTitleElem.isNull() && subTitleElem.nodeName() == "subtitle_file" ) { urlElem = subTitleElem.firstChild().toElement(); if( urlElem.isNull() ) { @@ -243,7 +243,7 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) return false; } - QString name = K3bMovixFileItem::subTitleFileName( newK3bItem->k3bName() ); + TQString name = K3bMovixFileItem::subTitleFileName( newK3bItem->k3bName() ); K3bFileItem* subItem = new K3bFileItem( urlElem.text(), this, root(), name ); newK3bItem->setSubTitleItem( subItem ); } @@ -262,24 +262,24 @@ bool K3bMovixDoc::loadDocumentData( QDomElement* rootElem ) } -bool K3bMovixDoc::saveDocumentData( QDomElement* docElem ) +bool K3bMovixDoc::saveDocumentData( TQDomElement* docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); - QDomElement optionsElem = doc.createElement( "data_options" ); + TQDomElement optionsElem = doc.createElement( "data_options" ); saveDocumentDataOptions( optionsElem ); - QDomElement headerElem = doc.createElement( "data_header" ); + TQDomElement headerElem = doc.createElement( "data_header" ); saveDocumentDataHeader( headerElem ); - QDomElement movixOptElem = doc.createElement( "movix_options" ); - QDomElement movixFilesElem = doc.createElement( "movix_files" ); + TQDomElement movixOptElem = doc.createElement( "movix_options" ); + TQDomElement movixFilesElem = doc.createElement( "movix_files" ); // save the movix options - QDomElement propElem = doc.createElement( "shutdown" ); + TQDomElement propElem = doc.createElement( "shutdown" ); propElem.setAttribute( "activated", shutdown() ? "yes" : "no" ); movixOptElem.appendChild( propElem ); @@ -332,22 +332,22 @@ bool K3bMovixDoc::saveDocumentData( QDomElement* docElem ) movixOptElem.appendChild( propElem ); propElem = doc.createElement( "loop_playlist" ); - propElem.appendChild( doc.createTextNode( QString::number(loopPlaylist()) ) ); + propElem.appendChild( doc.createTextNode( TQString::number(loopPlaylist()) ) ); movixOptElem.appendChild( propElem ); // save the movix items - for( QPtrListIterator it( m_movixFiles ); + for( TQPtrListIterator it( m_movixFiles ); *it; ++it ) { K3bMovixFileItem* item = *it; - QDomElement topElem = doc.createElement( "file" ); + TQDomElement topElem = doc.createElement( "file" ); topElem.setAttribute( "name", item->k3bName() ); - QDomElement urlElem = doc.createElement( "url" ); + TQDomElement urlElem = doc.createElement( "url" ); urlElem.appendChild( doc.createTextNode( item->localPath() ) ); topElem.appendChild( urlElem ); if( item->subTitleItem() ) { - QDomElement subElem = doc.createElement( "subtitle_file" ); + TQDomElement subElem = doc.createElement( "subtitle_file" ); urlElem = doc.createElement( "url" ); urlElem.appendChild( doc.createTextNode( item->subTitleItem()->localPath() ) ); subElem.appendChild( urlElem ); @@ -370,7 +370,7 @@ void K3bMovixDoc::slotDataItemRemoved( K3bDataItem* item ) { // check if it's a movix item if( K3bMovixFileItem* fi = dynamic_cast(item) ) - if( m_movixFiles.containsRef( fi ) ) { + if( m_movixFiles.tqcontainsRef( fi ) ) { emit movixItemRemoved( fi ); m_movixFiles.removeRef( fi ); setModified(true); @@ -380,7 +380,7 @@ void K3bMovixDoc::slotDataItemRemoved( K3bDataItem* item ) int K3bMovixDoc::indexOf( K3bMovixFileItem* item ) { - return m_movixFiles.findRef(item)+1; + return m_movixFiles.tqfindRef(item)+1; } @@ -390,12 +390,12 @@ void K3bMovixDoc::moveMovixItem( K3bMovixFileItem* item, K3bMovixFileItem* itemA return; // set the current item to track - m_movixFiles.findRef( item ); + m_movixFiles.tqfindRef( item ); // take the current item item = m_movixFiles.take(); - // if after == 0 findRef returnes -1 - int pos = m_movixFiles.findRef( itemAfter ); + // if after == 0 tqfindRef returnes -1 + int pos = m_movixFiles.tqfindRef( itemAfter ); m_movixFiles.insert( pos+1, item ); emit newMovixFileItems(); @@ -409,15 +409,15 @@ void K3bMovixDoc::addSubTitleItem( K3bMovixFileItem* item, const KURL& url ) if( item->subTitleItem() ) removeSubTitleItem( item ); - QFileInfo f( url.path() ); + TQFileInfo f( url.path() ); if( !f.isFile() || !url.isLocalFile() ) return; // check if there already is a file named like we want to name the subTitle file - QString name = K3bMovixFileItem::subTitleFileName( item->k3bName() ); + TQString name = K3bMovixFileItem::subTitleFileName( item->k3bName() ); if( nameAlreadyInDir( name, root() ) ) { - KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").arg(name) ); + KMessageBox::error( 0, i18n("Could not rename subtitle file. File with requested name %1 already exists.").tqarg(name) ); return; } diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h index 53debfc..cd46dbf 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.h +++ b/libk3b/projects/movixcd/k3bmovixdoc.h @@ -20,11 +20,11 @@ #include -#include +#include #include "k3b_export.h" //class K3bView; class KURL; -class QDomElement; +class TQDomElement; class K3bFileItem; class K3bMovixFileItem; class K3bDataItem; @@ -34,18 +34,19 @@ class KConfig; class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc { Q_OBJECT + TQ_OBJECT public: - K3bMovixDoc( QObject* parent = 0 ); + K3bMovixDoc( TQObject* tqparent = 0 ); virtual ~K3bMovixDoc(); virtual int type() const { return MOVIX; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); bool newDocument(); - const QPtrList& movixFileItems() const { return m_movixFiles; } + const TQPtrList& movixFileItems() const { return m_movixFiles; } int indexOf( K3bMovixFileItem* ); @@ -54,14 +55,14 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc bool reboot() const { return m_reboot; } bool ejectDisk() const { return m_ejectDisk; } bool randomPlay() const { return m_randomPlay; } - const QString& subtitleFontset() const { return m_subtitleFontset; } - const QString& bootMessageLanguage() const { return m_bootMessageLanguage; } - const QString& audioBackground() const { return m_audioBackground; } - const QString& keyboardLayout() const { return m_keyboardLayout; } - const QStringList& codecs() const { return m_codecs; } - const QString& defaultBootLabel() const { return m_defaultBootLabel; } - const QString& additionalMPlayerOptions() const { return m_additionalMPlayerOptions; } - const QString& unwantedMPlayerOptions() const { return m_unwantedMPlayerOptions; } + const TQString& subtitleFontset() const { return m_subtitleFontset; } + const TQString& bootMessageLanguage() const { return m_bootMessageLanguage; } + const TQString& audioBackground() const { return m_audioBackground; } + const TQString& keyboardLayout() const { return m_keyboardLayout; } + const TQStringList& codecs() const { return m_codecs; } + const TQString& defaultBootLabel() const { return m_defaultBootLabel; } + const TQString& additionalMPlayerOptions() const { return m_additionalMPlayerOptions; } + const TQString& unwantedMPlayerOptions() const { return m_unwantedMPlayerOptions; } int loopPlaylist() const { return m_loopPlaylist; } bool noDma() const { return m_noDma; } @@ -69,14 +70,14 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc void setReboot( bool v ) { m_reboot = v; } void setEjectDisk( bool v ) { m_ejectDisk = v; } void setRandomPlay( bool v ) { m_randomPlay = v; } - void setSubtitleFontset( const QString& v ) { m_subtitleFontset = v; } - void setBootMessageLanguage( const QString& v ) { m_bootMessageLanguage = v; } - void setAudioBackground( const QString& b ) { m_audioBackground = b; } - void setKeyboardLayout( const QString& l ) { m_keyboardLayout = l; } - void setCodecs( const QStringList& c ) { m_codecs = c; } - void setDefaultBootLabel( const QString& v ) { m_defaultBootLabel = v; } - void setAdditionalMPlayerOptions( const QString& v ) { m_additionalMPlayerOptions = v; } - void setUnwantedMPlayerOptions( const QString& v ) { m_unwantedMPlayerOptions = v; } + void setSubtitleFontset( const TQString& v ) { m_subtitleFontset = v; } + void setBootMessageLanguage( const TQString& v ) { m_bootMessageLanguage = v; } + void setAudioBackground( const TQString& b ) { m_audioBackground = b; } + void setKeyboardLayout( const TQString& l ) { m_keyboardLayout = l; } + void setCodecs( const TQStringList& c ) { m_codecs = c; } + void setDefaultBootLabel( const TQString& v ) { m_defaultBootLabel = v; } + void setAdditionalMPlayerOptions( const TQString& v ) { m_additionalMPlayerOptions = v; } + void setUnwantedMPlayerOptions( const TQString& v ) { m_unwantedMPlayerOptions = v; } void setLoopPlaylist( int v ) { m_loopPlaylist = v; } void setNoDma( bool b ) { m_noDma = b; } @@ -94,30 +95,30 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc protected: /** reimplemented from K3bDoc */ - bool loadDocumentData( QDomElement* root ); + bool loadDocumentData( TQDomElement* root ); /** reimplemented from K3bDoc */ - bool saveDocumentData( QDomElement* ); + bool saveDocumentData( TQDomElement* ); - virtual QString typeString() const { return "movix"; } + virtual TQString typeString() const { return "movix"; } private slots: void slotDataItemRemoved( K3bDataItem* ); private: - QPtrList m_movixFiles; + TQPtrList m_movixFiles; bool m_shutdown; bool m_reboot; bool m_ejectDisk; bool m_randomPlay; - QString m_subtitleFontset; - QString m_bootMessageLanguage; - QString m_audioBackground; - QString m_keyboardLayout; - QStringList m_codecs; - QString m_defaultBootLabel; - QString m_additionalMPlayerOptions; - QString m_unwantedMPlayerOptions; + TQString m_subtitleFontset; + TQString m_bootMessageLanguage; + TQString m_audioBackground; + TQString m_keyboardLayout; + TQStringList m_codecs; + TQString m_defaultBootLabel; + TQString m_additionalMPlayerOptions; + TQString m_unwantedMPlayerOptions; int m_loopPlaylist; bool m_noDma; }; diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 57e18af..04afd83 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include class K3bMovixDocPreparer::Private @@ -62,14 +62,14 @@ public: K3bDirItem* mplayerDir; K3bFileItem* playlistFileItem; - QPtrList newMovixItems; + TQPtrList newMovixItems; bool structuresCreated; }; -K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bJob( jh, parent, name ) +K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bJob( jh, tqparent, name ) { d = new Private(); d->doc = doc; @@ -175,11 +175,11 @@ bool K3bMovixDocPreparer::writePlaylistFile() d->playlistFile = new KTempFile(); d->playlistFile->setAutoDelete(true); - if( QTextStream* s = d->playlistFile->textStream() ) { + if( TQTextStream* s = d->playlistFile->textStream() ) { - const QPtrList& movixFileItems = d->doc->movixFileItems(); + const TQPtrList& movixFileItems = d->doc->movixFileItems(); - for( QPtrListIterator it( movixFileItems ); + for( TQPtrListIterator it( movixFileItems ); *it; ++it ) { *s << "/cdrom/"; *s << it.current()->writtenName(); @@ -190,33 +190,33 @@ bool K3bMovixDocPreparer::writePlaylistFile() return true; } else { - emit infoMessage( i18n("Could not write to temporary file %1").arg(d->playlistFile->name()), ERROR ); + emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->playlistFile->name()), ERROR ); return false; } } -bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const QString& originalPath ) +bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const TQString& originalPath ) { delete d->isolinuxConfigFile; d->isolinuxConfigFile = new KTempFile(); d->isolinuxConfigFile->setAutoDelete(true); - if( QTextStream* s = d->isolinuxConfigFile->textStream() ) { + if( TQTextStream* s = d->isolinuxConfigFile->textStream() ) { - // now open the default isolinux.cfg and copy everything except the first line which contains + // now open the default isolinux.cfg and copy everything except the first line which tqcontains // the default boot label - QFile f( originalPath ); + TQFile f( originalPath ); if( f.open( IO_ReadOnly ) ) { - QTextStream isolinuxConfigOrig( &f ); + TQTextStream isolinuxConfigOrig( &f ); if( d->doc->defaultBootLabel() != i18n("default") ) { isolinuxConfigOrig.readLine(); // skip first line *s << "default " << d->doc->defaultBootLabel() << endl; } - QString line = isolinuxConfigOrig.readLine(); + TQString line = isolinuxConfigOrig.readLine(); while( !line.isNull() ) { *s << line << endl; line = isolinuxConfigOrig.readLine(); @@ -229,7 +229,7 @@ bool K3bMovixDocPreparer::writeIsolinuxConfigFile( const QString& originalPath ) return false; } else { - emit infoMessage( i18n("Could not write to temporary file %1").arg(d->isolinuxConfigFile->name()), ERROR ); + emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->isolinuxConfigFile->name()), ERROR ); return false; } } @@ -241,7 +241,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile() d->movixRcFile = new KTempFile(); d->movixRcFile->setAutoDelete(true); - if( QTextStream* s = d->movixRcFile->textStream() ) { + if( TQTextStream* s = d->movixRcFile->textStream() ) { if( !d->doc->additionalMPlayerOptions().isEmpty() ) *s << "extra-mplayer-options=" << d->doc->additionalMPlayerOptions() << endl; @@ -263,7 +263,7 @@ bool K3bMovixDocPreparer::writeMovixRcFile() return true; } else { - emit infoMessage( i18n("Could not write to temporary file %1").arg(d->movixRcFile->name()), ERROR ); + emit infoMessage( i18n("Could not write to temporary file %1").tqarg(d->movixRcFile->name()), ERROR ); return false; } } @@ -297,28 +297,28 @@ bool K3bMovixDocPreparer::addMovixFiles() // the following sucks! Redesign it! // add all the isolinux files - QStringList isolinuxFiles = d->eMovixBin->isolinuxFiles(); + TQStringList isolinuxFiles = d->eMovixBin->isolinuxFiles(); isolinuxFiles.remove( "isolinux.bin" ); isolinuxFiles.remove( "isolinux.cfg" ); isolinuxFiles.remove( "kernel/vmlinuz" ); - for( QStringList::const_iterator it = isolinuxFiles.begin(); + for( TQStringList::const_iterator it = isolinuxFiles.begin(); it != isolinuxFiles.end(); ++it ) { - QString path = d->eMovixBin->path + "/isolinux/" + *it; + TQString path = d->eMovixBin->path + "/isolinux/" + *it; (void)new K3bFileItem( path, d->doc, d->isolinuxDir ); } - const QStringList& movixFiles = d->eMovixBin->movixFiles(); - for( QStringList::const_iterator it = movixFiles.begin(); + const TQStringList& movixFiles = d->eMovixBin->movixFiles(); + for( TQStringList::const_iterator it = movixFiles.begin(); it != movixFiles.end(); ++it ) { - QString path = d->eMovixBin->path + "/movix/" + *it; + TQString path = d->eMovixBin->path + "/movix/" + *it; (void)new K3bFileItem( path, d->doc, d->movixDir ); } // add doku files - QString path = d->eMovixBin->languageDir( d->doc->bootMessageLanguage() ); - QDir dir(path); - QStringList helpFiles = dir.entryList(QDir::Files); - for( QStringList::const_iterator it = helpFiles.begin(); + TQString path = d->eMovixBin->languageDir( d->doc->bootMessageLanguage() ); + TQDir dir(path); + TQStringList helpFiles = dir.entryList(TQDir::Files); + for( TQStringList::const_iterator it = helpFiles.begin(); it != helpFiles.end(); ++it ) { // some emovix installations include backup-files, no one's perfect ;) if( !(*it).endsWith( "~" ) ) @@ -331,13 +331,13 @@ bool K3bMovixDocPreparer::addMovixFiles() d->doc->subtitleFontset() != i18n("none") ) { d->mplayerDir = new K3bDirItem( "mplayer", d->doc, d->doc->root() ); - QString fontPath = d->eMovixBin->subtitleFontDir( d->doc->subtitleFontset() ); - QFileInfo fontType( fontPath ); + TQString fontPath = d->eMovixBin->subtitleFontDir( d->doc->subtitleFontset() ); + TQFileInfo fontType( fontPath ); if( fontType.isDir() ) { K3bDirItem* fontDir = new K3bDirItem( "font", d->doc, d->mplayerDir ); - QDir dir( fontPath ); - QStringList fontFiles = dir.entryList( QDir::Files ); - for( QStringList::const_iterator it = fontFiles.begin(); + TQDir dir( fontPath ); + TQStringList fontFiles = dir.entryList( TQDir::Files ); + for( TQStringList::const_iterator it = fontFiles.begin(); it != fontFiles.end(); ++it ) { (void)new K3bFileItem( fontPath + "/" + *it, d->doc, fontDir ); } @@ -378,16 +378,16 @@ bool K3bMovixDocPreparer::addMovixFilesNew() // 4. set weights for isolinux files // FIXME: use the settings from the doc - QStringList files = d->eMovixBin->files( d->doc->keyboardLayout(), + TQStringList files = d->eMovixBin->files( d->doc->keyboardLayout(), d->doc->subtitleFontset(), d->doc->audioBackground(), d->doc->bootMessageLanguage(), "all" /*d->doc->codecs()*/ ); // for now we simply don't allow selection - for( QStringList::iterator it = files.begin(); it != files.end(); ++it ) { - QString docPath = (*it).section( ' ', 0, 0 ); - QString filePath = (*it).section( ' ', 1, 1 ); - QString fileName = filePath.section( '/', -1 ); + for( TQStringList::iterator it = files.begin(); it != files.end(); ++it ) { + TQString docPath = (*it).section( ' ', 0, 0 ); + TQString filePath = (*it).section( ' ', 1, 1 ); + TQString fileName = filePath.section( '/', -1 ); if( fileName == "isolinux.cfg" ) { // replace the local file with our modified one @@ -406,7 +406,7 @@ bool K3bMovixDocPreparer::addMovixFilesNew() // set the proper sort weight bootItem->setSortWeight( 200 ); - bootItem->parent()->setSortWeight( 100 ); + bootItem->tqparent()->setSortWeight( 100 ); } else if( fileName != "movixrc" ) { // we create our own movixrc K3bFileItem* item = createItem( filePath, docPath ); @@ -424,10 +424,10 @@ bool K3bMovixDocPreparer::addMovixFilesNew() // eMovix supplied codecs. These codecs are not picked up by the movix-conf script K3bDirItem* codecDir = dynamic_cast( d->doc->root()->findByPath( "/eMoviX/codecs" ) ); if( !codecDir || codecDir->isEmpty() ) { - QDir localCodecDir( d->eMovixBin->movixDataDir() + "/codecs" ); + TQDir localCodecDir( d->eMovixBin->movixDataDir() + "/codecs" ); if( localCodecDir.exists() ) { - QStringList codecFiles = localCodecDir.entryList( QDir::Files ); - for( QStringList::const_iterator it = codecFiles.begin(); it != codecFiles.end(); ++it ) + TQStringList codecFiles = localCodecDir.entryList( TQDir::Files ); + for( TQStringList::const_iterator it = codecFiles.begin(); it != codecFiles.end(); ++it ) createItem( localCodecDir.path() + '/' + *it, "/eMoviX/codecs" ); } } @@ -443,7 +443,7 @@ bool K3bMovixDocPreparer::addMovixFilesNew() } -K3bFileItem* K3bMovixDocPreparer::createItem( const QString& localPath, const QString& docPath ) +K3bFileItem* K3bMovixDocPreparer::createItem( const TQString& localPath, const TQString& docPath ) { // make sure the path in the doc exists K3bDirItem* dir = createDir( docPath ); @@ -459,12 +459,12 @@ K3bFileItem* K3bMovixDocPreparer::createItem( const QString& localPath, const QS } -K3bDirItem* K3bMovixDocPreparer::createDir( const QString& docPath ) +K3bDirItem* K3bMovixDocPreparer::createDir( const TQString& docPath ) { - QStringList docPathSections = QStringList::split( '/', docPath ); + TQStringList docPathSections = TQStringList::split( '/', docPath ); K3bDirItem* dir = d->doc->root(); - for( QStringList::iterator it = docPathSections.begin(); it != docPathSections.end(); ++it ) { - K3bDataItem* next = dir->find( *it ); + for( TQStringList::iterator it = docPathSections.begin(); it != docPathSections.end(); ++it ) { + K3bDataItem* next = dir->tqfind( *it ); if( !next ) dir = new K3bDirItem( *it, d->doc, dir ); else if( next->isDir() ) @@ -478,9 +478,9 @@ K3bDirItem* K3bMovixDocPreparer::createDir( const QString& docPath ) // remember the dir to remove it if( dir != d->doc->root() ) { K3bDirItem* delDir = dir; - while( delDir->parent() != d->doc->root() ) - delDir = delDir->parent(); - if( d->newMovixItems.findRef( delDir ) == -1 ) + while( delDir->tqparent() != d->doc->root() ) + delDir = delDir->tqparent(); + if( d->newMovixItems.tqfindRef( delDir ) == -1 ) d->newMovixItems.append( delDir ); } diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.h b/libk3b/projects/movixcd/k3bmovixdocpreparer.h index 3844eae..8d4ba1e 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.h +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.h @@ -30,9 +30,10 @@ class K3bDirItem; class K3bMovixDocPreparer : public K3bJob { Q_OBJECT + TQ_OBJECT public: - explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bMovixDocPreparer(); K3bMovixDoc* doc() const; @@ -53,12 +54,12 @@ class K3bMovixDocPreparer : public K3bJob private: bool writePlaylistFile(); - bool writeIsolinuxConfigFile( const QString& ); + bool writeIsolinuxConfigFile( const TQString& ); bool writeMovixRcFile(); bool addMovixFiles(); bool addMovixFilesNew(); - K3bFileItem* createItem( const QString& localPath, const QString& docPath ); - K3bDirItem* createDir( const QString& docPath ); + K3bFileItem* createItem( const TQString& localPath, const TQString& docPath ); + K3bDirItem* createDir( const TQString& docPath ); class Private; Private* d; diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.cpp b/libk3b/projects/movixcd/k3bmovixfileitem.cpp index 12803a2..ccc387f 100644 --- a/libk3b/projects/movixcd/k3bmovixfileitem.cpp +++ b/libk3b/projects/movixcd/k3bmovixfileitem.cpp @@ -20,10 +20,10 @@ #include -K3bMovixFileItem::K3bMovixFileItem( const QString& fileName, +K3bMovixFileItem::K3bMovixFileItem( const TQString& fileName, K3bMovixDoc* doc, K3bDirItem* dir, - const QString& k3bName ) + const TQString& k3bName ) : K3bFileItem( fileName, doc, dir, k3bName ), m_doc(doc), m_subTitleItem(0) @@ -36,16 +36,16 @@ K3bMovixFileItem::~K3bMovixFileItem() if( m_subTitleItem ) m_doc->removeSubTitleItem( this ); - // remove this from parentdir + // remove this from tqparentdir // it is important to do it here and not // rely on the K3bFileItem destructor becasue // otherwise the doc is not informed early enough - if( parent() ) - parent()->takeDataItem( this ); + if( tqparent() ) + tqparent()->takeDataItem( this ); } -void K3bMovixFileItem::setK3bName( const QString& newName ) +void K3bMovixFileItem::setK3bName( const TQString& newName ) { K3bFileItem::setK3bName( newName ); @@ -56,11 +56,11 @@ void K3bMovixFileItem::setK3bName( const QString& newName ) } -QString K3bMovixFileItem::subTitleFileName( const QString& name ) +TQString K3bMovixFileItem::subTitleFileName( const TQString& name ) { // remove ending from k3bName - QString subName = name; - int pos = subName.findRev("."); + TQString subName = name; + int pos = subName.tqfindRev("."); if( pos > 0 ) subName.truncate( pos ); subName += ".sub"; diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.h b/libk3b/projects/movixcd/k3bmovixfileitem.h index 343f00b..a605434 100644 --- a/libk3b/projects/movixcd/k3bmovixfileitem.h +++ b/libk3b/projects/movixcd/k3bmovixfileitem.h @@ -25,7 +25,7 @@ class K3bMovixDoc; class K3bMovixFileItem : public K3bFileItem { public: - K3bMovixFileItem( const QString& fileName, K3bMovixDoc* doc, K3bDirItem* dir, const QString& k3bName = 0 ); + K3bMovixFileItem( const TQString& fileName, K3bMovixDoc* doc, K3bDirItem* dir, const TQString& k3bName = 0 ); ~K3bMovixFileItem(); K3bFileItem* subTitleItem() const { return m_subTitleItem; } @@ -35,13 +35,13 @@ class K3bMovixFileItem : public K3bFileItem * reimplemented from K3bDataItem * also renames the subTitleItem */ - void setK3bName( const QString& ); + void setK3bName( const TQString& ); /** * returnes the name that the subtitle file must have in * order to work with mplayer */ - static QString subTitleFileName( const QString& ); + static TQString subTitleFileName( const TQString& ); private: K3bMovixDoc* m_doc; diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp index 2579453..220a8da 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.cpp +++ b/libk3b/projects/movixcd/k3bmovixjob.cpp @@ -27,34 +27,34 @@ #include -K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, QObject* parent ) - : K3bBurnJob( jh, parent ), +K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) + : K3bBurnJob( jh, tqparent ), m_doc(doc) { m_dataJob = new K3bDataJob( doc, this, this ); m_movixDocPreparer = new K3bMovixDocPreparer( doc, this, this ); // pipe signals - connect( m_dataJob, SIGNAL(percent(int)), this, SIGNAL(percent(int)) ); - connect( m_dataJob, SIGNAL(subPercent(int)), this, SIGNAL(subPercent(int)) ); - connect( m_dataJob, SIGNAL(processedSubSize(int, int)), this, SIGNAL(processedSubSize(int, int)) ); - connect( m_dataJob, SIGNAL(processedSize(int, int)), this, SIGNAL(processedSize(int, int)) ); - connect( m_dataJob, SIGNAL(bufferStatus(int)), this, SIGNAL(bufferStatus(int)) ); - connect( m_dataJob, SIGNAL(deviceBuffer(int)), this, SIGNAL(deviceBuffer(int)) ); - connect( m_dataJob, SIGNAL(writeSpeed(int, int)), this, SIGNAL(writeSpeed(int, int)) ); - connect( m_dataJob, SIGNAL(newTask(const QString&)), this, SIGNAL(newTask(const QString&)) ); - connect( m_dataJob, SIGNAL(newSubTask(const QString&)), this, SIGNAL(newSubTask(const QString&)) ); - connect( m_dataJob, SIGNAL(debuggingOutput(const QString&, const QString&)), - this, SIGNAL(debuggingOutput(const QString&, const QString&)) ); - connect( m_dataJob, SIGNAL(infoMessage(const QString&, int)), - this, SIGNAL(infoMessage(const QString&, int)) ); - connect( m_dataJob, SIGNAL(burning(bool)), this, SIGNAL(burning(bool)) ); + 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(buffertqStatus(int)), this, TQT_SIGNAL(buffertqStatus(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)) ); // we need to clean up here - connect( m_dataJob, SIGNAL(finished(bool)), this, SLOT(slotDataJobFinished(bool)) ); + connect( m_dataJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotDataJobFinished(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)) ); } @@ -110,23 +110,23 @@ void K3bMovixJob::slotDataJobFinished( bool success ) } -QString K3bMovixJob::jobDescription() const +TQString K3bMovixJob::jobDescription() const { if( m_doc->isoOptions().volumeID().isEmpty() ) return i18n("Writing eMovix CD"); else - return i18n("Writing eMovix CD (%1)").arg(m_doc->isoOptions().volumeID()); + return i18n("Writing eMovix CD (%1)").tqarg(m_doc->isoOptions().volumeID()); } -QString K3bMovixJob::jobDetails() const +TQString K3bMovixJob::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 "k3bmovixjob.moc" diff --git a/libk3b/projects/movixcd/k3bmovixjob.h b/libk3b/projects/movixcd/k3bmovixjob.h index 81dea8e..d1689f6 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.h +++ b/libk3b/projects/movixcd/k3bmovixjob.h @@ -31,16 +31,17 @@ class K3bFileItem; class K3bMovixJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, QObject* parent = 0 ); + K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 ); ~K3bMovixJob(); K3bDoc* doc() const; K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp index 8720e8d..522e700 100644 --- a/libk3b/projects/movixcd/k3bmovixprogram.cpp +++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include K3bMovixProgram::K3bMovixProgram() @@ -31,17 +31,17 @@ K3bMovixProgram::K3bMovixProgram() { } -bool K3bMovixProgram::scan( const QString& p ) +bool K3bMovixProgram::scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; + TQString path = p; if( path[path.length()-1] != '/' ) path.append("/"); // first test if we have a version info (eMovix >= 0.8.0pre3) - if( !QFile::exists( path + "movix-version" ) ) + if( !TQFile::exists( path + "movix-version" ) ) return false; K3bMovixBin* bin = 0; @@ -74,19 +74,19 @@ bool K3bMovixProgram::scan( const QString& p ) } -bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const QString& path ) +bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const TQString& path ) { - QStringList files = bin->files(); - for( QStringList::iterator it = files.begin(); + TQStringList files = bin->files(); + for( TQStringList::iterator it = files.begin(); it != files.end(); ++it ) { - if( (*it).contains( "isolinux.cfg" ) ) { - bin->m_supportedBootLabels = determineSupportedBootLabels( QStringList::split( " ", *it )[1] ); + if( (*it).tqcontains( "isolinux.cfg" ) ) { + bin->m_supportedBootLabels = determineSupportedBootLabels( TQStringList::split( " ", *it )[1] ); break; } } // here we simply check for the movix-conf program - if( QFile::exists( path + "movix-conf" ) ) { + if( TQFile::exists( path + "movix-conf" ) ) { bin->addFeature( "newfiles" ); addBin(bin); return true; @@ -98,29 +98,29 @@ bool K3bMovixProgram::scanNewEMovix( K3bMovixBin* bin, const QString& path ) } -bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) +bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const TQString& path ) { // // first check if all necessary directories are present // - QDir dir( bin->movixDataDir() ); - QStringList subdirs = dir.entryList( QDir::Dirs ); - if( !subdirs.contains( "boot-messages" ) ) { + TQDir dir( bin->movixDataDir() ); + TQStringList subdirs = dir.entryList( TQDir::Dirs ); + if( !subdirs.tqcontains( "boot-messages" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'boot-messages'" << endl; delete bin; return false; } - if( !subdirs.contains( "isolinux" ) ) { + if( !subdirs.tqcontains( "isolinux" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'isolinux'" << endl; delete bin; return false; } - if( !subdirs.contains( "movix" ) ) { + if( !subdirs.tqcontains( "movix" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'movix'" << endl; delete bin; return false; } - if( !subdirs.contains( "mplayer-fonts" ) ) { + if( !subdirs.tqcontains( "mplayer-fonts" ) ) { kdDebug() << "(K3bMovixProgram) could not find subdir 'mplayer-fonts'" << endl; delete bin; return false; @@ -130,14 +130,14 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // // check if we have a version of eMovix which contains the movix-files script // - if( QFile::exists( path + "movix-files" ) ) { + if( TQFile::exists( path + "movix-files" ) ) { bin->addFeature( "files" ); KProcess p; K3bProcessOutputCollector out( &p ); p << bin->path + "movix-files"; if( p.start( KProcess::Block, KProcess::AllOutput ) ) { - bin->m_movixFiles = QStringList::split( "\n", out.output() ); + bin->m_movixFiles = TQStringList::split( "\n", out.output() ); } } @@ -145,8 +145,8 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // fallback: to be compatible with 0.8.0rc2 we just add all files in the movix directory // if( bin->m_movixFiles.isEmpty() ) { - QDir dir( bin->movixDataDir() + "/movix" ); - bin->m_movixFiles = dir.entryList(QDir::Files); + TQDir dir( bin->movixDataDir() + "/movix" ); + bin->m_movixFiles = dir.entryList(TQDir::Files); } // @@ -164,9 +164,9 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // // check every single necessary file :( // - for( QStringList::const_iterator it = bin->m_isolinuxFiles.begin(); + for( TQStringList::const_iterator it = bin->m_isolinuxFiles.begin(); it != bin->m_isolinuxFiles.end(); ++it ) { - if( !QFile::exists( bin->movixDataDir() + "/isolinux/" + *it ) ) { + if( !TQFile::exists( bin->movixDataDir() + "/isolinux/" + *it ) ) { kdDebug() << "(K3bMovixProgram) Could not find file " << *it << endl; delete bin; return false; @@ -177,7 +177,7 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // now check the boot-messages languages // dir.cd( "boot-messages" ); - bin->m_supportedLanguages = dir.entryList(QDir::Dirs); + bin->m_supportedLanguages = dir.entryList(TQDir::Dirs); bin->m_supportedLanguages.remove("."); bin->m_supportedLanguages.remove(".."); bin->m_supportedLanguages.remove("CVS"); // the eMovix makefile stuff seems not perfect ;) @@ -189,12 +189,12 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) // FIXME: every font dir needs to contain the "font.desc" file! // dir.cd( "mplayer-fonts" ); - bin->m_supportedSubtitleFonts = dir.entryList( QDir::Dirs ); + bin->m_supportedSubtitleFonts = dir.entryList( TQDir::Dirs ); bin->m_supportedSubtitleFonts.remove("."); bin->m_supportedSubtitleFonts.remove(".."); bin->m_supportedSubtitleFonts.remove("CVS"); // the eMovix makefile stuff seems not perfect ;) // new ttf fonts in 0.8.0rc2 - bin->m_supportedSubtitleFonts += dir.entryList( "*.ttf", QDir::Files ); + bin->m_supportedSubtitleFonts += dir.entryList( "*.ttf", TQDir::Files ); bin->m_supportedSubtitleFonts.prepend( i18n("none") ); dir.cdUp(); @@ -213,17 +213,17 @@ bool K3bMovixProgram::scanOldEMovix( K3bMovixBin* bin, const QString& path ) } -QStringList K3bMovixProgram::determineSupportedBootLabels( const QString& isoConfigFile ) const +TQStringList K3bMovixProgram::determineSupportedBootLabels( const TQString& isoConfigFile ) const { - QStringList list( i18n("default") ); + TQStringList list( i18n("default") ); - QFile f( isoConfigFile ); + TQFile f( isoConfigFile ); if( !f.open( IO_ReadOnly ) ) { kdDebug() << "(K3bMovixProgram) could not open file '" << f.name() << "'" << endl; } else { - QTextStream fs( &f ); - QString line = fs.readLine(); + TQTextStream fs( &f ); + TQString line = fs.readLine(); while( !line.isNull() ) { if( line.startsWith( "label" ) ) list.append( line.mid( 5 ).stripWhiteSpace() ); @@ -237,84 +237,84 @@ QStringList K3bMovixProgram::determineSupportedBootLabels( const QString& isoCon } -QString K3bMovixBin::subtitleFontDir( const QString& font ) const +TQString K3bMovixBin::subtitleFontDir( const TQString& font ) const { if( font == i18n("none" ) ) return ""; - else if( m_supportedSubtitleFonts.contains( font ) ) + else if( m_supportedSubtitleFonts.tqcontains( font ) ) return path + "/mplayer-fonts/" + font; else return ""; } -QString K3bMovixBin::languageDir( const QString& lang ) const +TQString K3bMovixBin::languageDir( const TQString& lang ) const { if( lang == i18n("default") ) return languageDir( "en" ); - else if( m_supportedLanguages.contains( lang ) ) + else if( m_supportedLanguages.tqcontains( lang ) ) return path + "/boot-messages/" + lang; else return ""; } -QStringList K3bMovixBin::supportedSubtitleFonts() const +TQStringList K3bMovixBin::supportedSubtitleFonts() const { if( version >= K3bVersion( 0, 9, 0 ) ) - return QStringList( i18n("default") ) += supported( "font" ); + return TQStringList( i18n("default") ) += supported( "font" ); else return m_supportedSubtitleFonts; } -QStringList K3bMovixBin::supportedLanguages() const +TQStringList K3bMovixBin::supportedLanguages() const { if( version >= K3bVersion( 0, 9, 0 ) ) - return QStringList( i18n("default") ) += supported( "lang" ); + return TQStringList( i18n("default") ) += supported( "lang" ); else return m_supportedLanguages; } // only used for eMovix >= 0.9.0 -QStringList K3bMovixBin::supportedKbdLayouts() const +TQStringList K3bMovixBin::supportedKbdLayouts() const { - return QStringList( i18n("default") ) += supported( "kbd" ); + return TQStringList( i18n("default") ) += supported( "kbd" ); } // only used for eMovix >= 0.9.0 -QStringList K3bMovixBin::supportedBackgrounds() const +TQStringList K3bMovixBin::supportedBackgrounds() const { - return QStringList( i18n("default") ) += supported( "background" ); + return TQStringList( i18n("default") ) += supported( "background" ); } // only used for eMovix >= 0.9.0 -QStringList K3bMovixBin::supportedCodecs() const +TQStringList K3bMovixBin::supportedCodecs() const { return supported( "codecs" ); } -QStringList K3bMovixBin::supported( const QString& type ) const +TQStringList K3bMovixBin::supported( const TQString& type ) const { KProcess p; K3bProcessOutputCollector out( &p ); p << path + "movix-conf" << "--supported=" + type; if( p.start( KProcess::Block, KProcess::AllOutput ) ) - return QStringList::split( "\n", out.output() ); + return TQStringList::split( "\n", out.output() ); else - return QStringList(); + return TQStringList(); } -QStringList K3bMovixBin::files( const QString& kbd, - const QString& font, - const QString& bg, - const QString& lang, - const QStringList& codecs ) const +TQStringList K3bMovixBin::files( const TQString& kbd, + const TQString& font, + const TQString& bg, + const TQString& lang, + const TQStringList& codecs ) const { KProcess p; K3bProcessOutputCollector out( &p ); @@ -333,7 +333,7 @@ QStringList K3bMovixBin::files( const QString& kbd, p << "--codecs" << codecs.join( "," ); if( p.start( KProcess::Block, KProcess::AllOutput ) ) - return QStringList::split( "\n", out.output() ); + return TQStringList::split( "\n", out.output() ); else - return QStringList(); + return TQStringList(); } diff --git a/libk3b/projects/movixcd/k3bmovixprogram.h b/libk3b/projects/movixcd/k3bmovixprogram.h index a6a9ac0..7508626 100644 --- a/libk3b/projects/movixcd/k3bmovixprogram.h +++ b/libk3b/projects/movixcd/k3bmovixprogram.h @@ -26,58 +26,58 @@ class LIBK3B_EXPORT K3bMovixBin : public K3bExternalBin : K3bExternalBin( p ) { } - const QString& movixDataDir() const { return m_movixPath; } + const TQString& movixDataDir() const { return m_movixPath; } - const QStringList& supportedBootLabels() const { return m_supportedBootLabels; } - QStringList supportedSubtitleFonts() const; - QStringList supportedLanguages() const; - QStringList supportedKbdLayouts() const; - QStringList supportedBackgrounds() const; - QStringList supportedCodecs() const; + const TQStringList& supportedBootLabels() const { return m_supportedBootLabels; } + TQStringList supportedSubtitleFonts() const; + TQStringList supportedLanguages() const; + TQStringList supportedKbdLayouts() const; + TQStringList supportedBackgrounds() const; + TQStringList supportedCodecs() const; /* * Unused for eMovix versions 0.9.0 and above */ - const QStringList& movixFiles() const { return m_movixFiles; } + const TQStringList& movixFiles() const { return m_movixFiles; } /* * Unused for eMovix versions 0.9.0 and above */ - const QStringList& isolinuxFiles() const { return m_isolinuxFiles; } + const TQStringList& isolinuxFiles() const { return m_isolinuxFiles; } /** * returnes empty string if font was not found * * Unused for eMovix versions 0.9.0 and above */ - QString subtitleFontDir( const QString& font ) const; + TQString subtitleFontDir( const TQString& font ) const; /** * returnes empty string if lang was not found * * Unused for eMovix versions 0.9.0 and above */ - QString languageDir( const QString& lang ) const; + TQString languageDir( const TQString& lang ) const; /** * Interface for the movix-conf --files interface for * versions >= 0.9.0 */ - QStringList files( const QString& kbd = QString::null, - const QString& font = QString::null, - const QString& bg = QString::null, - const QString& lang = QString::null, - const QStringList& codecs = QStringList() ) const; + TQStringList files( const TQString& kbd = TQString(), + const TQString& font = TQString(), + const TQString& bg = TQString(), + const TQString& lang = TQString(), + const TQStringList& codecs = TQStringList() ) const; private: - QStringList supported( const QString& ) const; + TQStringList supported( const TQString& ) const; - QString m_movixPath; - QStringList m_movixFiles; - QStringList m_isolinuxFiles; - QStringList m_supportedBootLabels; - QStringList m_supportedSubtitleFonts; - QStringList m_supportedLanguages; + TQString m_movixPath; + TQStringList m_movixFiles; + TQStringList m_isolinuxFiles; + TQStringList m_supportedBootLabels; + TQStringList m_supportedSubtitleFonts; + TQStringList m_supportedLanguages; friend class K3bMovixProgram; }; @@ -88,14 +88,14 @@ class LIBK3B_EXPORT K3bMovixProgram : public K3bExternalProgram public: K3bMovixProgram(); - bool scan( const QString& ); + bool scan( const TQString& ); bool supportsUserParameters() const { return false; } private: - bool scanNewEMovix( K3bMovixBin* bin, const QString& ); - bool scanOldEMovix( K3bMovixBin* bin, const QString& ); - QStringList determineSupportedBootLabels( const QString& ) const; + bool scanNewEMovix( K3bMovixBin* bin, const TQString& ); + bool scanOldEMovix( K3bMovixBin* bin, const TQString& ); + TQStringList determineSupportedBootLabels( const TQString& ) const; }; 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(); diff --git a/libk3b/projects/videocd/cdi/cdi_imag.rtf b/libk3b/projects/videocd/cdi/cdi_imag.rtf index 809145f..f866494 100644 Binary files a/libk3b/projects/videocd/cdi/cdi_imag.rtf and b/libk3b/projects/videocd/cdi/cdi_imag.rtf differ diff --git a/libk3b/projects/videocd/cdi/cdi_vcd.app b/libk3b/projects/videocd/cdi/cdi_vcd.app index ceb31fc..31a7527 100644 Binary files a/libk3b/projects/videocd/cdi/cdi_vcd.app and b/libk3b/projects/videocd/cdi/cdi_vcd.app differ diff --git a/libk3b/projects/videocd/cdi/icdia.htm b/libk3b/projects/videocd/cdi/icdia.htm index cd6c47b..53f9121 100644 --- a/libk3b/projects/videocd/cdi/icdia.htm +++ b/libk3b/projects/videocd/cdi/icdia.htm @@ -1,7 +1,7 @@ - - + + The New International CD-i Association diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index 462aea3..0898fdf 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -14,14 +14,14 @@ */ // QT-includes -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // KDE-includes #include @@ -49,8 +49,8 @@ bool print_progress = true; bool aspect_correction = false; byte forced_sequence_header = 0; -K3bVcdDoc::K3bVcdDoc( QObject* parent ) - : K3bDoc( parent ) +K3bVcdDoc::K3bVcdDoc( TQObject* tqparent ) + : K3bDoc( tqparent ) { m_tracks = 0L; m_vcdOptions = new K3bVcdOptions(); @@ -58,12 +58,12 @@ K3bVcdDoc::K3bVcdDoc( QObject* parent ) m_docType = VCD; m_vcdType = NONE; - m_urlAddingTimer = new QTimer( this ); - connect( m_urlAddingTimer, SIGNAL( timeout() ), this, SLOT( slotWorkUrlQueue() ) ); + m_urlAddingTimer = new TQTimer( this ); + connect( m_urlAddingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotWorkUrlQueue() ) ); // FIXME: remove the newTracks() signal and replace it with the changed signal - connect( this, SIGNAL( newTracks() ), this, SIGNAL( changed() ) ); - connect( this, SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, SIGNAL( changed() ) ); + connect( this, TQT_SIGNAL( newTracks() ), this, TQT_SIGNAL( changed() ) ); + connect( this, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQT_SIGNAL( changed() ) ); } K3bVcdDoc::~K3bVcdDoc() @@ -82,14 +82,14 @@ bool K3bVcdDoc::newDocument() while ( m_tracks->first() ) removeTrack( m_tracks->first() ); else - m_tracks = new QPtrList; + m_tracks = new TQPtrList; m_tracks->setAutoDelete( false ); return K3bDoc::newDocument(); } -QString K3bVcdDoc::name() const +TQString K3bVcdDoc::name() const { return m_vcdOptions->volumeId(); } @@ -133,8 +133,8 @@ K3b::Msf K3bVcdDoc::length() const bool K3bVcdDoc::isImage( const KURL& url ) { - QImage p; - return p.load( QFile::encodeName( url.path() ) ); + TQImage p; + return p.load( TQFile::encodeName( url.path() ) ); } void K3bVcdDoc::addUrls( const KURL::List& urls ) @@ -168,7 +168,7 @@ void K3bVcdDoc::slotWorkUrlQueue() return ; } - if ( !QFile::exists( item->url.path() ) ) { + if ( !TQFile::exists( item->url.path() ) ) { kdDebug() << "(K3bVcdDoc) file not found: " << item->url.path() << endl; m_notFoundFiles.append( item->url.path() ); return ; @@ -195,8 +195,8 @@ void K3bVcdDoc::slotWorkUrlQueue() K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) { char filename[ 255 ]; - QString error_string = ""; - strcpy( filename, QFile::encodeName( url.path() ) ); + TQString error_string = ""; + strcpy( filename, TQFile::encodeName( url.path() ) ); K3bMpegInfo* Mpeg = new K3bMpegInfo( filename ); if ( Mpeg ) { @@ -211,8 +211,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) i18n( "K3b will create a %1 image from the given MPEG " "files, but these files must already be in %2 " "format. K3b does not yet resample MPEG files." ) - .arg( i18n( "VCD" ) ) - .arg( i18n( "VCD" ) ), + .tqarg( i18n( "VCD" ) ) + .tqarg( i18n( "VCD" ) ), i18n( "Information" ) ); m_urlAddingTimer->start( 0 ); } else if ( vcdType() == NONE ) { @@ -223,8 +223,8 @@ K3bVcdTrack* K3bVcdDoc::createTrack( const KURL& url ) i18n( "K3b will create a %1 image from the given MPEG " "files, but these files must already be in %2 " "format. K3b does not yet resample MPEG files." ) - .arg( i18n( "SVCD" ) ) - .arg( i18n( "SVCD" ) ) + .tqarg( i18n( "SVCD" ) ) + .tqarg( i18n( "SVCD" ) ) + "\n\n" + i18n( "Note: Forcing MPEG2 as VCD is not supported by " "some standalone DVD players." ), @@ -336,7 +336,7 @@ void K3bVcdDoc::removeTrack( K3bVcdTrack* track ) } // set the current item to track - if ( m_tracks->findRef( track ) >= 0 ) { + if ( m_tracks->tqfindRef( track ) >= 0 ) { // take the current item track = m_tracks->take(); @@ -374,12 +374,12 @@ void K3bVcdDoc::moveTrack( const K3bVcdTrack* track, const K3bVcdTrack* after ) return ; // set the current item to track - m_tracks->findRef( track ); + m_tracks->tqfindRef( track ); // take the current item track = m_tracks->take(); - // if after == 0 findRef returnes -1 - int pos = m_tracks->findRef( after ); + // if after == 0 tqfindRef returnes -1 + int pos = m_tracks->tqfindRef( after ); m_tracks->insert( pos + 1, track ); // reorder pbc tracks @@ -389,15 +389,15 @@ void K3bVcdDoc::moveTrack( const K3bVcdTrack* track, const K3bVcdTrack* after ) } -QString K3bVcdDoc::typeString() const +TQString K3bVcdDoc::typeString() const { return "vcd"; } -K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bVcdJob( this, hdl, parent ); + return new K3bVcdJob( this, hdl, tqparent ); } void K3bVcdDoc::informAboutNotFoundFiles() @@ -448,9 +448,9 @@ void K3bVcdDoc::setPbcTracks() if ( m_tracks ) { int count = m_tracks->count(); - kdDebug() << QString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).arg( count ) << endl; + kdDebug() << TQString( "K3bVcdDoc::setPbcTracks() - we have %1 tracks in list." ).tqarg( count ) << endl; - QPtrListIterator iterTrack( *m_tracks ); + TQPtrListIterator iterTrack( *m_tracks ); K3bVcdTrack* track; while ( ( track = iterTrack.current() ) != 0 ) { ++iterTrack; @@ -546,11 +546,11 @@ void K3bVcdDoc::setPbcTracks() } -bool K3bVcdDoc::loadDocumentData( QDomElement* root ) +bool K3bVcdDoc::loadDocumentData( TQDomElement* root ) { newDocument(); - QDomNodeList nodes = root->childNodes(); + TQDomNodeList nodes = root->childNodes(); if ( nodes.length() < 3 ) return false; @@ -568,13 +568,13 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) // vcd Label - QDomNodeList vcdNodes = nodes.item( 1 ).childNodes(); + TQDomNodeList vcdNodes = nodes.item( 1 ).childNodes(); for ( uint i = 0; i < vcdNodes.count(); i++ ) { - QDomNode item = vcdNodes.item( i ); - QString name = item.nodeName(); + TQDomNode item = vcdNodes.item( i ); + TQString name = item.nodeName(); - kdDebug() << QString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).arg( name ) << endl; + kdDebug() << TQString( "(K3bVcdDoc::loadDocumentData) nodeName = '%1'" ).tqarg( name ) << endl; if ( name == "volumeId" ) vcdOptions() ->setVolumeId( item.toElement().text() ); @@ -629,14 +629,14 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) } // vcd Tracks - QDomNodeList trackNodes = nodes.item( 2 ).childNodes(); + TQDomNodeList trackNodes = nodes.item( 2 ).childNodes(); for ( uint i = 0; i < trackNodes.length(); i++ ) { // check if url is available - QDomElement trackElem = trackNodes.item( i ).toElement(); - QString url = trackElem.attributeNode( "url" ).value(); - if ( !QFile::exists( url ) ) + TQDomElement trackElem = trackNodes.item( i ).toElement(); + TQString url = trackElem.attributeNode( "url" ).value(); + if ( !TQFile::exists( url ) ) m_notFoundFiles.append( url ); else { KURL k; @@ -645,8 +645,8 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) track ->setPlayTime( trackElem.attribute( "playtime", "1" ).toInt() ); track ->setWaitTime( trackElem.attribute( "waittime", "2" ).toInt() ); track ->setReactivity( trackElem.attribute( "reactivity", "0" ).toInt() ); - track -> setPbcNumKeys( ( trackElem.attribute( "numkeys", "yes" ).contains( "yes" ) ) ? true : false ); - track -> setPbcNumKeysUserdefined( ( trackElem.attribute( "userdefinednumkeys", "no" ).contains( "yes" ) ) ? true : false ); + track -> setPbcNumKeys( ( trackElem.attribute( "numkeys", "yes" ).tqcontains( "yes" ) ) ? true : false ); + track -> setPbcNumKeysUserdefined( ( trackElem.attribute( "userdefinednumkeys", "no" ).tqcontains( "yes" ) ) ? true : false ); addTrack( track, m_tracks->count() ); } @@ -662,12 +662,12 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) int val; bool pbctrack; for ( uint trackId = 0; trackId < trackNodes.length(); trackId++ ) { - QDomElement trackElem = trackNodes.item( trackId ).toElement(); - QDomNodeList trackNodes = trackElem.childNodes(); + TQDomElement trackElem = trackNodes.item( trackId ).toElement(); + TQDomNodeList trackNodes = trackElem.childNodes(); for ( uint i = 0; i < trackNodes.length(); i++ ) { - QDomElement trackElem = trackNodes.item( i ).toElement(); - QString name = trackElem.tagName(); - if ( name.contains( "pbc" ) ) { + TQDomElement trackElem = trackNodes.item( i ).toElement(); + TQString name = trackElem.tagName(); + if ( name.tqcontains( "pbc" ) ) { if ( trackElem.hasAttribute ( "type" ) ) { type = trackElem.attribute ( "type" ).toInt(); if ( trackElem.hasAttribute ( "pbctrack" ) ) { @@ -688,7 +688,7 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) } } } - } else if ( name.contains( "numkeys" ) ) { + } else if ( name.tqcontains( "numkeys" ) ) { if ( trackElem.hasAttribute ( "key" ) ) { int key = trackElem.attribute ( "key" ).toInt(); if ( trackElem.hasAttribute ( "val" ) ) { @@ -717,15 +717,15 @@ bool K3bVcdDoc::loadDocumentData( QDomElement* root ) -bool K3bVcdDoc::saveDocumentData( QDomElement * docElem ) +bool K3bVcdDoc::saveDocumentData( TQDomElement * docElem ) { - QDomDocument doc = docElem->ownerDocument(); + TQDomDocument doc = docElem->ownerDocument(); saveGeneralDocumentData( docElem ); // save Vcd Label - QDomElement vcdMain = doc.createElement( "vcd" ); + TQDomElement vcdMain = doc.createElement( "vcd" ); - QDomElement vcdElem = doc.createElement( "volumeId" ); + TQDomElement vcdElem = doc.createElement( "volumeId" ); vcdElem.appendChild( doc.createTextNode( vcdOptions() ->volumeId() ) ); vcdMain.appendChild( vcdElem ); @@ -749,98 +749,98 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem ) // systemId() vcdElem = doc.createElement( "vcdType" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdType() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdType() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "mpegVersion" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->mpegVersion() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->mpegVersion() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "PreGapLeadout" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PreGapLeadout() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PreGapLeadout() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "PreGapTrack" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PreGapTrack() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PreGapTrack() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "FrontMarginTrack" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->FrontMarginTrack() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->FrontMarginTrack() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "RearMarginTrack" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RearMarginTrack() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RearMarginTrack() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "FrontMarginTrackSVCD" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->FrontMarginTrackSVCD() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->FrontMarginTrackSVCD() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "RearMarginTrackSVCD" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RearMarginTrackSVCD() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RearMarginTrackSVCD() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "volumeCount" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->volumeCount() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->volumeCount() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "volumeNumber" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->volumeNumber() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->volumeNumber() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "AutoDetect" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->AutoDetect() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->AutoDetect() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "CdiSupport" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->CdiSupport() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->CdiSupport() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "NonCompliantMode" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->NonCompliantMode() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->NonCompliantMode() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "Sector2336" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->Sector2336() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->Sector2336() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "UpdateScanOffsets" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->UpdateScanOffsets() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->UpdateScanOffsets() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "RelaxedAps" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->RelaxedAps() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->RelaxedAps() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "UseGaps" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->UseGaps() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->UseGaps() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "PbcEnabled" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->PbcEnabled() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->PbcEnabled() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "SegmentFolder" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->SegmentFolder() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->SegmentFolder() ) ) ); vcdMain.appendChild( vcdElem ); vcdElem = doc.createElement( "Restriction" ); - vcdElem.appendChild( doc.createTextNode( QString::number( vcdOptions() ->Restriction() ) ) ); + vcdElem.appendChild( doc.createTextNode( TQString::number( vcdOptions() ->Restriction() ) ) ); vcdMain.appendChild( vcdElem ); docElem->appendChild( vcdMain ); // save the tracks // ------------------------------------------------------------- - QDomElement contentsElem = doc.createElement( "contents" ); + TQDomElement contentsElem = doc.createElement( "contents" ); - QPtrListIterator iterTrack( *m_tracks ); + TQPtrListIterator iterTrack( *m_tracks ); K3bVcdTrack* track; while ( ( track = iterTrack.current() ) != 0 ) { ++iterTrack; - QDomElement trackElem = doc.createElement( "track" ); + TQDomElement trackElem = doc.createElement( "track" ); trackElem.setAttribute( "url", KIO::decodeFileName( track->absPath() ) ); trackElem.setAttribute( "playtime", track->getPlayTime() ); trackElem.setAttribute( "waittime", track->getWaitTime() ); @@ -853,7 +853,7 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem ) i++ ) { if ( track->isPbcUserDefined( i ) ) { // save pbcTracks - QDomElement pbcElem = doc.createElement( "pbc" ); + TQDomElement pbcElem = doc.createElement( "pbc" ); pbcElem.setAttribute( "type", i ); if ( track->getPbcTrack( i ) ) { pbcElem.setAttribute( "pbctrack", "yes" ); @@ -865,13 +865,13 @@ bool K3bVcdDoc::saveDocumentData( QDomElement * docElem ) trackElem.appendChild( pbcElem ); } } - QMap numKeyMap = track->DefinedNumKey(); - QMap::const_iterator trackIt; + TQMap numKeyMap = track->DefinedNumKey(); + TQMap::const_iterator trackIt; for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) { - QDomElement numElem = doc.createElement( "numkeys" ); + TQDomElement numElem = doc.createElement( "numkeys" ); if ( trackIt.data() ) { numElem.setAttribute( "key", trackIt.key() ); numElem.setAttribute( "val", trackIt.data() ->index() + 1 ); diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h index 8b10837..4f24200 100644 --- a/libk3b/projects/videocd/k3bvcddoc.h +++ b/libk3b/projects/videocd/k3bvcddoc.h @@ -16,14 +16,14 @@ #ifndef K3BVCDDOC_H #define K3BVCDDOC_H -// Qt Includes -#include -#include -#include -#include -#include -#include -#include +// TQt Includes +#include +#include +#include +#include +#include +#include +#include // Kde Includes #include @@ -37,10 +37,10 @@ class K3bApp; class K3bVcdTrack; class K3bVcdJob; //class K3bView; -class QWidget; -class QTimer; -class QDomDocument; -class QDomElement; +class TQWidget; +class TQTimer; +class TQDomDocument; +class TQDomElement; class KConfig; @@ -48,16 +48,17 @@ class KConfig; class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc { Q_OBJECT + TQ_OBJECT public: - K3bVcdDoc( QObject* ); + K3bVcdDoc( TQObject* ); ~K3bVcdDoc(); int type() const { return VCD; } - QString name() const; + TQString name() const; - enum vcdTypes { VCD11, VCD20, SVCD10, HQVCD, NONE}; + enum vcdTypes { VCD11, VCD20, SVCD10, HTQVCD, NONE}; bool newDocument(); int numOfTracks() const @@ -65,11 +66,11 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc return m_tracks->count(); } - const QString& vcdImage() const + const TQString& vcdImage() const { return m_vcdImage; } - void setVcdImage( const QString& s ) + void setVcdImage( const TQString& s ) { m_vcdImage = s; } @@ -99,7 +100,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc return m_tracks->take( i ); } - const QPtrList* tracks() const + const TQPtrList* tracks() const { return m_tracks; } @@ -108,7 +109,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc KIO::filesize_t size() const; K3b::Msf length() const; - K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent ); + K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); K3bVcdOptions* vcdOptions() const { return m_vcdOptions; @@ -149,18 +150,18 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc protected: /** reimplemented from K3bDoc */ - bool loadDocumentData( QDomElement* root ); + bool loadDocumentData( TQDomElement* root ); /** reimplemented from K3bDoc */ - bool saveDocumentData( QDomElement* ); + bool saveDocumentData( TQDomElement* ); - QString typeString() const; + TQString typeString() const; private: K3bVcdTrack* createTrack( const KURL& url ); void informAboutNotFoundFiles(); - QStringList m_notFoundFiles; - QString m_vcdImage; + TQStringList m_notFoundFiles; + TQString m_vcdImage; class PrivateUrlToAdd { @@ -173,10 +174,10 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc }; /** Holds all the urls that have to be added to the list of tracks. **/ - QPtrQueue urlsToAdd; - QTimer* m_urlAddingTimer; + TQPtrQueue urlsToAdd; + TQTimer* m_urlAddingTimer; - QPtrList* m_tracks; + TQPtrList* m_tracks; KIO::filesize_t calcTotalSize() const; KIO::filesize_t ISOsize() const; diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index a1b347a..156c79a 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -20,13 +20,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include "k3bvcdjob.h" @@ -43,8 +43,8 @@ #include #include -K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bBurnJob( jh, parent, name ) +K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bBurnJob( jh, tqparent, name ) { m_doc = doc; m_doc->setCopies( m_doc->dummy() || m_doc->onlyCreateImages() ? 1 : m_doc->copies() ); @@ -104,20 +104,20 @@ void K3bVcdJob::cancelAll() } // remove bin-file if it is unfinished or the user selected to remove image - if ( QFile::exists( m_doc->vcdImage() ) ) { + if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS ); - QFile::remove + emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS ); + TQFile::remove ( m_doc->vcdImage() ); m_doc->setVcdImage( "" ); } } // remove cue-file if it is unfinished or the user selected to remove image - if ( QFile::exists( m_cueFile ) ) { + if ( TQFile::exists( m_cueFile ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS ); - QFile::remove + emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS ); + TQFile::remove ( m_cueFile ); m_cueFile = ""; } @@ -133,7 +133,7 @@ void K3bVcdJob::start() emit burning( false ); m_canceled = false; - int pos = QString( m_doc->vcdImage() ).find( ".bin", QString( m_doc->vcdImage() ).length() - 4 ); + int pos = TQString( m_doc->vcdImage() ).tqfind( ".bin", TQString( m_doc->vcdImage() ).length() - 4 ); if ( pos > 0 ) { m_cueFile = m_doc->vcdImage().left( pos ) + ".cue"; } else { @@ -184,8 +184,8 @@ void K3bVcdJob::vcdxBuild() const K3bExternalBin* bin = k3bcore ->externalBinManager() ->binObject( "vcdxbuild" ); if ( !bin ) { kdDebug() << "(K3bVcdJob) could not find vcdxbuild executable" << endl; - emit infoMessage( i18n( "Could not find %1 executable." ).arg( "vcdxbuild" ), K3bJob::ERROR ); - emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).arg( ">= 0.7.12" ), K3bJob::INFO ); + emit infoMessage( i18n( "Could not tqfind %1 executable." ).tqarg( "vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "To create VideoCDs you must install VcdImager Version %1." ).tqarg( ">= 0.7.12" ), K3bJob::INFO ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -194,7 +194,7 @@ void K3bVcdJob::vcdxBuild() if ( bin->version < K3bVersion( "0.7.12" ) ) { kdDebug() << "(K3bVcdJob) vcdxbuild executable too old!" << endl; - emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).arg( "Vcdxbuild" ).arg( "0.7.12" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 executable too old: need version %2 or greater." ).tqarg( "Vcdxbuild" ).tqarg( "0.7.12" ), K3bJob::ERROR ); emit infoMessage( i18n( "You can find this on your distribution disks or download it from http://www.vcdimager.org" ), K3bJob::INFO ); cancelAll(); jobFinished( false ); @@ -202,13 +202,13 @@ void K3bVcdJob::vcdxBuild() } if ( !bin->copyright.isEmpty() ) - emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).arg( bin->name() ).arg( bin->version ).arg( bin->copyright ), INFO ); + emit infoMessage( i18n( "Using %1 %2 - Copyright (C) %3" ).tqarg( bin->name() ).tqarg( bin->version ).tqarg( bin->copyright ), INFO ); *m_process << bin; // additional user parameters from config - const QStringList& params = k3bcore->externalBinManager() ->program( "vcdxbuild" ) ->userParameters(); - for ( QStringList::const_iterator it = params.begin(); it != params.end(); ++it ) + const TQStringList& params = k3bcore->externalBinManager() ->program( "vcdxbuild" ) ->userParameters(); + for ( TQStringList::const_iterator it = params.begin(); it != params.end(); ++it ) *m_process << *it; @@ -219,25 +219,25 @@ void K3bVcdJob::vcdxBuild() *m_process << "--progress" << "--gui"; - *m_process << QString( "--cue-file=%1" ).arg( m_cueFile ); + *m_process << TQString( "--cue-file=%1" ).tqarg( m_cueFile ); - *m_process << QString( "--bin-file=%1" ).arg( m_doc->vcdImage() ); + *m_process << TQString( "--bin-file=%1" ).tqarg( m_doc->vcdImage() ); - *m_process << QString( "%1" ).arg( QFile::encodeName( m_xmlFile ) ); + *m_process << TQString( "%1" ).tqarg( TQFile::encodeName( m_xmlFile ).data() ); - connect( m_process, SIGNAL( receivedStderr( KProcess*, char*, int ) ), - this, SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); - connect( m_process, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); - connect( m_process, SIGNAL( processExited( KProcess* ) ), - this, SLOT( slotVcdxBuildFinished() ) ); + connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ), + this, TQT_SLOT( slotParseVcdxBuildOutput( KProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), + this, TQT_SLOT( slotVcdxBuildFinished() ) ); // vcdxbuild commandline parameters kdDebug() << "***** vcdxbuild parameters:" << endl; ; - const QValueList& args = m_process->args(); - QString s; - for ( QValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList& args = m_process->args(); + TQString s; + for ( TQValueList::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -245,7 +245,7 @@ void K3bVcdJob::vcdxBuild() if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { kdDebug() << "(K3bVcdJob) could not start vcdxbuild" << endl; - emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "Could not start %1." ).tqarg( "vcdxbuild" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); } @@ -253,44 +253,44 @@ void K3bVcdJob::vcdxBuild() void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) { - QString buffer = QString::fromLocal8Bit( output, len ); + TQString buffer = TQString::fromLocal8Bit( output, len ); // split to lines - QStringList lines = QStringList::split( "\n", buffer ); + TQStringList lines = TQStringList::split( "\n", buffer ); - QDomDocument xml_doc; - QDomElement xml_root; + TQDomDocument xml_doc; + TQDomElement xml_root; // do every line - for ( QStringList::Iterator str = lines.begin(); str != lines.end(); ++str ) { + for ( TQStringList::Iterator str = lines.begin(); str != lines.end(); ++str ) { *str = ( *str ).stripWhiteSpace(); emit debuggingOutput( "vcdxbuild", *str ); - xml_doc.setContent( QString( "" ) + *str + "" ); + xml_doc.setContent( TQString( "" ) + *str + "" ); xml_root = xml_doc.documentElement(); // There should be only one... but ... - for ( QDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) { - QDomElement el = node.toElement(); + for ( TQDomNode node = xml_root.firstChild(); !node.isNull(); node = node.nextSibling() ) { + TQDomElement el = node.toElement(); if ( el.isNull() ) continue; - const QString tagName = el.tagName().lower(); + const TQString tagName = el.tagName().lower(); if ( tagName == "progress" ) { - const QString oper = el.attribute( "operation" ).lower(); + const TQString oper = el.attribute( "operation" ).lower(); const unsigned long long pos = el.attribute( "position" ).toLong(); const long long size = el.attribute( "size" ).toLong(); if ( oper == "scan" ) { // Scan Video Files if ( m_stage == stageUnknown || pos < m_bytesFinished ) { - const uint index = el.attribute( "id" ).replace( QRegExp( "sequence-" ), "" ).toUInt(); + const uint index = el.attribute( "id" ).tqreplace( TQRegExp( "sequence-" ), "" ).toUInt(); m_currentWrittenTrack = m_doc->at( m_currentWrittenTrackNumber ); - emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).arg( index + 1 ).arg( doc() ->numOfTracks() ).arg( m_currentWrittenTrack->fileName() ) ); + emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" ).tqarg( index + 1 ).tqarg( doc() ->numOfTracks() ).tqarg( m_currentWrittenTrack->fileName() ) ); m_bytesFinished = 0; if ( !firstTrack ) { @@ -319,20 +319,20 @@ void K3bVcdJob::slotParseVcdxBuildOutput( KProcess*, char* output, int len ) return ; } } else if ( tagName == "log" ) { - QDomText tel = el.firstChild().toText(); - const QString level = el.attribute( "level" ).lower(); + TQDomText tel = el.firstChild().toText(); + const TQString level = el.attribute( "level" ).lower(); if ( tel.isText() ) { - const QString text = tel.data(); + const TQString text = tel.data(); if ( m_stage == stageWrite && level == "information" ) - kdDebug() << QString( "(K3bVcdJob) VcdxBuild information, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) VcdxBuild information, %1" ).tqarg( text ) << endl; if ( ( text ).startsWith( "writing track" ) ) - emit newSubTask( i18n( "Creating Image for track %1" ).arg( ( text ).mid( 14 ) ) ); + emit newSubTask( i18n( "Creating Image for track %1" ).tqarg( ( text ).mid( 14 ) ) ); else { if ( level != "error" ) { - kdDebug() << QString( "(K3bVcdJob) vcdxbuild warning, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) vcdxbuild warning, %1" ).tqarg( text ) << endl; parseInformation( text ); } else { - kdDebug() << QString( "(K3bVcdJob) vcdxbuild error, %1" ).arg( text ) << endl; + kdDebug() << TQString( "(K3bVcdJob) vcdxbuild error, %1" ).tqarg( text ) << endl; emit infoMessage( text, K3bJob::ERROR ); } } @@ -353,7 +353,7 @@ void K3bVcdJob::slotVcdxBuildFinished() m_imageFinished = true; break; default: - emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).arg( "vcdxbuild" ).arg( m_process->exitStatus() ), + emit infoMessage( i18n( "%1 returned an unknown error (code %2)." ).tqarg( "vcdxbuild" ).tqarg( m_process->exitStatus() ), K3bJob::ERROR ); emit infoMessage( i18n( "Please send me an email with the last output." ), K3bJob::ERROR ); cancelAll(); @@ -361,18 +361,18 @@ void K3bVcdJob::slotVcdxBuildFinished() return ; } } else { - emit infoMessage( i18n( "%1 did not exit cleanly." ).arg( "Vcdxbuild" ), K3bJob::ERROR ); + emit infoMessage( i18n( "%1 did not exit cleanly." ).tqarg( "Vcdxbuild" ), K3bJob::ERROR ); cancelAll(); jobFinished( false ); return ; } //remove xml-file - if ( QFile::exists( m_xmlFile ) ) - QFile::remove + if ( TQFile::exists( m_xmlFile ) ) + TQFile::remove ( m_xmlFile ); - kdDebug() << QString( "(K3bVcdJob) create only image: %1" ).arg( vcdDoc() ->onlyCreateImages() ) << endl; + kdDebug() << TQString( "(K3bVcdJob) create only image: %1" ).tqarg( vcdDoc() ->onlyCreateImages() ) << endl; if ( !vcdDoc() ->onlyCreateImages() ) startWriterjob(); else @@ -381,7 +381,7 @@ void K3bVcdJob::slotVcdxBuildFinished() void K3bVcdJob::startWriterjob() { - kdDebug() << QString( "(K3bVcdJob) writing copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) << endl; + kdDebug() << TQString( "(K3bVcdJob) writing copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) << endl; if ( prepareWriterJob() ) { if ( waitForMedia( m_doc->burner() ) < 0 ) { cancel(); @@ -392,7 +392,7 @@ void K3bVcdJob::startWriterjob() return ; if ( m_doc->copies() > 1 ) - emit newTask( i18n( "Writing Copy %1 of %2" ).arg( m_currentcopy ).arg( m_doc->copies() ) ); + emit newTask( i18n( "Writing Copy %1 of %2" ).tqarg( m_currentcopy ).tqarg( m_doc->copies() ) ); emit burning( true ); m_writerJob->start(); @@ -432,19 +432,19 @@ bool K3bVcdJob::prepareWriterJob() } - connect( m_writerJob, SIGNAL( infoMessage( const QString&, int ) ), this, SIGNAL( infoMessage( const QString&, int ) ) ); - connect( m_writerJob, SIGNAL( percent( int ) ), this, SLOT( slotWriterJobPercent( int ) ) ); - connect( m_writerJob, SIGNAL( processedSize( int, int ) ), this, SLOT( slotProcessedSize( int, int ) ) ); - connect( m_writerJob, SIGNAL( subPercent( int ) ), this, SIGNAL( subPercent( int ) ) ); - connect( m_writerJob, SIGNAL( processedSubSize( int, int ) ), this, SIGNAL( processedSubSize( int, int ) ) ); - connect( m_writerJob, SIGNAL( nextTrack( int, int ) ), this, SLOT( slotWriterNextTrack( int, int ) ) ); - connect( m_writerJob, SIGNAL( buffer( int ) ), this, SIGNAL( bufferStatus( int ) ) ); - connect( m_writerJob, SIGNAL( deviceBuffer( int ) ), this, SIGNAL( deviceBuffer( int ) ) ); - connect( m_writerJob, SIGNAL( writeSpeed( int, int ) ), this, SIGNAL( writeSpeed( int, int ) ) ); - connect( m_writerJob, SIGNAL( finished( bool ) ), this, SLOT( slotWriterJobFinished( bool ) ) ); - connect( m_writerJob, SIGNAL( newTask( const QString& ) ), this, SIGNAL( newTask( const QString& ) ) ); - connect( m_writerJob, SIGNAL( newSubTask( const QString& ) ), this, SIGNAL( newSubTask( const QString& ) ) ); - connect( m_writerJob, SIGNAL( debuggingOutput( const QString&, const QString& ) ), this, SIGNAL( debuggingOutput( const QString&, const QString& ) ) ); + 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( buffertqStatus( 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& ) ) ); return true; } @@ -461,7 +461,7 @@ void K3bVcdJob::slotProcessedSize( int cs, int ts ) void K3bVcdJob::slotWriterNextTrack( int t, int tt ) { - emit newSubTask( i18n( "Writing Track %1 of %2" ).arg( t ).arg( tt ) ); + emit newSubTask( i18n( "Writing Track %1 of %2" ).tqarg( t ).tqarg( tt ) ); } void K3bVcdJob::slotWriterJobFinished( bool success ) @@ -471,20 +471,20 @@ void K3bVcdJob::slotWriterJobFinished( bool success ) if ( m_currentcopy >= m_doc->copies() ) { // remove bin-file if it is unfinished or the user selected to remove image - if ( QFile::exists( m_doc->vcdImage() ) ) { + if ( TQFile::exists( m_doc->vcdImage() ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Binary file %1" ).arg( m_doc->vcdImage() ), K3bJob::SUCCESS ); - QFile::remove + emit infoMessage( i18n( "Removing Binary file %1" ).tqarg( m_doc->vcdImage() ), K3bJob::SUCCESS ); + TQFile::remove ( m_doc->vcdImage() ); m_doc->setVcdImage( "" ); } } // remove cue-file if it is unfinished or the user selected to remove image - if ( QFile::exists( m_cueFile ) ) { + if ( TQFile::exists( m_cueFile ) ) { if ( !m_doc->onTheFly() && m_doc->removeImages() || !m_imageFinished ) { - emit infoMessage( i18n( "Removing Cue file %1" ).arg( m_cueFile ), K3bJob::SUCCESS ); - QFile::remove + emit infoMessage( i18n( "Removing Cue file %1" ).tqarg( m_cueFile ), K3bJob::SUCCESS ); + TQFile::remove ( m_cueFile ); m_cueFile = ""; } @@ -506,38 +506,38 @@ void K3bVcdJob::slotWriterJobFinished( bool success ) } } -void K3bVcdJob::parseInformation( const QString &text ) +void K3bVcdJob::parseInformation( const TQString &text ) { // parse warning - if ( text.contains( "mpeg user scan data: one or more BCD fields out of range for" ) ) { - int index = text.find( " for" ); + if ( text.tqcontains( "mpeg user scan data: one or more BCD fields out of range for" ) ) { + int index = text.tqfind( " for" ); - emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).arg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "One or more BCD fields out of range for %1" ).tqarg( text.mid( index + 4 ).stripWhiteSpace() ), K3bJob::WARNING ); - } else if ( text.contains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) { + } else if ( text.tqcontains( "mpeg user scan data: from now on, scan information data errors will not be reported anymore" ) ) { emit infoMessage( i18n( "From now on, scan information data errors will not be reported anymore" ), K3bJob::INFO ); emit infoMessage( i18n( "Consider enabling the 'update scan offsets' option, if it is not enabled already." ), K3bJob::INFO ); - } else if ( text.contains( "APS' pts seems out of order (actual pts" ) ) { - int index = text.find( "(actual pts" ); - int index2 = text.find( ", last seen pts" ); - int index3 = text.find( ") -- ignoring this aps" ); + } else if ( text.tqcontains( "APS' pts seems out of order (actual pts" ) ) { + int index = text.tqfind( "(actual pts" ); + int index2 = text.tqfind( ", last seen pts" ); + int index3 = text.tqfind( ") -- ignoring this aps" ); - emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).arg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).arg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "APS' pts seems out of order (actual pts %1, last seen pts %2)" ).tqarg( text.mid( index + 12, index2 - index - 12 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 14, index3 - index2 - 14 ).stripWhiteSpace() ), K3bJob::WARNING ); emit infoMessage( i18n( "Ignoring this aps" ), K3bJob::INFO ); - } else if ( text.contains( "bad packet at packet" ) ) { - int index = text.find( "at packet #" ); - int index2 = text.find( "(stream byte offset" ); - int index3 = text.find( ") -- remaining " ); - int index4 = text.find( "bytes of stream will be ignored" ); + } else if ( text.tqcontains( "bad packet at packet" ) ) { + int index = text.tqfind( "at packet #" ); + int index2 = text.tqfind( "(stream byte offset" ); + int index3 = text.tqfind( ") -- remaining " ); + int index4 = text.tqfind( "bytes of stream will be ignored" ); - emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).arg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).arg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING ); - emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).arg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "Bad packet at packet #%1 (stream byte offset %2)" ).tqarg( text.mid( index + 11, index2 - index - 11 ).stripWhiteSpace() ).tqarg( text.mid( index2 + 19, index3 - index2 - 19 ).stripWhiteSpace() ), K3bJob::WARNING ); + emit infoMessage( i18n( "Remaining %1 bytes of stream will be ignored." ).tqarg( text.mid( index3 + 15, index4 - index3 - 15 ).stripWhiteSpace() ), K3bJob::WARNING ); } } -QString K3bVcdJob::jobDescription() const +TQString K3bVcdJob::jobDescription() const { switch ( m_doc->vcdType() ) { case K3bVcdDoc::VCD11: @@ -546,7 +546,7 @@ QString K3bVcdJob::jobDescription() const return i18n( "Writing Video CD (Version 2.0)" ); case K3bVcdDoc::SVCD10: return i18n( "Writing Super Video CD" ); - case K3bVcdDoc::HQVCD: + case K3bVcdDoc::HTQVCD: return i18n( "Writing High-Quality Video CD" ); default: return i18n( "Writing Video CD" ); @@ -554,14 +554,14 @@ QString K3bVcdJob::jobDescription() const } -QString K3bVcdJob::jobDetails() const +TQString K3bVcdJob::jobDetails() const { return ( i18n( "1 MPEG (%1)", "%n MPEGs (%1)", - m_doc->tracks() ->count() ).arg( KIO::convertSize( m_doc->size() ) ) + m_doc->tracks() ->count() ).tqarg( KIO::convertSize( m_doc->size() ) ) + ( m_doc->copies() > 1 ? i18n( " - %n copy", " - %n copies", m_doc->copies() ) - : QString::null ) ); + : TQString() ) ); } #include "k3bvcdjob.moc" diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h index 917c8b1..96d9026 100644 --- a/libk3b/projects/videocd/k3bvcdjob.h +++ b/libk3b/projects/videocd/k3bvcdjob.h @@ -20,10 +20,10 @@ class K3bVcdDoc; class K3bVcdTrack; -class QString; +class TQString; class K3bProcess; class KProcess; -class QDataStream; +class TQDataStream; class K3bAbstractWriter; class K3bDevice::Device; @@ -31,9 +31,10 @@ class K3bDevice::Device; class K3bVcdJob : public K3bBurnJob { Q_OBJECT + TQ_OBJECT public: - K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); ~K3bVcdJob(); K3bDoc* doc() const; @@ -43,8 +44,8 @@ class K3bVcdJob : public K3bBurnJob } K3bDevice::Device* writer() const; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); @@ -68,7 +69,7 @@ class K3bVcdJob : public K3bBurnJob void xmlGen(); void vcdxBuild(); - void parseInformation( const QString& ); + void parseInformation( const TQString& ); void startWriterjob(); int m_copies; @@ -103,10 +104,10 @@ class K3bVcdJob : public K3bBurnJob bool m_imageFinished; bool m_canceled; - QString m_tempPath; - QString m_cueFile; - QString m_xmlFile; - QString m_collectedOutput; + TQString m_tempPath; + TQString m_cueFile; + TQString m_xmlFile; + TQString m_collectedOutput; K3bAbstractWriter* m_writerJob; K3bProcess* m_process; diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index 6009a4a..854919f 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -20,9 +20,9 @@ #include #include -// Qt Includes -#include -#include +// TQt Includes +#include +#include // K3b Includes #include "k3bvcdoptions.h" @@ -37,7 +37,7 @@ K3bVcdOptions::K3bVcdOptions() m_volumeID( "VIDEOCD" ), m_albumID( "" ), m_volumeSetId( "" ), - m_publisher( QString( "K3b - Version %1" ).arg( k3bcore->version() ) ), + m_publisher( TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ) ), m_applicationId( "CDI/CDI_VCD.APP;1" ), m_systemId( "CD-RTOS CD-BRIDGE" ), m_vcdclass( "vcd" ), @@ -65,19 +65,19 @@ K3bVcdOptions::K3bVcdOptions() bool K3bVcdOptions::checkCdiFiles() { m_cdisize = 0; - if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ) ) + if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ) ) return false; - if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_text.fnt" ) ) ) + if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_text.fnt" ) ) ) return false; - if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_vcd.app" ) ) ) + if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_vcd.app" ) ) ) return false; - if ( !QFile::exists( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ) ) + if ( !TQFile::exists( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ) ) return false; - m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ).size(); - m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_text.fnt" ) ).size(); - m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_vcd.app" ) ).size(); - m_cdisize += QFile( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ).size(); + m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_imag.rtf" ) ).size(); + m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_text.fnt" ) ).size(); + m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_vcd.app" ) ).size(); + m_cdisize += TQFile( locate( "data", "k3b/cdi/cdi_vcd.cfg" ) ).size(); return true; } diff --git a/libk3b/projects/videocd/k3bvcdoptions.h b/libk3b/projects/videocd/k3bvcdoptions.h index aa5fed2..420e593 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.h +++ b/libk3b/projects/videocd/k3bvcdoptions.h @@ -16,7 +16,7 @@ #ifndef K3B_VCD_OPTIONS_H #define K3B_VCD_OPTIONS_H -#include +#include #include "k3b_export.h" class KConfigBase; @@ -25,41 +25,41 @@ class LIBK3B_EXPORT K3bVcdOptions { public: K3bVcdOptions(); - const QString& volumeId() const + const TQString& volumeId() const { return m_volumeID; } - const QString& albumId() const + const TQString& albumId() const { return m_albumID; } - const QString& volumeSetId() const + const TQString& volumeSetId() const { return m_volumeSetId; } - const QString& preparer() const + const TQString& preparer() const { return m_preparer; } - const QString& publisher() const + const TQString& publisher() const { return m_publisher; } - const QString& applicationId() const + const TQString& applicationId() const { return m_applicationId; } - const QString& systemId() const + const TQString& systemId() const { return m_systemId; } - const QString& vcdClass() const + const TQString& vcdClass() const { return m_vcdclass; } - const QString& vcdVersion() const + const TQString& vcdVersion() const { return m_vcdversion; } @@ -140,32 +140,32 @@ class LIBK3B_EXPORT K3bVcdOptions return m_cdisize; } - void setAlbumId( const QString& s ) + void setAlbumId( const TQString& s ) { m_albumID = s; } - void setVolumeId( const QString& s ) + void setVolumeId( const TQString& s ) { m_volumeID = s; } - void setVolumeSetId( const QString& s ) + void setVolumeSetId( const TQString& s ) { m_volumeSetId = s; } - void setPreparer( const QString& s ) + void setPreparer( const TQString& s ) { m_preparer = s; } - void setPublisher( const QString& s ) + void setPublisher( const TQString& s ) { m_publisher = s; } - void setVcdClass( const QString& s ) + void setVcdClass( const TQString& s ) { m_vcdclass = s; } - void setVcdVersion( const QString& s ) + void setVcdVersion( const TQString& s ) { m_vcdversion = s; } @@ -335,18 +335,18 @@ class LIBK3B_EXPORT K3bVcdOptions bool m_pbcnumkeysenabled; // volume descriptor - QString m_volumeID; - QString m_albumID; - QString m_volumeSetId; + TQString m_volumeID; + TQString m_albumID; + TQString m_volumeSetId; - QString m_preparer; - QString m_publisher; + TQString m_preparer; + TQString m_publisher; - QString m_applicationId; - QString m_systemId; + TQString m_applicationId; + TQString m_systemId; - QString m_vcdclass; - QString m_vcdversion; + TQString m_vcdclass; + TQString m_vcdversion; int m_pregapleadout; int m_pregaptrack; diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index 7f0043f..68d04fd 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -30,15 +30,15 @@ #include "k3bvcdtrack.h" #include -K3bVcdTrack::K3bVcdTrack( QPtrList* parent, const QString& filename ) +K3bVcdTrack::K3bVcdTrack( TQPtrList* tqparent, const TQString& filename ) : m_pbcnumkeys( true ), m_pbcnumkeysuserdefined( false ), m_file( filename ) { - m_parent = parent; - m_title = QFileInfo( m_file ).baseName( true ); + m_parent = tqparent; + m_title = TQFileInfo( m_file ).baseName( true ); - m_revreflist = new QPtrList; + m_revreflist = new TQPtrList; for ( int i = 0; i < K3bVcdTrack::_maxPbcTracks; i++ ) { m_pbctrackmap.insert( i, 0L ); @@ -65,9 +65,9 @@ KIO::filesize_t K3bVcdTrack::size() const int K3bVcdTrack::index() const { - int i = m_parent->find( this ); + int i = m_parent->tqfind( this ); if ( i < 0 ) - kdDebug() << "(K3bVcdTrack) I'm not part of my parent!" << endl; + kdDebug() << "(K3bVcdTrack) I'm not part of my tqparent!" << endl; return i; } @@ -119,23 +119,23 @@ void K3bVcdTrack::delRefFromUs() void K3bVcdTrack::setPbcTrack( int which, K3bVcdTrack* pbctrack ) { kdDebug() << "K3bVcdTrack::setPbcTrack " << which << ", " << pbctrack << endl; - m_pbctrackmap.replace( which, pbctrack ); + m_pbctrackmap.tqreplace( which, pbctrack ); } void K3bVcdTrack::setPbcNonTrack( int which, int type ) { kdDebug() << "K3bVcdTrack::setNonPbcTrack " << which << ", " << type << endl; - m_pbcnontrackmap.replace( which, type ); + m_pbcnontrackmap.tqreplace( which, type ); } void K3bVcdTrack::setUserDefined( int which, bool ud ) { - m_pbcusrdefmap.replace( which, ud ); + m_pbcusrdefmap.tqreplace( which, ud ); } K3bVcdTrack* K3bVcdTrack::getPbcTrack( const int& which ) { - if ( m_pbctrackmap.find( which ) == m_pbctrackmap.end() ) + if ( m_pbctrackmap.tqfind( which ) == m_pbctrackmap.end() ) return 0; else return m_pbctrackmap[ which ]; @@ -143,7 +143,7 @@ K3bVcdTrack* K3bVcdTrack::getPbcTrack( const int& which ) int K3bVcdTrack::getNonPbcTrack( const int& which ) { - if ( m_pbcnontrackmap.find( which ) == m_pbcnontrackmap.end() ) + if ( m_pbcnontrackmap.tqfind( which ) == m_pbcnontrackmap.end() ) return 0; else return m_pbcnontrackmap[ which ]; @@ -154,12 +154,12 @@ bool K3bVcdTrack::isPbcUserDefined( int which ) return m_pbcusrdefmap[ which ]; } -const QString K3bVcdTrack::resolution() +const TQString K3bVcdTrack::resolution() { if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { - return QString( "%1 x %2" ).arg( mpeg_info->video[ i ].hsize ).arg( mpeg_info->video[ i ].vsize ); + return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ i ].hsize ).tqarg( mpeg_info->video[ i ].vsize ); } } } @@ -167,22 +167,22 @@ const QString K3bVcdTrack::resolution() return i18n( "n/a" ); } -const QString K3bVcdTrack::highresolution() +const TQString K3bVcdTrack::highresolution() { if ( mpeg_info->has_video ) { if ( mpeg_info->video[ 2 ].seen ) { - return QString( "%1 x %2" ).arg( mpeg_info->video[ 2 ].hsize ).arg( mpeg_info->video[ 2 ].vsize ); + return TQString( "%1 x %2" ).tqarg( mpeg_info->video[ 2 ].hsize ).tqarg( mpeg_info->video[ 2 ].vsize ); } } return i18n( "n/a" ); } -const QString K3bVcdTrack::video_frate() +const TQString K3bVcdTrack::video_frate() { if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { - return QString::number( mpeg_info->video[ i ].frate ); + return TQString::number( mpeg_info->video[ i ].frate ); } } } @@ -190,12 +190,12 @@ const QString K3bVcdTrack::video_frate() return i18n( "n/a" ); } -const QString K3bVcdTrack::video_bitrate() +const TQString K3bVcdTrack::video_bitrate() { if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { - return i18n( "%1 bit/s" ).arg( mpeg_info->video[ i ].bitrate ) ; + return i18n( "%1 bit/s" ).tqarg( mpeg_info->video[ i ].bitrate ) ; } } } @@ -205,7 +205,7 @@ const QString K3bVcdTrack::video_bitrate() -const QString K3bVcdTrack::video_format() +const TQString K3bVcdTrack::video_format() { if ( mpeg_info->has_video ) { for ( int i = 0; i < 2; i++ ) { @@ -238,24 +238,24 @@ const QString K3bVcdTrack::video_format() return i18n( "n/a" ); } -const QString K3bVcdTrack::video_chroma() +const TQString K3bVcdTrack::video_chroma() { if ( mpeg_info->has_video ) { // MPEG1 only supports 4:2:0 Format if ( version() == K3bMpegInfo::MPEG_VERS_MPEG1 ) - return QString( "4:2:0" ); + return TQString( "4:2:0" ); for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->video[ i ].seen ) { switch ( mpeg_info->video[ i ].chroma_format ) { case 1 : - return QString( "4:2:0" ); + return TQString( "4:2:0" ); break; case 2 : - return QString( "4:2:2" ); + return TQString( "4:2:2" ); break; case 3 : - return QString( "4:4:4" ); + return TQString( "4:4:4" ); break; } @@ -266,12 +266,12 @@ const QString K3bVcdTrack::video_chroma() return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_layer() +const TQString K3bVcdTrack::audio_layer() { if ( mpeg_info->has_audio ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->audio[ i ].seen ) { - return QString::number( mpeg_info->audio[ i ].layer ); + return TQString::number( mpeg_info->audio[ i ].layer ); } } } @@ -279,12 +279,12 @@ const QString K3bVcdTrack::audio_layer() return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_bitrate() +const TQString K3bVcdTrack::audio_bitrate() { if ( mpeg_info->has_audio ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->audio[ i ].seen ) { - return i18n( "%1 bit/s" ).arg( mpeg_info->audio[ i ].bitrate ) ; + return i18n( "%1 bit/s" ).tqarg( mpeg_info->audio[ i ].bitrate ) ; } } } @@ -292,12 +292,12 @@ const QString K3bVcdTrack::audio_bitrate() return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_sampfreq() +const TQString K3bVcdTrack::audio_sampfreq() { if ( mpeg_info->has_audio ) { for ( int i = 0; i < 2; i++ ) { if ( mpeg_info->audio[ i ].seen ) { - return i18n( "%1 Hz" ).arg( mpeg_info->audio[ i ].sampfreq ) ; + return i18n( "%1 Hz" ).tqarg( mpeg_info->audio[ i ].sampfreq ) ; } } } @@ -305,25 +305,25 @@ const QString K3bVcdTrack::audio_sampfreq() return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_mode( ) +const TQString K3bVcdTrack::audio_mode( ) { if ( mpeg_info->has_audio ) { for ( int i = 2; i >= 0; i-- ) if ( mpeg_info->audio[ i ].seen ) - return QString( audio_type2str( mpeg_info->audio[ i ].version, mpeg_info->audio[ i ].mode, i ) ); + return TQString( audio_type2str( mpeg_info->audio[ i ].version, mpeg_info->audio[ i ].mode, i ) ); } return i18n( "n/a" ); } -const QString K3bVcdTrack::audio_copyright( ) +const TQString K3bVcdTrack::audio_copyright( ) { if ( mpeg_info->has_audio ) { for ( int i = 2; i >= 0; i-- ) if ( mpeg_info->audio[ i ].seen ) if ( mpeg_info->audio[ i ].copyright ) - return QString( "(c) " ) + ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) ); + return TQString( "(c) " ) + ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) ); else return ( mpeg_info->audio[ i ].original ? i18n( "original" ) : i18n( "duplicate" ) ); } @@ -331,22 +331,22 @@ const QString K3bVcdTrack::audio_copyright( ) return i18n( "n/a" ); } -const QString K3bVcdTrack::mpegTypeS( bool audio ) +const TQString K3bVcdTrack::mpegTypeS( bool audio ) { if ( mpeg_info->has_video && !audio ) { for ( int i = 0; i < 3; i++ ) if ( mpeg_info->video[ i ].seen ) { if ( i == 0 ) { - return QString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Motion Picture" ); + return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Motion Picture" ); } else { - return QString( "MPEG%1 " ).arg( mpeg_info->version ) + i18n( "Still Picture" ); + return TQString( "MPEG%1 " ).tqarg( mpeg_info->version ) + i18n( "Still Picture" ); } } } if ( mpeg_info->has_audio && audio ) { for ( int i = 0; i < 3; i++ ) if ( mpeg_info->audio[ i ].seen ) { - return QString( "MPEG%1 " ).arg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).arg( mpeg_info->audio[ i ].layer ); + return TQString( "MPEG%1 " ).tqarg( mpeg_info->audio[ i ].version ) + i18n( "Layer %1" ).tqarg( mpeg_info->audio[ i ].layer ); } } @@ -374,17 +374,17 @@ const int K3bVcdTrack::mpegType( ) return -1; // MPEG_UNKNOWN; } -const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int audio_mode, unsigned int audio_type ) +const TQString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int audio_mode, unsigned int audio_type ) { kdDebug() << "K3bVcdTrack::audio_type2str() version:" << version << " audio_mode:" << audio_mode << " audio_type:" << audio_type << endl; - QString audio_types[ 3 ][ 5 ] = { + TQString audio_types[ 3 ][ 5 ] = { { i18n( "unknown" ), i18n( "invalid" ), - QString::null, - QString::null, - QString::null + TQString(), + TQString(), + TQString() }, { i18n( "stereo" ), @@ -393,11 +393,11 @@ const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int au i18n( "single channel" ) }, { - QString::null, + TQString(), i18n( "dual channel" ), i18n( "surround sound" ), - QString::null, - QString::null + TQString(), + TQString() } }; switch ( version ) { @@ -417,18 +417,18 @@ const QString K3bVcdTrack::audio_type2str( unsigned int version, unsigned int au } // convert a time in second to HH:mm:ss notation -QString K3bVcdTrack::SecsToHMS( double duration ) +TQString K3bVcdTrack::SecsToHMS( double duration ) { byte hours = ( byte ) ( duration / 3600 ); byte mins = ( byte ) ( ( duration / 60 ) - ( hours * 60 ) ); float secs = duration - 60 * mins - 3600 * hours; if ( hours != 0 ) { - return QString( "%1:" ).arg( hours ).rightJustify( 3, ' ' ) + QString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + QString::number( secs, 'f', 2 ); + return TQString( "%1:" ).tqarg( hours ).rightJustify( 3, ' ' ) + TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 ); } if ( mins != 0 ) { - return QString( "%1:" ).arg( mins ).rightJustify( 3, '0' ) + QString::number( secs, 'f', 2 ); + return TQString( "%1:" ).tqarg( mins ).rightJustify( 3, '0' ) + TQString::number( secs, 'f', 2 ); } - return QString::number( secs, 'f', 2 ); + return TQString::number( secs, 'f', 2 ); } void K3bVcdTrack::PrintInfo() diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index 0d9a3cf..a06552e 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -16,11 +16,11 @@ #ifndef K3BVCDTRACK_H #define K3BVCDTRACK_H -// Qt Includes -#include -#include -#include -#include +// TQt Includes +#include +#include +#include +#include // Kde Includes #include @@ -31,25 +31,25 @@ class LIBK3B_EXPORT K3bVcdTrack { public: - K3bVcdTrack( QPtrList* parent, const QString& filename ); + K3bVcdTrack( TQPtrList* tqparent, const TQString& filename ); ~K3bVcdTrack(); - QString fileName() const + TQString fileName() const { - return QFileInfo( m_file ).fileName(); + return TQFileInfo( m_file ).fileName(); } - QString absPath() const + TQString absPath() const { - return QFileInfo( m_file ).absFilePath(); + return TQFileInfo( m_file ).absFilePath(); } KIO::filesize_t size() const; int index() const; - const QString& title() const + const TQString& title() const { return m_title; } - void setTitle( const QString& t ) + void setTitle( const TQString& t ) { m_title = t; } @@ -131,21 +131,21 @@ class LIBK3B_EXPORT K3bVcdTrack { m_definedkeysmap.clear(); } - QMap DefinedNumKey() + TQMap DefinedNumKey() { return m_definedkeysmap; } // Mpeg Infos - const QString resolution(); - const QString highresolution(); - const QString video_frate(); - const QString video_bitrate(); - const QString audio_layer(); - const QString audio_bitrate(); - const QString audio_sampfreq(); + const TQString resolution(); + const TQString highresolution(); + const TQString video_frate(); + const TQString video_bitrate(); + const TQString audio_layer(); + const TQString audio_bitrate(); + const TQString audio_sampfreq(); - const QString duration() + const TQString duration() { return SecsToHMS( mpeg_info->playing_time ); }; @@ -157,11 +157,11 @@ class LIBK3B_EXPORT K3bVcdTrack { return mpeg_info->muxrate; }; - const QString video_format( ); - const QString video_chroma( ); - const QString audio_mode( ); - const QString audio_copyright( ); - const QString mpegTypeS( bool audio = false ); + const TQString video_format( ); + const TQString video_chroma( ); + const TQString audio_mode( ); + const TQString audio_copyright( ); + const TQString mpegTypeS( bool audio = false ); const int mpegType(); void PrintInfo(); @@ -170,17 +170,17 @@ class LIBK3B_EXPORT K3bVcdTrack protected: - const QString audio_type2str( unsigned int , unsigned int, unsigned int ); - QString SecsToHMS( double ); + const TQString audio_type2str( unsigned int , unsigned int, unsigned int ); + TQString SecsToHMS( double ); - QPtrList* m_parent; + TQPtrList* m_parent; // PBC - QPtrList* m_revreflist; // List of Tracks which points to us - QMap m_pbctrackmap; // Pbc Tracks (Previous, Next, ...) - QMap m_pbcnontrackmap; // Pbc NON Track types (Previous, Next, ...) - QMap m_pbcusrdefmap; // Pbc is userdefined or defaults (Previous, Next, ...) - QMap m_definedkeysmap; + TQPtrList* m_revreflist; // List of Tracks which points to us + TQMap m_pbctrackmap; // Pbc Tracks (Previous, Next, ...) + TQMap m_pbcnontrackmap; // Pbc NON Track types (Previous, Next, ...) + TQMap m_pbcusrdefmap; // Pbc is userdefined or defaults (Previous, Next, ...) + TQMap m_definedkeysmap; bool m_pbcnumkeys; bool m_pbcnumkeysuserdefined; @@ -191,8 +191,8 @@ class LIBK3B_EXPORT K3bVcdTrack bool m_reactivity; int m_filetype; - QFile m_file; - QString m_title; + TQFile m_file; + TQString m_title; }; #endif diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp index 0b6f250..0857013 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.cpp +++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp @@ -14,7 +14,7 @@ * See the file "COPYING" for the exact licensing terms. */ -#include +#include #include #include @@ -35,15 +35,15 @@ K3bVcdXmlView::K3bVcdXmlView( K3bVcdDoc* pDoc ) K3bVcdXmlView::~K3bVcdXmlView() {} -bool K3bVcdXmlView::write( const QString& fname ) +bool K3bVcdXmlView::write( const TQString& fname ) { - QDomDocument xmlDoc( "videocd PUBLIC \"-//GNU//DTD VideoCD//EN\" \"http://www.gnu.org/software/vcdimager/videocd.dtd\"" ); + TQDomDocument xmlDoc( "videocd PUBLIC \"-//GNU//DTD VideoCD//EN\" \"http://www.gnu.org/software/vcdimager/videocd.dtd\"" ); // xmlDoc.appendChild( xmlDoc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"iso-8859-1\"" ) ); xmlDoc.appendChild( xmlDoc.createProcessingInstruction( "xml", "version=\"1.0\"" ) ); // create root element - QDomElement root = xmlDoc.createElement( "videocd" ); + TQDomElement root = xmlDoc.createElement( "videocd" ); root.setAttribute( "xmlns", "http://www.gnu.org/software/vcdimager/1.0/" ); root.setAttribute( "class", m_doc->vcdOptions() ->vcdClass() ); root.setAttribute( "version", m_doc->vcdOptions() ->vcdVersion() ); @@ -53,7 +53,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // Broken SVCD mode - NonCompliantMode if ( m_doc->vcdOptions() ->NonCompliantMode() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "svcd vcd30 mpegav" ); elemOption.setAttribute( "value", "true" ); @@ -65,7 +65,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // VCD3.0 track interpretation if ( m_doc->vcdOptions() ->VCD30interpretation() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "svcd vcd30 tracksvd" ); elemOption.setAttribute( "value", "true" ); @@ -73,7 +73,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // Relaxed aps if ( m_doc->vcdOptions() ->RelaxedAps() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "relaxed aps" ); elemOption.setAttribute( "value", "true" ); @@ -81,7 +81,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // Update scan offsets if ( m_doc->vcdOptions() ->UpdateScanOffsets() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "update scan offsets" ); elemOption.setAttribute( "value", "true" ); @@ -90,7 +90,7 @@ bool K3bVcdXmlView::write( const QString& fname ) // Gaps & Margins if ( m_doc->vcdOptions() ->UseGaps() ) { - QDomElement elemOption; + TQDomElement elemOption; elemOption = addSubElement( xmlDoc, root, "option" ); elemOption.setAttribute( "name", "leadout pregap" ); elemOption.setAttribute( "value", m_doc->vcdOptions() ->PreGapLeadout() ); @@ -120,23 +120,23 @@ bool K3bVcdXmlView::write( const QString& fname ) } // create info element - QDomElement elemInfo = addSubElement( xmlDoc, root, "info" ); + TQDomElement elemInfo = addSubElement( xmlDoc, root, "info" ); addSubElement( xmlDoc, elemInfo, "album-id", m_doc->vcdOptions() ->albumId().upper() ); addSubElement( xmlDoc, elemInfo, "volume-count", m_doc->vcdOptions() ->volumeCount() ); addSubElement( xmlDoc, elemInfo, "volume-number", m_doc->vcdOptions() ->volumeNumber() ); addSubElement( xmlDoc, elemInfo, "restriction", m_doc->vcdOptions() ->Restriction() ); // create pvd element - QDomElement elemPvd = addSubElement( xmlDoc, root, "pvd" ); + TQDomElement elemPvd = addSubElement( xmlDoc, root, "pvd" ); addSubElement( xmlDoc, elemPvd, "volume-id", m_doc->vcdOptions() ->volumeId().upper() ); addSubElement( xmlDoc, elemPvd, "system-id", m_doc->vcdOptions() ->systemId() ); addSubElement( xmlDoc, elemPvd, "application-id", m_doc->vcdOptions() ->applicationId() ); - addSubElement( xmlDoc, elemPvd, "preparer-id", QString( "K3b - Version %1" ).arg( k3bcore->version() ).upper() ); + addSubElement( xmlDoc, elemPvd, "preparer-id", TQString( "K3b - Version %1" ).tqarg( k3bcore->version() ).upper() ); addSubElement( xmlDoc, elemPvd, "publisher-id", m_doc->vcdOptions() ->publisher().upper() ); // create filesystem element - QDomElement elemFileSystem = addSubElement( xmlDoc, root, "filesystem" ); + TQDomElement elemFileSystem = addSubElement( xmlDoc, root, "filesystem" ); // SEGMENT folder, some standalone DVD-Player need this if ( !m_doc->vcdOptions() ->haveSegments() && m_doc->vcdOptions() ->SegmentFolder() ) @@ -144,26 +144,26 @@ bool K3bVcdXmlView::write( const QString& fname ) // create cdi element if ( m_doc->vcdOptions() ->CdiSupport() ) { - QDomElement elemFolder = addFolderElement( xmlDoc, elemFileSystem, "CDI" ); + TQDomElement elemFolder = addFolderElement( xmlDoc, elemFileSystem, "CDI" ); addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_imag.rtf" ), "CDI_IMAG.RTF", true ); addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_text.fnt" ), "CDI_TEXT.FNT" ); addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_vcd.app" ), "CDI_VCD.APP" ); - QString usercdicfg = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); - if ( QFile::exists( usercdicfg ) ) + TQString usercdicfg = locateLocal( "appdata", "cdi/cdi_vcd.cfg" ); + if ( TQFile::exists( usercdicfg ) ) addFileElement( xmlDoc, elemFolder, usercdicfg, "CDI_VCD.CFG" ); else addFileElement( xmlDoc, elemFolder, locate( "data", "k3b/cdi/cdi_vcd.cfg" ), "CDI_VCD.CFG" ); } // sequence-items element & segment-items element - QDomElement elemsequenceItems; - QDomElement elemsegmentItems; + TQDomElement elemsequenceItems; + TQDomElement elemsegmentItems; // sequence-item element & segment-item element - QDomElement elemsequenceItem; - QDomElement elemsegmentItem; + TQDomElement elemsequenceItem; + TQDomElement elemsegmentItem; // if we have segments, elemsegmentItems must be before any sequence in xml file order if ( m_doc->vcdOptions()->haveSegments() ) @@ -173,45 +173,45 @@ bool K3bVcdXmlView::write( const QString& fname ) elemsequenceItems = addSubElement( xmlDoc, root, "sequence-items" ); // if we have no sequence (photo (s)vcd) we must add a dummy sequence they inform the user to turn on pbc on there videoplayer if ( !m_doc->vcdOptions()->haveSequence() ) { - QString filename; + TQString filename; if ( m_doc->vcdOptions()->mpegVersion() == 1 ) filename = locate( "data", "k3b/extra/k3bphotovcd.mpg" ); else filename = locate( "data", "k3b/extra/k3bphotosvcd.mpg" ); elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" ); - elemsequenceItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( filename ) ) ); + elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( filename ).data() ) ); elemsequenceItem.setAttribute( "id", "sequence-000" ); // default entry - QDomElement elemdefaultEntry; + TQDomElement elemdefaultEntry; elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" ); elemdefaultEntry.setAttribute( "id", "entry-000" ); } // pbc - QDomElement elemPbc; + TQDomElement elemPbc; // Add Tracks to XML - QPtrListIterator it( *m_doc->tracks() ); + TQPtrListIterator it( *m_doc->tracks() ); for ( ; it.current(); ++it ) { if ( !it.current() ->isSegment() ) { - QString seqId = QString::number( it.current() ->index() ).rightJustify( 3, '0' ); + TQString seqId = TQString::number( it.current() ->index() ).rightJustify( 3, '0' ); elemsequenceItem = addSubElement( xmlDoc, elemsequenceItems, "sequence-item" ); - elemsequenceItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( it.current() ->absPath() ) ) ); - elemsequenceItem.setAttribute( "id", QString( "sequence-%1" ).arg( seqId ) ); + elemsequenceItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); + elemsequenceItem.setAttribute( "id", TQString( "sequence-%1" ).tqarg( seqId ) ); // default entry - QDomElement elemdefaultEntry; + TQDomElement elemdefaultEntry; elemdefaultEntry = addSubElement( xmlDoc, elemsequenceItem, "default-entry" ); - elemdefaultEntry.setAttribute( "id", QString( "entry-%1" ).arg( seqId ) ); + elemdefaultEntry.setAttribute( "id", TQString( "entry-%1" ).tqarg( seqId ) ); } else { // sequence-items element needs at least one segment to fit the XML elemsegmentItem = addSubElement( xmlDoc, elemsegmentItems, "segment-item" ); - elemsegmentItem.setAttribute( "src", QString( "%1" ).arg( QFile::encodeName( it.current() ->absPath() ) ) ); - elemsegmentItem.setAttribute( "id", QString( "segment-%1" ).arg( QString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) ); + elemsegmentItem.setAttribute( "src", TQString( "%1" ).tqarg( TQFile::encodeName( it.current() ->absPath() ).data() ) ); + elemsegmentItem.setAttribute( "id", TQString( "segment-%1" ).tqarg( TQString::number( it.current() ->index() ).rightJustify( 3, '0' ) ) ); } } @@ -226,17 +226,17 @@ bool K3bVcdXmlView::write( const QString& fname ) } if ( ! elemPbc.isNull() ) { - QDomElement elemEndlist = addSubElement( xmlDoc, elemPbc, "endlist" ); + TQDomElement elemEndlist = addSubElement( xmlDoc, elemPbc, "endlist" ); elemEndlist.setAttribute( "id", "end" ); elemEndlist.setAttribute( "rejected", "true" ); } m_xmlstring = xmlDoc.toString(); - kdDebug() << QString( "(K3bVcdXmlView) Write Data to %1:" ).arg( fname ) << endl; + kdDebug() << TQString( "(K3bVcdXmlView) Write Data to %1:" ).tqarg( fname ) << endl; - QFile xmlFile( fname ); + TQFile xmlFile( fname ); if ( xmlFile.open( IO_WriteOnly ) ) { - QTextStream ts( & xmlFile ); + TQTextStream ts( & xmlFile ); ts << m_xmlstring; xmlFile.close(); return true; @@ -245,89 +245,89 @@ bool K3bVcdXmlView::write( const QString& fname ) return false; } -void K3bVcdXmlView::addComment( QDomDocument& doc, QDomElement& parent, const QString& text ) +void K3bVcdXmlView::addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text ) { - QDomComment comment = doc.createComment( text ); - parent.appendChild( comment ); + TQDomComment comment = doc.createComment( text ); + tqparent.appendChild( comment ); } -QDomElement K3bVcdXmlView::addSubElement( QDomDocument& doc, QDomElement& parent, const QString& name, const QString& value ) +TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const TQString& value ) { - QDomElement element = doc.createElement( name ); - parent.appendChild( element ); + TQDomElement element = doc.createElement( name ); + tqparent.appendChild( element ); if ( !value.isNull() ) { - QDomText t = doc.createTextNode( value ); + TQDomText t = doc.createTextNode( value ); element.appendChild( t ); } return element; } -QDomElement K3bVcdXmlView::addSubElement( QDomDocument& doc, QDomElement& parent, const QString& name, const int& value ) +TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const int& value ) { - QDomElement element = doc.createElement( name ); - parent.appendChild( element ); + TQDomElement element = doc.createElement( name ); + tqparent.appendChild( element ); if ( value >= -1 ) { - QDomText t = doc.createTextNode( QString( "%1" ).arg( value ) ); + TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) ); element.appendChild( t ); } return element; } -QDomElement K3bVcdXmlView::addFolderElement( QDomDocument& doc, QDomElement& parent, const QString& name ) +TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name ) { - QDomElement elemFolder = addSubElement( doc, parent, "folder" ); + TQDomElement elemFolder = addSubElement( doc, tqparent, "folder" ); addSubElement( doc, elemFolder, "name", name ); return elemFolder; } -void K3bVcdXmlView::addFileElement( QDomDocument& doc, QDomElement& parent, const QString& src, const QString& name, bool mixed ) +void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& src, const TQString& name, bool mixed ) { - QDomElement elemFile = addSubElement( doc, parent, "file" ); - elemFile.setAttribute( "src", QString( "%1" ).arg( src ) ); + TQDomElement elemFile = addSubElement( doc, tqparent, "file" ); + elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) ); if ( mixed ) elemFile.setAttribute( "format", "mixed" ); addSubElement( doc, elemFile, "name", name ); } -void K3bVcdXmlView::doPbc( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track ) +void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) { - QString ref = ( track->isSegment() ) ? "segment" : "sequence"; + TQString ref = ( track->isSegment() ) ? "segment" : "sequence"; - QDomElement elemSelection = addSubElement( doc, parent, "selection" ); - elemSelection.setAttribute( "id", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) ); + TQDomElement elemSelection = addSubElement( doc, tqparent, "selection" ); + elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); setNumkeyBSN( doc, elemSelection, track ); for ( int i = 0; i < K3bVcdTrack::_maxPbcTracks; i++ ) { - QDomElement elemPbcSelectionPNRDT; + TQDomElement elemPbcSelectionPNRDT; if ( track->getPbcTrack( i ) ) { int index = track->getPbcTrack( i ) ->index(); - QString ref = ( track->getPbcTrack( i ) ->isSegment() ) ? "segment" : "sequence"; + TQString ref = ( track->getPbcTrack( i ) ->isSegment() ) ? "segment" : "sequence"; switch ( i ) { case K3bVcdTrack::PREVIOUS: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "prev" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::NEXT: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "next" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::RETURN: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "return" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::DEFAULT: elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "default" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); break; case K3bVcdTrack::AFTERTIMEOUT: if ( track->getWaitTime() >= 0 ) { elemPbcSelectionPNRDT = addSubElement( doc, elemSelection, "timeout" ); - elemPbcSelectionPNRDT.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( index ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionPNRDT.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( index ).rightJustify( 3, '0' ) ) ); } break; } @@ -363,23 +363,23 @@ void K3bVcdXmlView::doPbc( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* } addSubElement( doc, elemSelection, "wait", track->getWaitTime() ); - QDomElement loop = addSubElement( doc, elemSelection, "loop", track->getPlayTime() ); + TQDomElement loop = addSubElement( doc, elemSelection, "loop", track->getPlayTime() ); if ( track->Reactivity() ) loop.setAttribute( "jump-timing", "delayed" ); else loop.setAttribute( "jump-timing", "immediate" ); - addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", QString( "%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) ); + addSubElement( doc, elemSelection, "play-item" ).setAttribute( "ref", TQString( "%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); setNumkeySEL( doc, elemSelection, track ); } -void K3bVcdXmlView::setNumkeyBSN( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track ) +void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) { if ( track->PbcNumKeys() ) { if ( track->PbcNumKeysUserdefined() ) { - QMap numKeyMap = track->DefinedNumKey(); - QMap::const_iterator trackIt; + TQMap numKeyMap = track->DefinedNumKey(); + TQMap::const_iterator trackIt; m_startkey = 0; trackIt = numKeyMap.begin(); @@ -387,53 +387,53 @@ void K3bVcdXmlView::setNumkeyBSN( QDomDocument& doc, QDomElement& parent, K3bVcd m_startkey = trackIt.key(); if ( m_startkey > 0 ) - addSubElement( doc, parent, "bsn", m_startkey ); + addSubElement( doc, tqparent, "bsn", m_startkey ); else // user has no numKeys defined for this track track->setPbcNumKeys( false ); } else { // default start with key #1 - addSubElement( doc, parent, "bsn", 1 ); + addSubElement( doc, tqparent, "bsn", 1 ); } } } -void K3bVcdXmlView::setNumkeySEL( QDomDocument& doc, QDomElement& parent, K3bVcdTrack* track ) +void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) { if ( track->PbcNumKeys() ) { - QDomElement elemPbcSelectionNumKeySEL; - QString ref = ( track->isSegment() ) ? "segment" : "sequence"; + TQDomElement elemPbcSelectionNumKeySEL; + TQString ref = ( track->isSegment() ) ? "segment" : "sequence"; int none = m_startkey; if ( track->PbcNumKeysUserdefined() ) { - QMap numKeyMap = track->DefinedNumKey(); - QMap::const_iterator trackIt; + TQMap numKeyMap = track->DefinedNumKey(); + TQMap::const_iterator trackIt; for ( trackIt = numKeyMap.begin(); trackIt != numKeyMap.end(); ++trackIt ) { - kdDebug() << QString( "trackIt key: %1 none: %2" ).arg( trackIt.key() ).arg( none ) << endl; + kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl; while ( none < trackIt.key() ) { - elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) ); - addComment( doc, parent, QString( "key %1 -> %2 (normal none)" ).arg( none ).arg( QFile::encodeName( track->absPath() ) ) ); + elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); + addComment( doc, tqparent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) ); none++; } if ( trackIt.data() ) { - QString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence"; - elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) ); - addComment( doc, parent, QString( "key %1 -> %2" ).arg( trackIt.key() ).arg( QFile::encodeName( trackIt.data() ->absPath() ) ) ); + TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence"; + elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( trackIt.data() ->index() ).rightJustify( 3, '0' ) ) ); + addComment( doc, tqparent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) ); } else { - elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" ); - addComment( doc, parent, QString( "key %1 -> end" ).arg( trackIt.key() ) ); + addComment( doc, tqparent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) ); } none++; } } else { // default reference to itSelf - elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); - elemPbcSelectionNumKeySEL.setAttribute( "ref", QString( "select-%1-%2" ).arg( ref ).arg( QString::number( track->index() ).rightJustify( 3, '0' ) ) ); + elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL.setAttribute( "ref", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); } } } diff --git a/libk3b/projects/videocd/k3bvcdxmlview.h b/libk3b/projects/videocd/k3bvcdxmlview.h index d99549b..cce8341 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.h +++ b/libk3b/projects/videocd/k3bvcdxmlview.h @@ -17,8 +17,8 @@ #ifndef K3B_VCD_XMLVIEW_H #define K3B_VCD_XMLVIEW_H -#include -#include +#include +#include #include #include @@ -34,24 +34,24 @@ class K3bVcdXmlView K3bVcdXmlView( K3bVcdDoc* ); ~K3bVcdXmlView(); - bool write( const QString& ); - QString xmlString() + bool write( const TQString& ); + TQString xmlString() { return m_xmlstring; } private: - QString m_xmlstring; + TQString m_xmlstring; - void addComment( QDomDocument& doc, QDomElement& parent, const QString& text ); - QDomElement addSubElement( QDomDocument&, QDomElement&, const QString& name, const QString& value = QString::null ); - QDomElement addSubElement( QDomDocument&, QDomElement&, const QString& name, const int& value ); + void addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text ); + TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const TQString& value = TQString() ); + TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const int& value ); - QDomElement addFolderElement( QDomDocument&, QDomElement&, const QString& name ); - void addFileElement( QDomDocument&, QDomElement&, const QString& src, const QString& name, bool mixed = false ); - void doPbc( QDomDocument&, QDomElement&, K3bVcdTrack* ); - void setNumkeyBSN( QDomDocument& , QDomElement&, K3bVcdTrack* ); - void setNumkeySEL( QDomDocument& , QDomElement&, K3bVcdTrack* ); + TQDomElement addFolderElement( TQDomDocument&, TQDomElement&, const TQString& name ); + void addFileElement( TQDomDocument&, TQDomElement&, const TQString& src, const TQString& name, bool mixed = false ); + void doPbc( TQDomDocument&, TQDomElement&, K3bVcdTrack* ); + void setNumkeyBSN( TQDomDocument& , TQDomElement&, K3bVcdTrack* ); + void setNumkeySEL( TQDomDocument& , TQDomElement&, K3bVcdTrack* ); K3bVcdDoc* m_doc; int m_startkey; }; diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp index 583a0aa..089f22d 100644 --- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp +++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp @@ -41,19 +41,19 @@ K3bMpegInfo::K3bMpegInfo( const char* filename ) m_mpegfile = fopen( filename, "rb" ); if ( m_mpegfile == 0 ) { - kdDebug() << QString( "Unable to open %1" ).arg( m_filename ) << endl; + kdDebug() << TQString( "Unable to open %1" ).tqarg( m_filename ) << endl; return ; } if ( fseeko( m_mpegfile, 0, SEEK_END ) ) { - kdDebug() << QString( "Unable to seek in file %1" ).arg( m_filename ) << endl; + kdDebug() << TQString( "Unable to seek in file %1" ).tqarg( m_filename ) << endl; return ; } llong lof = ftello( m_mpegfile ); if ( lof == -1 ) { - kdDebug() << QString( "Seeking to end of input file %1 failed." ).arg( m_filename ) << endl; + kdDebug() << TQString( "Seeking to end of input file %1 failed." ).tqarg( m_filename ) << endl; //give up.. return ; } else @@ -61,8 +61,8 @@ K3bMpegInfo::K3bMpegInfo( const char* filename ) // nothing to do on an empty file if ( !m_filesize ) { - kdDebug() << QString( "File %1 is empty." ).arg( m_filename ) << endl; - m_error_string = i18n( "File %1 is empty." ).arg( m_filename ); + kdDebug() << TQString( "File %1 is empty." ).tqarg( m_filename ) << endl; + m_error_string = i18n( "File %1 is empty." ).tqarg( m_filename ); return ; } @@ -90,7 +90,7 @@ bool K3bMpegInfo::MpegParsePacket () if ( !EnsureMPEG( 0, MPEG_PACK_HEADER_CODE ) ) { llong code = GetNBytes( 0, 4 ); - kdDebug() << QString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).arg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).arg( code, 0, 16 ) << endl; + kdDebug() << TQString( "(K3bMpegInfo::mpeg_parse_packet ()) pack header code 0x%1 expected, but 0x%2 found" ).tqarg( 0x00000100 + MPEG_PACK_HEADER_CODE, 0, 16 ).tqarg( code, 0, 16 ) << endl; if ( code == 0x00000100 + MPEG_SEQUENCE_CODE ) { kdDebug() << "...this looks like a elementary video stream but a multiplexed program stream was required." << endl; @@ -120,7 +120,7 @@ bool K3bMpegInfo::MpegParsePacket () if ( offset != 0 ) { // we actually skipped some zeroes - kdDebug() << QString( "Skipped %1 zeroes at start of file" ).arg( offset ) << endl; + kdDebug() << TQString( "Skipped %1 zeroes at start of file" ).tqarg( offset ) << endl; } // here while schleife @@ -155,7 +155,7 @@ bool K3bMpegInfo::MpegParsePacket () { duration = ReadTSMpeg2( last_pack ); } else { - kdDebug() << QString( "no timestamp found" ) << endl; + kdDebug() << TQString( "no timestamp found" ) << endl; duration = ReadTS( last_pack ); } @@ -190,7 +190,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) int bits; case MPEG_PACK_HEADER_CODE: - // kdDebug() << QString( "MPEG_PACK_HEADER_CODE @ %1" ).arg( offset ) << endl; + // kdDebug() << TQString( "MPEG_PACK_HEADER_CODE @ %1" ).tqarg( offset ) << endl; offset += 4; @@ -214,7 +214,7 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) if ( m_initial_TS == 0.0 ) { m_initial_TS = ReadTS( offset ); - kdDebug() << QString( "Initial TS = %1" ).arg( m_initial_TS ) << endl; + kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl; } } else if ( bits >> 2 == 0x1 ) /* %01xx ISO13818-1 */ @@ -231,11 +231,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) if ( m_initial_TS == 0.0 ) { m_initial_TS = ReadTSMpeg2( offset ); - kdDebug() << QString( "Initial TS = %1" ).arg( m_initial_TS ) << endl; + kdDebug() << TQString( "Initial TS = %1" ).tqarg( m_initial_TS ) << endl; } } else { - kdDebug() << QString( "packet not recognized as either version 1 or 2 (%1)" ).arg( bits ) << endl; + kdDebug() << TQString( "packet not recognized as either version 1 or 2 (%1)" ).tqarg( bits ) << endl; mpeg_info->version = MPEG_VERS_INVALID; return -1; } @@ -254,11 +254,11 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) offset += 4; size = GetSize( offset ); offset += 2; - // kdDebug() << QString( "offset = %1, size = %2" ).arg( offset ).arg( size ) << endl; + // kdDebug() << TQString( "offset = %1, size = %2" ).tqarg( offset ).tqarg( size ) << endl; switch ( mark ) { case MPEG_SYSTEM_HEADER_CODE: - // kdDebug() << QString( "Systemheader: %1" ).arg( m_code, 0, 16 ) << endl; + // kdDebug() << TQString( "Systemheader: %1" ).tqarg( m_code, 0, 16 ) << endl; break; case MPEG_VIDEO_E0_CODE: @@ -296,18 +296,18 @@ llong K3bMpegInfo::MpegParsePacket ( llong offset ) break; case MPEG_PRIVATE_1_CODE: - kdDebug() << QString( "PrivateCode: %1" ).arg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "PrivateCode: %1" ).tqarg( mark, 0, 16 ) << endl; break; } break; case MPEG_PROGRAM_END_CODE: - kdDebug() << QString( "ProgramEndCode: %1" ).arg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "ProgramEndCode: %1" ).tqarg( mark, 0, 16 ) << endl; offset += 4; break; case MPEG_PICTURE_CODE: - kdDebug() << QString( "PictureCode: %1" ).arg( mark, 0, 16 ) << endl; + kdDebug() << TQString( "PictureCode: %1" ).tqarg( mark, 0, 16 ) << endl; offset += 3; break; @@ -325,7 +325,7 @@ byte K3bMpegInfo::GetByte( llong offset ) if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { if ( fseeko( m_mpegfile, offset, SEEK_SET ) ) { - kdDebug() << QString( "could not get seek to offset (%1) in file %2 (size:%3)" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; + kdDebug() << TQString( "could not get seek to offset (%1) in file %2 (size:%3)" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; return 0x11; } nread = fread( m_buffer, 1, BUFFERSIZE, m_mpegfile ); @@ -333,7 +333,7 @@ byte K3bMpegInfo::GetByte( llong offset ) m_buffend = offset + nread; if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { // weird - kdDebug() << QString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; + kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; return 0x11; } } @@ -355,7 +355,7 @@ byte K3bMpegInfo::bdGetByte( llong offset ) m_buffend = start + nread; if ( ( offset >= m_buffend ) || ( offset < m_buffstart ) ) { // weird - kdDebug() << QString( "could not get offset %1 in file %2 [%3]" ).arg( offset ).arg( m_filename ).arg( m_filesize ) << endl; + kdDebug() << TQString( "could not get offset %1 in file %2 [%3]" ).tqarg( offset ).tqarg( m_filename ).tqarg( m_filesize ) << endl; return 0x11; } diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h index 3436214..461af3a 100644 --- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h +++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.h @@ -30,7 +30,7 @@ #define MPEG_USER_CODE ((uchar) 0xb2) #define MPEG_SEQUENCE_CODE ((uchar) 0xb3) #define MPEG_EXT_CODE ((uchar) 0xb5) -#define MPEG_SEQ_END_CODE ((uchar) 0xb7) +#define MPEG_SETQ_END_CODE ((uchar) 0xb7) #define MPEG_GOP_CODE ((uchar) 0xb8) #define MPEG_PROGRAM_END_CODE ((uchar) 0xb9) #define MPEG_PACK_HEADER_CODE ((uchar) 0xba) @@ -127,7 +127,7 @@ class K3bMpegInfo { return mpeg_info->version; }; - const QString error_string() + const TQString error_string() { return m_error_string; }; @@ -171,7 +171,7 @@ class K3bMpegInfo llong m_buffend; byte* m_buffer; double m_initial_TS; - QString m_error_string; + TQString m_error_string; }; diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.cpp b/libk3b/projects/videodvd/k3bvideodvddoc.cpp index 2f02ac6..f86830d 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.cpp +++ b/libk3b/projects/videodvd/k3bvideodvddoc.cpp @@ -24,8 +24,8 @@ #include -K3bVideoDvdDoc::K3bVideoDvdDoc( QObject* parent ) - : K3bDvdDoc( parent ) +K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* tqparent ) + : K3bDvdDoc( tqparent ) { } @@ -63,9 +63,9 @@ bool K3bVideoDvdDoc::newDocument() } -K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, QObject* parent ) +K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) { - return new K3bVideoDvdJob( this, hdl, parent ); + return new K3bVideoDvdJob( this, hdl, tqparent ); } //#include "k3bdvddoc.moc" diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.h b/libk3b/projects/videodvd/k3bvideodvddoc.h index 034ae4d..cdfdfa7 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.h +++ b/libk3b/projects/videodvd/k3bvideodvddoc.h @@ -23,12 +23,12 @@ class KConfig; class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc { public: - K3bVideoDvdDoc( QObject* parent = 0 ); + K3bVideoDvdDoc( TQObject* tqparent = 0 ); virtual ~K3bVideoDvdDoc(); virtual int type() const { return VIDEODVD; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, QObject* parent ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); virtual bool newDocument(); @@ -37,7 +37,7 @@ class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc // TODO: implement load- and saveDocumentData since we do not need all those options protected: - virtual QString typeString() const { return "video_dvd"; } + virtual TQString typeString() const { return "video_dvd"; } private: K3bDirItem* m_videoTsDir; diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp index 7362aa0..ab7c17a 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp @@ -26,10 +26,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include @@ -38,12 +38,12 @@ class K3bVideoDvdImager::Private public: K3bVideoDvdDoc* doc; - QString tempPath; + TQString tempPath; }; -K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, QObject* parent, const char* name ) - : K3bIsoImager( doc, jh, parent, name ) +K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) + : K3bIsoImager( doc, jh, tqparent, name ) { d = new Private; d->doc = doc; @@ -104,30 +104,30 @@ int K3bVideoDvdImager::writePathSpec() // // We do this here since K3bIsoImager::start calls cleanup which deletes the temp files // - QDir dir( KGlobal::dirs()->resourceDirs( "tmp" ).first() ); + TQDir dir( KGlobal::dirs()->resourceDirs( "tmp" ).first() ); d->tempPath = K3b::findUniqueFilePrefix( "k3bVideoDvd", dir.path() ); kdDebug() << "(K3bVideoDvdImager) creating temp dir: " << d->tempPath << endl; if( !dir.mkdir( d->tempPath, true ) ) { - emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath), ERROR ); + emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath), ERROR ); return -1; } dir.cd( d->tempPath ); if( !dir.mkdir( "VIDEO_TS" ) ) { - emit infoMessage( i18n("Unable to create temporary directory '%1'.").arg(d->tempPath + "/VIDEO_TS"), ERROR ); + emit infoMessage( i18n("Unable to create temporary directory '%1'.").tqarg(d->tempPath + "/VIDEO_TS"), ERROR ); return -1; } - for( QPtrListIterator it( d->doc->videoTsDir()->children() ); *it; ++it ) { + for( TQPtrListIterator it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) { if( (*it)->isDir() ) { - emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").arg((*it)->k3bName()), ERROR ); + emit infoMessage( i18n("Found invalid entry in the VIDEO_TS folder (%1).").tqarg((*it)->k3bName()), ERROR ); return -1; } // convert to upper case names - if( ::symlink( QFile::encodeName( (*it)->localPath() ), - QFile::encodeName( d->tempPath + "/VIDEO_TS/" + (*it)->k3bName().upper() ) ) == -1 ) { - emit infoMessage( i18n("Unable to link temporary file in folder %1.").arg( d->tempPath ), ERROR ); + if( ::symlink( TQFile::encodeName( (*it)->localPath() ), + TQFile::encodeName( d->tempPath + "/VIDEO_TS/" + (*it)->k3bName().upper() ) ) == -1 ) { + emit infoMessage( i18n("Unable to link temporary file in folder %1.").tqarg( d->tempPath ), ERROR ); return -1; } } @@ -137,7 +137,7 @@ int K3bVideoDvdImager::writePathSpec() } -int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream ) +int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream ) { // // We handle the VIDEO_TS dir differently since otherwise mkisofs is not able to @@ -148,7 +148,7 @@ int K3bVideoDvdImager::writePathSpecForDir( K3bDirItem* dirItem, QTextStream& st } int num = 0; - for( QPtrListIterator it( dirItem->children() ); it.current(); ++it ) { + for( TQPtrListIterator it( dirItem->tqchildren() ); it.current(); ++it ) { K3bDataItem* item = it.current(); num++; @@ -192,25 +192,25 @@ bool K3bVideoDvdImager::addMkisofsParameters( bool printSize ) void K3bVideoDvdImager::cleanup() { - if( QFile::exists( d->tempPath ) ) { - QDir dir( d->tempPath ); + if( TQFile::exists( d->tempPath ) ) { + TQDir dir( d->tempPath ); dir.cd( "VIDEO_TS" ); - for( QPtrListIterator it( d->doc->videoTsDir()->children() ); *it; ++it ) + for( TQPtrListIterator it( d->doc->videoTsDir()->tqchildren() ); *it; ++it ) dir.remove( (*it)->k3bName().upper() ); dir.cdUp(); dir.rmdir( "VIDEO_TS" ); dir.cdUp(); dir.rmdir( d->tempPath ); } - d->tempPath = QString::null; + d->tempPath = TQString(); K3bIsoImager::cleanup(); } -void K3bVideoDvdImager::slotReceivedStderr( const QString& line ) +void K3bVideoDvdImager::slotReceivedStderr( const TQString& line ) { - if( line.contains( "Unable to make a DVD-Video image" ) ) { + if( line.tqcontains( "Unable to make a DVD-Video image" ) ) { emit infoMessage( i18n("The project does not contain all necessary VideoDVD files."), WARNING ); emit infoMessage( i18n("The resulting DVD will most likely not be playable on a Hifi DVD player."), WARNING ); } diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.h b/libk3b/projects/videodvd/k3bvideodvdimager.h index 0062d55..b1a9678 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.h +++ b/libk3b/projects/videodvd/k3bvideodvdimager.h @@ -32,9 +32,10 @@ class K3bVideoDvdDoc; class K3bVideoDvdImager : public K3bIsoImager { Q_OBJECT + TQ_OBJECT public: - K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, QObject* parent = 0, const char* name = 0 ); + K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bVideoDvdImager(); public slots: @@ -46,10 +47,10 @@ class K3bVideoDvdImager : public K3bIsoImager bool addMkisofsParameters( bool printSize = false ); int writePathSpec(); void cleanup(); - int writePathSpecForDir( K3bDirItem* dirItem, QTextStream& stream ); + int writePathSpecForDir( K3bDirItem* dirItem, TQTextStream& stream ); protected slots: - virtual void slotReceivedStderr( const QString& ); + virtual void slotReceivedStderr( const TQString& ); private: void fixVideoDVDSettings(); diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index f4e6129..b550379 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -30,8 +30,8 @@ -K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, QObject* parent ) - : K3bDvdJob( doc, jh, parent ), +K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) + : K3bDvdJob( doc, jh, tqparent ), m_doc(doc) { } @@ -64,7 +64,7 @@ bool K3bVideoDvdJob::prepareWriterJob() writer->setCloseDvd( true ); if( m_doc->onTheFly() ) { - writer->setImageToWrite( QString::null ); // read from stdin + writer->setImageToWrite( TQString() ); // read from stdin writer->setTrackSize( m_isoImager->size() ); } else @@ -76,7 +76,7 @@ bool K3bVideoDvdJob::prepareWriterJob() } -QString K3bVideoDvdJob::jobDescription() const +TQString K3bVideoDvdJob::jobDescription() const { if( m_doc->onlyCreateImages() ) { return i18n("Creating Video DVD Image File"); @@ -84,18 +84,18 @@ QString K3bVideoDvdJob::jobDescription() const else { return i18n("Writing Video DVD") + ( m_doc->isoOptions().volumeID().isEmpty() - ? QString::null - : QString( " (%1)" ).arg(m_doc->isoOptions().volumeID()) ); + ? TQString() + : TQString( " (%1)" ).tqarg(m_doc->isoOptions().volumeID()) ); } } -QString K3bVideoDvdJob::jobDetails() const +TQString K3bVideoDvdJob::jobDetails() const { - return ( i18n("ISO9660/Udf Filesystem (Size: %1)").arg(KIO::convertSize( doc()->size() )) + return ( i18n("ISO9660/Udf Filesystem (Size: %1)").tqarg(KIO::convertSize( doc()->size() )) + ( m_doc->copies() > 1 ? i18n(" - %n copy", " - %n copies", m_doc->copies()) - : QString::null ) ); + : TQString() ) ); } #include "k3bvideodvdjob.moc" diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.h b/libk3b/projects/videodvd/k3bvideodvdjob.h index 3f03cea..a1d079e 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.h +++ b/libk3b/projects/videodvd/k3bvideodvdjob.h @@ -28,13 +28,14 @@ class K3bVideoDvdDoc; class K3bVideoDvdJob : public K3bDvdJob { Q_OBJECT + TQ_OBJECT public: - K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, QObject* parent = 0 ); + K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); virtual ~K3bVideoDvdJob(); - virtual QString jobDescription() const; - virtual QString jobDetails() const; + virtual TQString jobDescription() const; + virtual TQString jobDetails() const; private: bool prepareWriterJob(); -- cgit v1.2.3