diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | df8e67b86696f691708af8592d86282b09bab011 (patch) | |
tree | ca90d734c9011d457a42f0a7004a9507b2c2c1bd /libk3b/projects | |
parent | 33881ea4441221b1ca0789a72c4c7249d923a0df (diff) | |
download | k3b-df8e67b86696f691708af8592d86282b09bab011.tar.gz k3b-df8e67b86696f691708af8592d86282b09bab011.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libk3b/projects')
86 files changed, 246 insertions, 246 deletions
diff --git a/libk3b/projects/audiocd/k3baudiodatasource.h b/libk3b/projects/audiocd/k3baudiodatasource.h index 5ac7336..f3bc770 100644 --- a/libk3b/projects/audiocd/k3baudiodatasource.h +++ b/libk3b/projects/audiocd/k3baudiodatasource.h @@ -150,7 +150,7 @@ class LIBK3B_EXPORT K3bAudioDataSource protected: /** - * Informs the tqparent track about changes. + * Informs the parent track about changes. */ void emitChange(); diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index 0cd8ae1..625f5bf 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -69,8 +69,8 @@ public: }; -K3bAudioDoc::K3bAudioDoc( TQObject* tqparent ) - : K3bDoc( tqparent ), +K3bAudioDoc::K3bAudioDoc( TQObject* parent ) + : K3bDoc( parent ), m_firstTrack(0), m_lastTrack(0) { @@ -288,11 +288,11 @@ bool K3bAudioDoc::readPlaylistFile( const KURL& url, KURL::List& playlist ) } -void K3bAudioDoc::addSources( K3bAudioTrack* tqparent, +void K3bAudioDoc::addSources( K3bAudioTrack* parent, const KURL::List& urls, K3bAudioDataSource* sourceAfter ) { - kdDebug() << "(K3bAudioDoc::addSources( " << tqparent << ", " + kdDebug() << "(K3bAudioDoc::addSources( " << parent << ", " << urls.first().path() << ", " << sourceAfter << " )" << endl; KURL::List allUrls = extractUrlList( urls ); @@ -302,7 +302,7 @@ void K3bAudioDoc::addSources( K3bAudioTrack* tqparent, if( sourceAfter ) file->moveAfter( sourceAfter ); else - file->moveAhead( tqparent->firstSource() ); + file->moveAhead( parent->firstSource() ); sourceAfter = file; } } @@ -916,9 +916,9 @@ int K3bAudioDoc::numOfTracks() const } -K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bAudioDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bAudioJob( this, hdl, tqparent ); + return new K3bAudioJob( this, hdl, parent ); } diff --git a/libk3b/projects/audiocd/k3baudiodoc.h b/libk3b/projects/audiocd/k3baudiodoc.h index 943bf14..70f8826 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.h +++ b/libk3b/projects/audiocd/k3baudiodoc.h @@ -112,7 +112,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc */ K3bDevice::Toc toToc() const; - K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ); + K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* parent = 0 ); /** * Shows dialogs. @@ -159,7 +159,7 @@ class LIBK3B_EXPORT K3bAudioDoc : public K3bDoc */ void addTrack( K3bAudioTrack* track, uint position = 0 ); - void addSources( K3bAudioTrack* tqparent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 ); + void addSources( K3bAudioTrack* parent, const KURL::List& urls, K3bAudioDataSource* sourceAfter = 0 ); void removeTrack( K3bAudioTrack* ); void moveTrack( K3bAudioTrack* track, K3bAudioTrack* after ); diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp index 0a385e9..ba0692f 100644 --- a/libk3b/projects/audiocd/k3baudioimager.cpp +++ b/libk3b/projects/audiocd/k3baudioimager.cpp @@ -167,8 +167,8 @@ void K3bAudioImager::WorkThread::cancel() -K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ), +K3bAudioImager::K3bAudioImager( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ), m_doc(doc) { m_thread = new WorkThread(doc); diff --git a/libk3b/projects/audiocd/k3baudioimager.h b/libk3b/projects/audiocd/k3baudioimager.h index bfa1d83..fae29e5 100644 --- a/libk3b/projects/audiocd/k3baudioimager.h +++ b/libk3b/projects/audiocd/k3baudioimager.h @@ -26,7 +26,7 @@ class K3bAudioImager : public K3bThreadJob TQ_OBJECT public: - K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioImager( K3bAudioDoc*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioImager(); /** diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp index ddf15a3..a03a218 100644 --- a/libk3b/projects/audiocd/k3baudiojob.cpp +++ b/libk3b/projects/audiocd/k3baudiojob.cpp @@ -92,8 +92,8 @@ class K3bAudioJob::Private }; -K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bAudioJob::K3bAudioJob( K3bAudioDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_doc( doc ), m_normalizeJob(0), m_maxSpeedJob(0) diff --git a/libk3b/projects/audiocd/k3baudiojob.h b/libk3b/projects/audiocd/k3baudiojob.h index 309d3f3..22b527b 100644 --- a/libk3b/projects/audiocd/k3baudiojob.h +++ b/libk3b/projects/audiocd/k3baudiojob.h @@ -41,7 +41,7 @@ class K3bAudioJob : public K3bBurnJob TQ_OBJECT public: - K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bAudioJob( K3bAudioDoc*, K3bJobHandler*, TQObject* parent = 0 ); ~K3bAudioJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp index 538d454..abbf753 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp @@ -43,8 +43,8 @@ public: }; -K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bAudioJobTempData::K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private( doc ); } diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.h b/libk3b/projects/audiocd/k3baudiojobtempdata.h index 62bc7e7..1291683 100644 --- a/libk3b/projects/audiocd/k3baudiojobtempdata.h +++ b/libk3b/projects/audiocd/k3baudiojobtempdata.h @@ -31,7 +31,7 @@ class K3bAudioJobTempData : public TQObject TQ_OBJECT public: - K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioJobTempData( K3bAudioDoc* doc, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioJobTempData(); const TQString& bufferFileName( int track ); diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp index cde09c9..2f8713b 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp @@ -203,8 +203,8 @@ int K3bAudioMaxSpeedJob::WorkThread::maxSpeedByMedia() const -K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ) +K3bAudioMaxSpeedJob::K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ) { m_thread = new WorkThread( doc ); setThread( m_thread ); diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h index 9526d4a..cb7f820 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.h +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.h @@ -27,7 +27,7 @@ class K3bAudioMaxSpeedJob : public K3bThreadJob TQ_OBJECT public: - K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioMaxSpeedJob( K3bAudioDoc* doc, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioMaxSpeedJob(); /** diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index 88c769b..52afb5e 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -23,8 +23,8 @@ #include <klocale.h> -K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bJob( hdl, tqparent, name ), +K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bJob( hdl, parent, name ), m_process(0) { } diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.h b/libk3b/projects/audiocd/k3baudionormalizejob.h index b623a41..eeff0ae 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.h +++ b/libk3b/projects/audiocd/k3baudionormalizejob.h @@ -32,7 +32,7 @@ class K3bAudioNormalizeJob : public K3bJob TQ_OBJECT public: - K3bAudioNormalizeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioNormalizeJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioNormalizeJob(); public slots: diff --git a/libk3b/projects/audiocd/k3baudiotrack.cpp b/libk3b/projects/audiocd/k3baudiotrack.cpp index 53d1d34..5f133a4 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.cpp +++ b/libk3b/projects/audiocd/k3baudiotrack.cpp @@ -59,8 +59,8 @@ K3bAudioTrack::K3bAudioTrack() } -K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* tqparent ) - : m_parent(tqparent), +K3bAudioTrack::K3bAudioTrack( K3bAudioDoc* parent ) + : m_parent(parent), m_copy(false), m_preEmp(false), m_index0Offset(150), @@ -282,7 +282,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track ) kdDebug() << "(K3bAudioTrack::moveAfter( " << track << " )" << endl; if( !track ) { if( !doc() ) { - kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl; + kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl; return; } @@ -302,7 +302,7 @@ void K3bAudioTrack::moveAfter( K3bAudioTrack* track ) // remove this from the list take(); - // set the new tqparent doc + // set the new parent doc m_parent = track->doc(); K3bAudioTrack* oldNext = track->m_next; @@ -330,7 +330,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track ) { if( !track ) { if( !doc() ) { - kdDebug() << "(K3bAudioTrack::moveAfter) no tqparent set" << endl; + kdDebug() << "(K3bAudioTrack::moveAfter) no parent set" << endl; return; } @@ -350,7 +350,7 @@ void K3bAudioTrack::moveAhead( K3bAudioTrack* track ) // remove this from the list take(); - // set the new tqparent doc + // set the new parent doc m_parent = track->doc(); K3bAudioTrack* oldPrev = track->m_prev; @@ -568,7 +568,7 @@ K3bAudioTrack* K3bAudioTrack::split( const K3b::Msf& pos ) splitTrack->addSource( addSource ); } - kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with tqparent " << doc() << endl; + kdDebug() << "(K3bAudioTrack) moving track " << splitTrack << " after this (" << this << ") with parent " << doc() << endl; splitTrack->moveAfter( this ); return splitTrack; diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h index 0edef0a..410b1f0 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.h +++ b/libk3b/projects/audiocd/k3baudiotrack.h @@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bAudioTrack public: K3bAudioTrack(); - K3bAudioTrack( K3bAudioDoc* tqparent ); + K3bAudioTrack( K3bAudioDoc* parent ); ~K3bAudioTrack(); K3bAudioDoc* doc() const { return m_parent; } diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index 14a78a4..2c4fa51 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -67,8 +67,8 @@ * \li or create your own K3bDirItems and K3bFileItems. The doc will be properly updated * by the constructors of the items. */ -K3bDataDoc::K3bDataDoc( TQObject* tqparent ) - : K3bDoc( tqparent ) +K3bDataDoc::K3bDataDoc( TQObject* parent ) + : K3bDoc( parent ) { m_root = 0; @@ -219,9 +219,9 @@ bool K3bDataDoc::nameAlreadyInDir( const TQString& name, K3bDirItem* dir ) } -K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* tqparent ) +K3bDirItem* K3bDataDoc::addEmptyDir( const TQString& name, K3bDirItem* parent ) { - K3bDirItem* item = new K3bDirItem( name, this, tqparent ); + K3bDirItem* item = new K3bDirItem( name, this, parent ); setModified( true ); @@ -332,7 +332,7 @@ bool K3bDataDoc::loadDocumentData( TQDomElement* rootElem ) // file we create a default one here. // if( !m_bootImages.isEmpty() && !m_bootCataloge ) - createBootCatalogeItem( m_bootImages.first()->tqparent() ); + createBootCatalogeItem( m_bootImages.first()->parent() ); informAboutNotFoundFiles(); @@ -511,7 +511,7 @@ bool K3bDataDoc::loadDocumentDataHeader( TQDomElement headerElem ) } -bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) +bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* parent ) { K3bDataItem* newItem = 0; @@ -535,7 +535,7 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) else if( !elem.attribute( "bootimage" ).isEmpty() ) { K3bBootItem* bootItem = new K3bBootItem( urlElem.text(), this, - tqparent, + parent, elem.attributeNode( "name" ).value() ); if( elem.attribute( "bootimage" ) == "floppy" ) bootItem->setImageType( K3bBootItem::FLOPPY ); @@ -554,18 +554,18 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) else { newItem = new K3bFileItem( urlElem.text(), this, - tqparent, + parent, elem.attributeNode( "name" ).value() ); } } else if( elem.nodeName() == "special" ) { if( elem.attributeNode( "type" ).value() == "boot cataloge" ) - createBootCatalogeItem( tqparent )->setK3bName( elem.attributeNode( "name" ).value() ); + createBootCatalogeItem( parent )->setK3bName( elem.attributeNode( "name" ).value() ); } else if( elem.nodeName() == "directory" ) { // This is for the VideoDVD project which already contains the *_TS folders K3bDirItem* newDirItem = 0; - if( K3bDataItem* item = tqparent->find( elem.attributeNode( "name" ).value() ) ) { + if( K3bDataItem* item = parent->find( elem.attributeNode( "name" ).value() ) ) { if( item->isDir() ) { newDirItem = static_cast<K3bDirItem*>(item); } @@ -576,7 +576,7 @@ bool K3bDataDoc::loadDataItem( TQDomElement& elem, K3bDirItem* tqparent ) } if( !newDirItem ) - newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, tqparent ); + newDirItem = new K3bDirItem( elem.attributeNode( "name" ).value(), this, parent ); TQDomNodeList childNodes = elem.childNodes(); for( uint i = 0; i < childNodes.count(); i++ ) { @@ -835,7 +835,7 @@ void K3bDataDoc::saveDocumentDataHeader( TQDomElement& headerElem ) } -void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ) +void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* parent ) { if( K3bFileItem* fileItem = dynamic_cast<K3bFileItem*>( item ) ) { if( m_oldSession.contains( fileItem ) ) { @@ -851,7 +851,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme if( item->sortWeight() != 0 ) topElem.setAttribute( "sort_weight", TQString::number(item->sortWeight()) ); - tqparent->appendChild( topElem ); + parent->appendChild( topElem ); // add boot options as attributes to preserve compatibility to older K3b versions if( K3bBootItem* bootItem = dynamic_cast<K3bBootItem*>( fileItem ) ) { @@ -874,7 +874,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme topElem.setAttribute( "name", m_bootCataloge->k3bName() ); topElem.setAttribute( "type", "boot cataloge" ); - tqparent->appendChild( topElem ); + parent->appendChild( topElem ); } else if( K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>( item ) ) { TQDomElement topElem = doc->createElement( "directory" ); @@ -888,7 +888,7 @@ void K3bDataDoc::saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomEleme saveDataItem( it.current(), doc, &topElem ); } - tqparent->appendChild( topElem ); + parent->appendChild( topElem ); } } @@ -979,9 +979,9 @@ void K3bDataDoc::moveItems( TQPtrList<K3bDataItem> itemList, K3bDirItem* newPare } -K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bDataDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bDataJob( this, hdl, tqparent ); + return new K3bDataJob( this, hdl, parent ); } @@ -1211,7 +1211,7 @@ bool K3bDataDoc::importSession( K3bDevice::Device* device ) } -void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* tqparent ) +void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, K3bDirItem* parent ) { Q_ASSERT(importDir); TQStringList entries = importDir->entries(); @@ -1220,7 +1220,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, for( TQStringList::const_iterator it = entries.begin(); it != entries.end(); ++it ) { const K3bIso9660Entry* entry = importDir->entry( *it ); - K3bDataItem* oldItem = tqparent->find( entry->name() ); + K3bDataItem* oldItem = parent->find( entry->name() ); if( entry->isDirectory() ) { K3bDirItem* dir = 0; if( oldItem && oldItem->isDir() ) { @@ -1230,7 +1230,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, // we overwrite without warning! if( oldItem ) removeItem( oldItem ); - dir = new K3bDirItem( entry->name(), this, tqparent ); + dir = new K3bDirItem( entry->name(), this, parent ); } dir->setRemoveable(false); @@ -1250,7 +1250,7 @@ void K3bDataDoc::createSessionImportItems( const K3bIso9660Directory* importDir, if( oldItem ) removeItem( oldItem ); - K3bSessionImportItem* item = new K3bSessionImportItem( file, this, tqparent ); + K3bSessionImportItem* item = new K3bSessionImportItem( file, this, parent ); item->setExtraInfo( i18n("From previous session") ); m_oldSession.append( item ); } diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h index eccbde9..ebb6507 100644 --- a/libk3b/projects/datacd/k3bdatadoc.h +++ b/libk3b/projects/datacd/k3bdatadoc.h @@ -64,7 +64,7 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc TQ_OBJECT public: - K3bDataDoc( TQObject* tqparent = 0 ); + K3bDataDoc( TQObject* parent = 0 ); virtual ~K3bDataDoc(); virtual int type() const { return DATA; } @@ -111,11 +111,11 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc void moveItem( K3bDataItem* item, K3bDirItem* newParent ); void moveItems( TQPtrList<K3bDataItem> itemList, K3bDirItem* newParent ); - K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* tqparent ); + K3bDirItem* addEmptyDir( const TQString& name, K3bDirItem* parent ); TQString treatWhitespace( const TQString& ); - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent = 0 ); MultiSessionMode multiSessionMode() const { return m_multisessionMode; } void setMultiSessionMode( MultiSessionMode mode ); @@ -246,22 +246,22 @@ class LIBK3B_EXPORT K3bDataDoc : public K3bDoc private: void prepareFilenamesInDir( K3bDirItem* dir ); - void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* tqparent ); + void createSessionImportItems( const K3bIso9660Directory*, K3bDirItem* parent ); /** * used by K3bDirItem to inform about removed items. */ - void itemRemovedFromDir( K3bDirItem* tqparent, K3bDataItem* removedItem ); - void itemAddedToDir( K3bDirItem* tqparent, K3bDataItem* addedItem ); + void itemRemovedFromDir( K3bDirItem* parent, K3bDataItem* removedItem ); + void itemAddedToDir( K3bDirItem* parent, K3bDataItem* addedItem ); /** * load recursivly */ - bool loadDataItem( TQDomElement& e, K3bDirItem* tqparent ); + bool loadDataItem( TQDomElement& e, K3bDirItem* parent ); /** * save recursivly */ - void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* tqparent ); + void saveDataItem( K3bDataItem* item, TQDomDocument* doc, TQDomElement* parent ); void informAboutNotFoundFiles(); diff --git a/libk3b/projects/datacd/k3bdataitem.cpp b/libk3b/projects/datacd/k3bdataitem.cpp index b2df008..f5ce21d 100644 --- a/libk3b/projects/datacd/k3bdataitem.cpp +++ b/libk3b/projects/datacd/k3bdataitem.cpp @@ -29,7 +29,7 @@ public: }; -K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags ) +K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent, int flags ) : m_bHideOnRockRidge(false), m_bHideOnJoliet(false), m_bRemoveable(true), @@ -45,8 +45,8 @@ K3bDataItem::K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent, int flags ) m_doc = doc; m_bHideOnRockRidge = m_bHideOnJoliet = false; - if( tqparent ) - m_parentDir = tqparent->getDirItem(); + if( parent ) + m_parentDir = parent->getDirItem(); else m_parentDir = 0; } @@ -121,8 +121,8 @@ void K3bDataItem::setK3bName( const TQString& name ) { return; } - if( tqparent() ) { - K3bDataItem* item = tqparent()->find( name ); + if( parent() ) { + K3bDataItem* item = parent()->find( name ); if( item && item != this ) { kdDebug() << "(K3bDataItem) item with that name already exists." << endl; return; @@ -143,8 +143,8 @@ const TQString& K3bDataItem::k3bName() const K3bDataItem* K3bDataItem::take() { - if( tqparent() ) - tqparent()->takeDataItem( this ); + if( parent() ) + parent()->takeDataItem( this ); return this; } @@ -153,7 +153,7 @@ K3bDataItem* K3bDataItem::take() TQString K3bDataItem::k3bPath() const { if( !getParent() ) - return TQString(); // the root item is the only one not having a tqparent + return TQString(); // the root item is the only one not having a parent else if( isDir() ) return getParent()->k3bPath() + k3bName() + "/"; else @@ -164,7 +164,7 @@ TQString K3bDataItem::k3bPath() const TQString K3bDataItem::writtenPath() const { if( !getParent() ) - return TQString(); // the root item is the only one not having a tqparent + return TQString(); // the root item is the only one not having a parent else if( isDir() ) return getParent()->writtenPath() + writtenName() + "/"; else @@ -175,7 +175,7 @@ TQString K3bDataItem::writtenPath() const TQString K3bDataItem::iso9660Path() const { if( !getParent() ) - return TQString(); // the root item is the only one not having a tqparent + return TQString(); // the root item is the only one not having a parent else if( isDir() ) return getParent()->iso9660Path() + iso9660Name() + "/"; else @@ -232,7 +232,7 @@ bool K3bDataItem::hideOnJoliet() const void K3bDataItem::setHideOnRockRidge( bool b ) { // there is no use in changing the value if - // it is already set by the tqparent + // it is already set by the parent if( ( !getParent() || !getParent()->hideOnRockRidge() ) && b != m_bHideOnRockRidge ) { m_bHideOnRockRidge = b; @@ -245,7 +245,7 @@ void K3bDataItem::setHideOnRockRidge( bool b ) void K3bDataItem::setHideOnJoliet( bool b ) { // there is no use in changing the value if - // it is already set by the tqparent + // it is already set by the parent if( ( !getParent() || !getParent()->hideOnJoliet() ) && b != m_bHideOnJoliet ) { m_bHideOnJoliet = b; diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h index db7452b..043a0d5 100644 --- a/libk3b/projects/datacd/k3bdataitem.h +++ b/libk3b/projects/datacd/k3bdataitem.h @@ -35,12 +35,12 @@ class K3bDataDoc; class LIBK3B_EXPORT K3bDataItem { public: - K3bDataItem( K3bDataDoc* doc, K3bDataItem* tqparent = 0, int flags = 0 ); + K3bDataItem( K3bDataDoc* doc, K3bDataItem* parent = 0, int flags = 0 ); /** * Default copy constructor. * - * The result is an exact copy except that no tqparent dir it set and, thus, also no doc. + * The result is an exact copy except that no parent dir it set and, thus, also no doc. */ K3bDataItem( const K3bDataItem& ); @@ -49,17 +49,17 @@ class LIBK3B_EXPORT K3bDataItem /** * Return an exact copy of this data item. * - * The result is an exact copy except that no tqparent dir it set and, thus, also no doc. + * The result is an exact copy except that no parent dir it set and, thus, also no doc. * * Implementations should use the default constructor. */ virtual K3bDataItem* copy() const = 0; - K3bDirItem* tqparent() { return m_parentDir; } + K3bDirItem* parent() { return m_parentDir; } K3bDirItem* getParent() const { return m_parentDir; } /** - * Remove this item from it's tqparent and return a pointer to it. + * Remove this item from it's parent and return a pointer to it. */ K3bDataItem* take(); @@ -133,7 +133,7 @@ class LIBK3B_EXPORT K3bDataItem virtual void reparent( K3bDirItem* ); // FIXME: use all these flags and make the isXXX methods - // non-virtual. Then move the tqparent()->addDataItem call + // non-virtual. Then move the parent()->addDataItem call // to the K3bDataItem constructor enum ItemFlags { DIR = 0x1, diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index abceb3a..0295e27 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -83,8 +83,8 @@ public: }; -K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ) +K3bDataJob::K3bDataJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ) { d = new Private; diff --git a/libk3b/projects/datacd/k3bdatajob.h b/libk3b/projects/datacd/k3bdatajob.h index a55e2d9..2604f47 100644 --- a/libk3b/projects/datacd/k3bdatajob.h +++ b/libk3b/projects/datacd/k3bdatajob.h @@ -43,7 +43,7 @@ class K3bDataJob : public K3bBurnJob TQ_OBJECT public: - K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bDataJob( K3bDataDoc*, K3bJobHandler*, TQObject* parent = 0 ); virtual ~K3bDataJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp index d9d4893..e562541 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp +++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp @@ -149,8 +149,8 @@ static TQString createItemsString( const TQValueList<K3bDataItem*>& items, unsig } -K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bJob( hdl, tqparent ) +K3bDataPreparationJob::K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bJob( hdl, parent ) { d = new Private( doc ); d->threadJob = new K3bThreadJob( d, this, this ); diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.h b/libk3b/projects/datacd/k3bdatapreparationjob.h index 3ac7d7d..e705d06 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.h +++ b/libk3b/projects/datacd/k3bdatapreparationjob.h @@ -32,7 +32,7 @@ class K3bDataPreparationJob : public K3bJob TQ_OBJECT public: - K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ); + K3bDataPreparationJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ); ~K3bDataPreparationJob(); bool hasBeenCanceled() const; diff --git a/libk3b/projects/datacd/k3bdiritem.cpp b/libk3b/projects/datacd/k3bdiritem.cpp index 16627c7..72af70b 100644 --- a/libk3b/projects/datacd/k3bdiritem.cpp +++ b/libk3b/projects/datacd/k3bdiritem.cpp @@ -37,8 +37,8 @@ K3bDirItem::K3bDirItem(const TQString& name, K3bDataDoc* doc, K3bDirItem* parent m_k3bName = name; // add automagically like a qlistviewitem - if( tqparent() ) - tqparent()->addDataItem( this ); + if( parent() ) + parent()->addDataItem( this ); } @@ -106,7 +106,7 @@ K3bDirItem* K3bDirItem::addDataItem( K3bDataItem* item ) int cnt = 1; while( K3bDataItem* oldItem = find( name ) ) { if( !oldItem->isDir() && oldItem->isFromOldSession() ) { - // in this case we remove this item from it's tqparent and save it in the new one + // in this case we remove this item from it's parent and save it in the new one // to be able to recover it oldItem->take(); static_cast<K3bSessionImportItem*>(oldItem)->setReplaceItem( static_cast<K3bFileItem*>(item) ); @@ -238,8 +238,8 @@ bool K3bDirItem::mkdir( const TQString& dirPath ) // An absolut path always starts at the root item // if( dirPath[0] == '/' ) { - if( tqparent() ) - return tqparent()->mkdir( dirPath ); + if( parent() ) + return parent()->mkdir( dirPath ); else return mkdir( dirPath.mid( 1 ) ); } @@ -294,12 +294,12 @@ bool K3bDirItem::isSubItem( K3bDataItem* item ) const if( dynamic_cast<K3bDirItem*>(item) == this ) return true; - K3bDirItem* d = item->tqparent(); + K3bDirItem* d = item->parent(); while( d ) { if( d == this ) { return true; } - d = d->tqparent(); + d = d->parent(); } return false; @@ -349,16 +349,16 @@ void K3bDirItem::updateSize( K3bDataItem* item, bool removed ) } } - if( tqparent() ) - tqparent()->updateSize( item, removed ); + if( parent() ) + parent()->updateSize( item, removed ); } void K3bDirItem::updateFiles( long files, long dirs ) { m_files += files; m_dirs += dirs; - if( tqparent() ) - tqparent()->updateFiles( files, dirs ); + if( parent() ) + parent()->updateFiles( files, dirs ); } diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index 7ec0fba..304cf1a 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem /** * Default copy constructor. Copies the dir including all tqchildren. However, none of the - * tqchildren will have set a doc and the copy dir will not have set a tqparent dir. + * tqchildren will have set a doc and the copy dir will not have set a parent dir. */ K3bDirItem( const K3bDirItem& ); @@ -111,7 +111,7 @@ class LIBK3B_EXPORT K3bDirItem : public K3bDataItem private: /** * this recursivly updates the size of the directories. - * The size of this dir and the tqparent dir is updated. + * The size of this dir and the parent dir is updated. * These values are just used for user information. */ void updateSize( K3bDataItem*, bool removed = false ); diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp index c6c7bb4..7cabec8 100644 --- a/libk3b/projects/datacd/k3bfileitem.cpp +++ b/libk3b/projects/datacd/k3bfileitem.cpp @@ -113,8 +113,8 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem* } // add automagically like a qlistviewitem - if( tqparent() ) - tqparent()->addDataItem( this ); + if( parent() ) + parent()->addDataItem( this ); } @@ -151,8 +151,8 @@ K3bFileItem::K3bFileItem( const k3b_struct_stat* stat, m_sizeFollowed = m_size; } - if( tqparent() ) - tqparent()->addDataItem( this ); + if( parent() ) + parent()->addDataItem( this ); } @@ -267,7 +267,7 @@ bool K3bFileItem::isValid() const } else if( tokens[i] == ".." ) { // change the directory - dir = dir->tqparent(); + dir = dir->parent(); if( dir == 0 ) return false; } diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h index e758d95..46e2930 100644 --- a/libk3b/projects/datacd/k3bfileitem.h +++ b/libk3b/projects/datacd/k3bfileitem.h @@ -53,7 +53,7 @@ public: /** * Default copy constructor * Creates a copy of the fileitem. The copy, however, is not an exact duplicate of this item. - * The copy does not have a tqparent dir set and any old session items are set to 0. + * The copy does not have a parent dir set and any old session items are set to 0. */ K3bFileItem( const K3bFileItem& ); diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index e511a30..1db1997 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -85,8 +85,8 @@ public: }; -K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bJob( hdl, tqparent, name ), +K3bIsoImager::K3bIsoImager( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bJob( hdl, parent, name ), m_pathSpecFile(0), m_rrHideFile(0), m_jolietHideFile(0), diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h index 446fef8..1208be3 100644 --- a/libk3b/projects/datacd/k3bisoimager.h +++ b/libk3b/projects/datacd/k3bisoimager.h @@ -39,7 +39,7 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler TQ_OBJECT public: - K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bIsoImager( K3bDataDoc*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); virtual ~K3bIsoImager(); virtual bool active() const; diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index a799374..e6d07e8 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -30,8 +30,8 @@ #include <tqstringlist.h> -K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bMsInfoFetcher::K3bMsInfoFetcher( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_process(0), m_device(0), m_dvd(false) diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h index da609cb..7a56f9f 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.h +++ b/libk3b/projects/datacd/k3bmsinfofetcher.h @@ -30,7 +30,7 @@ class K3bMsInfoFetcher : public K3bJob TQ_OBJECT public: - K3bMsInfoFetcher( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bMsInfoFetcher( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bMsInfoFetcher(); const TQString& msInfo() const { return m_msInfo; } diff --git a/libk3b/projects/datacd/k3bsessionimportitem.cpp b/libk3b/projects/datacd/k3bsessionimportitem.cpp index 92b52e4..35f7936 100644 --- a/libk3b/projects/datacd/k3bsessionimportitem.cpp +++ b/libk3b/projects/datacd/k3bsessionimportitem.cpp @@ -29,8 +29,8 @@ K3bSessionImportItem::K3bSessionImportItem( const K3bIso9660File* isoF, K3bDataD setK3bName( isoF->name() ); // add automagically like a qlistviewitem - if( tqparent() ) - tqparent()->addDataItem( this ); + if( parent() ) + parent()->addDataItem( this ); } @@ -48,8 +48,8 @@ K3bSessionImportItem::~K3bSessionImportItem() m_replaceItem->setReplacedItemFromOldSession(0); // remove this from parentdir - if( tqparent() ) - tqparent()->takeDataItem( this ); + if( parent() ) + parent()->takeDataItem( this ); } diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h index c8b7937..1dc3bb7 100644 --- a/libk3b/projects/datacd/k3bspecialdataitem.h +++ b/libk3b/projects/datacd/k3bspecialdataitem.h @@ -29,15 +29,15 @@ class K3bSpecialDataItem : public K3bDataItem { public: - K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* tqparent = 0, const TQString& k3bName = TQString() ) - : K3bDataItem( doc, tqparent ), + K3bSpecialDataItem( K3bDataDoc* doc, KIO::filesize_t size, K3bDirItem* parent = 0, const TQString& k3bName = TQString() ) + : K3bDataItem( doc, parent ), m_size( size ) { setK3bName( k3bName ); // add automagically like a qlistviewitem - if( tqparent ) - tqparent->addDataItem( this ); + if( parent ) + parent->addDataItem( this ); } K3bSpecialDataItem( const K3bSpecialDataItem& item ) @@ -48,8 +48,8 @@ class K3bSpecialDataItem : public K3bDataItem ~K3bSpecialDataItem() { // remove this from parentdir - if( tqparent() ) - tqparent()->takeDataItem( this ); + if( parent() ) + parent()->takeDataItem( this ); } K3bDataItem* copy() const { diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp index 795a314..2526b28 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp @@ -61,8 +61,8 @@ public: }; -K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bDvdBooktypeJob::K3bDvdBooktypeJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_action(0) { d = new Private; diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.h b/libk3b/projects/datadvd/k3bdvdbooktypejob.h index 6605007..4ede94e 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.h +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.h @@ -37,7 +37,7 @@ class K3bDvdBooktypeJob : public K3bJob TQ_OBJECT public: - K3bDvdBooktypeJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bDvdBooktypeJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bDvdBooktypeJob(); TQString jobDescription() const; diff --git a/libk3b/projects/datadvd/k3bdvddoc.cpp b/libk3b/projects/datadvd/k3bdvddoc.cpp index 2d6ae46..2f8a87f 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.cpp +++ b/libk3b/projects/datadvd/k3bdvddoc.cpp @@ -22,8 +22,8 @@ #include <kconfig.h> -K3bDvdDoc::K3bDvdDoc( TQObject* tqparent ) - : K3bDataDoc( tqparent ) +K3bDvdDoc::K3bDvdDoc( TQObject* parent ) + : K3bDataDoc( parent ) { } @@ -31,9 +31,9 @@ K3bDvdDoc::~K3bDvdDoc() { } -K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bDvdJob( this, hdl, tqparent ); + return new K3bDvdJob( this, hdl, parent ); } //#include "k3bdvddoc.moc" diff --git a/libk3b/projects/datadvd/k3bdvddoc.h b/libk3b/projects/datadvd/k3bdvddoc.h index 20b039e..ff3ebbf 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.h +++ b/libk3b/projects/datadvd/k3bdvddoc.h @@ -23,12 +23,12 @@ class KConfig; class LIBK3B_EXPORT K3bDvdDoc : public K3bDataDoc { public: - K3bDvdDoc( TQObject* tqparent = 0 ); + K3bDvdDoc( TQObject* parent = 0 ); virtual ~K3bDvdDoc(); virtual int type() const { return DVD; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent = 0 ); protected: virtual TQString typeString() const { return "dvd"; } diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp index d8bb75c..4a4adcb 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.cpp +++ b/libk3b/projects/datadvd/k3bdvdjob.cpp @@ -39,8 +39,8 @@ public: }; -K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bDataJob( doc, hdl, tqparent ), +K3bDvdJob::K3bDvdJob( K3bDataDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bDataJob( doc, hdl, parent ), m_doc( doc ) { d = new Private(); diff --git a/libk3b/projects/datadvd/k3bdvdjob.h b/libk3b/projects/datadvd/k3bdvdjob.h index 3bdf7b6..99b1176 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.h +++ b/libk3b/projects/datadvd/k3bdvdjob.h @@ -34,7 +34,7 @@ class K3bDvdJob : public K3bDataJob /** * To be more flexible we allow writing of any data doc */ - K3bDvdJob( K3bDataDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bDvdJob( K3bDataDoc*, K3bJobHandler*, TQObject* parent = 0 ); virtual ~K3bDvdJob(); virtual TQString jobDescription() const; diff --git a/libk3b/projects/datadvd/k3bdvdview.cpp b/libk3b/projects/datadvd/k3bdvdview.cpp index dc5f67a..c245e04 100644 --- a/libk3b/projects/datadvd/k3bdvdview.cpp +++ b/libk3b/projects/datadvd/k3bdvdview.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bDataView( doc, tqparent, name ) +K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *parent, const char *name ) + : K3bDataView( doc, parent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView() } -K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bDvdBurnDialog( m_doc, tqparent, name, true ); + return new K3bDvdBurnDialog( m_doc, parent, name, true ); } #include "k3bdvdview.moc" diff --git a/libk3b/projects/datadvd/k3bdvdview.h b/libk3b/projects/datadvd/k3bdvdview.h index 1072cc2..5d2b6ad 100644 --- a/libk3b/projects/datadvd/k3bdvdview.h +++ b/libk3b/projects/datadvd/k3bdvdview.h @@ -28,11 +28,11 @@ class K3bDvdView : public K3bDataView TQ_OBJECT public: - K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); + K3bDvdView( K3bDvdDoc* doc, TQWidget *parent = 0, const char *name = 0 ); ~K3bDvdView(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private: K3bDvdDoc* m_doc; diff --git a/libk3b/projects/k3babstractwriter.cpp b/libk3b/projects/k3babstractwriter.cpp index 61d2ac6..e911a2f 100644 --- a/libk3b/projects/k3babstractwriter.cpp +++ b/libk3b/projects/k3babstractwriter.cpp @@ -26,8 +26,8 @@ -K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bAbstractWriter::K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_burnDevice(dev), m_burnSpeed(1), m_simulate(false), diff --git a/libk3b/projects/k3babstractwriter.h b/libk3b/projects/k3babstractwriter.h index b6f4e1d..53d1841 100644 --- a/libk3b/projects/k3babstractwriter.h +++ b/libk3b/projects/k3babstractwriter.h @@ -74,7 +74,7 @@ class K3bAbstractWriter : public K3bJob protected: K3bAbstractWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); bool wasSourceUnreadable() const { return m_sourceUnreadable; } diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index 9472079..5d0f780 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -124,8 +124,8 @@ public: K3bCdrdaoWriter::K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - TQObject* tqparent, const char* name ) - : K3bAbstractWriter( dev, hdl, tqparent, name ), + TQObject* parent, const char* name ) + : K3bAbstractWriter( dev, hdl, parent, name ), m_command(WRITE), m_blankMode(MINIMAL), m_sourceDevice(0), diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h index 704125d..5a54abb 100644 --- a/libk3b/projects/k3bcdrdaowriter.h +++ b/libk3b/projects/k3bcdrdaowriter.h @@ -41,7 +41,7 @@ class K3bCdrdaoWriter : public K3bAbstractWriter enum SubMode { None, RW, RW_RAW }; K3bCdrdaoWriter( K3bDevice::Device* dev, K3bJobHandler*, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); ~K3bCdrdaoWriter(); /** diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp index e42c977..acc1d2d 100644 --- a/libk3b/projects/k3bcdrecordwriter.cpp +++ b/libk3b/projects/k3bcdrecordwriter.cpp @@ -66,8 +66,8 @@ public: K3bCdrecordWriter::K3bCdrecordWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - TQObject* tqparent, const char* name ) - : K3bAbstractWriter( dev, hdl, tqparent, name ), + TQObject* parent, const char* name ) + : K3bAbstractWriter( dev, hdl, parent, name ), m_clone(false), m_cue(false), m_forceNoEject(false) diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h index 6bb9792..a949034 100644 --- a/libk3b/projects/k3bcdrecordwriter.h +++ b/libk3b/projects/k3bcdrecordwriter.h @@ -35,7 +35,7 @@ class K3bCdrecordWriter : public K3bAbstractWriter public: K3bCdrecordWriter( K3bDevice::Device*, K3bJobHandler* hdl, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); ~K3bCdrecordWriter(); bool active() const; diff --git a/libk3b/projects/k3bdoc.cpp b/libk3b/projects/k3bdoc.cpp index 29648a7..ee70921 100644 --- a/libk3b/projects/k3bdoc.cpp +++ b/libk3b/projects/k3bdoc.cpp @@ -40,8 +40,8 @@ #include <k3bdevicemanager.h> -K3bDoc::K3bDoc( TQObject* tqparent ) - : TQObject( tqparent ), +K3bDoc::K3bDoc( TQObject* parent ) + : TQObject( parent ), m_modified(false), m_view(0) { diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index 1cdde4f..a77a5b8 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -155,7 +155,7 @@ class LIBK3B_EXPORT K3bDoc : public TQObject * easier this way since you don't need to distinguish between the different * project types. */ - virtual K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ) = 0; + virtual K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* parent = 0 ) = 0; int writingApp() const { return m_writingApp; } void setWritingApp( int a ) { m_writingApp = a; } diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp index ae33599..a7b8db7 100644 --- a/libk3b/projects/k3bdvdrecordwriter.cpp +++ b/libk3b/projects/k3bdvdrecordwriter.cpp @@ -26,8 +26,8 @@ #include <klocale.h> -K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* tqparent, const char* name ) - : K3bCdrecordWriter( dev, tqparent, name ) +K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* parent, const char* name ) + : K3bCdrecordWriter( dev, parent, name ) { } diff --git a/libk3b/projects/k3bdvdrecordwriter.h b/libk3b/projects/k3bdvdrecordwriter.h index 02421bb..97b5d16 100644 --- a/libk3b/projects/k3bdvdrecordwriter.h +++ b/libk3b/projects/k3bdvdrecordwriter.h @@ -31,7 +31,7 @@ class K3bDvdrecordWriter : public K3bCdrecordWriter TQ_OBJECT public: - K3bDvdrecordWriter( K3bDevice::Device*, TQObject* tqparent = 0, const char* name = 0 ); + K3bDvdrecordWriter( K3bDevice::Device*, TQObject* parent = 0, const char* name = 0 ); ~K3bDvdrecordWriter(); protected: diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp index a91d5c6..fabaaed 100644 --- a/libk3b/projects/k3bgrowisofshandler.cpp +++ b/libk3b/projects/k3bgrowisofshandler.cpp @@ -39,8 +39,8 @@ public: }; -K3bGrowisofsHandler::K3bGrowisofsHandler( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bGrowisofsHandler::K3bGrowisofsHandler( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private; reset(); diff --git a/libk3b/projects/k3bgrowisofshandler.h b/libk3b/projects/k3bgrowisofshandler.h index 5243ebc..7150fce 100644 --- a/libk3b/projects/k3bgrowisofshandler.h +++ b/libk3b/projects/k3bgrowisofshandler.h @@ -35,7 +35,7 @@ class K3bGrowisofsHandler : public TQObject TQ_OBJECT public: - K3bGrowisofsHandler( TQObject* tqparent = 0, const char* name = 0 ); + K3bGrowisofsHandler( TQObject* parent = 0, const char* name = 0 ); ~K3bGrowisofsHandler(); enum ErrorType { diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp index 5af4599..2881036 100644 --- a/libk3b/projects/k3bgrowisofswriter.cpp +++ b/libk3b/projects/k3bgrowisofswriter.cpp @@ -97,8 +97,8 @@ public: K3bGrowisofsWriter::K3bGrowisofsWriter( K3bDevice::Device* dev, K3bJobHandler* hdl, - TQObject* tqparent, const char* name ) - : K3bAbstractWriter( dev, hdl, tqparent, name ) + TQObject* parent, const char* name ) + : K3bAbstractWriter( dev, hdl, parent, name ) { d = new Private; d->speedEst = new K3bThroughputEstimator( this ); diff --git a/libk3b/projects/k3bgrowisofswriter.h b/libk3b/projects/k3bgrowisofswriter.h index b65b894..b7254dc 100644 --- a/libk3b/projects/k3bgrowisofswriter.h +++ b/libk3b/projects/k3bgrowisofswriter.h @@ -34,7 +34,7 @@ class K3bGrowisofsWriter : public K3bAbstractWriter public: K3bGrowisofsWriter( K3bDevice::Device*, K3bJobHandler*, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); ~K3bGrowisofsWriter(); bool active() const; diff --git a/libk3b/projects/k3bpipebuffer.cpp b/libk3b/projects/k3bpipebuffer.cpp index 4dbfd38..8e689c0 100644 --- a/libk3b/projects/k3bpipebuffer.cpp +++ b/libk3b/projects/k3bpipebuffer.cpp @@ -221,8 +221,8 @@ public: }; -K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ) +K3bPipeBuffer::K3bPipeBuffer( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ) { m_thread = new WorkThread(); setThread( m_thread ); diff --git a/libk3b/projects/k3bpipebuffer.h b/libk3b/projects/k3bpipebuffer.h index 7f6ad1b..86b7218 100644 --- a/libk3b/projects/k3bpipebuffer.h +++ b/libk3b/projects/k3bpipebuffer.h @@ -25,7 +25,7 @@ class K3bPipeBuffer : public K3bThreadJob { public: - K3bPipeBuffer( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bPipeBuffer( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bPipeBuffer(); /** diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index 2160581..8bd8eac 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -31,8 +31,8 @@ -K3bMixedDoc::K3bMixedDoc( TQObject* tqparent ) - : K3bDoc( tqparent ) +K3bMixedDoc::K3bMixedDoc( TQObject* parent ) + : K3bDoc( parent ) { m_dataDoc = new K3bDataDoc( this ); m_audioDoc = new K3bAudioDoc( this ); @@ -102,9 +102,9 @@ int K3bMixedDoc::numOfTracks() const } -K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bMixedDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bMixedJob( this, hdl, tqparent ); + return new K3bMixedJob( this, hdl, parent ); } diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.h b/libk3b/projects/mixedcd/k3bmixeddoc.h index b4ebc07..f1ef9d6 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.h +++ b/libk3b/projects/mixedcd/k3bmixeddoc.h @@ -36,7 +36,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc TQ_OBJECT public: - K3bMixedDoc( TQObject* tqparent = 0 ); + K3bMixedDoc( TQObject* parent = 0 ); ~K3bMixedDoc(); TQString name() const; @@ -51,7 +51,7 @@ class LIBK3B_EXPORT K3bMixedDoc : public K3bDoc int numOfTracks() const; - K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* tqparent = 0 ); + K3bBurnJob* newBurnJob( K3bJobHandler*, TQObject* parent = 0 ); K3bAudioDoc* audioDoc() const { return m_audioDoc; } K3bDataDoc* dataDoc() const { return m_dataDoc; } diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index 8fbe2ff..e99a1f9 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -95,8 +95,8 @@ public: }; -K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bMixedJob::K3bMixedJob( K3bMixedDoc* doc, K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_doc( doc ), m_normalizeJob(0) { diff --git a/libk3b/projects/mixedcd/k3bmixedjob.h b/libk3b/projects/mixedcd/k3bmixedjob.h index a00a0ce..6feb9d6 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.h +++ b/libk3b/projects/mixedcd/k3bmixedjob.h @@ -43,7 +43,7 @@ class K3bMixedJob : public K3bBurnJob TQ_OBJECT public: - K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bMixedJob( K3bMixedDoc*, K3bJobHandler*, TQObject* parent = 0 ); ~K3bMixedJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index d73e39a..cedf255 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -34,8 +34,8 @@ #include <tqfileinfo.h> -K3bMovixDoc::K3bMovixDoc( TQObject* tqparent ) - : K3bDataDoc( tqparent ) +K3bMovixDoc::K3bMovixDoc( TQObject* parent ) + : K3bDataDoc( parent ) { connect( this, TQT_SIGNAL(itemRemoved(K3bDataItem*)), this, TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); @@ -47,9 +47,9 @@ K3bMovixDoc::~K3bMovixDoc() } -K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bMovixDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bMovixJob( this, hdl, tqparent ); + return new K3bMovixJob( this, hdl, parent ); } diff --git a/libk3b/projects/movixcd/k3bmovixdoc.h b/libk3b/projects/movixcd/k3bmovixdoc.h index cd46dbf..90a4f1f 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.h +++ b/libk3b/projects/movixcd/k3bmovixdoc.h @@ -37,12 +37,12 @@ class LIBK3B_EXPORT K3bMovixDoc : public K3bDataDoc TQ_OBJECT public: - K3bMovixDoc( TQObject* tqparent = 0 ); + K3bMovixDoc( TQObject* parent = 0 ); virtual ~K3bMovixDoc(); virtual int type() const { return MOVIX; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent ); bool newDocument(); diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 38d8f81..79c70b3 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -68,8 +68,8 @@ public: }; -K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ) +K3bMovixDocPreparer::K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ) { d = new Private(); d->doc = doc; @@ -406,7 +406,7 @@ bool K3bMovixDocPreparer::addMovixFilesNew() // set the proper sort weight bootItem->setSortWeight( 200 ); - bootItem->tqparent()->setSortWeight( 100 ); + bootItem->parent()->setSortWeight( 100 ); } else if( fileName != "movixrc" ) { // we create our own movixrc K3bFileItem* item = createItem( filePath, docPath ); @@ -478,8 +478,8 @@ K3bDirItem* K3bMovixDocPreparer::createDir( const TQString& docPath ) // remember the dir to remove it if( dir != d->doc->root() ) { K3bDirItem* delDir = dir; - while( delDir->tqparent() != d->doc->root() ) - delDir = delDir->tqparent(); + while( delDir->parent() != d->doc->root() ) + delDir = delDir->parent(); if( d->newMovixItems.findRef( delDir ) == -1 ) d->newMovixItems.append( delDir ); } diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.h b/libk3b/projects/movixcd/k3bmovixdocpreparer.h index 8d4ba1e..4f1129c 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.h +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.h @@ -33,7 +33,7 @@ class K3bMovixDocPreparer : public K3bJob TQ_OBJECT public: - explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + explicit K3bMovixDocPreparer( K3bMovixDoc* doc, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bMovixDocPreparer(); K3bMovixDoc* doc() const; diff --git a/libk3b/projects/movixcd/k3bmovixfileitem.cpp b/libk3b/projects/movixcd/k3bmovixfileitem.cpp index 5242061..f727404 100644 --- a/libk3b/projects/movixcd/k3bmovixfileitem.cpp +++ b/libk3b/projects/movixcd/k3bmovixfileitem.cpp @@ -40,8 +40,8 @@ K3bMovixFileItem::~K3bMovixFileItem() // it is important to do it here and not // rely on the K3bFileItem destructor becasue // otherwise the doc is not informed early enough - if( tqparent() ) - tqparent()->takeDataItem( this ); + if( parent() ) + parent()->takeDataItem( this ); } diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp index 220a8da..8edcaae 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.cpp +++ b/libk3b/projects/movixcd/k3bmovixjob.cpp @@ -27,8 +27,8 @@ #include <kdebug.h> -K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) - : K3bBurnJob( jh, tqparent ), +K3bMovixJob::K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler* jh, TQObject* parent ) + : K3bBurnJob( jh, parent ), m_doc(doc) { m_dataJob = new K3bDataJob( doc, this, this ); diff --git a/libk3b/projects/movixcd/k3bmovixjob.h b/libk3b/projects/movixcd/k3bmovixjob.h index d1689f6..98338fa 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.h +++ b/libk3b/projects/movixcd/k3bmovixjob.h @@ -34,7 +34,7 @@ class K3bMovixJob : public K3bBurnJob TQ_OBJECT public: - K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bMovixJob( K3bMovixDoc* doc, K3bJobHandler*, TQObject* parent = 0 ); ~K3bMovixJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp index d05c75a..1672043 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp @@ -19,8 +19,8 @@ #include <kconfig.h> -K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* tqparent ) - : K3bMovixDoc( tqparent ) +K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* parent ) + : K3bMovixDoc( parent ) { } @@ -28,9 +28,9 @@ K3bMovixDvdDoc::~K3bMovixDvdDoc() { } -K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bMovixDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bMovixDvdJob( this, hdl, tqparent ); + return new K3bMovixDvdJob( this, hdl, parent ); } #include "k3bmovixdvddoc.moc" diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.h b/libk3b/projects/movixdvd/k3bmovixdvddoc.h index cd19cc8..063423c 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.h +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.h @@ -27,12 +27,12 @@ class LIBK3B_EXPORT K3bMovixDvdDoc : public K3bMovixDoc TQ_OBJECT public: - K3bMovixDvdDoc( TQObject* tqparent = 0 ); + K3bMovixDvdDoc( TQObject* parent = 0 ); ~K3bMovixDvdDoc(); int type() const { return MOVIX_DVD; } - K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent ); protected: TQString typeString() const { return "movixdvd"; } diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp index d97f42a..362511f 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp @@ -27,8 +27,8 @@ #include <kdebug.h> -K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) - : K3bBurnJob( jh, tqparent ), +K3bMovixDvdJob::K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler* jh, TQObject* parent ) + : K3bBurnJob( jh, parent ), m_doc(doc) { m_dvdJob = new K3bDvdJob( doc, this, this ); diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.h b/libk3b/projects/movixdvd/k3bmovixdvdjob.h index a803b75..0d098be 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.h +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.h @@ -34,7 +34,7 @@ class K3bMovixDvdJob : public K3bBurnJob TQ_OBJECT public: - K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bMovixDvdJob( K3bMovixDvdDoc* doc, K3bJobHandler*, TQObject* parent = 0 ); ~K3bMovixDvdJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index 1695353..a361d5d 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -49,8 +49,8 @@ bool print_progress = true; bool aspect_correction = false; byte forced_sequence_header = 0; -K3bVcdDoc::K3bVcdDoc( TQObject* tqparent ) - : K3bDoc( tqparent ) +K3bVcdDoc::K3bVcdDoc( TQObject* parent ) + : K3bDoc( parent ) { m_tracks = 0L; m_vcdOptions = new K3bVcdOptions(); @@ -395,9 +395,9 @@ TQString K3bVcdDoc::typeString() const } -K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bVcdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bVcdJob( this, hdl, tqparent ); + return new K3bVcdJob( this, hdl, parent ); } void K3bVcdDoc::informAboutNotFoundFiles() diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h index 4f24200..1878c31 100644 --- a/libk3b/projects/videocd/k3bvcddoc.h +++ b/libk3b/projects/videocd/k3bvcddoc.h @@ -109,7 +109,7 @@ class LIBK3B_EXPORT K3bVcdDoc : public K3bDoc KIO::filesize_t size() const; K3b::Msf length() const; - K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent ); K3bVcdOptions* vcdOptions() const { return m_vcdOptions; diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index bdeebec..662145c 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -43,8 +43,8 @@ #include <k3bcdrecordwriter.h> #include <k3bcdrdaowriter.h> -K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bBurnJob( jh, tqparent, name ) +K3bVcdJob::K3bVcdJob( K3bVcdDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bBurnJob( jh, parent, name ) { m_doc = doc; m_doc->setCopies( m_doc->dummy() || m_doc->onlyCreateImages() ? 1 : m_doc->copies() ); diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h index 96d9026..151c1b1 100644 --- a/libk3b/projects/videocd/k3bvcdjob.h +++ b/libk3b/projects/videocd/k3bvcdjob.h @@ -34,7 +34,7 @@ class K3bVcdJob : public K3bBurnJob TQ_OBJECT public: - K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bVcdJob( K3bVcdDoc*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bVcdJob(); K3bDoc* doc() const; diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index e3939cc..b008476 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -30,12 +30,12 @@ #include "k3bvcdtrack.h" #include <k3bglobals.h> -K3bVcdTrack::K3bVcdTrack( TQPtrList<K3bVcdTrack>* tqparent, const TQString& filename ) +K3bVcdTrack::K3bVcdTrack( TQPtrList<K3bVcdTrack>* parent, const TQString& filename ) : m_pbcnumkeys( true ), m_pbcnumkeysuserdefined( false ), m_file( filename ) { - m_parent = tqparent; + m_parent = parent; m_title = TQFileInfo( m_file ).baseName( true ); m_revreflist = new TQPtrList<K3bVcdTrack>; @@ -67,7 +67,7 @@ int K3bVcdTrack::index() const { int i = m_parent->find( this ); if ( i < 0 ) - kdDebug() << "(K3bVcdTrack) I'm not part of my tqparent!" << endl; + kdDebug() << "(K3bVcdTrack) I'm not part of my parent!" << endl; return i; } diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index a06552e..c48be55 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -31,7 +31,7 @@ class LIBK3B_EXPORT K3bVcdTrack { public: - K3bVcdTrack( TQPtrList<K3bVcdTrack>* tqparent, const TQString& filename ); + K3bVcdTrack( TQPtrList<K3bVcdTrack>* parent, const TQString& filename ); ~K3bVcdTrack(); TQString fileName() const diff --git a/libk3b/projects/videocd/k3bvcdxmlview.cpp b/libk3b/projects/videocd/k3bvcdxmlview.cpp index 0857013..203f54f 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.cpp +++ b/libk3b/projects/videocd/k3bvcdxmlview.cpp @@ -245,16 +245,16 @@ bool K3bVcdXmlView::write( const TQString& fname ) return false; } -void K3bVcdXmlView::addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text ) +void K3bVcdXmlView::addComment( TQDomDocument& doc, TQDomElement& parent, const TQString& text ) { TQDomComment comment = doc.createComment( text ); - tqparent.appendChild( comment ); + parent.appendChild( comment ); } -TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const TQString& value ) +TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& parent, const TQString& name, const TQString& value ) { TQDomElement element = doc.createElement( name ); - tqparent.appendChild( element ); + parent.appendChild( element ); if ( !value.isNull() ) { TQDomText t = doc.createTextNode( value ); element.appendChild( t ); @@ -262,10 +262,10 @@ TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqp return element; } -TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name, const int& value ) +TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& parent, const TQString& name, const int& value ) { TQDomElement element = doc.createElement( name ); - tqparent.appendChild( element ); + parent.appendChild( element ); if ( value >= -1 ) { TQDomText t = doc.createTextNode( TQString( "%1" ).tqarg( value ) ); element.appendChild( t ); @@ -273,17 +273,17 @@ TQDomElement K3bVcdXmlView::addSubElement( TQDomDocument& doc, TQDomElement& tqp return element; } -TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& name ) +TQDomElement K3bVcdXmlView::addFolderElement( TQDomDocument& doc, TQDomElement& parent, const TQString& name ) { - TQDomElement elemFolder = addSubElement( doc, tqparent, "folder" ); + TQDomElement elemFolder = addSubElement( doc, parent, "folder" ); addSubElement( doc, elemFolder, "name", name ); return elemFolder; } -void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& tqparent, const TQString& src, const TQString& name, bool mixed ) +void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& parent, const TQString& src, const TQString& name, bool mixed ) { - TQDomElement elemFile = addSubElement( doc, tqparent, "file" ); + TQDomElement elemFile = addSubElement( doc, parent, "file" ); elemFile.setAttribute( "src", TQString( "%1" ).tqarg( src ) ); if ( mixed ) elemFile.setAttribute( "format", "mixed" ); @@ -291,11 +291,11 @@ void K3bVcdXmlView::addFileElement( TQDomDocument& doc, TQDomElement& tqparent, addSubElement( doc, elemFile, "name", name ); } -void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) +void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack* track ) { TQString ref = ( track->isSegment() ) ? "segment" : "sequence"; - TQDomElement elemSelection = addSubElement( doc, tqparent, "selection" ); + TQDomElement elemSelection = addSubElement( doc, parent, "selection" ); elemSelection.setAttribute( "id", TQString( "select-%1-%2" ).tqarg( ref ).tqarg( TQString::number( track->index() ).rightJustify( 3, '0' ) ) ); setNumkeyBSN( doc, elemSelection, track ); @@ -374,7 +374,7 @@ void K3bVcdXmlView::doPbc( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTra setNumkeySEL( doc, elemSelection, track ); } -void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) +void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack* track ) { if ( track->PbcNumKeys() ) { if ( track->PbcNumKeysUserdefined() ) { @@ -387,18 +387,18 @@ void K3bVcdXmlView::setNumkeyBSN( TQDomDocument& doc, TQDomElement& tqparent, K3 m_startkey = trackIt.key(); if ( m_startkey > 0 ) - addSubElement( doc, tqparent, "bsn", m_startkey ); + addSubElement( doc, parent, "bsn", m_startkey ); else // user has no numKeys defined for this track track->setPbcNumKeys( false ); } else { // default start with key #1 - addSubElement( doc, tqparent, "bsn", 1 ); + addSubElement( doc, parent, "bsn", 1 ); } } } -void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& tqparent, K3bVcdTrack* track ) +void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& parent, K3bVcdTrack* track ) { if ( track->PbcNumKeys() ) { TQDomElement elemPbcSelectionNumKeySEL; @@ -412,27 +412,27 @@ void K3bVcdXmlView::setNumkeySEL( TQDomDocument& doc, TQDomElement& tqparent, K3 kdDebug() << TQString( "trackIt key: %1 none: %2" ).tqarg( trackIt.key() ).tqarg( none ) << endl; while ( none < trackIt.key() ) { - elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "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() ) ); + addComment( doc, parent, TQString( "key %1 -> %2 (normal none)" ).tqarg( none ).tqarg( TQFile::encodeName( track->absPath() ).data() ) ); none++; } if ( trackIt.data() ) { TQString ref = ( trackIt.data() ->isSegment() ) ? "segment" : "sequence"; - elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "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() ) ); + addComment( doc, parent, TQString( "key %1 -> %2" ).tqarg( trackIt.key() ).tqarg( TQFile::encodeName( trackIt.data() ->absPath() ).data() ) ); } else { - elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "select" ); elemPbcSelectionNumKeySEL.setAttribute( "ref", "end" ); - addComment( doc, tqparent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) ); + addComment( doc, parent, TQString( "key %1 -> end" ).tqarg( trackIt.key() ) ); } none++; } } else { // default reference to itSelf - elemPbcSelectionNumKeySEL = addSubElement( doc, tqparent, "select" ); + elemPbcSelectionNumKeySEL = addSubElement( doc, parent, "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 cce8341..6368dec 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.h +++ b/libk3b/projects/videocd/k3bvcdxmlview.h @@ -43,7 +43,7 @@ class K3bVcdXmlView private: TQString m_xmlstring; - void addComment( TQDomDocument& doc, TQDomElement& tqparent, const TQString& text ); + void addComment( TQDomDocument& doc, TQDomElement& parent, const TQString& text ); TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const TQString& value = TQString() ); TQDomElement addSubElement( TQDomDocument&, TQDomElement&, const TQString& name, const int& value ); diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.cpp b/libk3b/projects/videodvd/k3bvideodvddoc.cpp index f86830d..7ea3666 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.cpp +++ b/libk3b/projects/videodvd/k3bvideodvddoc.cpp @@ -24,8 +24,8 @@ #include <kconfig.h> -K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* tqparent ) - : K3bDvdDoc( tqparent ) +K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* parent ) + : K3bDvdDoc( parent ) { } @@ -63,9 +63,9 @@ bool K3bVideoDvdDoc::newDocument() } -K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ) +K3bBurnJob* K3bVideoDvdDoc::newBurnJob( K3bJobHandler* hdl, TQObject* parent ) { - return new K3bVideoDvdJob( this, hdl, tqparent ); + return new K3bVideoDvdJob( this, hdl, parent ); } //#include "k3bdvddoc.moc" diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.h b/libk3b/projects/videodvd/k3bvideodvddoc.h index cdfdfa7..e12ee07 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.h +++ b/libk3b/projects/videodvd/k3bvideodvddoc.h @@ -23,12 +23,12 @@ class KConfig; class LIBK3B_EXPORT K3bVideoDvdDoc : public K3bDvdDoc { public: - K3bVideoDvdDoc( TQObject* tqparent = 0 ); + K3bVideoDvdDoc( TQObject* parent = 0 ); virtual ~K3bVideoDvdDoc(); virtual int type() const { return VIDEODVD; } - virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* tqparent ); + virtual K3bBurnJob* newBurnJob( K3bJobHandler* hdl, TQObject* parent ); virtual bool newDocument(); diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp index 7ac82ee..f175779 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp @@ -42,8 +42,8 @@ public: }; -K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bIsoImager( doc, jh, tqparent, name ) +K3bVideoDvdImager::K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bIsoImager( doc, jh, parent, name ) { d = new Private; d->doc = doc; diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.h b/libk3b/projects/videodvd/k3bvideodvdimager.h index b1a9678..08f3c74 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.h +++ b/libk3b/projects/videodvd/k3bvideodvdimager.h @@ -35,7 +35,7 @@ class K3bVideoDvdImager : public K3bIsoImager TQ_OBJECT public: - K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bVideoDvdImager( K3bVideoDvdDoc* doc, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); virtual ~K3bVideoDvdImager(); public slots: diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index b550379..194dff7 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -30,8 +30,8 @@ -K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* tqparent ) - : K3bDvdJob( doc, jh, tqparent ), +K3bVideoDvdJob::K3bVideoDvdJob( K3bVideoDvdDoc* doc, K3bJobHandler* jh, TQObject* parent ) + : K3bDvdJob( doc, jh, parent ), m_doc(doc) { } diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.h b/libk3b/projects/videodvd/k3bvideodvdjob.h index a1d079e..4c8628f 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.h +++ b/libk3b/projects/videodvd/k3bvideodvdjob.h @@ -31,7 +31,7 @@ class K3bVideoDvdJob : public K3bDvdJob TQ_OBJECT public: - K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, TQObject* tqparent = 0 ); + K3bVideoDvdJob( K3bVideoDvdDoc*, K3bJobHandler*, TQObject* parent = 0 ); virtual ~K3bVideoDvdJob(); virtual TQString jobDescription() const; |