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/audiocd | |
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/audiocd')
-rw-r--r-- | libk3b/projects/audiocd/k3baudiodatasource.h | 2 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiodoc.cpp | 14 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiodoc.h | 4 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudioimager.cpp | 4 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudioimager.h | 2 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiojob.cpp | 4 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiojob.h | 2 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiojobtempdata.cpp | 4 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiojobtempdata.h | 2 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp | 4 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiomaxspeedjob.h | 2 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudionormalizejob.cpp | 4 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudionormalizejob.h | 2 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiotrack.cpp | 14 | ||||
-rw-r--r-- | libk3b/projects/audiocd/k3baudiotrack.h | 2 |
15 files changed, 33 insertions, 33 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; } |