diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | df8e67b86696f691708af8592d86282b09bab011 (patch) | |
| tree | ca90d734c9011d457a42f0a7004a9507b2c2c1bd /src/projects | |
| parent | 33881ea4441221b1ca0789a72c4c7249d923a0df (diff) | |
| download | k3b-df8e67b86696f691708af8592d86282b09bab011.tar.gz k3b-df8e67b86696f691708af8592d86282b09bab011.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/projects')
103 files changed, 302 insertions, 302 deletions
diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 4ec9ff3..0634caa 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -55,8 +55,8 @@ #include <kmessagebox.h> -K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, tqparent, name, modal ), +K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, parent, name, modal ), m_doc(_doc) { prepareGui(); diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h index 64355a2..3b3bb07 100644 --- a/src/projects/k3baudioburndialog.h +++ b/src/projects/k3baudioburndialog.h @@ -45,7 +45,7 @@ class K3bAudioBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bAudioBurnDialog(K3bAudioDoc* doc, TQWidget *tqparent=0, const char *name=0, bool modal = true ); + K3bAudioBurnDialog(K3bAudioDoc* doc, TQWidget *parent=0, const char *name=0, bool modal = true ); ~K3bAudioBurnDialog(); protected: diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp index f6237b9..a1dff26 100644 --- a/src/projects/k3baudiocdtextwidget.cpp +++ b/src/projects/k3baudiocdtextwidget.cpp @@ -36,8 +36,8 @@ class K3bAudioCdTextWidget::AllFieldsDialog : public KDialogBase { public: - AllFieldsDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, + AllFieldsDialog( TQWidget* parent ) + : KDialogBase( parent, "cdtext_allfields_dialog", true, i18n("CD-Text"), @@ -52,8 +52,8 @@ public: }; -K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* tqparent, const char* name ) - : base_K3bAudioCdTextWidget( tqparent, name ), +K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* parent, const char* name ) + : base_K3bAudioCdTextWidget( parent, name ), m_doc(0) { m_allFieldsDlg = new AllFieldsDialog( this ); diff --git a/src/projects/k3baudiocdtextwidget.h b/src/projects/k3baudiocdtextwidget.h index 88ff568..e4c2e35 100644 --- a/src/projects/k3baudiocdtextwidget.h +++ b/src/projects/k3baudiocdtextwidget.h @@ -28,7 +28,7 @@ class K3bAudioCdTextWidget : public base_K3bAudioCdTextWidget TQ_OBJECT public: - K3bAudioCdTextWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioCdTextWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioCdTextWidget(); bool isChecked() const; diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp index 541c946..4a6e722 100644 --- a/src/projects/k3baudiodatasourceeditwidget.cpp +++ b/src/projects/k3baudiodatasourceeditwidget.cpp @@ -27,8 +27,8 @@ #include <kdialog.h> -K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), +K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ), m_source(0) { m_editor = new K3bAudioEditorWidget( this ); diff --git a/src/projects/k3baudiodatasourceeditwidget.h b/src/projects/k3baudiodatasourceeditwidget.h index 10a7ace..4fe29f4 100644 --- a/src/projects/k3baudiodatasourceeditwidget.h +++ b/src/projects/k3baudiodatasourceeditwidget.h @@ -33,7 +33,7 @@ class K3bAudioDataSourceEditWidget : public TQWidget TQ_OBJECT public: - K3bAudioDataSourceEditWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioDataSourceEditWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioDataSourceEditWidget(); K3b::Msf startOffset() const; diff --git a/src/projects/k3baudiodatasourceviewitem.cpp b/src/projects/k3baudiodatasourceviewitem.cpp index eb70a66..6609d00 100644 --- a/src/projects/k3baudiodatasourceviewitem.cpp +++ b/src/projects/k3baudiodatasourceviewitem.cpp @@ -23,11 +23,11 @@ #include <kiconloader.h> -K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* tqparent, +K3bAudioDataSourceViewItem::K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* parent, K3bAudioDataSourceViewItem* after, K3bAudioDataSource* source ) - : K3bListViewItem( tqparent, after ), - m_trackViewItem( tqparent ), + : K3bListViewItem( parent, after ), + m_trackViewItem( parent ), m_source( source ), m_animationCounter(1) { diff --git a/src/projects/k3baudiodatasourceviewitem.h b/src/projects/k3baudiodatasourceviewitem.h index 7b2fb5a..89a7c74 100644 --- a/src/projects/k3baudiodatasourceviewitem.h +++ b/src/projects/k3baudiodatasourceviewitem.h @@ -25,7 +25,7 @@ class K3bAudioTrackViewItem; class K3bAudioDataSourceViewItem : public K3bListViewItem { public: - K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* tqparent, + K3bAudioDataSourceViewItem( K3bAudioTrackViewItem* parent, K3bAudioDataSourceViewItem* after, K3bAudioDataSource* ); diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index 186fdb5..fe0be91 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -168,8 +168,8 @@ public: }; -K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name, TQt::WNoAutoErase ), +K3bAudioEditorWidget::K3bAudioEditorWidget( TQWidget* parent, const char* name ) + : TQFrame( parent, name, TQt::WNoAutoErase ), m_maxMarkers(1), m_idCnt(1), m_mouseAt(true), diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h index fdb3088..b2edfa2 100644 --- a/src/projects/k3baudioeditorwidget.h +++ b/src/projects/k3baudioeditorwidget.h @@ -31,7 +31,7 @@ class K3bAudioEditorWidget : public TQFrame TQ_OBJECT public: - K3bAudioEditorWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioEditorWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioEditorWidget(); TQSize tqsizeHint() const; diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index 6894732..5e5ca7e 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -54,12 +54,12 @@ public: }; -K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* tqparent, const char* name ) +K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n("Please be patient..."), Cancel, Cancel, - tqparent, + parent, name, true, true ), @@ -93,12 +93,12 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, K3bAudioTrack* afterTrack, K3bAudioTrack* parentTrack, K3bAudioDataSource* afterSource, - TQWidget* tqparent ) + TQWidget* parent ) { if( urls.isEmpty() ) return 0; - K3bAudioTrackAddingDialog dlg( tqparent ); + K3bAudioTrackAddingDialog dlg( parent ); dlg.m_urls = extractUrlList( urls ); dlg.m_doc = doc; dlg.m_trackAfter = afterTrack; @@ -132,7 +132,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, .tqarg( dlg.m_unsupportedFiles.join( "<br>" ) ); if( !message.isEmpty() ) - KMessageBox::detailedSorry( tqparent, i18n("Problems while adding files to the project."), message ); + KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); return ret; } diff --git a/src/projects/k3baudiotrackaddingdialog.h b/src/projects/k3baudiotrackaddingdialog.h index 9fa5485..f0ee9cf 100644 --- a/src/projects/k3baudiotrackaddingdialog.h +++ b/src/projects/k3baudiotrackaddingdialog.h @@ -68,7 +68,7 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler K3bAudioTrack* afterTrack = 0, K3bAudioTrack* parentTrack = 0, K3bAudioDataSource* afterSource = 0, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); private slots: void slotAddUrls(); @@ -76,7 +76,7 @@ class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler void slotCancel(); private: - K3bAudioTrackAddingDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioTrackAddingDialog( TQWidget* parent = 0, const char* name = 0 ); static KURL::List extractUrlList( const KURL::List& urls ); diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp index 676e12b..bdfb9f0 100644 --- a/src/projects/k3baudiotrackdialog.cpp +++ b/src/projects/k3baudiotrackdialog.cpp @@ -54,10 +54,10 @@ // do only show cd-text and options (eventuelle index0) -K3bAudioTrackDialog::K3bAudioTrackDialog( TQPtrList<K3bAudioTrack>& tracks, TQWidget *tqparent, const char *name ) +K3bAudioTrackDialog::K3bAudioTrackDialog( TQPtrList<K3bAudioTrack>& tracks, TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Audio Track Properties"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Apply, - KDialogBase::Ok, tqparent, name ) + KDialogBase::Ok, parent, name ) { m_tracks = tracks; diff --git a/src/projects/k3baudiotrackdialog.h b/src/projects/k3baudiotrackdialog.h index 8eb0ce6..36a5eff 100644 --- a/src/projects/k3baudiotrackdialog.h +++ b/src/projects/k3baudiotrackdialog.h @@ -37,7 +37,7 @@ class K3bAudioTrackDialog : public KDialogBase TQ_OBJECT public: - K3bAudioTrackDialog( TQPtrList<K3bAudioTrack>&, TQWidget *tqparent=0, const char *name=0); + K3bAudioTrackDialog( TQPtrList<K3bAudioTrack>&, TQWidget *parent=0, const char *name=0); ~K3bAudioTrackDialog(); protected slots: diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index 1175de7..adc1e41 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -52,8 +52,8 @@ public: }; -K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* tqparent, const char* name ) - : TQObject( tqparent, name ), +K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, const char* name ) + : TQObject( parent, name ), K3bAudioClient(), m_doc( doc ), m_currentTrack( 0 ) diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h index 7868500..b4e7aff 100644 --- a/src/projects/k3baudiotrackplayer.h +++ b/src/projects/k3baudiotrackplayer.h @@ -33,7 +33,7 @@ class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient TQ_OBJECT public: - K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* tqparent = 0, const char* name = 0 ); + K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent = 0, const char* name = 0 ); ~K3bAudioTrackPlayer(); K3bAudioTrack* currentPlayingTrack() const { return m_currentTrack; } diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 9ec443a..6a987e6 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -30,10 +30,10 @@ #include <tqlayout.h> -K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* tqparent, const char* name ) +K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("Split Audio Track"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, tqparent, name ), + KDialogBase::Ok, parent, name ), m_track(track) { TQFrame* frame = plainPage(); @@ -193,10 +193,10 @@ void K3bAudioTrackSplitDialog::slotRemoveRange() void K3bAudioTrackSplitDialog::splitTrack( K3bAudioTrack* track, - TQWidget* tqparent, + TQWidget* parent, const char* name ) { - K3bAudioTrackSplitDialog d( track, tqparent, name ); + K3bAudioTrackSplitDialog d( track, parent, name ); if( d.exec() == TQDialog::Accepted ) { TQValueList<int> ranges = d.m_editorWidget->allRanges(); // we split the track at all range ends and just delete those that relate to the gaps in between diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h index ce9b01b..58ade55 100644 --- a/src/projects/k3baudiotracksplitdialog.h +++ b/src/projects/k3baudiotracksplitdialog.h @@ -37,7 +37,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase TQ_OBJECT public: - K3bAudioTrackSplitDialog( K3bAudioTrack*, TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioTrackSplitDialog( K3bAudioTrack*, TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioTrackSplitDialog(); bool eventFilter( TQObject* o, TQEvent* e ); @@ -47,7 +47,7 @@ class K3bAudioTrackSplitDialog : public KDialogBase /** * if this method returns true val is filled with the user selected value. */ - static void splitTrack( K3bAudioTrack* track, TQWidget* tqparent = 0, const char* name = 0 ); + static void splitTrack( K3bAudioTrack* track, TQWidget* parent = 0, const char* name = 0 ); private slots: void slotRangeModified( int, const K3b::Msf& start, const K3b::Msf& ); diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp index 0187d33..0bf23ec 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.cpp +++ b/src/projects/k3baudiotracktrmlookupdialog.cpp @@ -41,12 +41,12 @@ #include <tqapplication.h> -K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* tqparent, const char* name ) +K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("MusicBrainz Query"), KDialogBase::Cancel, KDialogBase::Cancel, - tqparent, + parent, name, true, true ) diff --git a/src/projects/k3baudiotracktrmlookupdialog.h b/src/projects/k3baudiotracktrmlookupdialog.h index f0d6718..b3cde66 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.h +++ b/src/projects/k3baudiotracktrmlookupdialog.h @@ -31,7 +31,7 @@ class K3bAudioTrackTRMLookupDialog : public KDialogBase TQ_OBJECT public: - K3bAudioTrackTRMLookupDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bAudioTrackTRMLookupDialog( TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioTrackTRMLookupDialog(); /** diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 4aebd99..23f3478 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -61,8 +61,8 @@ #include <kdialogbase.h> -K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* tqparent, const char* name ) - : K3bListView( tqparent, name ), +K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const char* name ) + : K3bListView( parent, name ), m_doc(doc), m_updatingColumnWidths(false), m_currentMouseOverItem(0), @@ -230,7 +230,7 @@ TQDragObject* K3bAudioTrackView::dragObject() } -void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ) +void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after ) { m_autoOpenTrackTimer->stop(); @@ -249,7 +249,7 @@ void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, T } } - if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( tqparent ) ) { + if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>( parent ) ) { m_dropTrackParent = tv->track(); } @@ -594,12 +594,12 @@ void K3bAudioTrackView::contentsDragLeaveEvent( TQDragLeaveEvent* e ) K3bAudioTrackViewItem* K3bAudioTrackView::findTrackItem( const TQPoint& pos ) const { - TQListViewItem* tqparent = 0; + TQListViewItem* parent = 0; TQListViewItem* after = 0; K3bAudioTrackView* that = const_cast<K3bAudioTrackView*>(this); - that->findDrop( pos, tqparent, after ); - if( tqparent ) - return static_cast<K3bAudioTrackViewItem*>( tqparent ); + that->findDrop( pos, parent, after ); + if( parent ) + return static_cast<K3bAudioTrackViewItem*>( parent ); else if( K3bAudioTrackViewItem* tv = dynamic_cast<K3bAudioTrackViewItem*>(after) ) return tv; else if( K3bAudioDataSourceViewItem* sv = dynamic_cast<K3bAudioDataSourceViewItem*>(after) ) diff --git a/src/projects/k3baudiotrackview.h b/src/projects/k3baudiotrackview.h index fb52509..5618089 100644 --- a/src/projects/k3baudiotrackview.h +++ b/src/projects/k3baudiotrackview.h @@ -46,7 +46,7 @@ class K3bAudioTrackView : public K3bListView TQ_OBJECT public: - K3bAudioTrackView( K3bAudioDoc*, TQWidget* tqparent, const char* name = 0 ); + K3bAudioTrackView( K3bAudioDoc*, TQWidget* parent, const char* name = 0 ); ~K3bAudioTrackView(); KActionCollection* actionCollection() const { return m_actionCollection; } @@ -106,7 +106,7 @@ class K3bAudioTrackView : public K3bListView private slots: void slotAnimation(); - void slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ); + void slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after ); void slotChanged(); void slotTrackChanged( K3bAudioTrack* ); void slotTrackRemoved( K3bAudioTrack* ); diff --git a/src/projects/k3baudiotrackviewitem.cpp b/src/projects/k3baudiotrackviewitem.cpp index 6c0418f..24d6f48 100644 --- a/src/projects/k3baudiotrackviewitem.cpp +++ b/src/projects/k3baudiotrackviewitem.cpp @@ -25,10 +25,10 @@ #include <tqpainter.h> -K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* tqparent, +K3bAudioTrackViewItem::K3bAudioTrackViewItem( K3bAudioTrackView* parent, K3bAudioTrackViewItem* after, K3bAudioTrack* track ) - : K3bListViewItem( tqparent, after ), + : K3bListViewItem( parent, after ), m_track( track ), m_alreadyRemoved(false), m_showingSources(false), diff --git a/src/projects/k3baudiotrackviewitem.h b/src/projects/k3baudiotrackviewitem.h index c9974ba..ecd40f9 100644 --- a/src/projects/k3baudiotrackviewitem.h +++ b/src/projects/k3baudiotrackviewitem.h @@ -25,7 +25,7 @@ class K3bAudioTrack; class K3bAudioTrackViewItem : public K3bListViewItem { public: - K3bAudioTrackViewItem( K3bAudioTrackView* tqparent, + K3bAudioTrackViewItem( K3bAudioTrackView* parent, K3bAudioTrackViewItem* after, K3bAudioTrack* track ); ~K3bAudioTrackViewItem(); diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp index 6dc0fe3..76f0c97 100644 --- a/src/projects/k3baudiotrackwidget.cpp +++ b/src/projects/k3baudiotrackwidget.cpp @@ -36,8 +36,8 @@ K3bAudioTrackWidget::K3bAudioTrackWidget( const TQPtrList<K3bAudioTrack>& tracks, - TQWidget* tqparent, const char* name ) - : base_K3bAudioTrackWidget( tqparent, name ), + TQWidget* parent, const char* name ) + : base_K3bAudioTrackWidget( parent, name ), m_tracks(tracks) { m_labelPostGap->setBuddy( m_editPostGap ); diff --git a/src/projects/k3baudiotrackwidget.h b/src/projects/k3baudiotrackwidget.h index bd7124b..aea9310 100644 --- a/src/projects/k3baudiotrackwidget.h +++ b/src/projects/k3baudiotrackwidget.h @@ -36,7 +36,7 @@ class K3bAudioTrackWidget : public base_K3bAudioTrackWidget public: K3bAudioTrackWidget( const TQPtrList<K3bAudioTrack>& tracks, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); ~K3bAudioTrackWidget(); public slots: diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index 929907e..c0019b9 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -49,8 +49,8 @@ -K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* tqparent, const char *name ) - : K3bView( pDoc, tqparent, name ) +K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *name ) + : K3bView( pDoc, parent, name ) { m_doc = pDoc; @@ -115,9 +115,9 @@ void K3bAudioView::init() } -K3bProjectBurnDialog* K3bAudioView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bAudioView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bAudioBurnDialog( m_doc, tqparent, name, true ); + return new K3bAudioBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3baudioview.h b/src/projects/k3baudioview.h index 006ee14..40dd01f 100644 --- a/src/projects/k3baudioview.h +++ b/src/projects/k3baudioview.h @@ -37,7 +37,7 @@ class K3bAudioView : public K3bView TQ_OBJECT public: - K3bAudioView( K3bAudioDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); + K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *name = 0 ); ~K3bAudioView(); K3bAudioTrackPlayer* player() const { return m_songlist->player(); } @@ -46,7 +46,7 @@ class K3bAudioView : public K3bView void addUrls( const KURL::List& ); protected: - K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bbootimagedialog.cpp b/src/projects/k3bbootimagedialog.cpp index 2cd1a63..a722736 100644 --- a/src/projects/k3bbootimagedialog.cpp +++ b/src/projects/k3bbootimagedialog.cpp @@ -21,10 +21,10 @@ K3bBootImageDialog::K3bBootImageDialog( K3bDataDoc* doc, - TQWidget* tqparent, + TQWidget* parent, const char* name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n("Boot Images"), Ok ) + : KDialogBase( parent, name, modal, i18n("Boot Images"), Ok ) { m_bootImageView = new K3bBootImageView( doc, this ); setMainWidget( m_bootImageView ); diff --git a/src/projects/k3bbootimagedialog.h b/src/projects/k3bbootimagedialog.h index 6f42849..9887b46 100644 --- a/src/projects/k3bbootimagedialog.h +++ b/src/projects/k3bbootimagedialog.h @@ -30,7 +30,7 @@ class K3bBootImageDialog : public KDialogBase public: K3bBootImageDialog( K3bDataDoc*, - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~K3bBootImageDialog(); diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 718bc04..92b4c87 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -39,14 +39,14 @@ class K3bBootImageView::PrivateBootImageViewItem : public KListViewItem { public: - PrivateBootImageViewItem( K3bBootItem* image, TQListView* tqparent ) - : KListViewItem( tqparent ), + PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent ) + : KListViewItem( parent ), m_image( image ) { } - PrivateBootImageViewItem( K3bBootItem* image, TQListView* tqparent, TQListViewItem* after ) - : KListViewItem( tqparent, after ), + PrivateBootImageViewItem( K3bBootItem* image, TQListView* parent, TQListViewItem* after ) + : KListViewItem( parent, after ), m_image( image ) { } @@ -75,8 +75,8 @@ private: }; -K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, TQWidget* tqparent, const char* name ) - : base_K3bBootImageView( tqparent, name ), +K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, TQWidget* parent, const char* name ) + : base_K3bBootImageView( parent, name ), m_doc(doc) { connect( m_buttonNew, TQT_SIGNAL(clicked()), diff --git a/src/projects/k3bbootimageview.h b/src/projects/k3bbootimageview.h index 102cedd..de0ca6a 100644 --- a/src/projects/k3bbootimageview.h +++ b/src/projects/k3bbootimageview.h @@ -29,7 +29,7 @@ class K3bBootImageView : public base_K3bBootImageView TQ_OBJECT public: - K3bBootImageView( K3bDataDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bBootImageView( K3bDataDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bBootImageView(); private slots: diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp index 7ce1789..782d898 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.cpp +++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp @@ -120,12 +120,12 @@ private: class K3bDataAdvancedImageSettingsWidget::PrivateCheckViewItem : public TQCheckListItem { public: - PrivateCheckViewItem( TQListView* tqparent, const TQString& text, Type tt = Controller ) - : TQCheckListItem( tqparent, text, tt ) { + PrivateCheckViewItem( TQListView* parent, const TQString& text, Type tt = Controller ) + : TQCheckListItem( parent, text, tt ) { } - PrivateCheckViewItem( TQListViewItem* tqparent, const TQString& text, Type tt = Controller ) - : TQCheckListItem( tqparent, text, tt ) { + PrivateCheckViewItem( TQListViewItem* parent, const TQString& text, Type tt = Controller ) + : TQCheckListItem( parent, text, tt ) { } protected: @@ -141,8 +141,8 @@ protected: }; -K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget* tqparent, const char* name ) - : base_K3bAdvancedDataImageSettings( tqparent, name ) +K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget* parent, const char* name ) + : base_K3bAdvancedDataImageSettings( parent, name ) { m_viewIsoSettings->header()->hide(); m_viewIsoSettings->setSorting( -1 ); diff --git a/src/projects/k3bdataadvancedimagesettingswidget.h b/src/projects/k3bdataadvancedimagesettingswidget.h index 9ea8124..2268193 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.h +++ b/src/projects/k3bdataadvancedimagesettingswidget.h @@ -29,7 +29,7 @@ class K3bDataAdvancedImageSettingsWidget : public base_K3bAdvancedDataImageSetti TQ_OBJECT public: - K3bDataAdvancedImageSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataAdvancedImageSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataAdvancedImageSettingsWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index 85f6a7d..2b4375f 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -64,8 +64,8 @@ #include "k3bfilecompilationsizehandler.h" -K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, tqparent, name, modal ) +K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, parent, name, modal ) { prepareGui(); diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h index 4105884..a1b0b4b 100644 --- a/src/projects/k3bdataburndialog.h +++ b/src/projects/k3bdataburndialog.h @@ -45,7 +45,7 @@ class K3bDataBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bDataBurnDialog(K3bDataDoc*, TQWidget *tqparent=0, const char *name=0, bool modal = true ); + K3bDataBurnDialog(K3bDataDoc*, TQWidget *parent=0, const char *name=0, bool modal = true ); ~K3bDataBurnDialog(); protected: diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index 82f11b4..6164aa2 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -64,8 +64,8 @@ public: }; -K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget* tqparent ) - : K3bListView( tqparent ), m_view(view) +K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget* parent ) + : K3bListView( parent ), m_view(view) { d = new Private(); @@ -171,7 +171,7 @@ void K3bDataDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListVie if( d->addParentDir ) { - // startDropAnimation( tqparent ); + // startDropAnimation( parent ); // check if items have been moved if( m_fileView && @@ -231,7 +231,7 @@ void K3bDataDirTreeView::slotItemAdded( K3bDataItem* item ) // should only be emitted once for every item // K3bDirItem* dirItem = static_cast<K3bDirItem*>( item ); - K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->parent()]; K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } @@ -268,7 +268,7 @@ void K3bDataDirTreeView::setCurrentDir( K3bDirItem* dirItem ) setCurrentItem( it.data() ); it.data()->setOpen(true); if( it.data() != root() ) - it.data()->tqparent()->setOpen(true); + it.data()->parent()->setOpen(true); } else { kdDebug() << "Tried to set unknown dirItem to current" << endl; @@ -328,7 +328,7 @@ void K3bDataDirTreeView::showPopupMenu( KListView*, TQListViewItem* item, const void K3bDataDirTreeView::slotNewDir() { if( K3bDataDirViewItem* vI = dynamic_cast<K3bDataDirViewItem*>(currentItem()) ) { - K3bDirItem* tqparent = vI->dirItem(); + K3bDirItem* parent = vI->dirItem(); TQString name; bool ok; @@ -337,7 +337,7 @@ void K3bDataDirTreeView::slotNewDir() i18n("Please insert the name for the new directory:"), i18n("New Directory"), &ok, this ); - while( ok && K3bDataDoc::nameAlreadyInDir( name, tqparent ) ) { + while( ok && K3bDataDoc::nameAlreadyInDir( name, parent ) ) { name = KInputDialog::getText( i18n("New Directory"), i18n("A file with that name already exists. " "Please insert the name for the new directory:"), @@ -348,7 +348,7 @@ void K3bDataDirTreeView::slotNewDir() return; - m_doc->addEmptyDir( name, tqparent ); + m_doc->addEmptyDir( name, parent ); } } @@ -448,7 +448,7 @@ void K3bDataDirTreeView::checkForNewItems() while( item != 0 ) { // check if we have an entry and if not, create one - // we can assume that a listViewItem for the tqparent exists + // we can assume that a listViewItem for the parent exists // since we go top to bottom if( item->isDir() ) { @@ -456,15 +456,15 @@ void K3bDataDirTreeView::checkForNewItems() TQMapIterator<K3bDirItem*, K3bDataDirViewItem*> itDirItem = m_itemMap.find( dirItem ); if( itDirItem == m_itemMap.end() ) { - K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* parentViewItem = m_itemMap[dirItem->parent()]; K3bDataDirViewItem* newDirItem = new K3bDataDirViewItem( dirItem, parentViewItem ); m_itemMap.insert( dirItem, newDirItem ); } else { - // check if tqparent still correct (to get moved items) + // check if parent still correct (to get moved items) K3bDataDirViewItem* dirViewItem = itDirItem.data(); - K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->tqparent(); - K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->tqparent()]; + K3bDataDirViewItem* parentViewItem = (K3bDataDirViewItem*)dirViewItem->parent(); + K3bDataDirViewItem* dirParentViewItem = m_itemMap[dirItem->parent()]; if( dirParentViewItem != parentViewItem ) { // reparent it parentViewItem->takeItem( dirViewItem ); diff --git a/src/projects/k3bdatadirtreeview.h b/src/projects/k3bdatadirtreeview.h index 2ffaaa7..5379d30 100644 --- a/src/projects/k3bdatadirtreeview.h +++ b/src/projects/k3bdatadirtreeview.h @@ -47,7 +47,7 @@ class K3bDataDirTreeView : public K3bListView TQ_OBJECT public: - K3bDataDirTreeView( K3bView*, K3bDataDoc*, TQWidget* tqparent ); + K3bDataDirTreeView( K3bView*, K3bDataDoc*, TQWidget* parent ); virtual ~K3bDataDirTreeView(); K3bDataDirViewItem* root() { return m_root; } @@ -61,7 +61,7 @@ class K3bDataDirTreeView : public K3bListView void setCurrentDir( K3bDirItem* ); signals: - // void urlsDropped( const KURL::List&, TQListViewItem* tqparent ); + // void urlsDropped( const KURL::List&, TQListViewItem* parent ); void dirSelected( K3bDirItem* ); protected: @@ -77,7 +77,7 @@ class K3bDataDirTreeView : public K3bListView KAction* m_actionProperties; protected slots: - virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); + virtual void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); private: void setupActions(); diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 996ca69..e5c0e84 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -47,8 +47,8 @@ #include <kdeversion.h> -K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, TQWidget* tqparent ) - : K3bListView( tqparent ), +K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, TQWidget* parent ) + : K3bListView( parent ), m_view(view), m_dropDirItem(0) { @@ -126,7 +126,7 @@ void K3bDataFileView::clearItems() void K3bDataFileView::slotItemAdded( K3bDataItem* item ) { - if( item->tqparent() == currentDir() ) { + if( item->parent() == currentDir() ) { K3bDataViewItem* vi = 0; if( item->isDir() ) vi = new K3bDataDirViewItem( static_cast<K3bDirItem*>(item), this ); @@ -174,7 +174,7 @@ void K3bDataFileView::checkForNewItems() // now check if some of the items have been moved out of the currently showing dir. for( TQListViewItemIterator it( this ); it.current(); ++it ) { K3bDataViewItem* dataViewItem = dynamic_cast<K3bDataViewItem*>( it.current() ); - if( dataViewItem && dataViewItem->dataItem()->tqparent() != currentDir() ) + if( dataViewItem && dataViewItem->dataItem()->parent() != currentDir() ) delete dataViewItem; } } @@ -373,7 +373,7 @@ void K3bDataFileView::showPopupMenu( KListView*, TQListViewItem* item, const TQP void K3bDataFileView::slotNewDir() { - K3bDirItem* tqparent = currentDir(); + K3bDirItem* parent = currentDir(); TQString name; bool ok; @@ -382,7 +382,7 @@ void K3bDataFileView::slotNewDir() i18n("Please insert the name for the new directory:"), i18n("New Directory"), &ok, this ); - while( ok && K3bDataDoc::nameAlreadyInDir( name, tqparent ) ) { + while( ok && K3bDataDoc::nameAlreadyInDir( name, parent ) ) { name = KInputDialog::getText( i18n("New Directory"), i18n("A file with that name already exists. " "Please insert the name for the new directory:"), @@ -393,7 +393,7 @@ void K3bDataFileView::slotNewDir() return; - m_doc->addEmptyDir( name, tqparent ); + m_doc->addEmptyDir( name, parent ); } @@ -418,7 +418,7 @@ void K3bDataFileView::slotRemoveItem() void K3bDataFileView::slotParentDir() { if( currentDir() != m_doc->root() ) { - slotSetCurrentDir( currentDir()->tqparent() ); + slotSetCurrentDir( currentDir()->parent() ); emit dirSelected( currentDir() ); } diff --git a/src/projects/k3bdatafileview.h b/src/projects/k3bdatafileview.h index cd7e2c8..804f128 100644 --- a/src/projects/k3bdatafileview.h +++ b/src/projects/k3bdatafileview.h @@ -50,7 +50,7 @@ class K3bDataFileView : public K3bListView TQ_OBJECT public: - K3bDataFileView( K3bView*, K3bDataDirTreeView*, K3bDataDoc*, TQWidget* tqparent ); + K3bDataFileView( K3bView*, K3bDataDirTreeView*, K3bDataDoc*, TQWidget* parent ); ~K3bDataFileView(); K3bDirItem* currentDir() const; @@ -67,7 +67,7 @@ class K3bDataFileView : public K3bListView private slots: void slotDataItemRemoved( K3bDataItem* ); void slotExecuted( TQListViewItem* ); - void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); + void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); void showPopupMenu( KListView*, TQListViewItem* _item, const TQPoint& ); void slotRenameItem(); void slotRemoveItem(); diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index be55ae6..88decbc 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -126,8 +126,8 @@ static void initializePresets() class K3bDataImageSettingsWidget::CustomFilesystemsDialog : public KDialogBase { public: - CustomFilesystemsDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, + CustomFilesystemsDialog( TQWidget* parent ) + : KDialogBase( parent, "custom_filesystems_dialog", true, i18n("Custom Data Project Filesystems"), @@ -145,8 +145,8 @@ public: class K3bDataImageSettingsWidget::VolumeDescDialog : public KDialogBase { public: - VolumeDescDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, + VolumeDescDialog( TQWidget* parent ) + : KDialogBase( parent, "voldesc_dialog", true, i18n("Volume Descriptor"), @@ -167,8 +167,8 @@ public: -K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* tqparent, const char* name ) - : base_K3bDataImageSettings( tqparent, name ), +K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const char* name ) + : base_K3bDataImageSettings( parent, name ), m_fileSystemOptionsShown(true) { tqlayout()->setMargin( KDialog::marginHint() ); diff --git a/src/projects/k3bdataimagesettingswidget.h b/src/projects/k3bdataimagesettingswidget.h index 13086f3..d82394a 100644 --- a/src/projects/k3bdataimagesettingswidget.h +++ b/src/projects/k3bdataimagesettingswidget.h @@ -28,7 +28,7 @@ class K3bDataImageSettingsWidget : public base_K3bDataImageSettings TQ_OBJECT public: - K3bDataImageSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataImageSettingsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataImageSettingsWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp index 87e6551..98736b1 100644 --- a/src/projects/k3bdatamultisessioncombobox.cpp +++ b/src/projects/k3bdatamultisessioncombobox.cpp @@ -29,8 +29,8 @@ static const int s_continueIndex = 3; static const int s_finishIndex = 4; -K3bDataMultiSessionCombobox::K3bDataMultiSessionCombobox( TQWidget* tqparent, const char* name ) - : TQComboBox( tqparent, name ), +K3bDataMultiSessionCombobox::K3bDataMultiSessionCombobox( TQWidget* parent, const char* name ) + : TQComboBox( parent, name ), m_forceNoMultiSession(false) { init( false ); diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h index 71ccc02..9618c00 100644 --- a/src/projects/k3bdatamultisessioncombobox.h +++ b/src/projects/k3bdatamultisessioncombobox.h @@ -28,7 +28,7 @@ class K3bDataMultiSessionCombobox : public TQComboBox TQ_OBJECT public: - K3bDataMultiSessionCombobox( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataMultiSessionCombobox( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataMultiSessionCombobox(); /** diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 36f985e..6a3c057 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -41,8 +41,8 @@ -K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidget* tqparent, const char* name ) - : KDialogBase( Plain, i18n("File Properties"), Ok|Cancel, Ok, tqparent, name, true, false ) +K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidget* parent, const char* name ) + : KDialogBase( Plain, i18n("File Properties"), Ok|Cancel, Ok, parent, name, true, false ) { m_dataItem = dataItem; @@ -182,10 +182,10 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge m_checkHideOnRockRidge->setChecked( dataItem->hideOnRockRidge() ); m_editSortWeight->setText( TQString::number(dataItem->sortWeight()) ); - // if the tqparent is hidden the value cannot be changed (see K3bDataItem::setHide...) - if( dataItem->tqparent() ) { - m_checkHideOnRockRidge->setDisabled( dataItem->tqparent()->hideOnRockRidge() ); - m_checkHideOnJoliet->setDisabled( dataItem->tqparent()->hideOnJoliet() ); + // if the parent is hidden the value cannot be changed (see K3bDataItem::setHide...) + if( dataItem->parent() ) { + m_checkHideOnRockRidge->setDisabled( dataItem->parent()->hideOnRockRidge() ); + m_checkHideOnJoliet->setDisabled( dataItem->parent()->hideOnJoliet() ); } if( !dataItem->isHideable() ) { diff --git a/src/projects/k3bdatapropertiesdialog.h b/src/projects/k3bdatapropertiesdialog.h index 8c79c47..de03d95 100644 --- a/src/projects/k3bdatapropertiesdialog.h +++ b/src/projects/k3bdatapropertiesdialog.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - K3bDataPropertiesDialog( K3bDataItem*, TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataPropertiesDialog( K3bDataItem*, TQWidget* parent = 0, const char* name = 0 ); ~K3bDataPropertiesDialog(); protected slots: diff --git a/src/projects/k3bdatasessionimportdialog.cpp b/src/projects/k3bdatasessionimportdialog.cpp index 80e45f1..bf5d263 100644 --- a/src/projects/k3bdatasessionimportdialog.cpp +++ b/src/projects/k3bdatasessionimportdialog.cpp @@ -30,8 +30,8 @@ #include <kmessagebox.h> -K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* tqparent ) - : KDialogBase( tqparent, +K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* parent ) + : KDialogBase( parent, "session_import_dialog", true, i18n("Session Import"), @@ -125,9 +125,9 @@ void K3bDataSessionImportDialog::slotSelectionChanged( K3bDevice::Device* dev ) } -K3bDataDoc* K3bDataSessionImportDialog::importSession( K3bDataDoc* doc, TQWidget* tqparent ) +K3bDataDoc* K3bDataSessionImportDialog::importSession( K3bDataDoc* doc, TQWidget* parent ) { - K3bDataSessionImportDialog dlg( tqparent ); + K3bDataSessionImportDialog dlg( parent ); dlg.importSession( doc ); dlg.exec(); return dlg.m_doc; diff --git a/src/projects/k3bdatasessionimportdialog.h b/src/projects/k3bdatasessionimportdialog.h index 7a092db..0213515 100644 --- a/src/projects/k3bdatasessionimportdialog.h +++ b/src/projects/k3bdatasessionimportdialog.h @@ -45,7 +45,7 @@ class K3bDataSessionImportDialog : public KDialogBase * * \return the project */ - static K3bDataDoc* importSession( K3bDataDoc* doc, TQWidget* tqparent ); + static K3bDataDoc* importSession( K3bDataDoc* doc, TQWidget* parent ); private slots: void slotOk(); @@ -55,7 +55,7 @@ class K3bDataSessionImportDialog : public KDialogBase void slotSelectionChanged( K3bDevice::Device* ); private: - K3bDataSessionImportDialog( TQWidget* tqparent = 0 ); + K3bDataSessionImportDialog( TQWidget* parent = 0 ); ~K3bDataSessionImportDialog(); K3bDataDoc* m_doc; diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 9f69d86..630d7f9 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -55,12 +55,12 @@ #include <unistd.h> -K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* tqparent, const char* name ) +K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n("Adding files to project '%1'").tqarg(doc->URL().fileName()), Cancel, Cancel, - tqparent, + parent, name, true, true ), @@ -108,7 +108,7 @@ K3bDataUrlAddingDialog::~K3bDataUrlAddingDialog() int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, K3bDirItem* dir, - TQWidget* tqparent ) + TQWidget* parent ) { if( urls.isEmpty() ) return 0; @@ -120,7 +120,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, if( urls.count() == 1 ) { K3bIso9660 isoF( urls.first().path() ); if( isoF.open() ) { - if( KMessageBox::warningYesNo( tqparent, + if( KMessageBox::warningYesNo( parent, i18n("<p>The file you are about to add to the project is an ISO9660 image. As such " "it can be burned to a medium directly since it already contains a file " "system.<br>" @@ -138,7 +138,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, } } - K3bDataUrlAddingDialog dlg( dir->doc(), tqparent ); + K3bDataUrlAddingDialog dlg( dir->doc(), parent ); dlg.m_urls = urls; for( KURL::List::ConstIterator it = urls.begin(); it != urls.end(); ++it ) dlg.m_urlQueue.append( tqMakePair( K3b::convertToLocalUrl(*it), dir ) ); @@ -158,7 +158,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, TQString message = dlg.resultMessage(); if( !message.isEmpty() ) - KMessageBox::detailedSorry( tqparent, i18n("Problems while adding files to the project."), message ); + KMessageBox::detailedSorry( parent, i18n("Problems while adding files to the project."), message ); return ret; } @@ -199,29 +199,29 @@ TQString K3bDataUrlAddingDialog::resultMessage() const int K3bDataUrlAddingDialog::moveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - TQWidget* tqparent ) + TQWidget* parent ) { - return copyMoveItems( items, dir, tqparent, false ); + return copyMoveItems( items, dir, parent, false ); } int K3bDataUrlAddingDialog::copyItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - TQWidget* tqparent ) + TQWidget* parent ) { - return copyMoveItems( items, dir, tqparent, true ); + return copyMoveItems( items, dir, parent, true ); } int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - TQWidget* tqparent, + TQWidget* parent, bool copy ) { if( items.isEmpty() ) return 0; - K3bDataUrlAddingDialog dlg( dir->doc(), tqparent ); + K3bDataUrlAddingDialog dlg( dir->doc(), parent ); dlg.m_infoLabel->setText( i18n("Moving files to project \"%1\"...").tqarg(dir->doc()->URL().fileName()) ); dlg.m_copyItems = copy; @@ -608,8 +608,8 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() m_counterLabel->setText( TQString("(%1/%2)").tqarg(m_filesHandled).tqarg(m_totalFiles) ); - if( dir == item->tqparent() ) { - kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into its own tqparent dir." << endl; + if( dir == item->parent() ) { + kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into its own parent dir." << endl; } else if( dir == item ) { kdDebug() << "(K3bDataUrlAddingDialog) trying to move an item into itselft." << endl; diff --git a/src/projects/k3bdataurladdingdialog.h b/src/projects/k3bdataurladdingdialog.h index ca6b4b2..2481eb5 100644 --- a/src/projects/k3bdataurladdingdialog.h +++ b/src/projects/k3bdataurladdingdialog.h @@ -43,16 +43,16 @@ class K3bDataUrlAddingDialog : public KDialogBase * \return \see TQDialog::exec() */ static int addUrls( const KURL::List& urls, K3bDirItem* dir = 0, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); static int moveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); static int copyItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); static int copyMoveItems( const TQValueList<K3bDataItem*>& items, K3bDirItem* dir, - TQWidget* tqparent, bool copy ); + TQWidget* parent, bool copy ); private slots: void slotAddUrls(); @@ -62,7 +62,7 @@ class K3bDataUrlAddingDialog : public KDialogBase void updateProgress(); private: - K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* parent = 0, const char* name = 0 ); bool getNewName( const TQString& oldName, K3bDirItem* dir, TQString& newName ); diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index 9aaa2b3..1ac59f8 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -53,8 +53,8 @@ #include <kdebug.h> -K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *tqparent, const char *name ) - : K3bView(doc, tqparent,name) +K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) + : K3bView(doc, parent,name) { m_doc = doc; @@ -156,9 +156,9 @@ void K3bDataView::editBootImages() } -K3bProjectBurnDialog* K3bDataView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bDataView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bDataBurnDialog( m_doc, tqparent, name, true ); + return new K3bDataBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h index ea2a6a1..6fed6d4 100644 --- a/src/projects/k3bdataview.h +++ b/src/projects/k3bdataview.h @@ -46,7 +46,7 @@ class K3bDataView : public K3bView TQ_OBJECT public: - K3bDataView(K3bDataDoc* doc, TQWidget *tqparent=0, const char *name=0); + K3bDataView(K3bDataDoc* doc, TQWidget *parent=0, const char *name=0); virtual ~K3bDataView(); K3bDirItem* currentDir() const; @@ -66,7 +66,7 @@ class K3bDataView : public K3bView K3bDataFileView* m_dataFileView; TQLineEdit* m_volumeIDEdit; - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private: K3bDataDoc* m_doc; diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index f200e55..c60f5d7 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -35,15 +35,15 @@ #include <tqfileinfo.h> -K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListView* tqparent ) - : K3bListViewItem( tqparent ), +K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListView* parent ) + : K3bListViewItem( parent ), m_dataItem(item) { init(); } -K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListViewItem* tqparent ) - : K3bListViewItem( tqparent ), +K3bDataViewItem::K3bDataViewItem( K3bDataItem* item, TQListViewItem* parent ) + : K3bListViewItem( parent ), m_dataItem(item) { init(); @@ -134,16 +134,16 @@ TQString K3bDataViewItem::key( int col, bool a ) const } -K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListView* tqparent ) - : K3bDataViewItem( dir, tqparent ) +K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListView* parent ) + : K3bDataViewItem( dir, parent ) { m_dirItem = dir; setPixmap( 0, dir->depth() > 7 ? SmallIcon( "folder_red" ) : SmallIcon( "folder" ) ); } -K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* tqparent ) - : K3bDataViewItem( dir, tqparent ) +K3bDataDirViewItem::K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* parent ) + : K3bDataViewItem( dir, parent ) { m_dirItem = dir; setPixmap( 0, dir->depth() > 7 ? SmallIcon( "folder_red" ) : SmallIcon( "folder" ) ); @@ -189,15 +189,15 @@ void K3bDataDirViewItem::highlightIcon( bool b ) -K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListView* tqparent ) - : K3bDataViewItem( file, tqparent ) +K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListView* parent ) + : K3bDataViewItem( file, parent ) { init( file ); } -K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListViewItem* tqparent ) - : K3bDataViewItem( file, tqparent ) +K3bDataFileViewItem::K3bDataFileViewItem( K3bFileItem* file, TQListViewItem* parent ) + : K3bDataViewItem( file, parent ) { init( file ); } @@ -262,8 +262,8 @@ TQString K3bDataFileViewItem::text( int index ) const -K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, TQListView* tqparent ) - : K3bDataDirViewItem( doc->root(), tqparent ) +K3bDataRootViewItem::K3bDataRootViewItem( K3bDataDoc* doc, TQListView* parent ) + : K3bDataDirViewItem( doc->root(), parent ) { m_doc = doc; setPixmap( 0, SmallIcon( "cdrom_unmount" ) ); @@ -297,8 +297,8 @@ void K3bDataRootViewItem::setText( int col, const TQString& text ) } -K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, TQListView* tqparent ) - : K3bDataViewItem( item, tqparent ) +K3bSpecialDataViewItem::K3bSpecialDataViewItem( K3bSpecialDataItem* item, TQListView* parent ) + : K3bDataViewItem( item, parent ) { setPixmap( 0, SmallIcon("unknown") ); } @@ -319,8 +319,8 @@ TQString K3bSpecialDataViewItem::text( int col ) const -K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, TQListView* tqparent ) - : K3bDataViewItem( item, tqparent ) +K3bSessionImportViewItem::K3bSessionImportViewItem( K3bSessionImportItem* item, TQListView* parent ) + : K3bDataViewItem( item, parent ) { setPixmap( 0, SmallIcon("unknown") ); } diff --git a/src/projects/k3bdataviewitem.h b/src/projects/k3bdataviewitem.h index ac95e98..645c076 100644 --- a/src/projects/k3bdataviewitem.h +++ b/src/projects/k3bdataviewitem.h @@ -34,8 +34,8 @@ class TQColorGroup; class K3bDataViewItem : public K3bListViewItem { public: - K3bDataViewItem( K3bDataItem*, TQListView* tqparent ); - K3bDataViewItem( K3bDataItem*, TQListViewItem* tqparent ); + K3bDataViewItem( K3bDataItem*, TQListView* parent ); + K3bDataViewItem( K3bDataItem*, TQListViewItem* parent ); virtual ~K3bDataViewItem(); virtual K3bDataItem* dataItem() const { return m_dataItem; } @@ -59,8 +59,8 @@ class K3bDataViewItem : public K3bListViewItem class K3bDataDirViewItem : public K3bDataViewItem { public: - K3bDataDirViewItem( K3bDirItem* dir, TQListView* tqparent ); - K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* tqparent ); + K3bDataDirViewItem( K3bDirItem* dir, TQListView* parent ); + K3bDataDirViewItem( K3bDirItem* dir, TQListViewItem* parent ); ~K3bDataDirViewItem(); virtual TQString text( int ) const; @@ -81,8 +81,8 @@ class K3bDataDirViewItem : public K3bDataViewItem class K3bDataFileViewItem : public K3bDataViewItem { public: - K3bDataFileViewItem( K3bFileItem*, TQListView* tqparent ); - K3bDataFileViewItem( K3bFileItem*, TQListViewItem* tqparent ); + K3bDataFileViewItem( K3bFileItem*, TQListView* parent ); + K3bDataFileViewItem( K3bFileItem*, TQListViewItem* parent ); ~K3bDataFileViewItem() {} TQString text( int ) const; @@ -102,7 +102,7 @@ class K3bDataFileViewItem : public K3bDataViewItem class K3bDataRootViewItem : public K3bDataDirViewItem { public: - K3bDataRootViewItem( K3bDataDoc*, TQListView* tqparent ); + K3bDataRootViewItem( K3bDataDoc*, TQListView* parent ); ~K3bDataRootViewItem(); TQString text( int ) const; diff --git a/src/projects/k3bdatavolumedescwidget.cpp b/src/projects/k3bdatavolumedescwidget.cpp index be443a5..580fed6 100644 --- a/src/projects/k3bdatavolumedescwidget.cpp +++ b/src/projects/k3bdatavolumedescwidget.cpp @@ -24,8 +24,8 @@ #include <tqtoolbutton.h> -K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* tqparent, const char* name ) - : base_K3bDataVolumeDescWidget( tqparent, name ) +K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* parent, const char* name ) + : base_K3bDataVolumeDescWidget( parent, name ) { // the maximal number of characters that can be inserted are set in the ui file! diff --git a/src/projects/k3bdatavolumedescwidget.h b/src/projects/k3bdatavolumedescwidget.h index 27102e2..fdff6ea 100644 --- a/src/projects/k3bdatavolumedescwidget.h +++ b/src/projects/k3bdatavolumedescwidget.h @@ -28,7 +28,7 @@ class K3bDataVolumeDescWidget : public base_K3bDataVolumeDescWidget TQ_OBJECT public: - K3bDataVolumeDescWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bDataVolumeDescWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bDataVolumeDescWidget(); void load( const K3bIsoOptions& ); diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index 4654bb9..17ee516 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -44,8 +44,8 @@ #include <tqspinbox.h> -K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), +K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal, true ), m_doc( doc ) { prepareGui(); diff --git a/src/projects/k3bdvdburndialog.h b/src/projects/k3bdvdburndialog.h index 3400c7d..dccffd9 100644 --- a/src/projects/k3bdvdburndialog.h +++ b/src/projects/k3bdvdburndialog.h @@ -35,7 +35,7 @@ class K3bDvdBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bDvdBurnDialog( K3bDvdDoc*, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); + K3bDvdBurnDialog( K3bDvdDoc*, TQWidget *parent = 0, const char *name = 0, bool modal = true ); ~K3bDvdBurnDialog(); protected slots: diff --git a/src/projects/k3bdvdview.cpp b/src/projects/k3bdvdview.cpp index dc5f67a..c245e04 100644 --- a/src/projects/k3bdvdview.cpp +++ b/src/projects/k3bdvdview.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bDataView( doc, tqparent, name ) +K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *parent, const char *name ) + : K3bDataView( doc, parent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bDvdView::~K3bDvdView() } -K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bDvdView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bDvdBurnDialog( m_doc, tqparent, name, true ); + return new K3bDvdBurnDialog( m_doc, parent, name, true ); } #include "k3bdvdview.moc" diff --git a/src/projects/k3bdvdview.h b/src/projects/k3bdvdview.h index 1072cc2..5d2b6ad 100644 --- a/src/projects/k3bdvdview.h +++ b/src/projects/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/src/projects/k3bencodingconverter.cpp b/src/projects/k3bencodingconverter.cpp index 38e219e..9fa2a79 100644 --- a/src/projects/k3bencodingconverter.cpp +++ b/src/projects/k3bencodingconverter.cpp @@ -77,7 +77,7 @@ bool K3bEncodingConverter::encodedLocally( const TQCString& s ) } -bool K3bEncodingConverter::fixEncoding( const TQCString& s, TQCString& result, TQWidget* tqparent, bool cache ) +bool K3bEncodingConverter::fixEncoding( const TQCString& s, TQCString& result, TQWidget* parent, bool cache ) { #ifdef IMPLEMENT_THIS_METHOD // HAVE_ICONV_H if( !d->lastEncoding.isEmpty() ) { diff --git a/src/projects/k3bencodingconverter.h b/src/projects/k3bencodingconverter.h index c88f5be..4054d08 100644 --- a/src/projects/k3bencodingconverter.h +++ b/src/projects/k3bencodingconverter.h @@ -41,13 +41,13 @@ class K3bEncodingConverter * the proper encoding based on example conversions. * * \param s The string to be fixed. - * \param tqparent The tqparent widget to be used when showing the encoding selection dialog. + * \param parent The parent widget to be used when showing the encoding selection dialog. * \param cacheEncoding If true the codeset used for successful conversion is cached and * reused for the next call to fixEncoding. * * \return True if the conversion was successful. */ - bool fixEncoding( const TQCString& s, TQCString& result, TQWidget* tqparent = 0, bool cacheEncoding = true ); + bool fixEncoding( const TQCString& s, TQCString& result, TQWidget* parent = 0, bool cacheEncoding = true ); private: bool convert( const TQCString& s, TQCString& result, const TQString& from, const TQString& to ); diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 4d9f543..30f10e6 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -67,8 +67,8 @@ public: }; -K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* tqparent ) - : TQWidget( tqparent, 0, WRepaintNoErase ) +K3bFillStatusDisplayWidget::K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent ) + : TQWidget( parent, 0, WRepaintNoErase ) { d = new Private(); d->doc = doc; @@ -279,8 +279,8 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) class K3bFillStatusDisplay::ToolTip : public TQToolTip { public: - ToolTip( K3bDoc* doc, TQWidget* tqparent ) - : TQToolTip( tqparent, 0 ), + ToolTip( K3bDoc* doc, TQWidget* parent ) + : TQToolTip( parent, 0 ), m_doc(doc) { } @@ -329,8 +329,8 @@ public: }; -K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *tqparent, const char *name ) - : TQFrame(tqparent,name) +K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const char *name ) + : TQFrame(parent,name) { d = new Private; d->doc = doc; diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index d123426..c1cc810 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -48,7 +48,7 @@ class K3bFillStatusDisplayWidget : public TQWidget TQ_OBJECT public: - K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* tqparent ); + K3bFillStatusDisplayWidget( K3bDoc* doc, TQWidget* parent ); ~K3bFillStatusDisplayWidget(); TQSize tqsizeHint() const; @@ -79,7 +79,7 @@ class K3bFillStatusDisplay : public TQFrame { TQ_OBJECT public: - K3bFillStatusDisplay(K3bDoc* doc, TQWidget *tqparent=0, const char *name=0); + K3bFillStatusDisplay(K3bDoc* doc, TQWidget *parent=0, const char *name=0); ~K3bFillStatusDisplay(); public slots: diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 791b3d0..2053e32 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -59,8 +59,8 @@ #include <kmessagebox.h> -K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal ), m_doc(doc) +K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal ), m_doc(doc) { prepareGui(); diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h index 94d224e..5c390fb 100644 --- a/src/projects/k3bmixedburndialog.h +++ b/src/projects/k3bmixedburndialog.h @@ -40,7 +40,7 @@ class K3bMixedBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bMixedBurnDialog( K3bMixedDoc*, TQWidget *tqparent=0, const char *name=0, bool modal = true ); + K3bMixedBurnDialog( K3bMixedDoc*, TQWidget *parent=0, const char *name=0, bool modal = true ); protected: void loadK3bDefaults(); diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp index 9a014dc..c19bd28 100644 --- a/src/projects/k3bmixeddirtreeview.cpp +++ b/src/projects/k3bmixeddirtreeview.cpp @@ -33,8 +33,8 @@ class K3bMixedDirTreeView::PrivateAudioRootViewItem : public K3bListViewItem { public: - PrivateAudioRootViewItem( K3bMixedDoc* doc, TQListView* tqparent, TQListViewItem* after ) - : K3bListViewItem( tqparent, after ), + PrivateAudioRootViewItem( K3bMixedDoc* doc, TQListView* parent, TQListViewItem* after ) + : K3bListViewItem( parent, after ), m_doc(doc) { setPixmap( 0, SmallIcon("sound") ); @@ -52,8 +52,8 @@ public: }; -K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* tqparent, const char* ) - : K3bDataDirTreeView( view, doc->dataDoc(), tqparent ), m_doc(doc) +K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* parent, const char* ) + : K3bDataDirTreeView( view, doc->dataDoc(), parent ), m_doc(doc) { m_audioRootItem = new PrivateAudioRootViewItem( doc, this, root() ); @@ -68,7 +68,7 @@ K3bMixedDirTreeView::~K3bMixedDirTreeView() } -void K3bMixedDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after ) +void K3bMixedDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after ) { if( !e->isAccepted() ) return; @@ -81,7 +81,7 @@ void K3bMixedDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, } } else - K3bDataDirTreeView::slotDropped( e, tqparent, after ); + K3bDataDirTreeView::slotDropped( e, parent, after ); } diff --git a/src/projects/k3bmixeddirtreeview.h b/src/projects/k3bmixeddirtreeview.h index a7320fc..b1b3a39 100644 --- a/src/projects/k3bmixeddirtreeview.h +++ b/src/projects/k3bmixeddirtreeview.h @@ -32,7 +32,7 @@ class K3bMixedDirTreeView : public K3bDataDirTreeView TQ_OBJECT public: - K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bMixedDirTreeView(); signals: @@ -40,7 +40,7 @@ class K3bMixedDirTreeView : public K3bDataDirTreeView void dataTreeSelected(); protected slots: - void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* tqparent ); + void slotDropped( TQDropEvent* e, TQListViewItem* after, TQListViewItem* parent ); private slots: void slotSelectionChanged( TQListViewItem* i ); diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp index 1022d0a..8d1b939 100644 --- a/src/projects/k3bmixedview.cpp +++ b/src/projects/k3bmixedview.cpp @@ -44,8 +44,8 @@ #include <kactionclasses.h> -K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* tqparent, const char* name ) - : K3bView( doc, tqparent, name ), m_doc(doc) +K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* parent, const char* name ) + : K3bView( doc, parent, name ), m_doc(doc) { TQSplitter* splitter = new TQSplitter( this ); m_mixedDirTreeView = new K3bMixedDirTreeView( this, doc, splitter ); @@ -138,9 +138,9 @@ void K3bMixedView::slotBurn() } -K3bProjectBurnDialog* K3bMixedView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bMixedView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bMixedBurnDialog( m_doc, tqparent, name, true ); + return new K3bMixedBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bmixedview.h b/src/projects/k3bmixedview.h index 1111dd3..4da7391 100644 --- a/src/projects/k3bmixedview.h +++ b/src/projects/k3bmixedview.h @@ -36,7 +36,7 @@ class K3bMixedView : public K3bView TQ_OBJECT public: - K3bMixedView( K3bMixedDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bMixedView( K3bMixedDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bMixedView(); K3bDirItem* currentDir() const; @@ -48,7 +48,7 @@ class K3bMixedView : public K3bView void addUrls( const KURL::List& ); protected: - K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private slots: void slotAudioTreeSelected(); diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index 1a785d8..4a49d4f 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -43,8 +43,8 @@ #include <tqfileinfo.h> -K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* tqparent, const char* name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal ), +K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, const char* name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal ), m_doc(doc) { prepareGui(); diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h index 326a5b7..05fc413 100644 --- a/src/projects/k3bmovixburndialog.h +++ b/src/projects/k3bmovixburndialog.h @@ -33,7 +33,7 @@ class K3bMovixBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); + K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~K3bMovixBurnDialog(); protected slots: diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index fccc3b0..9cc5617 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -45,8 +45,8 @@ #include <tqfileinfo.h> -K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* tqparent, const char* name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), +K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* parent, const char* name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal, true ), m_doc(doc) { prepareGui(); diff --git a/src/projects/k3bmovixdvdburndialog.h b/src/projects/k3bmovixdvdburndialog.h index ca0b4d0..fe08e29 100644 --- a/src/projects/k3bmovixdvdburndialog.h +++ b/src/projects/k3bmovixdvdburndialog.h @@ -32,7 +32,7 @@ class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); + K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~K3bMovixDvdBurnDialog(); protected slots: diff --git a/src/projects/k3bmovixdvdview.cpp b/src/projects/k3bmovixdvdview.cpp index 42b864d..ae1e5a7 100644 --- a/src/projects/k3bmovixdvdview.cpp +++ b/src/projects/k3bmovixdvdview.cpp @@ -22,8 +22,8 @@ #include <klocale.h> -K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bMovixView( doc, tqparent, name ) +K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *parent, const char *name ) + : K3bMovixView( doc, parent, name ) { m_doc = doc; @@ -40,9 +40,9 @@ K3bMovixDvdView::~K3bMovixDvdView() } -K3bProjectBurnDialog* K3bMovixDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bMovixDvdView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bMovixDvdBurnDialog( m_doc, tqparent, name, true ); + return new K3bMovixDvdBurnDialog( m_doc, parent, name, true ); } #include "k3bmovixdvdview.moc" diff --git a/src/projects/k3bmovixdvdview.h b/src/projects/k3bmovixdvdview.h index d6d1977..e368ed7 100644 --- a/src/projects/k3bmovixdvdview.h +++ b/src/projects/k3bmovixdvdview.h @@ -28,11 +28,11 @@ class K3bMovixDvdView : public K3bMovixView TQ_OBJECT public: - K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); + K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *parent = 0, const char *name = 0 ); ~K3bMovixDvdView(); protected: - K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); private: K3bMovixDvdDoc* m_doc; diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index f6fbfa1..e43dfd5 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -32,9 +32,9 @@ K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - TQListView* tqparent, + TQListView* parent, TQListViewItem* after ) - : K3bListViewItem( tqparent, after ), + : K3bListViewItem( parent, after ), m_doc(doc), m_fileItem(item) { @@ -43,8 +43,8 @@ K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixListViewItem::K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - TQListViewItem* tqparent ) - : K3bListViewItem( tqparent ), + TQListViewItem* parent ) + : K3bListViewItem( parent ), m_doc(doc), m_fileItem(item) { @@ -58,9 +58,9 @@ K3bMovixListViewItem::~K3bMovixListViewItem() K3bMovixFileViewItem::K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - TQListView* tqparent, + TQListView* parent, TQListViewItem* after ) - : K3bMovixListViewItem( doc, item, tqparent, after ), + : K3bMovixListViewItem( doc, item, parent, after ), KFileItem( 0, 0, KURL::fromPathOrURL(item->localPath()) ) { setPixmap( 1, KFileItem::pixmap( 16, KIcon::DefaultState ) ); @@ -119,8 +119,8 @@ TQString K3bMovixFileViewItem::key( int, bool ) const K3bMovixSubTitleViewItem::K3bMovixSubTitleViewItem( K3bMovixDoc* doc, K3bMovixFileItem* item, - K3bMovixListViewItem* tqparent ) - : K3bMovixListViewItem( doc, item, tqparent ), + K3bMovixListViewItem* parent ) + : K3bMovixListViewItem( doc, item, parent ), KFileItem( 0, 0, KURL::fromPathOrURL(item->subTitleItem()->localPath()) ) { } @@ -166,8 +166,8 @@ TQString K3bMovixSubTitleViewItem::text( int c ) const -K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* tqparent, const char* name ) - : K3bListView( tqparent, name ), +K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const char* name ) + : K3bListView( parent, name ), m_doc(doc) { addColumn( i18n("No.") ); diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index d3b8119..fac8e4b 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -32,8 +32,8 @@ class K3bFileItem; class K3bMovixListViewItem : public K3bListViewItem { public: - K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* tqparent, TQListViewItem* after ); - K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListViewItem* tqparent ); + K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* parent, TQListViewItem* after ); + K3bMovixListViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListViewItem* parent ); ~K3bMovixListViewItem(); K3bMovixFileItem* fileItem() const { return m_fileItem; } @@ -50,7 +50,7 @@ class K3bMovixListViewItem : public K3bListViewItem class K3bMovixFileViewItem : public K3bMovixListViewItem, public KFileItem { public: - K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* tqparent, TQListViewItem* ); + K3bMovixFileViewItem( K3bMovixDoc* doc, K3bMovixFileItem*, TQListView* parent, TQListViewItem* ); TQString text( int ) const; void setText(int col, const TQString& text ); @@ -62,7 +62,7 @@ class K3bMovixFileViewItem : public K3bMovixListViewItem, public KFileItem class K3bMovixSubTitleViewItem : public K3bMovixListViewItem, public KFileItem { public: - K3bMovixSubTitleViewItem( K3bMovixDoc*, K3bMovixFileItem* item, K3bMovixListViewItem* tqparent ); + K3bMovixSubTitleViewItem( K3bMovixDoc*, K3bMovixFileItem* item, K3bMovixListViewItem* parent ); ~K3bMovixSubTitleViewItem(); TQString text( int ) const; @@ -77,7 +77,7 @@ class K3bMovixListView : public K3bListView TQ_OBJECT public: - K3bMovixListView( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent = 0, const char* name = 0 ); ~K3bMovixListView(); TQDragObject* dragObject(); diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index f9220a9..5041244 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -79,8 +79,8 @@ private: }; -K3bMovixOptionsWidget::K3bMovixOptionsWidget( TQWidget* tqparent, const char* name ) - : base_K3bMovixOptionsWidget( tqparent, name ) +K3bMovixOptionsWidget::K3bMovixOptionsWidget( TQWidget* parent, const char* name ) + : base_K3bMovixOptionsWidget( parent, name ) { m_keyboardLangHelper = new LanguageSelectionHelper( m_comboKeyboardLayout ); m_helpLangHelper = new LanguageSelectionHelper( m_comboBootMessageLanguage ); diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h index 76437f7..fe0e83e 100644 --- a/src/projects/k3bmovixoptionswidget.h +++ b/src/projects/k3bmovixoptionswidget.h @@ -30,7 +30,7 @@ class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget TQ_OBJECT public: - K3bMovixOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 ); + K3bMovixOptionsWidget( TQWidget* parent = 0, const char* name = 0 ); ~K3bMovixOptionsWidget(); public slots: diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 45a30ff..58c6ba7 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -38,8 +38,8 @@ #include <tqlineedit.h> -K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* tqparent, const char* name ) - : K3bView( doc, tqparent, name ), +K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name ) + : K3bView( doc, parent, name ), m_doc(doc) { m_listView = new K3bMovixListView( m_doc, this ); @@ -176,9 +176,9 @@ void K3bMovixView::slotAddSubTitleFile() } -K3bProjectBurnDialog* K3bMovixView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bMovixView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bMovixBurnDialog( m_doc, tqparent, name, true ); + return new K3bMovixBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h index 3f07c68..2b58bc9 100644 --- a/src/projects/k3bmovixview.h +++ b/src/projects/k3bmovixview.h @@ -35,7 +35,7 @@ class K3bMovixView : public K3bView TQ_OBJECT public: - K3bMovixView( K3bMovixDoc* doc, TQWidget* tqparent = 0, const char* name = 0 ); + K3bMovixView( K3bMovixDoc* doc, TQWidget* parent = 0, const char* name = 0 ); virtual ~K3bMovixView(); private slots: @@ -47,7 +47,7 @@ class K3bMovixView : public K3bView void slotDocChanged(); protected: - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); K3bMovixListView* m_listView; diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index 09d59d1..2074cd2 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -152,9 +152,9 @@ void K3bMusicBrainzJob::MusicBrainzThread::run() -// cannot use this as tqparent for the K3bSimpleJobHandler since this has not been constructed yet -K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* tqparent, const char* name ) - : K3bJob( new K3bSimpleJobHandler( 0 ), TQT_TQOBJECT(tqparent), name ), +// cannot use this as parent for the K3bSimpleJobHandler since this has not been constructed yet +K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* parent, const char* name ) + : K3bJob( new K3bSimpleJobHandler( 0 ), TQT_TQOBJECT(parent), name ), m_canceled( false ) { m_trmThread = new TRMThread(); @@ -259,7 +259,7 @@ void K3bMusicBrainzJob::slotMbJobFinished( bool success ) 0, false, &ok, - dynamic_cast<TQWidget*>(tqparent()) ); + dynamic_cast<TQWidget*>(parent()) ); else s = resultStringsUnique.first(); diff --git a/src/projects/k3bmusicbrainzjob.h b/src/projects/k3bmusicbrainzjob.h index 52653a1..5e85f67 100644 --- a/src/projects/k3bmusicbrainzjob.h +++ b/src/projects/k3bmusicbrainzjob.h @@ -45,10 +45,10 @@ class K3bMusicBrainzJob : public K3bJob public: /** - * \param tqparent since we do not use this job with a normal progressdialog we need a widget - * as tqparent + * \param parent since we do not use this job with a normal progressdialog we need a widget + * as parent */ - K3bMusicBrainzJob( TQWidget* tqparent = 0, const char* name = 0 ); + K3bMusicBrainzJob( TQWidget* parent = 0, const char* name = 0 ); ~K3bMusicBrainzJob(); bool hasBeenCanceled() const { return m_canceled; } diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index 5390e4c..66bd61a 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -51,8 +51,8 @@ #include <kiconloader.h> -K3bProjectBurnDialog::K3bProjectBurnDialog( K3bDoc* doc, TQWidget *tqparent, const char *name, bool modal, bool dvd ) - : K3bInteractionDialog( tqparent, name, i18n("Project"), TQString(), +K3bProjectBurnDialog::K3bProjectBurnDialog( K3bDoc* doc, TQWidget *parent, const char *name, bool modal, bool dvd ) + : K3bInteractionDialog( parent, name, i18n("Project"), TQString(), START_BUTTON|SAVE_BUTTON|CANCEL_BUTTON, START_BUTTON, "default " + doc->typeString() + " settings", modal ), m_writerSelectionWidget(0), diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h index 2e7f32f..92e8c99 100644 --- a/src/projects/k3bprojectburndialog.h +++ b/src/projects/k3bprojectburndialog.h @@ -42,7 +42,7 @@ class K3bProjectBurnDialog : public K3bInteractionDialog TQ_OBJECT public: - K3bProjectBurnDialog( K3bDoc* doc, TQWidget *tqparent=0, const char *name=0, + K3bProjectBurnDialog( K3bDoc* doc, TQWidget *parent=0, const char *name=0, bool modal = true, bool dvd = false ); ~K3bProjectBurnDialog(); diff --git a/src/projects/k3bprojectplugindialog.cpp b/src/projects/k3bprojectplugindialog.cpp index 4a6d1fb..6b59c68 100644 --- a/src/projects/k3bprojectplugindialog.cpp +++ b/src/projects/k3bprojectplugindialog.cpp @@ -20,8 +20,8 @@ #include <tqwidget.h> -K3bProjectPluginDialog::K3bProjectPluginDialog( K3bProjectPlugin* plugin, K3bDoc* doc, TQWidget* tqparent, const char* name ) - : K3bInteractionDialog( tqparent, name, +K3bProjectPluginDialog::K3bProjectPluginDialog( K3bProjectPlugin* plugin, K3bDoc* doc, TQWidget* parent, const char* name ) + : K3bInteractionDialog( parent, name, TQString(), TQString(), START_BUTTON|CANCEL_BUTTON, diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 07c7b85..3f2434c 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -47,8 +47,8 @@ #include <k3bexternalbinmanager.h> #include <k3bvalidators.h> -K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( _doc, tqparent, name, modal ) +K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( _doc, parent, name, modal ) { m_vcdDoc = _doc; diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h index 322fedf..3f75d3d 100644 --- a/src/projects/k3bvcdburndialog.h +++ b/src/projects/k3bvcdburndialog.h @@ -39,7 +39,7 @@ class K3bVcdBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bVcdBurnDialog( K3bVcdDoc* doc, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); + K3bVcdBurnDialog( K3bVcdDoc* doc, TQWidget *parent = 0, const char *name = 0, bool modal = true ); ~K3bVcdBurnDialog(); K3bVcdDoc* vcdDoc() const diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index 372ae1c..3232384 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -39,8 +39,8 @@ #include "k3bvcddoc.h" #include <k3bview.h> -K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bListView( tqparent, name ), m_doc( doc ), m_view( view ) +K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, const char *name ) + : K3bListView( parent, name ), m_doc( doc ), m_view( view ) { setAcceptDrops( true ); setDropVisualizer( true ); diff --git a/src/projects/k3bvcdlistview.h b/src/projects/k3bvcdlistview.h index 01fa218..bb48a87 100644 --- a/src/projects/k3bvcdlistview.h +++ b/src/projects/k3bvcdlistview.h @@ -41,7 +41,7 @@ class K3bVcdListView : public K3bListView TQ_OBJECT public: - K3bVcdListView( K3bView*, K3bVcdDoc*, TQWidget *tqparent = 0, const char *name = 0 ); + K3bVcdListView( K3bView*, K3bVcdDoc*, TQWidget *parent = 0, const char *name = 0 ); ~K3bVcdListView(); /** diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index 5232632..9ad778f 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -22,15 +22,15 @@ #include "k3bvcdtrack.h" #include <k3bglobals.h> -K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent ) - : K3bListViewItem( tqparent ), m_track( track ) +K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent ) + : K3bListViewItem( parent ), m_track( track ) { setEditor( 1, LINE ); animate(); } -K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent, TQListViewItem* after ) - : K3bListViewItem( tqparent, after ), m_track( track ) +K3bVcdListViewItem::K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, TQListViewItem* after ) + : K3bListViewItem( parent, after ), m_track( track ) { setEditor( 1, LINE ); animate(); diff --git a/src/projects/k3bvcdlistviewitem.h b/src/projects/k3bvcdlistviewitem.h index 9a1a290..085deb7 100644 --- a/src/projects/k3bvcdlistviewitem.h +++ b/src/projects/k3bvcdlistviewitem.h @@ -24,8 +24,8 @@ class K3bVcdListViewItem : public K3bListViewItem { public: - K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent ); - K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* tqparent, TQListViewItem* after ); + K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent ); + K3bVcdListViewItem( K3bVcdTrack* track, K3bListView* parent, TQListViewItem* after ); ~K3bVcdListViewItem(); /** reimplemented from TQListViewItem */ diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 7fac6b1..be140f7 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -47,9 +47,9 @@ #include <k3bcutcombobox.h> -K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& tracks, TQPtrList<K3bVcdTrack>& selectedTracks, TQWidget* tqparent, const char* name ) +K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& tracks, TQPtrList<K3bVcdTrack>& selectedTracks, TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n( "Video Track Properties" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, - KDialogBase::Ok, tqparent, name ) + KDialogBase::Ok, parent, name ) { prepareGui(); diff --git a/src/projects/k3bvcdtrackdialog.h b/src/projects/k3bvcdtrackdialog.h index 565275b..0bf23e3 100644 --- a/src/projects/k3bvcdtrackdialog.h +++ b/src/projects/k3bvcdtrackdialog.h @@ -40,7 +40,7 @@ class K3bVcdTrackDialog : public KDialogBase TQ_OBJECT public: - K3bVcdTrackDialog( K3bVcdDoc*, TQPtrList<K3bVcdTrack>& tracks, TQPtrList<K3bVcdTrack>& selectedTracks, TQWidget* tqparent = 0, const char* name = 0 ); + K3bVcdTrackDialog( K3bVcdDoc*, TQPtrList<K3bVcdTrack>& tracks, TQPtrList<K3bVcdTrack>& selectedTracks, TQWidget* parent = 0, const char* name = 0 ); ~K3bVcdTrackDialog(); protected slots: diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index 852928f..2a42495 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -34,8 +34,8 @@ #include <k3bcore.h> -K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, TQWidget* tqparent, const char *name ) - : K3bView( pDoc, tqparent, name ) +K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, TQWidget* parent, const char *name ) + : K3bView( pDoc, parent, name ) { m_doc = pDoc; @@ -53,9 +53,9 @@ K3bVcdView::~K3bVcdView() {} -K3bProjectBurnDialog* K3bVcdView::newBurnDialog( TQWidget * tqparent, const char * name ) +K3bProjectBurnDialog* K3bVcdView::newBurnDialog( TQWidget * parent, const char * name ) { - return new K3bVcdBurnDialog( m_doc, tqparent, name, true ); + return new K3bVcdBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bvcdview.h b/src/projects/k3bvcdview.h index a58a465..036dbdc 100644 --- a/src/projects/k3bvcdview.h +++ b/src/projects/k3bvcdview.h @@ -39,11 +39,11 @@ class K3bVcdView : public K3bView TQ_OBJECT public: - K3bVcdView( K3bVcdDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); + K3bVcdView( K3bVcdDoc* pDoc, TQWidget* parent, const char *name = 0 ); ~K3bVcdView(); protected: - K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp index d7602b0..c5adefb 100644 --- a/src/projects/k3bvideodvdburndialog.cpp +++ b/src/projects/k3bvideodvdburndialog.cpp @@ -40,8 +40,8 @@ #include <tqwhatsthis.h> -K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *tqparent, const char *name, bool modal ) - : K3bProjectBurnDialog( doc, tqparent, name, modal, true ), +K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *parent, const char *name, bool modal ) + : K3bProjectBurnDialog( doc, parent, name, modal, true ), m_doc( doc ) { prepareGui(); diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h index af393d1..5dfc9d5 100644 --- a/src/projects/k3bvideodvdburndialog.h +++ b/src/projects/k3bvideodvdburndialog.h @@ -31,7 +31,7 @@ class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog TQ_OBJECT public: - K3bVideoDvdBurnDialog( K3bVideoDvdDoc*, TQWidget *tqparent = 0, const char *name = 0, bool modal = true ); + K3bVideoDvdBurnDialog( K3bVideoDvdDoc*, TQWidget *parent = 0, const char *name = 0, bool modal = true ); ~K3bVideoDvdBurnDialog(); protected slots: diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp index 792ffc5..252e2d0 100644 --- a/src/projects/k3bvideodvdview.cpp +++ b/src/projects/k3bvideodvdview.cpp @@ -31,8 +31,8 @@ #include <tqsplitter.h> -K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *tqparent, const char *name ) - : K3bView( doc, tqparent, name ), +K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *parent, const char *name ) + : K3bView( doc, parent, name ), m_doc(doc) { fillStatusDisplay()->showDvdSizes(true); @@ -58,9 +58,9 @@ K3bVideoDvdView::~K3bVideoDvdView() } -K3bProjectBurnDialog* K3bVideoDvdView::newBurnDialog( TQWidget* tqparent, const char* name ) +K3bProjectBurnDialog* K3bVideoDvdView::newBurnDialog( TQWidget* parent, const char* name ) { - return new K3bVideoDvdBurnDialog( m_doc, tqparent, name, true ); + return new K3bVideoDvdBurnDialog( m_doc, parent, name, true ); } diff --git a/src/projects/k3bvideodvdview.h b/src/projects/k3bvideodvdview.h index 59dd88d..cd0d037 100644 --- a/src/projects/k3bvideodvdview.h +++ b/src/projects/k3bvideodvdview.h @@ -30,13 +30,13 @@ class K3bVideoDvdView : public K3bView TQ_OBJECT public: - K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *tqparent = 0, const char *name = 0 ); + K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *parent = 0, const char *name = 0 ); ~K3bVideoDvdView(); void addUrls( const KURL::List& ); protected: - virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* tqparent = 0, const char* name = 0 ); + virtual K3bProjectBurnDialog* newBurnDialog( TQWidget* parent = 0, const char* name = 0 ); void init(); diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index ccb2656..fbd3a91 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -40,8 +40,8 @@ #include <k3bcore.h> -K3bView::K3bView( K3bDoc* pDoc, TQWidget *tqparent, const char* name ) - : TQWidget( tqparent, name ), +K3bView::K3bView( K3bDoc* pDoc, TQWidget *parent, const char* name ) + : TQWidget( parent, name ), m_doc( pDoc ) { TQGridLayout* grid = new TQGridLayout( this ); diff --git a/src/projects/k3bview.h b/src/projects/k3bview.h index 9ca4438..7736cf5 100644 --- a/src/projects/k3bview.h +++ b/src/projects/k3bview.h @@ -48,7 +48,7 @@ class K3bView : public TQWidget, public KXMLGUIClient /** * */ - K3bView( K3bDoc* pDoc, TQWidget* tqparent, const char *name = 0 ); + K3bView( K3bDoc* pDoc, TQWidget* parent, const char *name = 0 ); virtual ~K3bView(); /** |