From df8e67b86696f691708af8592d86282b09bab011 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: 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 --- libk3b/cddb/k3bcddb.cpp | 4 +- libk3b/cddb/k3bcddb.h | 2 +- libk3b/cddb/k3bcddbhttpquery.cpp | 4 +- libk3b/cddb/k3bcddbhttpquery.h | 2 +- libk3b/cddb/k3bcddblocalquery.cpp | 4 +- libk3b/cddb/k3bcddblocalquery.h | 2 +- libk3b/cddb/k3bcddblocalsubmit.cpp | 4 +- libk3b/cddb/k3bcddblocalsubmit.h | 2 +- libk3b/cddb/k3bcddbmultientriesdialog.cpp | 8 +-- libk3b/cddb/k3bcddbmultientriesdialog.h | 4 +- libk3b/cddb/k3bcddbpquery.cpp | 4 +- libk3b/cddb/k3bcddbpquery.h | 2 +- libk3b/cddb/k3bcddbquery.cpp | 4 +- libk3b/cddb/k3bcddbquery.h | 2 +- libk3b/cddb/k3bcddbsubmit.cpp | 4 +- libk3b/cddb/k3bcddbsubmit.h | 2 +- libk3b/core/k3bcore.cpp | 4 +- libk3b/core/k3bcore.h | 2 +- libk3b/core/k3bexternalbinmanager.cpp | 4 +- libk3b/core/k3bexternalbinmanager.h | 2 +- libk3b/core/k3bglobals.cpp | 12 ++--- libk3b/core/k3bglobals.h | 2 +- libk3b/core/k3bjob.cpp | 8 +-- libk3b/core/k3bjob.h | 6 +-- libk3b/core/k3bsimplejobhandler.cpp | 4 +- libk3b/core/k3bsimplejobhandler.h | 2 +- libk3b/core/k3bthreadjob.cpp | 8 +-- libk3b/core/k3bthreadjob.h | 4 +- libk3b/jobs/k3baudiocuefilewritingjob.cpp | 4 +- libk3b/jobs/k3baudiocuefilewritingjob.h | 2 +- libk3b/jobs/k3baudiosessionreadingjob.cpp | 4 +- libk3b/jobs/k3baudiosessionreadingjob.h | 2 +- libk3b/jobs/k3bbinimagewritingjob.cpp | 4 +- libk3b/jobs/k3bbinimagewritingjob.h | 2 +- libk3b/jobs/k3bblankingjob.cpp | 4 +- libk3b/jobs/k3bblankingjob.h | 2 +- libk3b/jobs/k3bcdcopyjob.cpp | 4 +- libk3b/jobs/k3bcdcopyjob.h | 2 +- libk3b/jobs/k3bcdda2wavreader.cpp | 4 +- libk3b/jobs/k3bcdda2wavreader.h | 2 +- libk3b/jobs/k3bclonejob.cpp | 4 +- libk3b/jobs/k3bclonejob.h | 2 +- libk3b/jobs/k3bdatatrackreader.cpp | 4 +- libk3b/jobs/k3bdatatrackreader.h | 2 +- libk3b/jobs/k3bdvdcopyjob.cpp | 4 +- libk3b/jobs/k3bdvdcopyjob.h | 2 +- libk3b/jobs/k3bdvdformattingjob.cpp | 4 +- libk3b/jobs/k3bdvdformattingjob.h | 2 +- libk3b/jobs/k3breadcdreader.cpp | 4 +- libk3b/jobs/k3breadcdreader.h | 2 +- libk3b/jobs/k3bverificationjob.cpp | 4 +- libk3b/jobs/k3bverificationjob.h | 2 +- libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp | 4 +- libk3b/jobs/k3bvideodvdtitledetectclippingjob.h | 2 +- libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp | 4 +- libk3b/jobs/k3bvideodvdtitletranscodingjob.h | 2 +- libk3b/plugin/k3baudiodecoder.cpp | 4 +- libk3b/plugin/k3baudiodecoder.h | 8 +-- libk3b/plugin/k3baudioencoder.cpp | 4 +- libk3b/plugin/k3baudioencoder.h | 2 +- libk3b/plugin/k3baudiooutputplugin.h | 4 +- libk3b/plugin/k3baudioserver.cpp | 4 +- libk3b/plugin/k3baudioserver.h | 2 +- libk3b/plugin/k3bplugin.cpp | 4 +- libk3b/plugin/k3bplugin.h | 4 +- libk3b/plugin/k3bpluginconfigwidget.cpp | 4 +- libk3b/plugin/k3bpluginconfigwidget.h | 2 +- libk3b/plugin/k3bpluginfactory.h | 4 +- libk3b/plugin/k3bpluginmanager.cpp | 10 ++-- libk3b/plugin/k3bpluginmanager.h | 4 +- libk3b/plugin/k3bprojectplugin.h | 8 +-- libk3b/projects/audiocd/k3baudiodatasource.h | 2 +- libk3b/projects/audiocd/k3baudiodoc.cpp | 14 +++--- libk3b/projects/audiocd/k3baudiodoc.h | 4 +- libk3b/projects/audiocd/k3baudioimager.cpp | 4 +- libk3b/projects/audiocd/k3baudioimager.h | 2 +- libk3b/projects/audiocd/k3baudiojob.cpp | 4 +- libk3b/projects/audiocd/k3baudiojob.h | 2 +- libk3b/projects/audiocd/k3baudiojobtempdata.cpp | 4 +- libk3b/projects/audiocd/k3baudiojobtempdata.h | 2 +- libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp | 4 +- libk3b/projects/audiocd/k3baudiomaxspeedjob.h | 2 +- libk3b/projects/audiocd/k3baudionormalizejob.cpp | 4 +- libk3b/projects/audiocd/k3baudionormalizejob.h | 2 +- libk3b/projects/audiocd/k3baudiotrack.cpp | 14 +++--- libk3b/projects/audiocd/k3baudiotrack.h | 2 +- libk3b/projects/datacd/k3bdatadoc.cpp | 42 ++++++++-------- libk3b/projects/datacd/k3bdatadoc.h | 16 +++--- libk3b/projects/datacd/k3bdataitem.cpp | 24 ++++----- libk3b/projects/datacd/k3bdataitem.h | 12 ++--- libk3b/projects/datacd/k3bdatajob.cpp | 4 +- libk3b/projects/datacd/k3bdatajob.h | 2 +- libk3b/projects/datacd/k3bdatapreparationjob.cpp | 4 +- libk3b/projects/datacd/k3bdatapreparationjob.h | 2 +- libk3b/projects/datacd/k3bdiritem.cpp | 22 ++++----- libk3b/projects/datacd/k3bdiritem.h | 4 +- libk3b/projects/datacd/k3bfileitem.cpp | 10 ++-- libk3b/projects/datacd/k3bfileitem.h | 2 +- libk3b/projects/datacd/k3bisoimager.cpp | 4 +- libk3b/projects/datacd/k3bisoimager.h | 2 +- libk3b/projects/datacd/k3bmsinfofetcher.cpp | 4 +- libk3b/projects/datacd/k3bmsinfofetcher.h | 2 +- libk3b/projects/datacd/k3bsessionimportitem.cpp | 8 +-- libk3b/projects/datacd/k3bspecialdataitem.h | 12 ++--- libk3b/projects/datadvd/k3bdvdbooktypejob.cpp | 4 +- libk3b/projects/datadvd/k3bdvdbooktypejob.h | 2 +- libk3b/projects/datadvd/k3bdvddoc.cpp | 8 +-- libk3b/projects/datadvd/k3bdvddoc.h | 4 +- libk3b/projects/datadvd/k3bdvdjob.cpp | 4 +- libk3b/projects/datadvd/k3bdvdjob.h | 2 +- libk3b/projects/datadvd/k3bdvdview.cpp | 8 +-- libk3b/projects/datadvd/k3bdvdview.h | 4 +- libk3b/projects/k3babstractwriter.cpp | 4 +- libk3b/projects/k3babstractwriter.h | 2 +- libk3b/projects/k3bcdrdaowriter.cpp | 4 +- libk3b/projects/k3bcdrdaowriter.h | 2 +- libk3b/projects/k3bcdrecordwriter.cpp | 4 +- libk3b/projects/k3bcdrecordwriter.h | 2 +- libk3b/projects/k3bdoc.cpp | 4 +- libk3b/projects/k3bdoc.h | 2 +- libk3b/projects/k3bdvdrecordwriter.cpp | 4 +- libk3b/projects/k3bdvdrecordwriter.h | 2 +- libk3b/projects/k3bgrowisofshandler.cpp | 4 +- libk3b/projects/k3bgrowisofshandler.h | 2 +- libk3b/projects/k3bgrowisofswriter.cpp | 4 +- libk3b/projects/k3bgrowisofswriter.h | 2 +- libk3b/projects/k3bpipebuffer.cpp | 4 +- libk3b/projects/k3bpipebuffer.h | 2 +- libk3b/projects/mixedcd/k3bmixeddoc.cpp | 8 +-- libk3b/projects/mixedcd/k3bmixeddoc.h | 4 +- libk3b/projects/mixedcd/k3bmixedjob.cpp | 4 +- libk3b/projects/mixedcd/k3bmixedjob.h | 2 +- libk3b/projects/movixcd/k3bmovixdoc.cpp | 8 +-- libk3b/projects/movixcd/k3bmovixdoc.h | 4 +- libk3b/projects/movixcd/k3bmovixdocpreparer.cpp | 10 ++-- libk3b/projects/movixcd/k3bmovixdocpreparer.h | 2 +- libk3b/projects/movixcd/k3bmovixfileitem.cpp | 4 +- libk3b/projects/movixcd/k3bmovixjob.cpp | 4 +- libk3b/projects/movixcd/k3bmovixjob.h | 2 +- libk3b/projects/movixdvd/k3bmovixdvddoc.cpp | 8 +-- libk3b/projects/movixdvd/k3bmovixdvddoc.h | 4 +- libk3b/projects/movixdvd/k3bmovixdvdjob.cpp | 4 +- libk3b/projects/movixdvd/k3bmovixdvdjob.h | 2 +- libk3b/projects/videocd/k3bvcddoc.cpp | 8 +-- libk3b/projects/videocd/k3bvcddoc.h | 2 +- libk3b/projects/videocd/k3bvcdjob.cpp | 4 +- libk3b/projects/videocd/k3bvcdjob.h | 2 +- libk3b/projects/videocd/k3bvcdtrack.cpp | 6 +-- libk3b/projects/videocd/k3bvcdtrack.h | 2 +- libk3b/projects/videocd/k3bvcdxmlview.cpp | 46 ++++++++--------- libk3b/projects/videocd/k3bvcdxmlview.h | 2 +- libk3b/projects/videodvd/k3bvideodvddoc.cpp | 8 +-- libk3b/projects/videodvd/k3bvideodvddoc.h | 4 +- libk3b/projects/videodvd/k3bvideodvdimager.cpp | 4 +- libk3b/projects/videodvd/k3bvideodvdimager.h | 2 +- libk3b/projects/videodvd/k3bvideodvdjob.cpp | 4 +- libk3b/projects/videodvd/k3bvideodvdjob.h | 2 +- libk3b/tools/k3bbusywidget.cpp | 4 +- libk3b/tools/k3bbusywidget.h | 2 +- libk3b/tools/k3bcdtextvalidator.cpp | 4 +- libk3b/tools/k3bcdtextvalidator.h | 2 +- libk3b/tools/k3bcutcombobox.cpp | 8 +-- libk3b/tools/k3bcutcombobox.h | 4 +- libk3b/tools/k3bdevicecombobox.cpp | 4 +- libk3b/tools/k3bdevicecombobox.h | 2 +- libk3b/tools/k3bdevicehandler.cpp | 8 +-- libk3b/tools/k3bdevicehandler.h | 4 +- libk3b/tools/k3bdeviceselectiondialog.cpp | 16 +++--- libk3b/tools/k3bdeviceselectiondialog.h | 8 +-- libk3b/tools/k3bdirsizejob.cpp | 4 +- libk3b/tools/k3bdirsizejob.h | 2 +- libk3b/tools/k3bintmapcombobox.cpp | 4 +- libk3b/tools/k3bintmapcombobox.h | 2 +- libk3b/tools/k3bintvalidator.cpp | 8 +-- libk3b/tools/k3bintvalidator.h | 4 +- libk3b/tools/k3blistview.cpp | 60 +++++++++++------------ libk3b/tools/k3blistview.h | 26 +++++----- libk3b/tools/k3blistviewitemanimator.cpp | 8 +-- libk3b/tools/k3blistviewitemanimator.h | 4 +- libk3b/tools/k3bmd5job.cpp | 4 +- libk3b/tools/k3bmd5job.h | 2 +- libk3b/tools/k3bmsfedit.cpp | 8 +-- libk3b/tools/k3bmsfedit.h | 4 +- libk3b/tools/k3bmultichoicedialog.cpp | 8 +-- libk3b/tools/k3bmultichoicedialog.h | 4 +- libk3b/tools/k3bprogressdialog.cpp | 4 +- libk3b/tools/k3bprogressdialog.h | 2 +- libk3b/tools/k3bpushbutton.cpp | 16 +++--- libk3b/tools/k3bpushbutton.h | 8 +-- libk3b/tools/k3bradioaction.cpp | 28 +++++------ libk3b/tools/k3bradioaction.h | 34 ++++++------- libk3b/tools/k3brichtextlabel.cpp | 8 +-- libk3b/tools/k3brichtextlabel.h | 4 +- libk3b/tools/k3bstdguiitems.cpp | 60 +++++++++++------------ libk3b/tools/k3bstdguiitems.h | 30 ++++++------ libk3b/tools/k3bthreadwidget.cpp | 12 ++--- libk3b/tools/k3bthreadwidget.h | 2 +- libk3b/tools/k3bthroughputestimator.cpp | 4 +- libk3b/tools/k3bthroughputestimator.h | 2 +- libk3b/tools/k3btitlelabel.cpp | 4 +- libk3b/tools/k3btitlelabel.h | 2 +- libk3b/tools/k3btoolbox.cpp | 18 +++---- libk3b/tools/k3btoolbox.h | 6 +-- libk3b/tools/k3btoolbutton.cpp | 4 +- libk3b/tools/k3btoolbutton.h | 2 +- libk3b/tools/k3bvalidators.cpp | 34 ++++++------- libk3b/tools/k3bvalidators.h | 16 +++--- libk3b/tools/kcutlabel.cpp | 8 +-- libk3b/tools/kcutlabel.h | 4 +- libk3b/tools/libisofs/iso_fs.h | 4 +- libk3b/tools/libisofs/isofs.h | 4 +- 211 files changed, 647 insertions(+), 647 deletions(-) (limited to 'libk3b') diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index 5cee3da..23da695 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -36,8 +36,8 @@ #include "k3bcddbmultientriesdialog.h" -K3bCddb::K3bCddb( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bCddb::K3bCddb( TQObject* parent, const char* name ) + : TQObject( parent, name ) { m_httpQuery = 0; m_cddbpQuery = 0; diff --git a/libk3b/cddb/k3bcddb.h b/libk3b/cddb/k3bcddb.h index b7e5a47..20929f9 100644 --- a/libk3b/cddb/k3bcddb.h +++ b/libk3b/cddb/k3bcddb.h @@ -41,7 +41,7 @@ class LIBK3B_EXPORT K3bCddb : public TQObject TQ_OBJECT public: - K3bCddb( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddb( TQObject* parent = 0, const char* name = 0 ); ~K3bCddb(); TQString errorString() const; diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index c21460f..f3b9152 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -29,8 +29,8 @@ #include -K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* tqparent, const char* name ) - : K3bCddbQuery( tqparent, name ) +K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* parent, const char* name ) + : K3bCddbQuery( parent, name ) { m_server = "freedb.org"; m_port = 80; diff --git a/libk3b/cddb/k3bcddbhttpquery.h b/libk3b/cddb/k3bcddbhttpquery.h index 12a275e..611dece 100644 --- a/libk3b/cddb/k3bcddbhttpquery.h +++ b/libk3b/cddb/k3bcddbhttpquery.h @@ -32,7 +32,7 @@ class K3bCddbHttpQuery : public K3bCddbQuery TQ_OBJECT public: - K3bCddbHttpQuery( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbHttpQuery( TQObject* parent = 0, const char* name = 0 ); ~K3bCddbHttpQuery(); public slots: diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp index 81f69e2..1c247dd 100644 --- a/libk3b/cddb/k3bcddblocalquery.cpp +++ b/libk3b/cddb/k3bcddblocalquery.cpp @@ -25,8 +25,8 @@ #include -K3bCddbLocalQuery::K3bCddbLocalQuery( TQObject* tqparent , const char* name ) - : K3bCddbQuery( tqparent, name ) +K3bCddbLocalQuery::K3bCddbLocalQuery( TQObject* parent , const char* name ) + : K3bCddbQuery( parent, name ) { } diff --git a/libk3b/cddb/k3bcddblocalquery.h b/libk3b/cddb/k3bcddblocalquery.h index f373698..e75d2fe 100644 --- a/libk3b/cddb/k3bcddblocalquery.h +++ b/libk3b/cddb/k3bcddblocalquery.h @@ -30,7 +30,7 @@ class K3bCddbLocalQuery : public K3bCddbQuery TQ_OBJECT public: - K3bCddbLocalQuery( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbLocalQuery( TQObject* parent = 0, const char* name = 0 ); ~K3bCddbLocalQuery(); public slots: diff --git a/libk3b/cddb/k3bcddblocalsubmit.cpp b/libk3b/cddb/k3bcddblocalsubmit.cpp index f7dc730..3c401b1 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.cpp +++ b/libk3b/cddb/k3bcddblocalsubmit.cpp @@ -25,8 +25,8 @@ #include -K3bCddbLocalSubmit::K3bCddbLocalSubmit( TQObject* tqparent, const char* name ) - : K3bCddbSubmit( tqparent, name ) +K3bCddbLocalSubmit::K3bCddbLocalSubmit( TQObject* parent, const char* name ) + : K3bCddbSubmit( parent, name ) { } diff --git a/libk3b/cddb/k3bcddblocalsubmit.h b/libk3b/cddb/k3bcddblocalsubmit.h index 88f127c..265b469 100644 --- a/libk3b/cddb/k3bcddblocalsubmit.h +++ b/libk3b/cddb/k3bcddblocalsubmit.h @@ -28,7 +28,7 @@ class K3bCddbLocalSubmit : public K3bCddbSubmit TQ_OBJECT public: - K3bCddbLocalSubmit( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbLocalSubmit( TQObject* parent = 0, const char* name = 0 ); ~K3bCddbLocalSubmit(); public slots: diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.cpp b/libk3b/cddb/k3bcddbmultientriesdialog.cpp index df5a938..f8746b7 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.cpp +++ b/libk3b/cddb/k3bcddbmultientriesdialog.cpp @@ -25,8 +25,8 @@ -K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* tqparent, const char* name ) - : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, tqparent, name ) +K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* parent, const char* name ) + : KDialogBase( Plain, i18n("CDDB Database Entry"), Ok|Cancel, Ok, parent, name ) { TQFrame* frame = plainPage(); TQVBoxLayout* tqlayout = new TQVBoxLayout( frame ); @@ -42,9 +42,9 @@ K3bCddbMultiEntriesDialog::K3bCddbMultiEntriesDialog( TQWidget* tqparent, const setMinimumSize( 280, 200 ); } -K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* query, TQWidget* tqparent ) +K3bCddbResultHeader K3bCddbMultiEntriesDialog::selectCddbEntry( K3bCddbQuery* query, TQWidget* parent ) { - K3bCddbMultiEntriesDialog d( tqparent ); + K3bCddbMultiEntriesDialog d( parent ); const TQValueList headers = query->getInexactMatches(); diff --git a/libk3b/cddb/k3bcddbmultientriesdialog.h b/libk3b/cddb/k3bcddbmultientriesdialog.h index 43c409e..2365587 100644 --- a/libk3b/cddb/k3bcddbmultientriesdialog.h +++ b/libk3b/cddb/k3bcddbmultientriesdialog.h @@ -37,10 +37,10 @@ class K3bCddbMultiEntriesDialog : public KDialogBase public: ~K3bCddbMultiEntriesDialog(); - static K3bCddbResultHeader selectCddbEntry( K3bCddbQuery* query, TQWidget* tqparent = 0 ); + static K3bCddbResultHeader selectCddbEntry( K3bCddbQuery* query, TQWidget* parent = 0 ); protected: - K3bCddbMultiEntriesDialog( TQWidget* tqparent = 0, const char* name = 0); + K3bCddbMultiEntriesDialog( TQWidget* parent = 0, const char* name = 0); private: KListBox *m_listBox; diff --git a/libk3b/cddb/k3bcddbpquery.cpp b/libk3b/cddb/k3bcddbpquery.cpp index 15f3e18..bcd75be 100644 --- a/libk3b/cddb/k3bcddbpquery.cpp +++ b/libk3b/cddb/k3bcddbpquery.cpp @@ -25,8 +25,8 @@ -K3bCddbpQuery::K3bCddbpQuery( TQObject* tqparent, const char* name ) - :K3bCddbQuery( tqparent, name ) +K3bCddbpQuery::K3bCddbpQuery( TQObject* parent, const char* name ) + :K3bCddbQuery( parent, name ) { m_socket = new TQSocket( this ); m_stream.setDevice( m_socket ); diff --git a/libk3b/cddb/k3bcddbpquery.h b/libk3b/cddb/k3bcddbpquery.h index 423cad1..d0a12bc 100644 --- a/libk3b/cddb/k3bcddbpquery.h +++ b/libk3b/cddb/k3bcddbpquery.h @@ -31,7 +31,7 @@ class K3bCddbpQuery : public K3bCddbQuery TQ_OBJECT public: - K3bCddbpQuery( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbpQuery( TQObject* parent = 0, const char* name = 0 ); ~K3bCddbpQuery(); public slots: diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp index 1c6605b..e4ccc75 100644 --- a/libk3b/cddb/k3bcddbquery.cpp +++ b/libk3b/cddb/k3bcddbquery.cpp @@ -35,8 +35,8 @@ -K3bCddbQuery::K3bCddbQuery( TQObject* tqparent, const char* name ) - : TQObject(tqparent, name) +K3bCddbQuery::K3bCddbQuery( TQObject* parent, const char* name ) + : TQObject(parent, name) { m_bQueryFinishedEmited = false; } diff --git a/libk3b/cddb/k3bcddbquery.h b/libk3b/cddb/k3bcddbquery.h index eebc4cb..6d75262 100644 --- a/libk3b/cddb/k3bcddbquery.h +++ b/libk3b/cddb/k3bcddbquery.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bCddbQuery : public TQObject TQ_OBJECT public: - K3bCddbQuery( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbQuery( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bCddbQuery(); void query( const K3bDevice::Toc& ); diff --git a/libk3b/cddb/k3bcddbsubmit.cpp b/libk3b/cddb/k3bcddbsubmit.cpp index 01aa7f8..06e123f 100644 --- a/libk3b/cddb/k3bcddbsubmit.cpp +++ b/libk3b/cddb/k3bcddbsubmit.cpp @@ -19,8 +19,8 @@ #include -K3bCddbSubmit::K3bCddbSubmit( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bCddbSubmit::K3bCddbSubmit( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } diff --git a/libk3b/cddb/k3bcddbsubmit.h b/libk3b/cddb/k3bcddbsubmit.h index cb9906f..58e7249 100644 --- a/libk3b/cddb/k3bcddbsubmit.h +++ b/libk3b/cddb/k3bcddbsubmit.h @@ -30,7 +30,7 @@ class K3bCddbSubmit : public TQObject TQ_OBJECT public: - K3bCddbSubmit( TQObject* tqparent = 0, const char* name = 0 ); + K3bCddbSubmit( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bCddbSubmit(); int error() const { return m_error; } diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index a32acae..29a60e3 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -121,8 +121,8 @@ K3bCore* K3bCore::s_k3bCore = 0; -K3bCore::K3bCore( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bCore::K3bCore( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h index f97430c..bc11521 100644 --- a/libk3b/core/k3bcore.h +++ b/libk3b/core/k3bcore.h @@ -62,7 +62,7 @@ class LIBK3B_EXPORT K3bCore : public TQObject * Although K3bCore is a singlelton it's constructor is not private to make inheritance * possible. Just make sure to only create one instance. */ - K3bCore( TQObject* tqparent = 0, const char* name = 0 ); + K3bCore( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bCore(); const TQValueList& runningJobs() const; diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp index eb7203f..ac9ffa4 100644 --- a/libk3b/core/k3bexternalbinmanager.cpp +++ b/libk3b/core/k3bexternalbinmanager.cpp @@ -161,8 +161,8 @@ void K3bExternalProgram::addUserParameter( const TQString& p ) // /////////////////////////////////////////////////////////// -K3bExternalBinManager::K3bExternalBinManager( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bExternalBinManager::K3bExternalBinManager( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h index 11a8dcb..e0e9d42 100644 --- a/libk3b/core/k3bexternalbinmanager.h +++ b/libk3b/core/k3bexternalbinmanager.h @@ -117,7 +117,7 @@ class LIBK3B_EXPORT K3bExternalBinManager : public TQObject TQ_OBJECT public: - K3bExternalBinManager( TQObject* tqparent = 0, const char* name = 0 ); + K3bExternalBinManager( TQObject* parent = 0, const char* name = 0 ); ~K3bExternalBinManager(); void search(); diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index 1d91cd3..09373be 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -191,17 +191,17 @@ TQString K3b::prepareDir( const TQString& dir ) TQString K3b::parentDir( const TQString& path ) { - TQString tqparent = path; + TQString parent = path; if( path[path.length()-1] == '/' ) - tqparent.truncate( tqparent.length()-1 ); + parent.truncate( parent.length()-1 ); - int pos = tqparent.findRev( '/' ); + int pos = parent.findRev( '/' ); if( pos >= 0 ) - tqparent.truncate( pos+1 ); + parent.truncate( pos+1 ); else // relative path, do anything... - tqparent = "/"; + parent = "/"; - return tqparent; + return parent; } diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h index 6554d7d..0b58f58 100644 --- a/libk3b/core/k3bglobals.h +++ b/libk3b/core/k3bglobals.h @@ -161,7 +161,7 @@ namespace K3b LIBK3B_EXPORT TQString prepareDir( const TQString& dir ); /** - * returns the tqparent dir of a path. + * returns the parent dir of a path. * CAUTION: this does only work well with absolut paths. * * Example: /usr/share/doc -> /usr/share/ diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp index 046de06..02697d6 100644 --- a/libk3b/core/k3bjob.cpp +++ b/libk3b/core/k3bjob.cpp @@ -34,8 +34,8 @@ public: const char* K3bJob::DEFAULT_SIGNAL_CONNECTION = "K3bJobDefault"; -K3bJob::K3bJob( K3bJobHandler* handler, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ), +K3bJob::K3bJob( K3bJobHandler* handler, TQObject* parent, const char* name ) + : TQObject( parent, name ), m_jobHandler( handler ), m_canceled(false), m_active(false) @@ -231,8 +231,8 @@ public: -K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* tqparent, const char* name ) - : K3bJob( handler, tqparent, name ), +K3bBurnJob::K3bBurnJob( K3bJobHandler* handler, TQObject* parent, const char* name ) + : K3bJob( handler, parent, name ), m_writeMethod( K3b::DEFAULT ) { d = new Private; diff --git a/libk3b/core/k3bjob.h b/libk3b/core/k3bjob.h index b64b85b..cbb4758 100644 --- a/libk3b/core/k3bjob.h +++ b/libk3b/core/k3bjob.h @@ -30,7 +30,7 @@ namespace K3bDevice { /** * This is the baseclass for all the jobs in K3b which actually do the work like burning a cd! - * The K3bJob object takes care of registering with the k3bcore or with a tqparent K3bJob. + * The K3bJob object takes care of registering with the k3bcore or with a parent K3bJob. * * Every job has a jobhandler which can be another job (in which case the job is handled as * a subjob) or an arbitrary class implementing the K3bJobHandler interface. @@ -212,7 +212,7 @@ class LIBK3B_EXPORT K3bJob : public TQObject, public K3bJobHandler * \see runningSubJobs() * \see numRunningSubJobs() */ - K3bJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); + K3bJob( K3bJobHandler* hdl, TQObject* parent = 0, const char* name = 0 ); /** * Call this in start() to properly register the job and emit the started() signal. @@ -260,7 +260,7 @@ class LIBK3B_EXPORT K3bBurnJob : public K3bJob TQ_OBJECT public: - K3bBurnJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); + K3bBurnJob( K3bJobHandler* hdl, TQObject* parent = 0, const char* name = 0 ); virtual ~K3bBurnJob(); /** diff --git a/libk3b/core/k3bsimplejobhandler.cpp b/libk3b/core/k3bsimplejobhandler.cpp index d48349e..554a621 100644 --- a/libk3b/core/k3bsimplejobhandler.cpp +++ b/libk3b/core/k3bsimplejobhandler.cpp @@ -16,8 +16,8 @@ #include "k3bsimplejobhandler.h" -K3bSimpleJobHandler::K3bSimpleJobHandler( TQObject* tqparent ) - : TQObject( tqparent ), +K3bSimpleJobHandler::K3bSimpleJobHandler( TQObject* parent ) + : TQObject( parent ), K3bJobHandler() { } diff --git a/libk3b/core/k3bsimplejobhandler.h b/libk3b/core/k3bsimplejobhandler.h index 60d4bf9..7657906 100644 --- a/libk3b/core/k3bsimplejobhandler.h +++ b/libk3b/core/k3bsimplejobhandler.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bSimpleJobHandler : public TQObject, public K3bJobHandler TQ_OBJECT public: - K3bSimpleJobHandler( TQObject* tqparent = 0 ); + K3bSimpleJobHandler( TQObject* parent = 0 ); ~K3bSimpleJobHandler(); /* diff --git a/libk3b/core/k3bthreadjob.cpp b/libk3b/core/k3bthreadjob.cpp index fcc192e..634aa91 100644 --- a/libk3b/core/k3bthreadjob.cpp +++ b/libk3b/core/k3bthreadjob.cpp @@ -23,15 +23,15 @@ -K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bThreadJob::K3bThreadJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_running(false) { } -K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bThreadJob::K3bThreadJob( K3bThread* thread, K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_running(false) { setThread(thread); diff --git a/libk3b/core/k3bthreadjob.h b/libk3b/core/k3bthreadjob.h index 34b43fd..319e69f 100644 --- a/libk3b/core/k3bthreadjob.h +++ b/libk3b/core/k3bthreadjob.h @@ -43,8 +43,8 @@ class LIBK3B_EXPORT K3bThreadJob : public K3bJob TQ_OBJECT public: - K3bThreadJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); - K3bThreadJob( K3bThread*, K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bThreadJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); + K3bThreadJob( K3bThread*, K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); virtual ~K3bThreadJob(); void setThread( K3bThread* t ); diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp b/libk3b/jobs/k3baudiocuefilewritingjob.cpp index 9b88345..d66b529 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp +++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp @@ -50,8 +50,8 @@ private: }; -K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bBurnJob( jh, tqparent, name ), +K3bAudioCueFileWritingJob::K3bAudioCueFileWritingJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bBurnJob( jh, parent, name ), m_decoder(0) { m_analyserThread = new AnalyserThread(); diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.h b/libk3b/jobs/k3baudiocuefilewritingjob.h index a59dcb0..ba85d0a 100644 --- a/libk3b/jobs/k3baudiocuefilewritingjob.h +++ b/libk3b/jobs/k3baudiocuefilewritingjob.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bAudioCueFileWritingJob : public K3bBurnJob TQ_OBJECT public: - K3bAudioCueFileWritingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioCueFileWritingJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioCueFileWritingJob(); K3bDevice::Device* writer() const; diff --git a/libk3b/jobs/k3baudiosessionreadingjob.cpp b/libk3b/jobs/k3baudiosessionreadingjob.cpp index acf7e9d..1946415 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.cpp +++ b/libk3b/jobs/k3baudiosessionreadingjob.cpp @@ -206,8 +206,8 @@ void K3bAudioSessionReadingJob::WorkThread::cancel() -K3bAudioSessionReadingJob::K3bAudioSessionReadingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ) +K3bAudioSessionReadingJob::K3bAudioSessionReadingJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ) { m_thread = new WorkThread(); setThread( m_thread ); diff --git a/libk3b/jobs/k3baudiosessionreadingjob.h b/libk3b/jobs/k3baudiosessionreadingjob.h index 53ae7fa..358c569 100644 --- a/libk3b/jobs/k3baudiosessionreadingjob.h +++ b/libk3b/jobs/k3baudiosessionreadingjob.h @@ -33,7 +33,7 @@ class K3bAudioSessionReadingJob : public K3bThreadJob TQ_OBJECT public: - K3bAudioSessionReadingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioSessionReadingJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioSessionReadingJob(); /** diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp b/libk3b/jobs/k3bbinimagewritingjob.cpp index 0f58f7c..2fd0b60 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.cpp +++ b/libk3b/jobs/k3bbinimagewritingjob.cpp @@ -30,8 +30,8 @@ -K3bBinImageWritingJob::K3bBinImageWritingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bBinImageWritingJob::K3bBinImageWritingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_device(0), m_simulate(false), m_force(false), diff --git a/libk3b/jobs/k3bbinimagewritingjob.h b/libk3b/jobs/k3bbinimagewritingjob.h index 9782985..13e4f88 100644 --- a/libk3b/jobs/k3bbinimagewritingjob.h +++ b/libk3b/jobs/k3bbinimagewritingjob.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bBinImageWritingJob : public K3bBurnJob TQ_OBJECT public: - K3bBinImageWritingJob( K3bJobHandler*, TQObject* tqparent = 0 ); + K3bBinImageWritingJob( K3bJobHandler*, TQObject* parent = 0 ); ~K3bBinImageWritingJob(); K3bDevice::Device* writer() const { return m_device; }; diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index 80eba84..5781b2b 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -31,8 +31,8 @@ -K3bBlankingJob::K3bBlankingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bBlankingJob::K3bBlankingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_writerJob(0), m_force(true), m_device(0), diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h index ab6becd..37e1b42 100644 --- a/libk3b/jobs/k3bblankingjob.h +++ b/libk3b/jobs/k3bblankingjob.h @@ -30,7 +30,7 @@ class LIBK3B_EXPORT K3bBlankingJob : public K3bBurnJob TQ_OBJECT public: - K3bBlankingJob( K3bJobHandler*, TQObject* tqparent = 0 ); + K3bBlankingJob( K3bJobHandler*, TQObject* parent = 0 ); ~K3bBlankingJob(); K3bDevice::Device* writer() const; diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index de93b4f..9a266bf 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -115,8 +115,8 @@ public: }; -K3bCdCopyJob::K3bCdCopyJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bBurnJob( hdl, tqparent ), +K3bCdCopyJob::K3bCdCopyJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bBurnJob( hdl, parent ), m_simulate(false), m_copies(1), m_onlyCreateImages(false), diff --git a/libk3b/jobs/k3bcdcopyjob.h b/libk3b/jobs/k3bcdcopyjob.h index 65c7e9f..1f41d48 100644 --- a/libk3b/jobs/k3bcdcopyjob.h +++ b/libk3b/jobs/k3bcdcopyjob.h @@ -35,7 +35,7 @@ class LIBK3B_EXPORT K3bCdCopyJob : public K3bBurnJob TQ_OBJECT public: - K3bCdCopyJob( K3bJobHandler* hdl, TQObject* tqparent = 0 ); + K3bCdCopyJob( K3bJobHandler* hdl, TQObject* parent = 0 ); ~K3bCdCopyJob(); K3bDevice::Device* writer() const { return m_onlyCreateImages ? 0 : m_writerDevice; } diff --git a/libk3b/jobs/k3bcdda2wavreader.cpp b/libk3b/jobs/k3bcdda2wavreader.cpp index c583ec8..5202fc4 100644 --- a/libk3b/jobs/k3bcdda2wavreader.cpp +++ b/libk3b/jobs/k3bcdda2wavreader.cpp @@ -52,8 +52,8 @@ public: }; -K3bCdda2wavReader::K3bCdda2wavReader( TQObject* tqparent, const char* name ) - : K3bJob( tqparent, name ) +K3bCdda2wavReader::K3bCdda2wavReader( TQObject* parent, const char* name ) + : K3bJob( parent, name ) { d = new Private(); } diff --git a/libk3b/jobs/k3bcdda2wavreader.h b/libk3b/jobs/k3bcdda2wavreader.h index 938e1a5..6018614 100644 --- a/libk3b/jobs/k3bcdda2wavreader.h +++ b/libk3b/jobs/k3bcdda2wavreader.h @@ -35,7 +35,7 @@ class K3bCdda2wavReader : public K3bJob TQ_OBJECT public: - K3bCdda2wavReader( TQObject* tqparent = 0, const char* name = 0 ); + K3bCdda2wavReader( TQObject* parent = 0, const char* name = 0 ); ~K3bCdda2wavReader(); bool active() const; diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp index 8ed8cad..f8ce4f7 100644 --- a/libk3b/jobs/k3bclonejob.cpp +++ b/libk3b/jobs/k3bclonejob.cpp @@ -43,8 +43,8 @@ public: }; -K3bCloneJob::K3bCloneJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bBurnJob( hdl, tqparent, name ), +K3bCloneJob::K3bCloneJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bBurnJob( hdl, parent, name ), m_writerDevice(0), m_readerDevice(0), m_writerJob(0), diff --git a/libk3b/jobs/k3bclonejob.h b/libk3b/jobs/k3bclonejob.h index e928f3c..6306596 100644 --- a/libk3b/jobs/k3bclonejob.h +++ b/libk3b/jobs/k3bclonejob.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bCloneJob : public K3bBurnJob TQ_OBJECT public: - K3bCloneJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bCloneJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bCloneJob(); K3bDevice::Device* writer() const { return m_writerDevice; } diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp index 85a14cd..9ff5dd5 100644 --- a/libk3b/jobs/k3bdatatrackreader.cpp +++ b/libk3b/jobs/k3bdatatrackreader.cpp @@ -71,8 +71,8 @@ private: }; -K3bDataTrackReader::K3bDataTrackReader( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bThreadJob( jh, tqparent, name ) +K3bDataTrackReader::K3bDataTrackReader( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bThreadJob( jh, parent, name ) { m_thread = new WorkThread(); setThread( m_thread ); diff --git a/libk3b/jobs/k3bdatatrackreader.h b/libk3b/jobs/k3bdatatrackreader.h index 0782079..e54a818 100644 --- a/libk3b/jobs/k3bdatatrackreader.h +++ b/libk3b/jobs/k3bdatatrackreader.h @@ -41,7 +41,7 @@ namespace K3bDevice { class K3bDataTrackReader : public K3bThreadJob { public: - K3bDataTrackReader( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bDataTrackReader( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bDataTrackReader(); enum SectorSize { diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index bcbba68..b123e24 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -83,8 +83,8 @@ public: }; -K3bDvdCopyJob::K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bBurnJob( hdl, tqparent, name ), +K3bDvdCopyJob::K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bBurnJob( hdl, parent, name ), m_writerDevice(0), m_readerDevice(0), m_onTheFly(false), diff --git a/libk3b/jobs/k3bdvdcopyjob.h b/libk3b/jobs/k3bdvdcopyjob.h index eb2e51c..1042adc 100644 --- a/libk3b/jobs/k3bdvdcopyjob.h +++ b/libk3b/jobs/k3bdvdcopyjob.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bDvdCopyJob : public K3bBurnJob TQ_OBJECT public: - K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* tqparent = 0, const char* name = 0 ); + K3bDvdCopyJob( K3bJobHandler* hdl, TQObject* parent = 0, const char* name = 0 ); ~K3bDvdCopyJob(); K3bDevice::Device* writer() const { return m_onlyCreateImage ? 0 : m_writerDevice; } diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp b/libk3b/jobs/k3bdvdformattingjob.cpp index 9b6a58b..46c8563 100644 --- a/libk3b/jobs/k3bdvdformattingjob.cpp +++ b/libk3b/jobs/k3bdvdformattingjob.cpp @@ -71,8 +71,8 @@ public: }; -K3bDvdFormattingJob::K3bDvdFormattingJob( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bBurnJob( jh, tqparent, name ) +K3bDvdFormattingJob::K3bDvdFormattingJob( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bBurnJob( jh, parent, name ) { d = new Private; } diff --git a/libk3b/jobs/k3bdvdformattingjob.h b/libk3b/jobs/k3bdvdformattingjob.h index cf8b7eb..2e3bbcd 100644 --- a/libk3b/jobs/k3bdvdformattingjob.h +++ b/libk3b/jobs/k3bdvdformattingjob.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bDvdFormattingJob : public K3bBurnJob TQ_OBJECT public: - K3bDvdFormattingJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bDvdFormattingJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bDvdFormattingJob(); TQString jobDescription() const; diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index 38adab1..fb2a7bd 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -60,8 +60,8 @@ public: -K3bReadcdReader::K3bReadcdReader( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ), +K3bReadcdReader::K3bReadcdReader( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ), m_noCorr(false), m_clone(false), m_noError(false), diff --git a/libk3b/jobs/k3breadcdreader.h b/libk3b/jobs/k3breadcdreader.h index de6f225..b59f890 100644 --- a/libk3b/jobs/k3breadcdreader.h +++ b/libk3b/jobs/k3breadcdreader.h @@ -37,7 +37,7 @@ class K3bReadcdReader : public K3bJob TQ_OBJECT public: - K3bReadcdReader( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bReadcdReader( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bReadcdReader(); bool active() const; diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index 963f1a2..5b8cc62 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -89,8 +89,8 @@ public: }; -K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, TQObject* tqparent, const char* name ) - : K3bJob( hdl, tqparent, name ) +K3bVerificationJob::K3bVerificationJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) + : K3bJob( hdl, parent, name ) { d = new Private(); diff --git a/libk3b/jobs/k3bverificationjob.h b/libk3b/jobs/k3bverificationjob.h index 945198d..257520a 100644 --- a/libk3b/jobs/k3bverificationjob.h +++ b/libk3b/jobs/k3bverificationjob.h @@ -50,7 +50,7 @@ class K3bVerificationJob : public K3bJob TQ_OBJECT public: - K3bVerificationJob( K3bJobHandler*, TQObject* tqparent = 0, const char* name = 0 ); + K3bVerificationJob( K3bJobHandler*, TQObject* parent = 0, const char* name = 0 ); ~K3bVerificationJob(); public slots: diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp index 2d7fd43..cf30eed 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.cpp @@ -46,8 +46,8 @@ public: -K3bVideoDVDTitleDetectClippingJob::K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bJob( hdl, tqparent ), +K3bVideoDVDTitleDetectClippingJob::K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bJob( hdl, parent ), m_clippingTop( 0 ), m_clippingBottom( 0 ), m_clippingLeft( 0 ), diff --git a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h index a102810..cd27b6c 100644 --- a/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h +++ b/libk3b/jobs/k3bvideodvdtitledetectclippingjob.h @@ -31,7 +31,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleDetectClippingJob : public K3bJob TQ_OBJECT public: - K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bVideoDVDTitleDetectClippingJob( K3bJobHandler* hdl, TQObject* parent ); ~K3bVideoDVDTitleDetectClippingJob(); const K3bVideoDVD::VideoDVD& videoDVD() const { return m_dvd; } diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp index 3af2278..96d670b 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp @@ -47,8 +47,8 @@ public: -K3bVideoDVDTitleTranscodingJob::K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* tqparent ) - : K3bJob( hdl, tqparent ), +K3bVideoDVDTitleTranscodingJob::K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* parent ) + : K3bJob( hdl, parent ), m_clippingTop( 0 ), m_clippingBottom( 0 ), m_clippingLeft( 0 ), diff --git a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h index 8523d0e..963a81b 100644 --- a/libk3b/jobs/k3bvideodvdtitletranscodingjob.h +++ b/libk3b/jobs/k3bvideodvdtitletranscodingjob.h @@ -36,7 +36,7 @@ class LIBK3B_EXPORT K3bVideoDVDTitleTranscodingJob : public K3bJob TQ_OBJECT public: - K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* tqparent ); + K3bVideoDVDTitleTranscodingJob( K3bJobHandler* hdl, TQObject* parent ); ~K3bVideoDVDTitleTranscodingJob(); /** diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp index 075deb2..b2d347b 100644 --- a/libk3b/plugin/k3baudiodecoder.cpp +++ b/libk3b/plugin/k3baudiodecoder.cpp @@ -106,8 +106,8 @@ public: -K3bAudioDecoder::K3bAudioDecoder( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bAudioDecoder::K3bAudioDecoder( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); } diff --git a/libk3b/plugin/k3baudiodecoder.h b/libk3b/plugin/k3baudiodecoder.h index ed13c66..c4c97f9 100644 --- a/libk3b/plugin/k3baudiodecoder.h +++ b/libk3b/plugin/k3baudiodecoder.h @@ -37,7 +37,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public TQObject TQ_OBJECT public: - K3bAudioDecoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioDecoder( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bAudioDecoder(); @@ -213,8 +213,8 @@ class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin TQ_OBJECT public: - K3bAudioDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ) - : K3bPlugin( tqparent, name ) { + K3bAudioDecoderFactory( TQObject* parent = 0, const char* name = 0 ) + : K3bPlugin( parent, name ) { } virtual ~K3bAudioDecoderFactory() { @@ -241,7 +241,7 @@ class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin */ virtual bool canDecode( const KURL& filename ) = 0; - virtual K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const = 0; + virtual K3bAudioDecoder* createDecoder( TQObject* parent = 0, const char* name = 0 ) const = 0; /** * Searching for an audiodecoder for @p filename. diff --git a/libk3b/plugin/k3baudioencoder.cpp b/libk3b/plugin/k3baudioencoder.cpp index d7f72d1..76240e4 100644 --- a/libk3b/plugin/k3baudioencoder.cpp +++ b/libk3b/plugin/k3baudioencoder.cpp @@ -34,8 +34,8 @@ public: }; -K3bAudioEncoder::K3bAudioEncoder( TQObject* tqparent, const char* name ) - : K3bPlugin( tqparent, name ) +K3bAudioEncoder::K3bAudioEncoder( TQObject* parent, const char* name ) + : K3bPlugin( parent, name ) { d = new Private(); } diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h index b3fc01b..928b432 100644 --- a/libk3b/plugin/k3baudioencoder.h +++ b/libk3b/plugin/k3baudioencoder.h @@ -36,7 +36,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin TQ_OBJECT public: - K3bAudioEncoder( TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioEncoder( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bAudioEncoder(); // TODO: if the following methods are to be activated the config methods in diff --git a/libk3b/plugin/k3baudiooutputplugin.h b/libk3b/plugin/k3baudiooutputplugin.h index fdd57a5..0145465 100644 --- a/libk3b/plugin/k3baudiooutputplugin.h +++ b/libk3b/plugin/k3baudiooutputplugin.h @@ -62,8 +62,8 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin virtual int write( char* data, int len ) = 0; protected: - K3bAudioOutputPlugin( TQObject* tqparent = 0, const char* name = 0 ) - : K3bPlugin( tqparent, name ) { + K3bAudioOutputPlugin( TQObject* parent = 0, const char* name = 0 ) + : K3bPlugin( parent, name ) { } }; diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp index 3251ed5..197a042 100644 --- a/libk3b/plugin/k3baudioserver.cpp +++ b/libk3b/plugin/k3baudioserver.cpp @@ -89,8 +89,8 @@ private: }; -K3bAudioServer::K3bAudioServer( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ), +K3bAudioServer::K3bAudioServer( TQObject* parent, const char* name ) + : TQObject( parent, name ), m_usedOutputPlugin(0), m_pluginInitialized(false), m_client(0) diff --git a/libk3b/plugin/k3baudioserver.h b/libk3b/plugin/k3baudioserver.h index b428056..a4cd49d 100644 --- a/libk3b/plugin/k3baudioserver.h +++ b/libk3b/plugin/k3baudioserver.h @@ -32,7 +32,7 @@ class LIBK3B_EXPORT K3bAudioServer : public TQObject TQ_OBJECT public: - K3bAudioServer( TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioServer( TQObject* parent = 0, const char* name = 0 ); ~K3bAudioServer(); /** diff --git a/libk3b/plugin/k3bplugin.cpp b/libk3b/plugin/k3bplugin.cpp index 6929bd0..2f1afe9 100644 --- a/libk3b/plugin/k3bplugin.cpp +++ b/libk3b/plugin/k3bplugin.cpp @@ -17,8 +17,8 @@ #include "k3bplugin.h" -K3bPlugin::K3bPlugin( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bPlugin::K3bPlugin( TQObject* parent, const char* name ) + : TQObject( parent, name ) { } diff --git a/libk3b/plugin/k3bplugin.h b/libk3b/plugin/k3bplugin.h index 1eeb622..5a41b66 100644 --- a/libk3b/plugin/k3bplugin.h +++ b/libk3b/plugin/k3bplugin.h @@ -85,7 +85,7 @@ class LIBK3B_EXPORT K3bPlugin : public TQObject friend class K3bPluginManager; public: - K3bPlugin( TQObject* tqparent = 0, const char* name = 0 ); + K3bPlugin( TQObject* parent = 0, const char* name = 0 ); virtual ~K3bPlugin(); const K3bPluginInfo& pluginInfo() const { return m_pluginInfo; } @@ -105,7 +105,7 @@ class LIBK3B_EXPORT K3bPlugin : public TQObject * * The caller has to destroy the widget */ - virtual K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; + virtual K3bPluginConfigWidget* createConfigWidget( TQWidget* parent = 0, const char* name = 0 ) const; private: K3bPluginInfo m_pluginInfo; diff --git a/libk3b/plugin/k3bpluginconfigwidget.cpp b/libk3b/plugin/k3bpluginconfigwidget.cpp index b93fa9d..21876d5 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.cpp +++ b/libk3b/plugin/k3bpluginconfigwidget.cpp @@ -22,8 +22,8 @@ #include -K3bPluginConfigWidget::K3bPluginConfigWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +K3bPluginConfigWidget::K3bPluginConfigWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { } diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h index 3e5068d..7840ac4 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.h +++ b/libk3b/plugin/k3bpluginconfigwidget.h @@ -26,7 +26,7 @@ class LIBK3B_EXPORT K3bPluginConfigWidget : public TQWidget TQ_OBJECT public: - K3bPluginConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bPluginConfigWidget( TQWidget* parent = 0, const char* name = 0 ); virtual ~K3bPluginConfigWidget(); public slots: diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h index 463703f..7892dfa 100644 --- a/libk3b/plugin/k3bpluginfactory.h +++ b/libk3b/plugin/k3bpluginfactory.h @@ -64,10 +64,10 @@ class K3bPluginFactory : public KLibFactory } } - virtual TQObject* createObject( TQObject *tqparent, const char *name, + virtual TQObject* createObject( TQObject *parent, const char *name, const char*, const TQStringList& ) { initializeMessageCatalogue(); - return new T( tqparent, name ); + return new T( parent, name ); } private: diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index fc69933..3274ef6 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -42,8 +42,8 @@ public: -K3bPluginManager::K3bPluginManager( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bPluginManager::K3bPluginManager( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); } @@ -163,9 +163,9 @@ int K3bPluginManager::pluginSystemVersion() const } -int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* tqparent, const char* name ) +int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* parent, const char* name ) { - KDialogBase dlg( tqparent, + KDialogBase dlg( parent, name, true, i18n("Configure plugin %1").tqarg( plugin->pluginInfo().name() ) ); @@ -181,7 +181,7 @@ int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* tqparent, c return r; } else { - KMessageBox::sorry( tqparent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) ); + KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) ); return 0; } } diff --git a/libk3b/plugin/k3bpluginmanager.h b/libk3b/plugin/k3bpluginmanager.h index c047c1a..64a4b74 100644 --- a/libk3b/plugin/k3bpluginmanager.h +++ b/libk3b/plugin/k3bpluginmanager.h @@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bPluginManager : public TQObject TQ_OBJECT public: - K3bPluginManager( TQObject* tqparent = 0, const char* name = 0 ); + K3bPluginManager( TQObject* parent = 0, const char* name = 0 ); ~K3bPluginManager(); /** @@ -61,7 +61,7 @@ class LIBK3B_EXPORT K3bPluginManager : public TQObject void loadPlugin( const TQString& fileName ); - int execPluginDialog( K3bPlugin*, TQWidget* tqparent = 0, const char* name = 0 ); + int execPluginDialog( K3bPlugin*, TQWidget* parent = 0, const char* name = 0 ); private: class Private; diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h index a8d0c47..aafb359 100644 --- a/libk3b/plugin/k3bprojectplugin.h +++ b/libk3b/plugin/k3bprojectplugin.h @@ -77,8 +77,8 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin * @p activate() will not be used. A plugin has a GUI if it's functionality is started * by some user input. */ - K3bProjectPlugin( int type, bool gui = false, TQObject* tqparent = 0, const char* name = 0 ) - : K3bPlugin( tqparent, name ), + K3bProjectPlugin( int type, bool gui = false, TQObject* parent = 0, const char* name = 0 ) + : K3bPlugin( parent, name ), m_type(type), m_hasGUI(gui) { } @@ -139,9 +139,9 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin * this will be the doc to work on. It should * be dynamically casted to the needed project type. * - * @param tqparent the tqparent widget to be used for things like progress dialogs. + * @param parent the parent widget to be used for things like progress dialogs. */ - virtual void activate( K3bDoc* doc, TQWidget* tqparent ) { Q_UNUSED(doc); Q_UNUSED(tqparent); } + virtual void activate( K3bDoc* doc, TQWidget* parent ) { Q_UNUSED(doc); Q_UNUSED(parent); } protected: void setText( const TQString& s ) { m_text = s; } 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 -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(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( 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( 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( 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 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 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& 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(oldItem)->setReplaceItem( static_cast(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(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 -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 -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 -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 -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 -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 -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 -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 -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 -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 #include -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 -K3bVcdTrack::K3bVcdTrack( TQPtrList* tqparent, const TQString& filename ) +K3bVcdTrack::K3bVcdTrack( TQPtrList* 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; @@ -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* tqparent, const TQString& filename ); + K3bVcdTrack( TQPtrList* 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 -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; diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp index 2f53629..a5f81e3 100644 --- a/libk3b/tools/k3bbusywidget.cpp +++ b/libk3b/tools/k3bbusywidget.cpp @@ -21,8 +21,8 @@ #include -K3bBusyWidget::K3bBusyWidget( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +K3bBusyWidget::K3bBusyWidget( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { m_busyTimer = new TQTimer( this ); m_iBusyPosition = 0; diff --git a/libk3b/tools/k3bbusywidget.h b/libk3b/tools/k3bbusywidget.h index bc83c5e..7eb927e 100644 --- a/libk3b/tools/k3bbusywidget.h +++ b/libk3b/tools/k3bbusywidget.h @@ -30,7 +30,7 @@ class LIBK3B_EXPORT K3bBusyWidget : public TQFrame TQ_OBJECT public: - K3bBusyWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bBusyWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bBusyWidget(); void showBusy( bool b ); diff --git a/libk3b/tools/k3bcdtextvalidator.cpp b/libk3b/tools/k3bcdtextvalidator.cpp index 19e20d7..abd2fc5 100644 --- a/libk3b/tools/k3bcdtextvalidator.cpp +++ b/libk3b/tools/k3bcdtextvalidator.cpp @@ -16,8 +16,8 @@ #include "k3bcdtextvalidator.h" -K3bCdTextValidator::K3bCdTextValidator(TQObject *tqparent, const char *name) - : K3bLatin1Validator(tqparent, name) +K3bCdTextValidator::K3bCdTextValidator(TQObject *parent, const char *name) + : K3bLatin1Validator(parent, name) { } diff --git a/libk3b/tools/k3bcdtextvalidator.h b/libk3b/tools/k3bcdtextvalidator.h index e2d3983..896e712 100644 --- a/libk3b/tools/k3bcdtextvalidator.h +++ b/libk3b/tools/k3bcdtextvalidator.h @@ -24,7 +24,7 @@ class LIBK3B_EXPORT K3bCdTextValidator : public K3bLatin1Validator { public: - K3bCdTextValidator(TQObject *tqparent = 0, const char *name = 0); + K3bCdTextValidator(TQObject *parent = 0, const char *name = 0); ~K3bCdTextValidator(); State validate( TQString& input, int& pos ) const; diff --git a/libk3b/tools/k3bcutcombobox.cpp b/libk3b/tools/k3bcutcombobox.cpp index c4b1d20..3536c24 100644 --- a/libk3b/tools/k3bcutcombobox.cpp +++ b/libk3b/tools/k3bcutcombobox.cpp @@ -41,16 +41,16 @@ public: }; -K3bCutComboBox::K3bCutComboBox( TQWidget* tqparent, const char* name ) - : KComboBox( tqparent, name ) +K3bCutComboBox::K3bCutComboBox( TQWidget* parent, const char* name ) + : KComboBox( parent, name ) { d = new Private(); // tqsetSizePolicy( TQSizePolicy::Maximum, sizePolicy().horData(), sizePolicy().hasHeightForWidth() ); } -K3bCutComboBox::K3bCutComboBox( int method, TQWidget* tqparent, const char* name ) - : KComboBox( tqparent, name ) +K3bCutComboBox::K3bCutComboBox( int method, TQWidget* parent, const char* name ) + : KComboBox( parent, name ) { d = new Private(); d->method = method; diff --git a/libk3b/tools/k3bcutcombobox.h b/libk3b/tools/k3bcutcombobox.h index 19e4ef7..7bc8f70 100644 --- a/libk3b/tools/k3bcutcombobox.h +++ b/libk3b/tools/k3bcutcombobox.h @@ -38,8 +38,8 @@ class LIBK3B_EXPORT K3bCutComboBox : public KComboBox TQ_OBJECT public: - K3bCutComboBox( TQWidget* tqparent = 0, const char* name = 0 ); - K3bCutComboBox( int method, TQWidget* tqparent = 0, const char* name = 0 ); + K3bCutComboBox( TQWidget* parent = 0, const char* name = 0 ); + K3bCutComboBox( int method, TQWidget* parent = 0, const char* name = 0 ); virtual ~K3bCutComboBox(); enum Method { diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp index 4993e11..8d2870c 100644 --- a/libk3b/tools/k3bdevicecombobox.cpp +++ b/libk3b/tools/k3bdevicecombobox.cpp @@ -32,8 +32,8 @@ public: }; -K3bDeviceComboBox::K3bDeviceComboBox( TQWidget* tqparent, const char* name ) - : KComboBox( tqparent, name ) +K3bDeviceComboBox::K3bDeviceComboBox( TQWidget* parent, const char* name ) + : KComboBox( parent, name ) { d = new Private(); connect( this, TQT_SIGNAL(activated(int)), diff --git a/libk3b/tools/k3bdevicecombobox.h b/libk3b/tools/k3bdevicecombobox.h index 51b93ce..d427179 100644 --- a/libk3b/tools/k3bdevicecombobox.h +++ b/libk3b/tools/k3bdevicecombobox.h @@ -37,7 +37,7 @@ class LIBK3B_EXPORT K3bDeviceComboBox : public KComboBox TQ_OBJECT public: - K3bDeviceComboBox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDeviceComboBox( TQWidget* parent = 0, const char* name = 0 ); ~K3bDeviceComboBox(); K3bDevice::Device* selectedDevice() const; diff --git a/libk3b/tools/k3bdevicehandler.cpp b/libk3b/tools/k3bdevicehandler.cpp index 92fd2ff..daabe01 100644 --- a/libk3b/tools/k3bdevicehandler.cpp +++ b/libk3b/tools/k3bdevicehandler.cpp @@ -139,8 +139,8 @@ private: }; -K3bDevice::DeviceHandler::DeviceHandler( Device* dev, TQObject* tqparent, const char* name ) - : K3bThreadJob( 0, tqparent, name ), +K3bDevice::DeviceHandler::DeviceHandler( Device* dev, TQObject* parent, const char* name ) + : K3bThreadJob( 0, parent, name ), m_selfDelete(false) { m_thread = new DeviceHandlerThread(); @@ -149,8 +149,8 @@ K3bDevice::DeviceHandler::DeviceHandler( Device* dev, TQObject* tqparent, const } -K3bDevice::DeviceHandler::DeviceHandler( TQObject* tqparent, const char* name ) - : K3bThreadJob( 0, tqparent, name ), +K3bDevice::DeviceHandler::DeviceHandler( TQObject* parent, const char* name ) + : K3bThreadJob( 0, parent, name ), m_selfDelete(false) { m_thread = new DeviceHandlerThread(); diff --git a/libk3b/tools/k3bdevicehandler.h b/libk3b/tools/k3bdevicehandler.h index da26629..bd27294 100644 --- a/libk3b/tools/k3bdevicehandler.h +++ b/libk3b/tools/k3bdevicehandler.h @@ -50,8 +50,8 @@ namespace K3bDevice TQ_OBJECT public: - DeviceHandler( Device*, TQObject* tqparent = 0, const char* name = 0 ); - DeviceHandler( TQObject* tqparent = 0, const char* name = 0 ); + DeviceHandler( Device*, TQObject* parent = 0, const char* name = 0 ); + DeviceHandler( TQObject* parent = 0, const char* name = 0 ); /** * This constructor is used by the global "quick" methods and should not be used diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp index c4e03ee..0c6c3f4 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.cpp +++ b/libk3b/tools/k3bdeviceselectiondialog.cpp @@ -37,7 +37,7 @@ public: }; -K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( TQWidget* tqparent, +K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( TQWidget* parent, const char* name, const TQString& text, bool modal ) @@ -45,7 +45,7 @@ K3bDeviceSelectionDialog::K3bDeviceSelectionDialog( TQWidget* tqparent, i18n("Device Selection"), Ok|Cancel, Ok, - tqparent, + parent, name, modal ) { @@ -94,7 +94,7 @@ void K3bDeviceSelectionDialog::setSelectedDevice( K3bDevice::Device* dev ) } -K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, +K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* parent, const TQPtrList& devices, const TQString& text ) { @@ -103,7 +103,7 @@ K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, if( devices.count() == 1 ) return devices.getFirst(); - K3bDeviceSelectionDialog dlg( tqparent, 0, text ); + K3bDeviceSelectionDialog dlg( parent, 0, text ); dlg.addDevices( devices ); if( dlg.exec() == Accepted ) @@ -112,18 +112,18 @@ K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, return 0; } -K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* tqparent, +K3bDevice::Device* K3bDeviceSelectionDialog::selectDevice( TQWidget* parent, const TQString& text ) { - return selectDevice( tqparent, k3bcore->deviceManager()->allDevices(), text ); + return selectDevice( parent, k3bcore->deviceManager()->allDevices(), text ); } -K3bDevice::Device* K3bDeviceSelectionDialog::selectWriter( TQWidget* tqparent, const TQString& text ) +K3bDevice::Device* K3bDeviceSelectionDialog::selectWriter( TQWidget* parent, const TQString& text ) { - return selectDevice( tqparent, k3bcore->deviceManager()->burningDevices(), text ); + return selectDevice( parent, k3bcore->deviceManager()->burningDevices(), text ); } diff --git a/libk3b/tools/k3bdeviceselectiondialog.h b/libk3b/tools/k3bdeviceselectiondialog.h index 5295408..c4a4fdc 100644 --- a/libk3b/tools/k3bdeviceselectiondialog.h +++ b/libk3b/tools/k3bdeviceselectiondialog.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bDeviceSelectionDialog : public KDialogBase TQ_OBJECT public: - K3bDeviceSelectionDialog( TQWidget* tqparent = 0, + K3bDeviceSelectionDialog( TQWidget* parent = 0, const char* name = 0, const TQString& text = TQString(), bool modal = false ); @@ -47,11 +47,11 @@ class LIBK3B_EXPORT K3bDeviceSelectionDialog : public KDialogBase K3bDevice::Device* selectedDevice() const; - static K3bDevice::Device* selectWriter( TQWidget* tqparent, + static K3bDevice::Device* selectWriter( TQWidget* parent, const TQString& text = TQString() ); - static K3bDevice::Device* selectDevice( TQWidget* tqparent, + static K3bDevice::Device* selectDevice( TQWidget* parent, const TQString& text = TQString() ); - static K3bDevice::Device* selectDevice( TQWidget* tqparent, + static K3bDevice::Device* selectDevice( TQWidget* parent, const TQPtrList& devices, const TQString& text = TQString() ); diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp index 51b28e8..cddf0e7 100644 --- a/libk3b/tools/k3bdirsizejob.cpp +++ b/libk3b/tools/k3bdirsizejob.cpp @@ -131,8 +131,8 @@ private: }; -K3bDirSizeJob::K3bDirSizeJob( TQObject* tqparent ) - : K3bThreadJob( new K3bSimpleJobHandler(), tqparent ) +K3bDirSizeJob::K3bDirSizeJob( TQObject* parent ) + : K3bThreadJob( new K3bSimpleJobHandler(), parent ) { d = new WorkThread; setThread( d ); diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h index 82c54d5..4b8ca7e 100644 --- a/libk3b/tools/k3bdirsizejob.h +++ b/libk3b/tools/k3bdirsizejob.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bDirSizeJob : public K3bThreadJob TQ_OBJECT public: - K3bDirSizeJob( TQObject* tqparent = 0 ); + K3bDirSizeJob( TQObject* parent = 0 ); ~K3bDirSizeJob(); KIO::filesize_t totalSize() const; diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp index c3db356..3dd9731 100644 --- a/libk3b/tools/k3bintmapcombobox.cpp +++ b/libk3b/tools/k3bintmapcombobox.cpp @@ -31,8 +31,8 @@ public: }; -K3bIntMapComboBox::K3bIntMapComboBox( TQWidget* tqparent, const char* name ) - : KComboBox( tqparent, name ) +K3bIntMapComboBox::K3bIntMapComboBox( TQWidget* parent, const char* name ) + : KComboBox( parent, name ) { d = new Private; connect( this, TQT_SIGNAL(highlighted(int)), diff --git a/libk3b/tools/k3bintmapcombobox.h b/libk3b/tools/k3bintmapcombobox.h index 622c202..f1da427 100644 --- a/libk3b/tools/k3bintmapcombobox.h +++ b/libk3b/tools/k3bintmapcombobox.h @@ -33,7 +33,7 @@ class LIBK3B_EXPORT K3bIntMapComboBox : public KComboBox TQ_OBJECT public: - K3bIntMapComboBox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bIntMapComboBox( TQWidget* parent = 0, const char* name = 0 ); ~K3bIntMapComboBox(); int selectedValue() const; diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp index ed38088..725de5a 100644 --- a/libk3b/tools/k3bintvalidator.cpp +++ b/libk3b/tools/k3bintvalidator.cpp @@ -24,15 +24,15 @@ #include -K3bIntValidator::K3bIntValidator ( TQWidget * tqparent, const char * name ) - : TQValidator(TQT_TQOBJECT(tqparent), name) +K3bIntValidator::K3bIntValidator ( TQWidget * parent, const char * name ) + : TQValidator(TQT_TQOBJECT(parent), name) { m_min = m_max = 0; } -K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * tqparent, const char * name ) - : TQValidator(TQT_TQOBJECT(tqparent), name) +K3bIntValidator::K3bIntValidator ( int bottom, int top, TQWidget * parent, const char * name ) + : TQValidator(TQT_TQOBJECT(parent), name) { m_min = bottom; m_max = top; diff --git a/libk3b/tools/k3bintvalidator.h b/libk3b/tools/k3bintvalidator.h index 0945f89..ecb1a9e 100644 --- a/libk3b/tools/k3bintvalidator.h +++ b/libk3b/tools/k3bintvalidator.h @@ -34,12 +34,12 @@ class LIBK3B_EXPORT K3bIntValidator : public TQValidator /** * Constuctor. Also sets the base value. */ - K3bIntValidator ( TQWidget * tqparent, const char * name = 0 ); + K3bIntValidator ( TQWidget * parent, const char * name = 0 ); /** * Constructor. Also sets the minimum, maximum, and numeric base values. */ - K3bIntValidator ( int bottom, int top, TQWidget * tqparent, const char * name = 0 ); + K3bIntValidator ( int bottom, int top, TQWidget * parent, const char * name = 0 ); /** * Destructs the validator. diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp index 4af4480..fb3be4b 100644 --- a/libk3b/tools/k3blistview.cpp +++ b/libk3b/tools/k3blistview.cpp @@ -97,70 +97,70 @@ public: -K3bListViewItem::K3bListViewItem(TQListView *tqparent) - : KListViewItem( tqparent ) +K3bListViewItem::K3bListViewItem(TQListView *parent) + : KListViewItem( parent ) { init(); } -K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent) - : KListViewItem( tqparent ) +K3bListViewItem::K3bListViewItem(TQListViewItem *parent) + : KListViewItem( parent ) { init(); } -K3bListViewItem::K3bListViewItem(TQListView *tqparent, TQListViewItem *after) - : KListViewItem( tqparent, after ) +K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after) + : KListViewItem( parent, after ) { init(); } -K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after) - : KListViewItem( tqparent, after ) +K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after) + : KListViewItem( parent, after ) { init(); } -K3bListViewItem::K3bListViewItem(TQListView *tqparent, +K3bListViewItem::K3bListViewItem(TQListView *parent, const TQString& s1, const TQString& s2, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( tqparent, s1, s2, s3, s4, s5, s6, s7, s8 ) + : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, +K3bListViewItem::K3bListViewItem(TQListViewItem *parent, const TQString& s1, const TQString& s2, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( tqparent, s1, s2, s3, s4, s5, s6, s7, s8 ) + : KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(TQListView *tqparent, TQListViewItem *after, +K3bListViewItem::K3bListViewItem(TQListView *parent, TQListViewItem *after, const TQString& s1, const TQString& s2, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( tqparent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) + : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } -K3bListViewItem::K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after, +K3bListViewItem::K3bListViewItem(TQListViewItem *parent, TQListViewItem *after, const TQString& s1, const TQString& s2, const TQString& s3, const TQString& s4, const TQString& s5, const TQString& s6, const TQString& s7, const TQString& s8) - : KListViewItem( tqparent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) + : KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 ) { init(); } @@ -461,29 +461,29 @@ void K3bListViewItem::paintProgressBar( TQPainter* p, const TQColorGroup& cgh, i -K3bCheckListViewItem::K3bCheckListViewItem(TQListView *tqparent) - : K3bListViewItem( tqparent ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListView *parent) + : K3bListViewItem( parent ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *tqparent) - : K3bListViewItem( tqparent ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *parent) + : K3bListViewItem( parent ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(TQListView *tqparent, TQListViewItem *after) - : K3bListViewItem( tqparent, after ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListView *parent, TQListViewItem *after) + : K3bListViewItem( parent, after ), m_checked(false) { } -K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *tqparent, TQListViewItem *after) - : K3bListViewItem( tqparent, after ), +K3bCheckListViewItem::K3bCheckListViewItem(TQListViewItem *parent, TQListViewItem *after) + : K3bListViewItem( parent, after ), m_checked(false) { } @@ -545,8 +545,8 @@ public: }; -K3bListView::K3bListView( TQWidget* tqparent, const char* name ) - : KListView( tqparent, name ), +K3bListView::K3bListView( TQWidget* parent, const char* name ) + : KListView( parent, name ), m_noItemVMargin( 20 ), m_noItemHMargin( 20 ) { @@ -1210,8 +1210,8 @@ TQListViewItem* K3bListView::parentItem( TQListViewItem* item ) { if( !item ) return 0; - if( item->tqparent() ) - return item->tqparent(); + if( item->parent() ) + return item->parent(); else return K3bListView::parentItem( item->itemAbove() ); } @@ -1221,7 +1221,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList& items ) { // // Create drag pixmap. - // If there are too many items fade the pixmap using the tqmask + // If there are too many items fade the pixmap using the mask // always fade invisible items // int width = header()->width(); @@ -1245,7 +1245,7 @@ KPixmap K3bListView::createDragPixmap( const TQPtrList& items ) KPixmap pix; pix.resize( width, height ); pix.fill( TQt::white ); - // TQBitmap tqmask( width, bottom-top ); + // TQBitmap mask( width, bottom-top ); // now paint all the visible items into the pixmap // FIXME: only paint the visible items diff --git a/libk3b/tools/k3blistview.h b/libk3b/tools/k3blistview.h index 03daf00..6512052 100644 --- a/libk3b/tools/k3blistview.h +++ b/libk3b/tools/k3blistview.h @@ -42,30 +42,30 @@ class K3bListView; class LIBK3B_EXPORT K3bListViewItem : public KListViewItem { public: - K3bListViewItem(TQListView *tqparent); - K3bListViewItem(TQListViewItem *tqparent); - K3bListViewItem(TQListView *tqparent, TQListViewItem *after); - K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after); + K3bListViewItem(TQListView *parent); + K3bListViewItem(TQListViewItem *parent); + K3bListViewItem(TQListView *parent, TQListViewItem *after); + K3bListViewItem(TQListViewItem *parent, TQListViewItem *after); - K3bListViewItem(TQListView *tqparent, + K3bListViewItem(TQListView *parent, const TQString&, const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString()); - K3bListViewItem(TQListViewItem *tqparent, + K3bListViewItem(TQListViewItem *parent, const TQString&, const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString()); - K3bListViewItem(TQListView *tqparent, TQListViewItem *after, + K3bListViewItem(TQListView *parent, TQListViewItem *after, const TQString&, const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString()); - K3bListViewItem(TQListViewItem *tqparent, TQListViewItem *after, + K3bListViewItem(TQListViewItem *parent, TQListViewItem *after, const TQString&, const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), const TQString& = TQString(), @@ -136,10 +136,10 @@ class LIBK3B_EXPORT K3bListViewItem : public KListViewItem class LIBK3B_EXPORT K3bCheckListViewItem : public K3bListViewItem { public: - K3bCheckListViewItem(TQListView *tqparent); - K3bCheckListViewItem(TQListViewItem *tqparent); - K3bCheckListViewItem(TQListView *tqparent, TQListViewItem *after); - K3bCheckListViewItem(TQListViewItem *tqparent, TQListViewItem *after); + K3bCheckListViewItem(TQListView *parent); + K3bCheckListViewItem(TQListViewItem *parent); + K3bCheckListViewItem(TQListView *parent, TQListViewItem *after); + K3bCheckListViewItem(TQListViewItem *parent, TQListViewItem *after); virtual bool isChecked() const; virtual void setChecked( bool checked ); @@ -161,7 +161,7 @@ class LIBK3B_EXPORT K3bListView : public KListView TQ_OBJECT public: - K3bListView (TQWidget *tqparent = 0, const char *name = 0); + K3bListView (TQWidget *parent = 0, const char *name = 0); virtual ~K3bListView(); virtual void setCurrentItem( TQListViewItem* ); diff --git a/libk3b/tools/k3blistviewitemanimator.cpp b/libk3b/tools/k3blistviewitemanimator.cpp index b1bcf71..eef276e 100644 --- a/libk3b/tools/k3blistviewitemanimator.cpp +++ b/libk3b/tools/k3blistviewitemanimator.cpp @@ -22,15 +22,15 @@ #include -K3bListViewItemAnimator::K3bListViewItemAnimator( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bListViewItemAnimator::K3bListViewItemAnimator( TQObject* parent, const char* name ) + : TQObject( parent, name ) { init(); } -K3bListViewItemAnimator::K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bListViewItemAnimator::K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* parent, const char* name ) + : TQObject( parent, name ) { init(); setItem( item, col ); diff --git a/libk3b/tools/k3blistviewitemanimator.h b/libk3b/tools/k3blistviewitemanimator.h index 660ee98..c4dfabc 100644 --- a/libk3b/tools/k3blistviewitemanimator.h +++ b/libk3b/tools/k3blistviewitemanimator.h @@ -33,11 +33,11 @@ class LIBK3B_EXPORT K3bListViewItemAnimator : public TQObject TQ_OBJECT public: - K3bListViewItemAnimator( TQObject* tqparent = 0, const char* name = 0 ); + K3bListViewItemAnimator( TQObject* parent = 0, const char* name = 0 ); /** * Will use the items pixmap. */ - K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* tqparent = 0, const char* name = 0 ); + K3bListViewItemAnimator( TQListViewItem* item, int col, TQObject* parent = 0, const char* name = 0 ); ~K3bListViewItemAnimator(); TQListViewItem* item() const; diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index 7c46eea..a04c9a0 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -68,8 +68,8 @@ public: }; -K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, TQObject* tqparent, const char* name ) - : K3bJob( jh, tqparent, name ) +K3bMd5Job::K3bMd5Job( K3bJobHandler* jh, TQObject* parent, const char* name ) + : K3bJob( jh, parent, name ) { d = new K3bMd5JobPrivate; d->data = new char[K3bMd5JobPrivate::BUFFERSIZE]; diff --git a/libk3b/tools/k3bmd5job.h b/libk3b/tools/k3bmd5job.h index 8c487a2..8292862 100644 --- a/libk3b/tools/k3bmd5job.h +++ b/libk3b/tools/k3bmd5job.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bMd5Job : public K3bJob TQ_OBJECT public: - K3bMd5Job( K3bJobHandler* jh , TQObject* tqparent = 0, const char* name = 0 ); + K3bMd5Job( K3bJobHandler* jh , TQObject* parent = 0, const char* name = 0 ); ~K3bMd5Job(); TQCString hexDigest(); diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp index 86c018a..2266be8 100644 --- a/libk3b/tools/k3bmsfedit.cpp +++ b/libk3b/tools/k3bmsfedit.cpp @@ -26,15 +26,15 @@ -K3bMsfValidator::K3bMsfValidator( TQObject* tqparent, const char* name ) - : TQRegExpValidator( K3b::Msf::regExp(), tqparent, name ) +K3bMsfValidator::K3bMsfValidator( TQObject* parent, const char* name ) + : TQRegExpValidator( K3b::Msf::regExp(), parent, name ) { } -K3bMsfEdit::K3bMsfEdit( TQWidget* tqparent, const char* name ) - : TQSpinBox( tqparent, name ) +K3bMsfEdit::K3bMsfEdit( TQWidget* parent, const char* name ) + : TQSpinBox( parent, name ) { setValidator( new K3bMsfValidator( TQT_TQOBJECT(this) ) ); setMinValue( 0 ); diff --git a/libk3b/tools/k3bmsfedit.h b/libk3b/tools/k3bmsfedit.h index 984c674..d3e75ec 100644 --- a/libk3b/tools/k3bmsfedit.h +++ b/libk3b/tools/k3bmsfedit.h @@ -28,7 +28,7 @@ class K3bMsfValidator : public TQRegExpValidator { public: - K3bMsfValidator( TQObject* tqparent = 0, const char* name = 0 ); + K3bMsfValidator( TQObject* parent = 0, const char* name = 0 ); }; @@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bMsfEdit : public TQSpinBox TQ_OBJECT public: - K3bMsfEdit( TQWidget* tqparent = 0, const char* name = 0 ); + K3bMsfEdit( TQWidget* parent = 0, const char* name = 0 ); ~K3bMsfEdit(); TQSize tqsizeHint() const; diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp index e4cc364..01f64cd 100644 --- a/libk3b/tools/k3bmultichoicedialog.cpp +++ b/libk3b/tools/k3bmultichoicedialog.cpp @@ -78,8 +78,8 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon) K3bMultiChoiceDialog::K3bMultiChoiceDialog( const TQString& caption, const TQString& text, TQMessageBox::Icon icon, - TQWidget* tqparent, const char* name ) - : KDialog( tqparent, name ) + TQWidget* parent, const char* name ) + : KDialog( parent, name ) { d = new Private(); d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); @@ -161,7 +161,7 @@ void K3bMultiChoiceDialog::closeEvent( TQCloseEvent* e ) int K3bMultiChoiceDialog::choose( const TQString& caption, const TQString& text, TQMessageBox::Icon icon, - TQWidget* tqparent, + TQWidget* parent, const char* name, int buttonCount, const KGuiItem& b1, @@ -171,7 +171,7 @@ int K3bMultiChoiceDialog::choose( const TQString& caption, const KGuiItem& b5, const KGuiItem& b6 ) { - K3bMultiChoiceDialog dlg( caption, text, icon, tqparent, name ); + K3bMultiChoiceDialog dlg( caption, text, icon, parent, name ); dlg.addButton( b1 ); if( buttonCount > 1 ) dlg.addButton( b2 ); diff --git a/libk3b/tools/k3bmultichoicedialog.h b/libk3b/tools/k3bmultichoicedialog.h index be0748a..bfa57af 100644 --- a/libk3b/tools/k3bmultichoicedialog.h +++ b/libk3b/tools/k3bmultichoicedialog.h @@ -34,7 +34,7 @@ class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog K3bMultiChoiceDialog( const TQString& caption, const TQString& text, TQMessageBox::Icon = TQMessageBox::Information, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); ~K3bMultiChoiceDialog(); /** @@ -45,7 +45,7 @@ class LIBK3B_EXPORT K3bMultiChoiceDialog : public KDialog static int choose( const TQString& caption, const TQString& text, TQMessageBox::Icon = TQMessageBox::Information, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0, int buttonCount = 2, const KGuiItem& b1 = KStdGuiItem::yes(), diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp index e0e5a05..fe7b2af 100644 --- a/libk3b/tools/k3bprogressdialog.cpp +++ b/libk3b/tools/k3bprogressdialog.cpp @@ -28,10 +28,10 @@ K3bProgressDialog::K3bProgressDialog( const TQString& text, - TQWidget* tqparent, + TQWidget* parent, const TQString& caption, const char* name ) - : KDialogBase( tqparent, name, true, caption, Cancel|Ok, Ok, true ) + : KDialogBase( parent, name, true, caption, Cancel|Ok, Ok, true ) { TQFrame* main = makeMainWidget(); TQGridLayout* mainLayout = new TQGridLayout( main ); diff --git a/libk3b/tools/k3bprogressdialog.h b/libk3b/tools/k3bprogressdialog.h index 5ff9ad8..35cc73d 100644 --- a/libk3b/tools/k3bprogressdialog.h +++ b/libk3b/tools/k3bprogressdialog.h @@ -38,7 +38,7 @@ class LIBK3B_EXPORT K3bProgressDialog : public KDialogBase public: K3bProgressDialog( const TQString& text = TQString(), - TQWidget* tqparent = 0, + TQWidget* parent = 0, const TQString& caption = TQString(), const char* name = 0 ); ~K3bProgressDialog(); diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index 43ac0a3..a4c58bd 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -37,16 +37,16 @@ public: -K3bPushButton::K3bPushButton( TQWidget* tqparent, const char* name ) - : KPushButton( tqparent, name ) +K3bPushButton::K3bPushButton( TQWidget* parent, const char* name ) + : KPushButton( parent, name ) { d = new Private(); installEventFilter(this); } -K3bPushButton::K3bPushButton( const TQString& text, TQWidget* tqparent, const char* name ) - : KPushButton( text, tqparent, name ) +K3bPushButton::K3bPushButton( const TQString& text, TQWidget* parent, const char* name ) + : KPushButton( text, parent, name ) { d = new Private(); installEventFilter(this); @@ -54,16 +54,16 @@ K3bPushButton::K3bPushButton( const TQString& text, TQWidget* tqparent, const ch K3bPushButton::K3bPushButton( const TQIconSet& icon, const TQString& text, - TQWidget* tqparent, const char* name ) - : KPushButton( icon, text, tqparent, name ) + TQWidget* parent, const char* name ) + : KPushButton( icon, text, parent, name ) { d = new Private(); installEventFilter(this); } -K3bPushButton::K3bPushButton( const KGuiItem& item, TQWidget* tqparent, const char* name ) - : KPushButton( item, tqparent, name ) +K3bPushButton::K3bPushButton( const KGuiItem& item, TQWidget* parent, const char* name ) + : KPushButton( item, parent, name ) { d = new Private(); installEventFilter(this); diff --git a/libk3b/tools/k3bpushbutton.h b/libk3b/tools/k3bpushbutton.h index 523cefe..89729b2 100644 --- a/libk3b/tools/k3bpushbutton.h +++ b/libk3b/tools/k3bpushbutton.h @@ -32,24 +32,24 @@ class LIBK3B_EXPORT K3bPushButton : public KPushButton /** * Default constructor. */ - K3bPushButton( TQWidget* tqparent = 0, const char* name = 0 ); + K3bPushButton( TQWidget* parent = 0, const char* name = 0 ); /** * Constructor, that sets the button-text to @p text */ - K3bPushButton( const TQString& text, TQWidget* tqparent = 0, const char* name = 0 ); + K3bPushButton( const TQString& text, TQWidget* parent = 0, const char* name = 0 ); /** * Constructor, that sets an icon and the button-text to @p text */ K3bPushButton( const TQIconSet& icon, const TQString& text, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); /** * Constructor that takes a KGuiItem for the text, the icon, the tooltip * and the what's this help */ - K3bPushButton( const KGuiItem& item, TQWidget* tqparent = 0, const char* name = 0 ); + K3bPushButton( const KGuiItem& item, TQWidget* parent = 0, const char* name = 0 ); /** * Destructs the button. diff --git a/libk3b/tools/k3bradioaction.cpp b/libk3b/tools/k3bradioaction.cpp index 5315dcd..4293322 100644 --- a/libk3b/tools/k3bradioaction.cpp +++ b/libk3b/tools/k3bradioaction.cpp @@ -18,32 +18,32 @@ #include K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, - TQObject* tqparent, const char* name ) - : KToggleAction( text, cut, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, cut, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) - : KToggleAction( text, cut, receiver, slot, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - TQObject* tqparent, const char* name ) - : KToggleAction( text, pix, cut, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, pix, cut, parent, name ), m_alwaysEmit(false) { } K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, - TQObject* tqparent, const char* name ) - : KToggleAction( text, pix, cut, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, pix, cut, parent, name ), m_alwaysEmit(false) { } @@ -51,8 +51,8 @@ K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) - : KToggleAction( text, pix, cut, receiver, slot, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, pix, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } @@ -60,14 +60,14 @@ K3bRadioAction::K3bRadioAction( const TQString& text, const TQIconSet& pix, K3bRadioAction::K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name ) - : KToggleAction( text, pix, cut, receiver, slot, tqparent, name ), + TQObject* parent, const char* name ) + : KToggleAction( text, pix, cut, receiver, slot, parent, name ), m_alwaysEmit(false) { } -K3bRadioAction::K3bRadioAction( TQObject* tqparent, const char* name ) - : KToggleAction( tqparent, name ), +K3bRadioAction::K3bRadioAction( TQObject* parent, const char* name ) + : KToggleAction( parent, name ), m_alwaysEmit(false) { } diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h index d65b3f5..262e153 100644 --- a/libk3b/tools/k3bradioaction.h +++ b/libk3b/tools/k3bradioaction.h @@ -39,72 +39,72 @@ class LIBK3B_EXPORT K3bRadioAction : public KToggleAction * * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* tqparent = 0, const char* name = 0 ); + K3bRadioAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, - const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 ); + const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); /** * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's tqparent. + * @param receiver The SLOT's parent. * @param slot The TQT_SLOT to invoke to execute this action. - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ K3bRadioAction( const TQString& text, const TQString& pix, const KShortcut& cut, const TQObject* receiver, const char* slot, - TQObject* tqparent, const char* name = 0 ); + TQObject* parent, const char* name = 0 ); /** - * @param tqparent This action's tqparent. + * @param parent This action's parent. * @param name An internal name for this action. */ - K3bRadioAction( TQObject* tqparent = 0, const char* name = 0 ); + K3bRadioAction( TQObject* parent = 0, const char* name = 0 ); /** * @param b if true the action will always emit the activated signal diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp index af6c471..02878c2 100644 --- a/libk3b/tools/k3brichtextlabel.cpp +++ b/libk3b/tools/k3brichtextlabel.cpp @@ -35,15 +35,15 @@ static TQString qrichtextify( const TQString& text ) return lines.join(TQString()); } -K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +K3bRichTextLabel::K3bRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); tqsetAlignment( TQt::WordBreak ); setText(text); } -K3bRichTextLabel::K3bRichTextLabel( TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +K3bRichTextLabel::K3bRichTextLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); tqsetAlignment( TQt::WordBreak ); } diff --git a/libk3b/tools/k3brichtextlabel.h b/libk3b/tools/k3brichtextlabel.h index 3f1c407..cf1bc79 100644 --- a/libk3b/tools/k3brichtextlabel.h +++ b/libk3b/tools/k3brichtextlabel.h @@ -37,8 +37,8 @@ public: /** * Default constructor. */ - K3bRichTextLabel( TQWidget *tqparent, const char *name = 0 ); - K3bRichTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 ); + K3bRichTextLabel( TQWidget *parent, const char *name = 0 ); + K3bRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp index ebc9666..c8fee1b 100644 --- a/libk3b/tools/k3bstdguiitems.cpp +++ b/libk3b/tools/k3bstdguiitems.cpp @@ -25,9 +25,9 @@ #include -TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Simulate"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Simulate"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked K3b will perform all writing steps with the " "laser turned off." "

This is useful, for example, to test a higher writing speed " @@ -37,9 +37,9 @@ TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* tqparent, const char* na return c; } -TQCheckBox* K3bStdGuiItems::daoCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::daoCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Disk at once"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Disk at once"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will write the CD in 'disk at once' mode as " "compared to 'track at once' (TAO)." "

It is always recommended to use DAO where possible." @@ -49,9 +49,9 @@ TQCheckBox* K3bStdGuiItems::daoCheckbox( TQWidget* tqparent, const char* name ) return c; } -TQCheckBox* K3bStdGuiItems::burnproofCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::burnproofCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Use Burnfree"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Use Burnfree"), parent, name ); TQToolTip::add( c, i18n("Enable Burnfree (or Just Link) to avoid buffer underruns") ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b enables Burnfree " "(or Just Link). This is " @@ -70,9 +70,9 @@ TQCheckBox* K3bStdGuiItems::burnproofCheckbox( TQWidget* tqparent, const char* n return c; } -TQCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Only create image"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Only create image"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will only create an " "image and not do any actual writing." "

The image can later be written to a CD/DVD with most current writing " @@ -81,9 +81,9 @@ TQCheckBox* K3bStdGuiItems::onlyCreateImagesCheckbox( TQWidget* tqparent, const return c; } -TQCheckBox* K3bStdGuiItems::createCacheImageCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::createCacheImageCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Create image"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Create image"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will create an image before writing " "the files to the CD/DVD. Otherwise the data will be written on-the-fly, " "i.e. no intermediate image will be created." @@ -94,9 +94,9 @@ TQCheckBox* K3bStdGuiItems::createCacheImageCheckbox( TQWidget* tqparent, const return c; } -TQCheckBox* K3bStdGuiItems::removeImagesCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::removeImagesCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Remove image"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Remove image"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will remove any created images after the " "writing has finished." "

Uncheck this if you want to keep the images.") ); @@ -104,9 +104,9 @@ TQCheckBox* K3bStdGuiItems::removeImagesCheckbox( TQWidget* tqparent, const char return c; } -TQCheckBox* K3bStdGuiItems::onTheFlyCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::onTheFlyCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("On the fly"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("On the fly"), parent, name ); TQWhatsThis::add( c, i18n("

If this option is checked, K3b will not create an image first but write " "the files directly to the CD/DVD." "

Caution: Although this should work on most systems, make sure " @@ -116,9 +116,9 @@ TQCheckBox* K3bStdGuiItems::onTheFlyCheckbox( TQWidget* tqparent, const char* na return c; } -TQCheckBox* K3bStdGuiItems::cdTextCheckbox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::cdTextCheckbox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Write CD-TEXT"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Write CD-TEXT"), parent, name ); TQToolTip::add( c, i18n("Create CD-TEXT entries") ); TQWhatsThis::add( c, i18n("

If this option is checked K3b uses some otherwise-unused space on the audio " "CD to store additional information, like the artist or the CD title." @@ -131,9 +131,9 @@ TQCheckBox* K3bStdGuiItems::cdTextCheckbox( TQWidget* tqparent, const char* name } -TQComboBox* K3bStdGuiItems::paranoiaModeComboBox( TQWidget* tqparent, const char* name ) +TQComboBox* K3bStdGuiItems::paranoiaModeComboBox( TQWidget* parent, const char* name ) { - TQComboBox* c = new TQComboBox( tqparent, name ); + TQComboBox* c = new TQComboBox( parent, name ); c->insertItem( "0" ); c->insertItem( "1" ); c->insertItem( "2" ); @@ -150,9 +150,9 @@ TQComboBox* K3bStdGuiItems::paranoiaModeComboBox( TQWidget* tqparent, const char } -TQCheckBox* K3bStdGuiItems::startMultisessionCheckBox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::startMultisessionCheckBox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Start multisession CD"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Start multisession CD"), parent, name ); TQToolTip::add( c, i18n("Do not close the disk to allow additional sessions to be added later") ); TQWhatsThis::add( c, i18n("

If this option is checked K3b will not close the CD, and will write " "a temporary table of contents.

" @@ -161,9 +161,9 @@ TQCheckBox* K3bStdGuiItems::startMultisessionCheckBox( TQWidget* tqparent, const } -TQCheckBox* K3bStdGuiItems::normalizeCheckBox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::normalizeCheckBox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Normalize volume levels"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Normalize volume levels"), parent, name ); TQToolTip::add( c, i18n("Adjust the volume levels of all tracks") ); TQWhatsThis::add( c, i18n("

If this option is checked K3b will adjust the volume of all tracks " "to a standard level. This is useful for things like creating mixes, " @@ -175,9 +175,9 @@ TQCheckBox* K3bStdGuiItems::normalizeCheckBox( TQWidget* tqparent, const char* n } -TQCheckBox* K3bStdGuiItems::verifyCheckBox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::verifyCheckBox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Verify written data"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Verify written data"), parent, name ); TQToolTip::add( c, i18n("Compare original with written data") ); TQWhatsThis::add( c, i18n("

If this option is checked, then after successfully " "writing the disk K3b will compare the original source data " @@ -187,9 +187,9 @@ TQCheckBox* K3bStdGuiItems::verifyCheckBox( TQWidget* tqparent, const char* name } -TQCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( TQWidget* tqparent, const char* name ) +TQCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( TQWidget* parent, const char* name ) { - TQCheckBox* c = new TQCheckBox( i18n("Ignore read errors"), tqparent, name ); + TQCheckBox* c = new TQCheckBox( i18n("Ignore read errors"), parent, name ); TQToolTip::add( c, i18n("Skip unreadable audio sectors") ); TQWhatsThis::add( c, i18n("

If this option is checked and K3b is not able to read an " "audio sector from the source CD it will be replaced with zeros " @@ -200,16 +200,16 @@ TQCheckBox* K3bStdGuiItems::ignoreAudioReadErrorsCheckBox( TQWidget* tqparent, c } -TQFrame* K3bStdGuiItems::horizontalLine( TQWidget* tqparent, const char* name ) +TQFrame* K3bStdGuiItems::horizontalLine( TQWidget* parent, const char* name ) { - TQFrame* line = new TQFrame( tqparent, name ); + TQFrame* line = new TQFrame( parent, name ); line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); return line; } -TQFrame* K3bStdGuiItems::verticalLine( TQWidget* tqparent, const char* name ) +TQFrame* K3bStdGuiItems::verticalLine( TQWidget* parent, const char* name ) { - TQFrame* line = new TQFrame( tqparent, name ); + TQFrame* line = new TQFrame( parent, name ); line->setFrameStyle( TQFrame::VLine | TQFrame::Sunken ); return line; } diff --git a/libk3b/tools/k3bstdguiitems.h b/libk3b/tools/k3bstdguiitems.h index c90aaf8..d65133c 100644 --- a/libk3b/tools/k3bstdguiitems.h +++ b/libk3b/tools/k3bstdguiitems.h @@ -25,21 +25,21 @@ class TQFrame; namespace K3bStdGuiItems { - LIBK3B_EXPORT TQCheckBox* simulateCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* daoCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* burnproofCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* onlyCreateImagesCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* createCacheImageCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* removeImagesCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* onTheFlyCheckbox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* cdTextCheckbox( TQWidget* tqparent = 0, const char* name = 0); - LIBK3B_EXPORT TQComboBox* paranoiaModeComboBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* startMultisessionCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* normalizeCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* verifyCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQCheckBox* ignoreAudioReadErrorsCheckBox( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQFrame* horizontalLine( TQWidget* tqparent = 0, const char* name = 0 ); - LIBK3B_EXPORT TQFrame* verticalLine( TQWidget* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* simulateCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* daoCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* burnproofCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* onlyCreateImagesCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* createCacheImageCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* removeImagesCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* onTheFlyCheckbox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* cdTextCheckbox( TQWidget* parent = 0, const char* name = 0); + LIBK3B_EXPORT TQComboBox* paranoiaModeComboBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* startMultisessionCheckBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* normalizeCheckBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* verifyCheckBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQCheckBox* ignoreAudioReadErrorsCheckBox( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQFrame* horizontalLine( TQWidget* parent = 0, const char* name = 0 ); + LIBK3B_EXPORT TQFrame* verticalLine( TQWidget* parent = 0, const char* name = 0 ); } #endif diff --git a/libk3b/tools/k3bthreadwidget.cpp b/libk3b/tools/k3bthreadwidget.cpp index efbe2fa..103b67b 100644 --- a/libk3b/tools/k3bthreadwidget.cpp +++ b/libk3b/tools/k3bthreadwidget.cpp @@ -34,14 +34,14 @@ public: class K3bThreadWidget::DeviceSelectionEvent : public TQCustomEvent { public: - DeviceSelectionEvent( TQWidget* tqparent, const TQString& text, int id ) + DeviceSelectionEvent( TQWidget* parent, const TQString& text, int id ) : TQCustomEvent( TQEvent::User + 22 ), - m_parent(tqparent), + m_parent(parent), m_text(text), m_id(id) { } - TQWidget* tqparent() const { return m_parent; } + TQWidget* parent() const { return m_parent; } const TQString& text() const { return m_text; } int id() const { return m_id; } @@ -102,7 +102,7 @@ K3bThreadWidget* K3bThreadWidget::instance() // static -K3bDevice::Device* K3bThreadWidget::selectDevice( TQWidget* tqparent, +K3bDevice::Device* K3bThreadWidget::selectDevice( TQWidget* parent, const TQString& text ) { // request a new data set @@ -110,7 +110,7 @@ K3bDevice::Device* K3bThreadWidget::selectDevice( TQWidget* tqparent, // inform the instance about the request TQApplication::postEvent( K3bThreadWidget::instance(), - new K3bThreadWidget::DeviceSelectionEvent( tqparent, text, data->id ) ); + new K3bThreadWidget::DeviceSelectionEvent( parent, text, data->id ) ); // wait for the result to be ready data->con.wait(); @@ -128,7 +128,7 @@ void K3bThreadWidget::customEvent( TQCustomEvent* e ) { if( DeviceSelectionEvent* dse = dynamic_cast(e) ) { // create dialog - K3bDevice::Device* dev = K3bDeviceSelectionDialog::selectDevice( dse->tqparent(), dse->text() ); + K3bDevice::Device* dev = K3bDeviceSelectionDialog::selectDevice( dse->parent(), dse->text() ); // return it to the thread Data* dat = data( dse->id() ); diff --git a/libk3b/tools/k3bthreadwidget.h b/libk3b/tools/k3bthreadwidget.h index 1b514c2..6bf67ea 100644 --- a/libk3b/tools/k3bthreadwidget.h +++ b/libk3b/tools/k3bthreadwidget.h @@ -45,7 +45,7 @@ class K3bThreadWidget : public TQObject /** * Call this from a thread to show a device selection dialog. */ - static K3bDevice::Device* selectDevice( TQWidget* tqparent, + static K3bDevice::Device* selectDevice( TQWidget* parent, const TQString& text = TQString() ); protected: diff --git a/libk3b/tools/k3bthroughputestimator.cpp b/libk3b/tools/k3bthroughputestimator.cpp index d6183b3..7e330b4 100644 --- a/libk3b/tools/k3bthroughputestimator.cpp +++ b/libk3b/tools/k3bthroughputestimator.cpp @@ -38,8 +38,8 @@ public: }; -K3bThroughputEstimator::K3bThroughputEstimator( TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ) +K3bThroughputEstimator::K3bThroughputEstimator( TQObject* parent, const char* name ) + : TQObject( parent, name ) { d = new Private(); } diff --git a/libk3b/tools/k3bthroughputestimator.h b/libk3b/tools/k3bthroughputestimator.h index 52d3272..07b0a54 100644 --- a/libk3b/tools/k3bthroughputestimator.h +++ b/libk3b/tools/k3bthroughputestimator.h @@ -31,7 +31,7 @@ class K3bThroughputEstimator : public TQObject TQ_OBJECT public: - K3bThroughputEstimator( TQObject* tqparent = 0, const char* name = 0 ); + K3bThroughputEstimator( TQObject* parent = 0, const char* name = 0 ); ~K3bThroughputEstimator(); int average() const; diff --git a/libk3b/tools/k3btitlelabel.cpp b/libk3b/tools/k3btitlelabel.cpp index db9edc0..21476b0 100644 --- a/libk3b/tools/k3btitlelabel.cpp +++ b/libk3b/tools/k3btitlelabel.cpp @@ -94,8 +94,8 @@ public: -K3bTitleLabel::K3bTitleLabel( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +K3bTitleLabel::K3bTitleLabel( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { d = new Private(); m_toolTip = new ToolTip( this ); diff --git a/libk3b/tools/k3btitlelabel.h b/libk3b/tools/k3btitlelabel.h index 3547a5c..b850b12 100644 --- a/libk3b/tools/k3btitlelabel.h +++ b/libk3b/tools/k3btitlelabel.h @@ -29,7 +29,7 @@ class LIBK3B_EXPORT K3bTitleLabel : public TQFrame TQ_OBJECT public: - K3bTitleLabel( TQWidget* tqparent = 0, const char* name = 0 ); + K3bTitleLabel( TQWidget* parent = 0, const char* name = 0 ); ~K3bTitleLabel(); TQSize tqsizeHint() const; diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp index 2adf274..cf72a3b 100644 --- a/libk3b/tools/k3btoolbox.cpp +++ b/libk3b/tools/k3btoolbox.cpp @@ -42,7 +42,7 @@ class K3bToolBoxSeparator : public TQWidget TQ_OBJECT public: - K3bToolBoxSeparator( K3bToolBox* tqparent ); + K3bToolBoxSeparator( K3bToolBox* parent ); TQSize tqsizeHint() const; @@ -51,8 +51,8 @@ class K3bToolBoxSeparator : public TQWidget }; -K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* tqparent ) - : TQWidget( tqparent ) +K3bToolBoxSeparator::K3bToolBoxSeparator( K3bToolBox* parent ) + : TQWidget( parent ) { tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); } @@ -77,8 +77,8 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* ) -K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* tqparent ) - : TQToolButton( tqparent ), +K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* parent ) + : TQToolButton( parent ), m_popupMenu(0) { tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); @@ -123,8 +123,8 @@ K3bToolBoxButton::K3bToolBoxButton( KAction* action, TQWidget* tqparent ) K3bToolBoxButton::K3bToolBoxButton( const TQString& text, const TQString& icon, const TQString& tooltip, const TQString& whatsthis, TQObject* receiver, const char* slot, - TQWidget* tqparent ) - : TQToolButton( tqparent ), + TQWidget* parent ) + : TQToolButton( parent ), m_popupMenu(0) { tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Fixed, tqsizePolicy().verData()) ); @@ -168,8 +168,8 @@ void K3bToolBoxButton::resizeEvent( TQResizeEvent* e ) -K3bToolBox::K3bToolBox( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +K3bToolBox::K3bToolBox( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed) ); diff --git a/libk3b/tools/k3btoolbox.h b/libk3b/tools/k3btoolbox.h index b93346b..77f2424 100644 --- a/libk3b/tools/k3btoolbox.h +++ b/libk3b/tools/k3btoolbox.h @@ -39,11 +39,11 @@ class LIBK3B_EXPORT K3bToolBoxButton : public TQToolButton TQ_OBJECT public: - K3bToolBoxButton( KAction*, TQWidget* tqparent ); + K3bToolBoxButton( KAction*, TQWidget* parent ); K3bToolBoxButton( const TQString& text, const TQString& icon, const TQString& tooltip, const TQString& whatsthis, TQObject* receiver, const char* slot, - TQWidget* tqparent ); + TQWidget* parent ); private slots: void slotPopupActivated(); @@ -62,7 +62,7 @@ class LIBK3B_EXPORT K3bToolBox : public TQFrame TQ_OBJECT public: - K3bToolBox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bToolBox( TQWidget* parent = 0, const char* name = 0 ); ~K3bToolBox(); K3bToolBoxButton* addButton( const TQString& text, const TQString& icon, diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index 6f63c63..67af0d5 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -31,8 +31,8 @@ public: }; -K3bToolButton::K3bToolButton( TQWidget* tqparent ) - : TQToolButton( tqparent ) +K3bToolButton::K3bToolButton( TQWidget* parent ) + : TQToolButton( parent ) { d = new Private; d->instantMenu = false; diff --git a/libk3b/tools/k3btoolbutton.h b/libk3b/tools/k3btoolbutton.h index 707801f..6b2057d 100644 --- a/libk3b/tools/k3btoolbutton.h +++ b/libk3b/tools/k3btoolbutton.h @@ -33,7 +33,7 @@ class TQEvent; class LIBK3B_EXPORT K3bToolButton : public TQToolButton { public: - K3bToolButton( TQWidget* tqparent = 0 ); + K3bToolButton( TQWidget* parent = 0 ); ~K3bToolButton(); void setInstantMenu( bool ); diff --git a/libk3b/tools/k3bvalidators.cpp b/libk3b/tools/k3bvalidators.cpp index b8a6e65..6bf63b6 100644 --- a/libk3b/tools/k3bvalidators.cpp +++ b/libk3b/tools/k3bvalidators.cpp @@ -19,8 +19,8 @@ #include -K3bCharValidator::K3bCharValidator( TQObject* tqparent, const char* name ) - : TQValidator( tqparent, name ), +K3bCharValidator::K3bCharValidator( TQObject* parent, const char* name ) + : TQValidator( parent, name ), m_replaceChar( '_' ) { } @@ -49,8 +49,8 @@ void K3bCharValidator::fixup( TQString& s ) const } -K3bLatin1Validator::K3bLatin1Validator( TQObject* tqparent, const char* name ) - : K3bCharValidator( tqparent, name ) +K3bLatin1Validator::K3bLatin1Validator( TQObject* parent, const char* name ) + : K3bCharValidator( parent, name ) { } @@ -64,8 +64,8 @@ TQValidator::State K3bLatin1Validator::validateChar( const TQChar& c ) const } -K3bAsciiValidator::K3bAsciiValidator( TQObject* tqparent, const char* name ) - : K3bLatin1Validator( tqparent, name ) +K3bAsciiValidator::K3bAsciiValidator( TQObject* parent, const char* name ) + : K3bLatin1Validator( parent, name ) { } @@ -82,15 +82,15 @@ TQValidator::State K3bAsciiValidator::validateChar( const TQChar& c ) const -K3bValidator::K3bValidator( TQObject* tqparent, const char* name ) - : TQRegExpValidator( tqparent, name ), +K3bValidator::K3bValidator( TQObject* parent, const char* name ) + : TQRegExpValidator( parent, name ), m_replaceChar('_') { } -K3bValidator::K3bValidator( const TQRegExp& rx, TQObject* tqparent, const char* name ) - : TQRegExpValidator( rx, tqparent, name ), +K3bValidator::K3bValidator( const TQRegExp& rx, TQObject* parent, const char* name ) + : TQRegExpValidator( rx, parent, name ), m_replaceChar('_') { } @@ -116,22 +116,22 @@ TQString K3bValidators::fixup( const TQString& input, const TQRegExp& rx, const } -K3bValidator* K3bValidators::isrcValidator( TQObject* tqparent, const char* name ) +K3bValidator* K3bValidators::isrcValidator( TQObject* parent, const char* name ) { - return new K3bValidator( TQRegExp("^[A-Z\\d]{2,2}-[A-Z\\d]{3,3}-\\d{2,2}-\\d{5,5}$"), tqparent, name ); + return new K3bValidator( TQRegExp("^[A-Z\\d]{2,2}-[A-Z\\d]{3,3}-\\d{2,2}-\\d{5,5}$"), parent, name ); } -K3bValidator* K3bValidators::iso9660Validator( bool allowEmpty, TQObject* tqparent, const char* name ) +K3bValidator* K3bValidators::iso9660Validator( bool allowEmpty, TQObject* parent, const char* name ) { if( allowEmpty ) - return new K3bValidator( TQRegExp( "[^/]*" ), tqparent, name ); + return new K3bValidator( TQRegExp( "[^/]*" ), parent, name ); else - return new K3bValidator( TQRegExp( "[^/]+" ), tqparent, name ); + return new K3bValidator( TQRegExp( "[^/]+" ), parent, name ); } -K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, TQObject* tqparent, const char* name ) +K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, TQObject* parent, const char* name ) { TQRegExp rx; switch ( type ) { @@ -150,5 +150,5 @@ K3bValidator* K3bValidators::iso646Validator( int type, bool AllowLowerCase, TQO break; } - return new K3bValidator( rx, tqparent, name ); + return new K3bValidator( rx, parent, name ); } diff --git a/libk3b/tools/k3bvalidators.h b/libk3b/tools/k3bvalidators.h index d391cb9..42197f4 100644 --- a/libk3b/tools/k3bvalidators.h +++ b/libk3b/tools/k3bvalidators.h @@ -26,7 +26,7 @@ class LIBK3B_EXPORT K3bCharValidator : public TQValidator { public: - K3bCharValidator( TQObject* tqparent = 0, const char* name = 0 ); + K3bCharValidator( TQObject* parent = 0, const char* name = 0 ); virtual State validateChar( const TQChar& ) const = 0; @@ -50,7 +50,7 @@ class LIBK3B_EXPORT K3bCharValidator : public TQValidator class LIBK3B_EXPORT K3bLatin1Validator : public K3bCharValidator { public: - K3bLatin1Validator( TQObject* tqparent = 0, const char* name = 0 ); + K3bLatin1Validator( TQObject* parent = 0, const char* name = 0 ); virtual State validateChar( const TQChar& ) const; }; @@ -59,7 +59,7 @@ class LIBK3B_EXPORT K3bLatin1Validator : public K3bCharValidator class LIBK3B_EXPORT K3bAsciiValidator : public K3bLatin1Validator { public: - K3bAsciiValidator( TQObject* tqparent = 0, const char* name = 0 ); + K3bAsciiValidator( TQObject* parent = 0, const char* name = 0 ); virtual State validateChar( const TQChar& ) const; }; @@ -74,8 +74,8 @@ class LIBK3B_EXPORT K3bAsciiValidator : public K3bLatin1Validator class LIBK3B_EXPORT K3bValidator : public TQRegExpValidator { public: - K3bValidator( TQObject* tqparent, const char * name = 0 ); - K3bValidator( const TQRegExp& rx, TQObject* tqparent, const char* name = 0 ); + K3bValidator( TQObject* parent, const char * name = 0 ); + K3bValidator( const TQRegExp& rx, TQObject* parent, const char* name = 0 ); void setReplaceChar( const TQChar& s ) { m_replaceChar = s; } const TQChar& replaceChar() const { return m_replaceChar; } @@ -105,13 +105,13 @@ namespace K3bValidators *

  • S: serial number (digits)
    • * */ - LIBK3B_EXPORT K3bValidator* isrcValidator( TQObject* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT K3bValidator* isrcValidator( TQObject* parent = 0, const char* name = 0 ); /** * This needs to be replaced by something better in the future... * Even the name sucks! */ - LIBK3B_EXPORT K3bValidator* iso9660Validator( bool allowEmpty = true, TQObject* tqparent = 0, const char* name = 0 ); + LIBK3B_EXPORT K3bValidator* iso9660Validator( bool allowEmpty = true, TQObject* parent = 0, const char* name = 0 ); /** * (1) d-characters are: A-Z, 0-9, _ (see ISO-9660:1988, Annex A, Table 15) @@ -125,7 +125,7 @@ namespace K3bValidators LIBK3B_EXPORT K3bValidator* iso646Validator( int type = Iso646_a, bool AllowLowerCase = false, - TQObject* tqparent = 0, const char* name = 0 ); + TQObject* parent = 0, const char* name = 0 ); } #endif diff --git a/libk3b/tools/kcutlabel.cpp b/libk3b/tools/kcutlabel.cpp index 650f83d..fd806ba 100644 --- a/libk3b/tools/kcutlabel.cpp +++ b/libk3b/tools/kcutlabel.cpp @@ -23,8 +23,8 @@ #include -KCutLabel::KCutLabel( const TQString &text , TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ), +KCutLabel::KCutLabel( const TQString &text , TQWidget *parent, const char *name ) + : TQLabel ( parent, name ), m_minChars(1) { TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); tqsetSizePolicy(myLabelSizePolicy); @@ -32,8 +32,8 @@ KCutLabel::KCutLabel( const TQString &text , TQWidget *tqparent, const char *nam cutTextToLabel(); } -KCutLabel::KCutLabel( TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ), +KCutLabel::KCutLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ), m_minChars(1) { TQSizePolicy myLabelSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); tqsetSizePolicy(myLabelSizePolicy); diff --git a/libk3b/tools/kcutlabel.h b/libk3b/tools/kcutlabel.h index 5df44b3..7b96fe2 100644 --- a/libk3b/tools/kcutlabel.h +++ b/libk3b/tools/kcutlabel.h @@ -33,8 +33,8 @@ class LIBK3B_EXPORT KCutLabel : public TQLabel /** * Default constructor. */ - KCutLabel( TQWidget *tqparent = 0, const char *name = 0); - KCutLabel( const TQString &text, TQWidget *tqparent = 0, const char *name = 0 ); + KCutLabel( TQWidget *parent = 0, const char *name = 0); + KCutLabel( const TQString &text, TQWidget *parent = 0, const char *name = 0 ); virtual TQSize tqminimumSizeHint() const; diff --git a/libk3b/tools/libisofs/iso_fs.h b/libk3b/tools/libisofs/iso_fs.h index b726b9f..43353b0 100644 --- a/libk3b/tools/libisofs/iso_fs.h +++ b/libk3b/tools/libisofs/iso_fs.h @@ -131,13 +131,13 @@ struct hs_primary_descriptor { char root_directory_record [ISODCL (181, 214)]; /* 9.1 */ }; -/* We use this to help us look up the tqparent inode numbers. */ +/* We use this to help us look up the parent inode numbers. */ struct iso_path_table{ char name_len[1]; /* 711 */ char ext_attr_length[1]; /* 711 */ char extent[4]; /* 731 */ - char tqparent[2]; /* 721 */ + char parent[2]; /* 721 */ char name[1]; }; diff --git a/libk3b/tools/libisofs/isofs.h b/libk3b/tools/libisofs/isofs.h index 6f2fe2d..f284903 100644 --- a/libk3b/tools/libisofs/isofs.h +++ b/libk3b/tools/libisofs/isofs.h @@ -43,7 +43,7 @@ typedef struct _rr_entry { int serno; int dev_major; int dev_minor; - int pl; /* tqparent location */ + int pl; /* parent location */ int cl; /* child location */ int re; /* relocated */ char z_algo[2]; /* zizofs algorithm */ @@ -60,7 +60,7 @@ typedef struct _iso_vol_desc { typedef struct _boot_entry { struct _boot_entry *next; struct _boot_entry *prev; - struct _boot_entry *tqparent; + struct _boot_entry *parent; struct _boot_entry *child; char data[32]; } boot_entry; -- cgit v1.2.3