The New International CD-i Association

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/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 +- 15 files changed, 476 insertions(+), 474 deletions(-) (limited to 'libk3b/projects/videocd') 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; }; -- cgit v1.2.3