diff options
Diffstat (limited to 'src/projects')
91 files changed, 376 insertions, 389 deletions
diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui index b0870b8..ec11a1d 100644 --- a/src/projects/base_k3baudiocdtextwidget.ui +++ b/src/projects/base_k3baudiocdtextwidget.ui @@ -207,13 +207,13 @@ <tabstop>m_editTitle</tabstop> <tabstop>m_editPerformer</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotCopyTitle()</slot> <slot access="protected" specifier="pure virtual">slotCopyPerformer()</slot> <slot access="protected" specifier="pure virtual">slotCopyArranger()</slot> <slot access="protected" specifier="pure virtual">slotCopyComposer()</slot> <slot access="protected" specifier="pure virtual">slotCopySongwriter()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui index f944926..9a1379a 100644 --- a/src/projects/base_k3baudiotrackwidget.ui +++ b/src/projects/base_k3baudiotrackwidget.ui @@ -204,7 +204,7 @@ <string>Preemph&asis</string> </property> <property name="whatsThis" stdset="0"> - <string><p>Preemphasis is mainly used in audio processing. Higher frequencies in audio Q_SIGNALS usually have lower amplitudes. This can lead to bad signal quality on noisy transmission because the high frequencies might become too weak. To avoid this effect, high frequencies are amplified before transmission (preemphasis); the receiver will then weaken them accordingly for playback.</string> + <string><p>Preemphasis is mainly used in audio processing. Higher frequencies in audio signals usually have lower amplitudes. This can lead to bad signal quality on noisy transmission because the high frequencies might become too weak. To avoid this effect, high frequencies are amplified before transmission (preemphasis); the receiver will then weaken them accordingly for playback.</string> </property> </widget> <widget class="TQCheckBox"> diff --git a/src/projects/base_k3bbootimageview.ui b/src/projects/base_k3bbootimageview.ui index 3811f86..6e2aa27 100644 --- a/src/projects/base_k3bbootimageview.ui +++ b/src/projects/base_k3bbootimageview.ui @@ -384,9 +384,9 @@ <slot>slotOptionsChanged()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotOptionsChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 8e4fff8..761cb75 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -79,13 +79,13 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, cons advancedTabGrid->setSpacing( spacingHint() ); advancedTabGrid->setMargin( marginHint() ); - TQGroupBox* advancedSettingsGroup = new TQGroupBox( 1, Qt::Vertical, i18n("Settings"), advancedTab ); + TQGroupBox* advancedSettingsGroup = new TQGroupBox( 1, TQt::Vertical, i18n("Settings"), advancedTab ); m_checkNormalize = K3bStdGuiItems::normalizeCheckBox( advancedSettingsGroup ); - TQGroupBox* advancedGimmickGroup = new TQGroupBox( 1, Qt::Vertical, i18n("Gimmicks"), advancedTab ); + TQGroupBox* advancedGimmickGroup = new TQGroupBox( 1, TQt::Vertical, i18n("Gimmicks"), advancedTab ); m_checkHideFirstTrack = new TQCheckBox( i18n( "Hide first track" ), advancedGimmickGroup, "m_checkHideFirstTrack" ); - m_audioRippingGroup = new TQGroupBox( 3, Qt::Vertical, i18n("Audio Ripping"), advancedTab ); + m_audioRippingGroup = new TQGroupBox( 3, TQt::Vertical, i18n("Audio Ripping"), advancedTab ); TQHBox* box = new TQHBox( m_audioRippingGroup ); box->setSpacing( spacingHint() ); box->setStretchFactor(new TQLabel( i18n("Paranoia mode:"), box ), 1 ); @@ -103,10 +103,10 @@ K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, cons addPage( advancedTab, i18n("Advanced") ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkNormalize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNormalizeToggled(bool)) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCacheImageToggled(bool)) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkNormalize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotNormalizeToggled(bool)) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCacheImageToggled(bool)) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); // ToolTips // ------------------------------------------------------------------------- diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h index c564efe..11c3008 100644 --- a/src/projects/k3baudioburndialog.h +++ b/src/projects/k3baudioburndialog.h @@ -41,7 +41,7 @@ class TQShowEvent; */ class K3bAudioBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp index a180f02..1e1fd06 100644 --- a/src/projects/k3baudiocdtextwidget.cpp +++ b/src/projects/k3baudiocdtextwidget.cpp @@ -67,7 +67,7 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* parent, const char* name ) m_allFieldsDlg->w->m_buttonCopyComposer->setPixmap( SmallIcon( "edit-copy" ) ); m_allFieldsDlg->w->m_buttonCopyArranger->setPixmap( SmallIcon( "edit-copy" ) ); - TQValidator* cdTextVal = new K3bCdTextValidator( TQT_TQOBJECT(this) ); + TQValidator* cdTextVal = new K3bCdTextValidator( this ); m_editTitle->setValidator( cdTextVal ); m_editPerformer->setValidator( cdTextVal ); @@ -80,19 +80,19 @@ K3bAudioCdTextWidget::K3bAudioCdTextWidget( TQWidget* parent, const char* name ) m_allFieldsDlg->w->m_editSongwriter->setValidator( cdTextVal ); m_allFieldsDlg->w->m_editComposer->setValidator( cdTextVal ); - connect( m_allFieldsDlg->w->m_buttonCopyTitle, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyTitle()) ); - connect( m_allFieldsDlg->w->m_buttonCopyPerformer, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyPerformer()) ); - connect( m_allFieldsDlg->w->m_buttonCopyArranger, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyArranger()) ); - connect( m_allFieldsDlg->w->m_buttonCopySongwriter, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopySongwriter()) ); - connect( m_allFieldsDlg->w->m_buttonCopyComposer, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyComposer()) ); - - connect( m_buttonMoreFields, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMoreFields()) ); + connect( m_allFieldsDlg->w->m_buttonCopyTitle, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyTitle()) ); + connect( m_allFieldsDlg->w->m_buttonCopyPerformer, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyPerformer()) ); + connect( m_allFieldsDlg->w->m_buttonCopyArranger, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyArranger()) ); + connect( m_allFieldsDlg->w->m_buttonCopySongwriter, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopySongwriter()) ); + connect( m_allFieldsDlg->w->m_buttonCopyComposer, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyComposer()) ); + + connect( m_buttonMoreFields, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMoreFields()) ); } diff --git a/src/projects/k3baudiocdtextwidget.h b/src/projects/k3baudiocdtextwidget.h index a6ed0d2..b9f828a 100644 --- a/src/projects/k3baudiocdtextwidget.h +++ b/src/projects/k3baudiocdtextwidget.h @@ -24,7 +24,7 @@ class K3bAudioDoc; class K3bAudioCdTextWidget : public base_K3bAudioCdTextWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp index 84b943b..dff3f38 100644 --- a/src/projects/k3baudiodatasourceeditwidget.cpp +++ b/src/projects/k3baudiodatasourceeditwidget.cpp @@ -51,14 +51,14 @@ K3bAudioDataSourceEditWidget::K3bAudioDataSourceEditWidget( TQWidget* parent, co grid->setColStretch( 1, 1 ); // setup connections between the msfedits and the editor - connect( m_editor, TQT_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), - this, TQT_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); + connect( m_editor, TQ_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), + this, TQ_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); - connect( m_editStartOffset, TQT_SIGNAL(valueChanged(const K3b::Msf&)), - this, TQT_SLOT(slotStartOffsetEdited(const K3b::Msf&)) ); + connect( m_editStartOffset, TQ_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQ_SLOT(slotStartOffsetEdited(const K3b::Msf&)) ); - connect( m_editEndOffset, TQT_SIGNAL(valueChanged(const K3b::Msf&)), - this, TQT_SLOT(slotEndOffsetEdited(const K3b::Msf&)) ); + connect( m_editEndOffset, TQ_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQ_SLOT(slotEndOffsetEdited(const K3b::Msf&)) ); TQToolTip::add( m_editor, i18n("Drag the edges of the highlighted area to define the portion of the " "audio source you want to include in the Audio CD track. " diff --git a/src/projects/k3baudiodatasourceeditwidget.h b/src/projects/k3baudiodatasourceeditwidget.h index 428caad..49b985e 100644 --- a/src/projects/k3baudiodatasourceeditwidget.h +++ b/src/projects/k3baudiodatasourceeditwidget.h @@ -29,7 +29,7 @@ class K3bMsfEdit; */ class K3bAudioDataSourceEditWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudioeditorwidget.cpp b/src/projects/k3baudioeditorwidget.cpp index 690b544..23d9100 100644 --- a/src/projects/k3baudioeditorwidget.cpp +++ b/src/projects/k3baudioeditorwidget.cpp @@ -491,7 +491,7 @@ void K3bAudioEditorWidget::drawContents( TQPainter* p ) pix.fill( colorGroup().base() ); TQPainter pixP; - pixP.begin( &pix, TQT_TQOBJECT(this) ); + pixP.begin( &pix, this ); TQRect drawRect( contentsRect() ); drawRect.setLeft( drawRect.left() + m_margin ); @@ -718,7 +718,7 @@ void K3bAudioEditorWidget::mouseMoveEvent( TQMouseEvent* e ) if( m_mouseAt ) emit mouseAt( posToMsf( e->pos().x() ) ); - if( e->state() & Qt::LeftButton ) { + if( e->state() & TQt::LeftButton ) { if( m_draggedRange ) { // determine the position the range's end was dragged to and its other end K3b::Msf msfPos = TQMAX( 0, TQMIN( posToMsf( e->pos().x() ), m_length-1 ) ); diff --git a/src/projects/k3baudioeditorwidget.h b/src/projects/k3baudioeditorwidget.h index 0a31ef9..e1005ff 100644 --- a/src/projects/k3baudioeditorwidget.h +++ b/src/projects/k3baudioeditorwidget.h @@ -27,7 +27,7 @@ class TQPainter; class K3bAudioEditorWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp index 30ff9df..e722ed0 100644 --- a/src/projects/k3baudiotrackaddingdialog.cpp +++ b/src/projects/k3baudiotrackaddingdialog.cpp @@ -77,8 +77,8 @@ K3bAudioTrackAddingDialog::K3bAudioTrackAddingDialog( TQWidget* parent, const ch grid->addWidget( m_busyWidget, 1, 0 ); m_analyserThread = new AnalyserThread(); - m_analyserJob = new K3bThreadJob( m_analyserThread, this, TQT_TQOBJECT(this) ); - connect( m_analyserJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotAnalysingFinished(bool)) ); + m_analyserJob = new K3bThreadJob( m_analyserThread, this, this ); + connect( m_analyserJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotAnalysingFinished(bool)) ); } @@ -107,7 +107,7 @@ int K3bAudioTrackAddingDialog::addUrls( const KURL::List& urls, dlg.m_infoLabel->setText( i18n("Adding files to project \"%1\"...").arg(doc->URL().fileName()) ); dlg.m_busyWidget->showBusy(true); - TQTimer::singleShot( 0, &dlg, TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, &dlg, TQ_SLOT(slotAddUrls()) ); int ret = dlg.exec(); TQString message; @@ -199,7 +199,7 @@ void K3bAudioTrackAddingDialog::slotAddUrls() // invalid file, next url if( !valid ) { m_urls.remove( m_urls.begin() ); - TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } @@ -251,7 +251,7 @@ void K3bAudioTrackAddingDialog::slotAnalysingFinished( bool /*success*/ ) } } - TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } diff --git a/src/projects/k3baudiotrackaddingdialog.h b/src/projects/k3baudiotrackaddingdialog.h index 1b14ec9..cf7312d 100644 --- a/src/projects/k3baudiotrackaddingdialog.h +++ b/src/projects/k3baudiotrackaddingdialog.h @@ -32,7 +32,7 @@ class K3bAudioDoc; class K3bAudioTrackAddingDialog : public KDialogBase, public K3bJobHandler { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackdialog.h b/src/projects/k3baudiotrackdialog.h index ade45d5..a238ecf 100644 --- a/src/projects/k3baudiotrackdialog.h +++ b/src/projects/k3baudiotrackdialog.h @@ -33,7 +33,7 @@ class K3bAudioTrackWidget; class K3bAudioTrackDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp index 2118791..4f644a7 100644 --- a/src/projects/k3baudiotrackplayer.cpp +++ b/src/projects/k3baudiotrackplayer.cpp @@ -70,43 +70,43 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co d->actionPlay = new TDEAction( i18n("Play"), "media-playback-start", TDEShortcut(), - this, TQT_SLOT(playPause()), + this, TQ_SLOT(playPause()), d->actionCollection, "play" ); d->actionPause = new TDEAction( i18n("Pause"), "media-playback-pause", TDEShortcut(), - this, TQT_SLOT(playPause()), + this, TQ_SLOT(playPause()), d->actionCollection, "pause" ); d->actionPlayPause = new TDEAction( i18n("Play/Pause"), "media-playback-start", TDEShortcut(), - this, TQT_SLOT(playPause()), + this, TQ_SLOT(playPause()), d->actionCollection, "play_pause" ); d->actionStop = new TDEAction( i18n("Stop"), "media-playback-stop", TDEShortcut(), - this, TQT_SLOT(stop()), + this, TQ_SLOT(stop()), d->actionCollection, "stop" ); d->actionNext = new TDEAction( i18n("Next"), "media-skip-forward", TDEShortcut(), - this, TQT_SLOT(next()), + this, TQ_SLOT(next()), d->actionCollection, "next" ); d->actionPrev = new TDEAction( i18n("Prev"), "media-skip-backward", TDEShortcut(), - this, TQT_SLOT(prev()), + this, TQ_SLOT(prev()), d->actionCollection, "prev" ); - d->seekSlider = new TQSlider( 0, 100, 1, 0, Qt::Horizontal, 0, "audiotrackplayerslider" ); - connect( d->seekSlider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotSeek(int)) ); + d->seekSlider = new TQSlider( 0, 100, 1, 0, TQt::Horizontal, 0, "audiotrackplayerslider" ); + connect( d->seekSlider, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(slotSeek(int)) ); // FIXME: maybe it's not such a good idea to use a KWidgetAction here since this way the player // can only be used once in one widget. If the action would always create a new slider we could plug // the action into several toolboxes and also use it in some resizing or track splitting dialogs. @@ -118,7 +118,7 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co d->actionCollection, "seek" ); // this should be done in KWidgetAction but is not yet - connect( d->actionSeek, TQT_SIGNAL(enabled(bool)), d->seekSlider, TQT_SLOT(setEnabled(bool)) ); + connect( d->actionSeek, TQ_SIGNAL(enabled(bool)), d->seekSlider, TQ_SLOT(setEnabled(bool)) ); d->actionStop->setEnabled(false); d->actionPause->setEnabled(false); @@ -126,18 +126,18 @@ K3bAudioTrackPlayer::K3bAudioTrackPlayer( K3bAudioDoc* doc, TQObject* parent, co d->actionPrev->setEnabled(false); d->actionSeek->setEnabled(false); - connect( m_doc, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotDocChanged()) ); - connect( m_doc, TQT_SIGNAL(trackChanged(K3bAudioTrack*)), - this, TQT_SLOT(slotTrackChanged(K3bAudioTrack*)) ); - connect( m_doc, TQT_SIGNAL(trackRemoved(K3bAudioTrack*)), - this, TQT_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); - connect( &d->sliderTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateSlider()) ); + connect( m_doc, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotDocChanged()) ); + connect( m_doc, TQ_SIGNAL(trackChanged(K3bAudioTrack*)), + this, TQ_SLOT(slotTrackChanged(K3bAudioTrack*)) ); + connect( m_doc, TQ_SIGNAL(trackRemoved(K3bAudioTrack*)), + this, TQ_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); + connect( &d->sliderTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateSlider()) ); // we just stop the player if the audio server has an error. K3bMainWindow will show the error message // This is all very hacky and has to be improved for K3b 2.0. But then we will probably use Phonon anyway... - connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), this, TQT_SLOT(stop()) ); + connect( K3bAudioServer::instance(), TQ_SIGNAL(error(const TQString&)), this, TQ_SLOT(stop()) ); // tooltips d->actionPlay->setToolTip( i18n("Play") ); diff --git a/src/projects/k3baudiotrackplayer.h b/src/projects/k3baudiotrackplayer.h index a7583be..b8779bf 100644 --- a/src/projects/k3baudiotrackplayer.h +++ b/src/projects/k3baudiotrackplayer.h @@ -29,7 +29,7 @@ class TDEAction; class K3bAudioTrackPlayer : public TQObject, public K3bAudioClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp index 3ba799b..2c67cb3 100644 --- a/src/projects/k3baudiotracksplitdialog.cpp +++ b/src/projects/k3baudiotracksplitdialog.cpp @@ -60,14 +60,14 @@ K3bAudioTrackSplitDialog::K3bAudioTrackSplitDialog( K3bAudioTrack* track, TQWidg m_editorWidget->enableRangeSelection( true ); m_editorWidget->installEventFilter( this ); - connect( m_editorWidget, TQT_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), - this, TQT_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); - connect( m_editorWidget, TQT_SIGNAL(selectedRangeChanged(int)), - this, TQT_SLOT(slotRangeSelectionChanged(int)) ); - connect( m_msfEditStart, TQT_SIGNAL(valueChanged(const K3b::Msf&)), - this, TQT_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); - connect( m_msfEditEnd, TQT_SIGNAL(valueChanged(const K3b::Msf&)), - this, TQT_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); + connect( m_editorWidget, TQ_SIGNAL(rangeChanged(int, const K3b::Msf&, const K3b::Msf&)), + this, TQ_SLOT(slotRangeModified(int, const K3b::Msf&, const K3b::Msf&)) ); + connect( m_editorWidget, TQ_SIGNAL(selectedRangeChanged(int)), + this, TQ_SLOT(slotRangeSelectionChanged(int)) ); + connect( m_msfEditStart, TQ_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQ_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); + connect( m_msfEditEnd, TQ_SIGNAL(valueChanged(const K3b::Msf&)), + this, TQ_SLOT(slotMsfEditChanged(const K3b::Msf&)) ); setupActions(); @@ -94,11 +94,11 @@ void K3bAudioTrackSplitDialog::setupActions() m_popupMenu = new TDEPopupMenu( this ); TDEAction* actionSplitHere = new TDEAction( i18n("Split Here"), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitHere()), + TDEShortcut(), this, TQ_SLOT(slotSplitHere()), actionCollection(), "range_split" ); // FIXME: after the message freeze give this action a proper name like "Remove track part" TDEAction* actionRemoveRange = new TDEAction( i18n("Remove this Range"), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRange()), + TDEShortcut(), this, TQ_SLOT(slotRemoveRange()), actionCollection(), "range_remove" ); actionSplitHere->plug( m_popupMenu ); @@ -162,13 +162,13 @@ void K3bAudioTrackSplitDialog::splitAt( const TQPoint& p ) bool K3bAudioTrackSplitDialog::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorWidget) ) { + if( o == m_editorWidget ) { if( e->type() == TQEvent::MouseButtonDblClick ) { - TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); + TQMouseEvent* me = static_cast<TQMouseEvent*>( e ); splitAt( me->pos() ); } else if( e->type() == TQEvent::ContextMenu ) { - TQContextMenuEvent* ce = TQT_TQCONTEXTMENUEVENT( e ); + TQContextMenuEvent* ce = static_cast<TQContextMenuEvent*>( e ); ce->consume(); m_lastClickPosition = ce->pos(); if( m_editorWidget->findRange( ce->pos().x() ) > 0 ) diff --git a/src/projects/k3baudiotracksplitdialog.h b/src/projects/k3baudiotracksplitdialog.h index 937688b..96fb39d 100644 --- a/src/projects/k3baudiotracksplitdialog.h +++ b/src/projects/k3baudiotracksplitdialog.h @@ -33,7 +33,7 @@ class TDEPopupMenu; */ class K3bAudioTrackSplitDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp index 07c6027..d82f92a 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.cpp +++ b/src/projects/k3baudiotracktrmlookupdialog.cpp @@ -68,11 +68,11 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, co m_inLoop = false; m_mbJob = new K3bMusicBrainzJob( this ); - connect( m_mbJob, TQT_SIGNAL(infoMessage(const TQString&, int)), - this, TQT_SLOT(slotMbJobInfoMessage(const TQString&, int)) ); - connect( m_mbJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMbJobFinished(bool)) ); - connect( m_mbJob, TQT_SIGNAL(trackFinished(K3bAudioTrack*, bool)), - this, TQT_SLOT(slotTrackFinished(K3bAudioTrack*, bool)) ); + connect( m_mbJob, TQ_SIGNAL(infoMessage(const TQString&, int)), + this, TQ_SLOT(slotMbJobInfoMessage(const TQString&, int)) ); + connect( m_mbJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotMbJobFinished(bool)) ); + connect( m_mbJob, TQ_SIGNAL(trackFinished(K3bAudioTrack*, bool)), + this, TQ_SLOT(slotTrackFinished(K3bAudioTrack*, bool)) ); } diff --git a/src/projects/k3baudiotracktrmlookupdialog.h b/src/projects/k3baudiotracktrmlookupdialog.h index e6c2b2e..7ebca38 100644 --- a/src/projects/k3baudiotracktrmlookupdialog.h +++ b/src/projects/k3baudiotracktrmlookupdialog.h @@ -27,7 +27,7 @@ class K3bBusyWidget; class K3bAudioTrackTRMLookupDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 5eaf550..d20658e 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -68,11 +68,11 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const m_currentMouseOverItem(0), m_currentlyPlayingTrack(0) { - m_player = new K3bAudioTrackPlayer( m_doc, TQT_TQOBJECT(this) ); - connect( m_player, TQT_SIGNAL(playingTrack(K3bAudioTrack*)), TQT_TQOBJECT(this), - TQT_SLOT(showPlayerIndicator(K3bAudioTrack*)) ); - connect( m_player, TQT_SIGNAL(paused(bool)), TQT_TQOBJECT(this), TQT_SLOT(togglePauseIndicator(bool)) ); - connect( m_player, TQT_SIGNAL(stopped()), TQT_TQOBJECT(this), TQT_SLOT(removePlayerIndicator()) ); + m_player = new K3bAudioTrackPlayer( m_doc, this ); + connect( m_player, TQ_SIGNAL(playingTrack(K3bAudioTrack*)), this, + TQ_SLOT(showPlayerIndicator(K3bAudioTrack*)) ); + connect( m_player, TQ_SIGNAL(paused(bool)), this, TQ_SLOT(togglePauseIndicator(bool)) ); + connect( m_player, TQ_SIGNAL(stopped()), this, TQ_SLOT(removePlayerIndicator()) ); setItemMargin( 5 ); setAcceptDrops( true ); @@ -90,27 +90,27 @@ K3bAudioTrackView::K3bAudioTrackView( K3bAudioDoc* doc, TQWidget* parent, const setupColumns(); setupActions(); - m_playerItemAnimator = new K3bListViewItemAnimator( TQT_TQOBJECT(this) ); + m_playerItemAnimator = new K3bListViewItemAnimator( this ); m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotAnimation()) ); + connect( m_animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimation()) ); m_autoOpenTrackTimer = new TQTimer( this ); - connect( m_autoOpenTrackTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotDragTimeout()) ); - - connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotProperties()) ); - - connect( doc, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotChanged()) ); - connect( doc, TQT_SIGNAL(trackChanged(K3bAudioTrack*)), - this, TQT_SLOT(slotTrackChanged(K3bAudioTrack*)) ); - connect( doc, TQT_SIGNAL(trackRemoved(K3bAudioTrack*)), - this, TQT_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); + connect( m_autoOpenTrackTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragTimeout()) ); + + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotProperties()) ); + + connect( doc, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotChanged()) ); + connect( doc, TQ_SIGNAL(trackChanged(K3bAudioTrack*)), + this, TQ_SLOT(slotTrackChanged(K3bAudioTrack*)) ); + connect( doc, TQ_SIGNAL(trackRemoved(K3bAudioTrack*)), + this, TQ_SLOT(slotTrackRemoved(K3bAudioTrack*)) ); slotChanged(); @@ -155,33 +155,33 @@ void K3bAudioTrackView::setupActions() m_popupMenu = new TDEPopupMenu( this ); m_actionProperties = new TDEAction( i18n("Properties"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + TDEShortcut(), this, TQ_SLOT(slotProperties()), actionCollection(), "track_properties" ); m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), + Key_Delete, this, TQ_SLOT(slotRemove()), actionCollection(), "track_remove" ); m_actionAddSilence = new TDEAction( i18n("Add Silence") + "...", "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddSilence()), + TDEShortcut(), this, TQ_SLOT(slotAddSilence()), actionCollection(), "track_add_silence" ); m_actionMergeTracks = new TDEAction( i18n("Merge Tracks"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotMergeTracks()), + TDEShortcut(), this, TQ_SLOT(slotMergeTracks()), actionCollection(), "track_merge" ); m_actionSplitSource = new TDEAction( i18n("Source to Track"), "misc", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitSource()), + TDEShortcut(), this, TQ_SLOT(slotSplitSource()), actionCollection(), "source_split" ); m_actionSplitTrack = new TDEAction( i18n("Split Track..."), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotSplitTrack()), + TDEShortcut(), this, TQ_SLOT(slotSplitTrack()), actionCollection(), "track_split" ); m_actionEditSource = new TDEAction( i18n("Edit Source..."), 0, - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditSource()), + TDEShortcut(), this, TQ_SLOT(slotEditSource()), actionCollection(), "source_edit" ); m_actionPlayTrack = new TDEAction( i18n("Play Track"), "media-playback-start", - TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotPlayTrack()), + TDEShortcut(), this, TQ_SLOT(slotPlayTrack()), actionCollection(), "track_play" ); #ifdef HAVE_MUSICBRAINZ - TDEAction* mbAction = new TDEAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotQueryMusicBrainz()), + TDEAction* mbAction = new TDEAction( i18n("Musicbrainz Lookup"), "musicbrainz", 0, this, + TQ_SLOT(slotQueryMusicBrainz()), actionCollection(), "project_audio_musicbrainz" ); mbAction->setToolTip( i18n("Try to determine meta information over the internet") ); #endif @@ -394,7 +394,7 @@ void K3bAudioTrackView::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQL // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } @@ -451,7 +451,7 @@ K3bAudioTrackViewItem* K3bAudioTrackView::getTrackViewItem( K3bAudioTrack* track // so the user may not change the cd-text until the one from the // file is loaded. // - // Since for some reason QT thinks it's bad to open disabled items + // Since for some reason TQt thinks it's bad to open disabled items // we need to open it before disabling it // newItem->showSources( track->numberSources() != 1 ); diff --git a/src/projects/k3baudiotrackview.h b/src/projects/k3baudiotrackview.h index f64e4ee..197c2cd 100644 --- a/src/projects/k3baudiotrackview.h +++ b/src/projects/k3baudiotrackview.h @@ -42,7 +42,7 @@ class K3bAudioTrackPlayer; class K3bAudioTrackView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp index 9c9860e..b285744 100644 --- a/src/projects/k3baudiotrackwidget.cpp +++ b/src/projects/k3baudiotrackwidget.cpp @@ -48,14 +48,14 @@ K3bAudioTrackWidget::K3bAudioTrackWidget( const TQPtrList<K3bAudioTrack>& tracks // no post-gap for the last track m_editPostGap->setDisabled( tracks.count() == 1 && !tracks.getFirst()->next() ); - K3bCdTextValidator* val = new K3bCdTextValidator( TQT_TQOBJECT(this) ); + K3bCdTextValidator* val = new K3bCdTextValidator( this ); m_editSongwriter->setValidator( val ); m_editArranger->setValidator( val ); m_editComposer->setValidator( val ); m_editMessage->setValidator( val ); m_editTitle->setValidator( val ); m_editPerformer->setValidator( val ); - m_editIsrc->setValidator( K3bValidators::isrcValidator( TQT_TQOBJECT(this) ) ); + m_editIsrc->setValidator( K3bValidators::isrcValidator( this ) ); load(); } diff --git a/src/projects/k3baudiotrackwidget.h b/src/projects/k3baudiotrackwidget.h index 6ef9eb9..ee36ed7 100644 --- a/src/projects/k3baudiotrackwidget.h +++ b/src/projects/k3baudiotrackwidget.h @@ -31,7 +31,7 @@ class K3bAudioTrack; */ class K3bAudioTrackWidget : public base_K3bAudioTrackWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index eb39b90..7c46e04 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -37,7 +37,7 @@ #include <tdeactionclasses.h> #include <k3bprojectplugin.h> -// QT-includes +// TQt includes #include <tqlayout.h> #include <tqstring.h> @@ -59,7 +59,7 @@ K3bAudioView::K3bAudioView( K3bAudioDoc* pDoc, TQWidget* parent, const char *nam fillStatusDisplay()->showTime(); // add button for the audio conversion - TDEAction* conversionAction = new TDEAction( i18n("Convert Tracks"), "edit-redo", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAudioConversion()), + TDEAction* conversionAction = new TDEAction( i18n("Convert Tracks"), "edit-redo", 0, this, TQ_SLOT(slotAudioConversion()), actionCollection(), "project_audio_convert" ); conversionAction->setToolTip( i18n("Convert audio tracks to other audio formats." ) ); diff --git a/src/projects/k3baudioview.h b/src/projects/k3baudioview.h index 92052c5..460dba8 100644 --- a/src/projects/k3baudioview.h +++ b/src/projects/k3baudioview.h @@ -33,7 +33,7 @@ class K3bAudioTrackView; */ class K3bAudioView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bbootimagedialog.h b/src/projects/k3bbootimagedialog.h index fa96a97..e89ca89 100644 --- a/src/projects/k3bbootimagedialog.h +++ b/src/projects/k3bbootimagedialog.h @@ -25,7 +25,7 @@ class K3bDataDoc; class K3bBootImageDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 85c00bd..0d7a4a9 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -79,16 +79,16 @@ K3bBootImageView::K3bBootImageView( K3bDataDoc* doc, TQWidget* parent, const cha : base_K3bBootImageView( parent, name ), m_doc(doc) { - connect( m_buttonNew, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewBootImage()) ); - connect( m_buttonDelete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeleteBootImage()) ); - connect( m_buttonToggleOptions, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotToggleOptions()) ); - connect( m_viewImages, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); - connect( m_radioNoEmulation, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotNoEmulationToggled(bool)) ); + connect( m_buttonNew, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewBootImage()) ); + connect( m_buttonDelete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeleteBootImage()) ); + connect( m_buttonToggleOptions, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotToggleOptions()) ); + connect( m_viewImages, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); + connect( m_radioNoEmulation, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotNoEmulationToggled(bool)) ); K3bIntValidator* v = new K3bIntValidator( this ); m_editLoadSegment->setValidator( v ); diff --git a/src/projects/k3bbootimageview.h b/src/projects/k3bbootimageview.h index e10819e..2e2a14e 100644 --- a/src/projects/k3bbootimageview.h +++ b/src/projects/k3bbootimageview.h @@ -25,7 +25,7 @@ class K3bBootItem; class K3bBootImageView : public base_K3bBootImageView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp index cd8af5e..fda6835 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.cpp +++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp @@ -244,14 +244,14 @@ K3bDataAdvancedImageSettingsWidget::K3bDataAdvancedImageSettingsWidget( TQWidget miscRoot->setOpen( true ); - m_comboInputCharset->setValidator( new TQRegExpValidator( TQRegExp("[\\w_-]*"), TQT_TQOBJECT(this) ) ); + m_comboInputCharset->setValidator( new TQRegExpValidator( TQRegExp("[\\w_-]*"), this ) ); // fill charset combo for( int i = 0; mkisofsCharacterSets[i]; i++ ) { m_comboInputCharset->insertItem( TQString( mkisofsCharacterSets[i] ) ); } - connect( m_checkJoliet, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotJolietToggled(bool)) ); + connect( m_checkJoliet, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotJolietToggled(bool)) ); } diff --git a/src/projects/k3bdataadvancedimagesettingswidget.h b/src/projects/k3bdataadvancedimagesettingswidget.h index b6b1be2..2cdff85 100644 --- a/src/projects/k3bdataadvancedimagesettingswidget.h +++ b/src/projects/k3bdataadvancedimagesettingswidget.h @@ -25,7 +25,7 @@ class TQCheckListItem; class K3bDataAdvancedImageSettingsWidget : public base_K3bAdvancedDataImageSettings { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index 6b0abdd..f330738 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -84,8 +84,8 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c setupSettingsTab(); - connect( m_comboMultisession, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotMultiSessionModeChanged()) ); + connect( m_comboMultisession, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotMultiSessionModeChanged()) ); m_writerSelectionWidget->setWantedMediumState( K3bDevice::STATE_EMPTY|K3bDevice::STATE_INCOMPLETE ); @@ -98,8 +98,8 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c m_tempDirSelectionWidget->setDefaultImageFileName( _doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), - m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQ_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQ_SLOT(setDefaultImageFileName(const TQString&)) ); } K3bDataBurnDialog::~K3bDataBurnDialog() @@ -157,10 +157,10 @@ void K3bDataBurnDialog::setupSettingsTab() frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); - m_groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); + m_groupDataMode = new TQGroupBox( 1, TQt::Vertical, i18n("Datatrack Mode"), frame ); m_dataModeWidget = new K3bDataModeWidget( m_groupDataMode ); - TQGroupBox* groupMultiSession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); + TQGroupBox* groupMultiSession = new TQGroupBox( 1, TQt::Vertical, i18n("Multisession Mode"), frame ); m_comboMultisession = new K3bDataMultiSessionCombobox( groupMultiSession ); frameLayout->addWidget( m_groupDataMode, 0, 0 ); diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h index 749b783..4910869 100644 --- a/src/projects/k3bdataburndialog.h +++ b/src/projects/k3bdataburndialog.h @@ -41,7 +41,7 @@ class K3bDataMultiSessionCombobox; class K3bDataBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp index f7ca4ae..64fc412 100644 --- a/src/projects/k3bdatadirtreeview.cpp +++ b/src/projects/k3bdatadirtreeview.cpp @@ -89,15 +89,15 @@ K3bDataDirTreeView::K3bDataDirTreeView( K3bView* view, K3bDataDoc* doc, TQWidget m_root = new K3bDataRootViewItem( doc, this ); m_itemMap.insert( doc->root(), m_root ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(TDEListView*,TQListViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( m_doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotDocChanged()) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( m_doc, TQ_SIGNAL(itemRemoved(K3bDataItem*)), this, TQ_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQ_SIGNAL(itemAdded(K3bDataItem*)), this, TQ_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(showPopupMenu(TDEListView*,TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); setupActions(); } @@ -207,7 +207,7 @@ void K3bDataDirTreeView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListVie // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } } @@ -280,24 +280,24 @@ void K3bDataDirTreeView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, this, TQ_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, this, TQ_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, this, TQ_SLOT(slotRemoveItem()), actionCollection(), "remove" ); TDEShortcut renameShortCut( Key_F2 ); renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, this, TQ_SLOT(slotRenameItem()), actionCollection(), "rename" ); m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } @@ -393,7 +393,7 @@ void K3bDataDirTreeView::startDropAnimation( K3bDirItem* dir ) d->animationCounter = 0; d->animatedDirItem = vI; d->beforeAniPixmap = TQPixmap( *vI->pixmap(0) ); - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotDropAnimate()) ); } } @@ -426,7 +426,7 @@ void K3bDataDirTreeView::slotDropAnimate() } d->animationCounter++; - TQTimer::singleShot( 300, TQT_TQOBJECT(this), TQT_SLOT(slotDropAnimate()) ); + TQTimer::singleShot( 300, this, TQ_SLOT(slotDropAnimate()) ); } } } diff --git a/src/projects/k3bdatadirtreeview.h b/src/projects/k3bdatadirtreeview.h index dd9f543..788613d 100644 --- a/src/projects/k3bdatadirtreeview.h +++ b/src/projects/k3bdatadirtreeview.h @@ -43,7 +43,7 @@ class TQDragLeaveEvent; class K3bDataDirTreeView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp index 634e26b..69d4a2d 100644 --- a/src/projects/k3bdatafileview.cpp +++ b/src/projects/k3bdatafileview.cpp @@ -79,16 +79,16 @@ K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView m_currentDir = doc->root(); checkForNewItems(); - connect( m_treeView, TQT_SIGNAL(dirSelected(K3bDirItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotSetCurrentDir(K3bDirItem*)) ); - connect( m_doc, TQT_SIGNAL(itemRemoved(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotDataItemRemoved(K3bDataItem*)) ); - connect( m_doc, TQT_SIGNAL(itemAdded(K3bDataItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotItemAdded(K3bDataItem*)) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) ); + connect( m_treeView, TQ_SIGNAL(dirSelected(K3bDirItem*)), this, TQ_SLOT(slotSetCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQ_SIGNAL(itemRemoved(K3bDataItem*)), this, TQ_SLOT(slotDataItemRemoved(K3bDataItem*)) ); + connect( m_doc, TQ_SIGNAL(itemAdded(K3bDataItem*)), this, TQ_SLOT(slotItemAdded(K3bDataItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(showPopupMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)) ); setupActions(); } @@ -289,7 +289,7 @@ void K3bDataFileView::slotDropped( TQDropEvent* e, TQListViewItem*, TQListViewIt // event queues: the url adding dialog will be non-modal regardless of // the settings in case we open it directly. // - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } } @@ -319,32 +319,32 @@ void K3bDataFileView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + m_actionProperties = new TDEAction( i18n("Properties"), "misc", 0, this, TQ_SLOT(slotProperties()), actionCollection(), "properties" ); - m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotNewDir()), + m_actionNewDir = new TDEAction( i18n("New Directory..."), "folder-new", CTRL+Key_N, this, TQ_SLOT(slotNewDir()), actionCollection(), "new_dir" ); - m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()), + m_actionRemove = new TDEAction( i18n("Remove"), "edit-delete", Key_Delete, this, TQ_SLOT(slotRemoveItem()), actionCollection(), "remove" ); TDEShortcut renameShortCut( Key_F2 ); renameShortCut.append( TDEShortcut(CTRL+Key_R) ); // backwards compatibility - m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, TQT_TQOBJECT(this), TQT_SLOT(slotRenameItem()), + m_actionRename = new TDEAction( i18n("Rename"), "edit", renameShortCut, this, TQ_SLOT(slotRenameItem()), actionCollection(), "rename" ); - m_actionParentDir = new TDEAction( i18n("Parent Directory"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotParentDir()), + m_actionParentDir = new TDEAction( i18n("Parent Directory"), "go-up", 0, this, TQ_SLOT(slotParentDir()), actionCollection(), "parent_dir" ); - m_actionOpen = new TDEAction( i18n("Open"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpen()), + m_actionOpen = new TDEAction( i18n("Open"), "document-open", 0, this, TQ_SLOT(slotOpen()), actionCollection(), "open" ); m_popupMenu = new TDEActionMenu( m_actionCollection, "contextMenu" ); m_popupMenu->insert( m_actionParentDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionRename ); m_popupMenu->insert( m_actionRemove ); m_popupMenu->insert( m_actionNewDir ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionOpen ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_actionProperties ); - m_popupMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); + m_popupMenu->insert( new TDEActionSeparator( this ) ); m_popupMenu->insert( m_view->actionCollection()->action("project_burn") ); } diff --git a/src/projects/k3bdatafileview.h b/src/projects/k3bdatafileview.h index 8775aba..9c4cd06 100644 --- a/src/projects/k3bdatafileview.h +++ b/src/projects/k3bdatafileview.h @@ -46,7 +46,7 @@ class TQDragLeaveEvent; class K3bDataFileView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp index 08cda53..5371c89 100644 --- a/src/projects/k3bdataimagesettingswidget.cpp +++ b/src/projects/k3bdataimagesettingswidget.cpp @@ -176,12 +176,12 @@ K3bDataImageSettingsWidget::K3bDataImageSettingsWidget( TQWidget* parent, const m_customFsDlg = new CustomFilesystemsDialog( this ); m_volDescDlg = new VolumeDescDialog( this ); - connect( m_buttonCustomFilesystems, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCustomFilesystems()) ); - connect( m_buttonMoreVolDescFields, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMoreVolDescFields()) ); - connect( m_comboSpaceHandling, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSpaceHandlingChanged(int)) ); + connect( m_buttonCustomFilesystems, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCustomFilesystems()) ); + connect( m_buttonMoreVolDescFields, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMoreVolDescFields()) ); + connect( m_comboSpaceHandling, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSpaceHandlingChanged(int)) ); for( int i = 0; i < FS_MAX; ++i ) m_comboFilesystems->insertItem( i18n( s_fsPresetNames[i] ) ); diff --git a/src/projects/k3bdataimagesettingswidget.h b/src/projects/k3bdataimagesettingswidget.h index 4d54baf..ebb232a 100644 --- a/src/projects/k3bdataimagesettingswidget.h +++ b/src/projects/k3bdataimagesettingswidget.h @@ -24,7 +24,7 @@ class K3bIsoOptions; class K3bDataImageSettingsWidget : public base_K3bDataImageSettings { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h index 704f61c..cbb9142 100644 --- a/src/projects/k3bdatamultisessioncombobox.h +++ b/src/projects/k3bdatamultisessioncombobox.h @@ -24,7 +24,7 @@ class TDEConfigBase; class K3bDataMultiSessionCombobox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 970d607..fdf4faa 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -167,7 +167,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge sortingBoxGrid->setSpacing( spacingHint() ); sortingBoxGrid->setMargin( marginHint() ); m_editSortWeight = new KLineEdit( sortingBox ); - m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, TQT_TQOBJECT(m_editSortWeight) ) ); + m_editSortWeight->setValidator( new TQIntValidator( -2147483647, 2147483647, m_editSortWeight ) ); m_editSortWeight->setAlignment( TQt::AlignRight ); sortingBoxGrid->addWidget( new TQLabel( i18n("Sort weight:"), sortingBox ), 0, 0 ); sortingBoxGrid->addWidget( m_editSortWeight, 0, 1 ); @@ -222,7 +222,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge "It sorts the order in which the file data is " "written to the image.") ); - m_editName->setValidator( K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ) ); + m_editName->setValidator( K3bValidators::iso9660Validator( false, this ) ); m_editName->setReadOnly( !dataItem->isRenameable() ); m_editName->setFocus(); } diff --git a/src/projects/k3bdatapropertiesdialog.h b/src/projects/k3bdatapropertiesdialog.h index 55b5ec1..24498e7 100644 --- a/src/projects/k3bdatapropertiesdialog.h +++ b/src/projects/k3bdatapropertiesdialog.h @@ -32,7 +32,7 @@ class TQCheckBox; */ class K3bDataPropertiesDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/src/projects/k3bdatasessionimportdialog.cpp b/src/projects/k3bdatasessionimportdialog.cpp index 6ccaec2..b994841 100644 --- a/src/projects/k3bdatasessionimportdialog.cpp +++ b/src/projects/k3bdatasessionimportdialog.cpp @@ -42,8 +42,8 @@ K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* parent ) m_comboMedia = new K3bMediaSelectionComboBox( this ); setMainWidget( m_comboMedia ); - connect( m_comboMedia, TQT_SIGNAL(selectionChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); + connect( m_comboMedia, TQ_SIGNAL(selectionChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotSelectionChanged(K3bDevice::Device*)) ); } diff --git a/src/projects/k3bdatasessionimportdialog.h b/src/projects/k3bdatasessionimportdialog.h index 4cfb6de..2f8416e 100644 --- a/src/projects/k3bdatasessionimportdialog.h +++ b/src/projects/k3bdatasessionimportdialog.h @@ -32,7 +32,7 @@ class K3bMediaSelectionComboBox; class K3bDataSessionImportDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index b110a6d..a3c84be 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -91,9 +91,9 @@ K3bDataUrlAddingDialog::K3bDataUrlAddingDialog( K3bDataDoc* doc, TQWidget* paren grid->addWidget( m_infoLabel, 0, 0 ); grid->addMultiCellWidget( m_progressWidget, 1, 1, 0, 1 ); - m_dirSizeJob = new K3bDirSizeJob( TQT_TQOBJECT(this) ); - connect( m_dirSizeJob, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(slotDirSizeDone(bool)) ); + m_dirSizeJob = new K3bDirSizeJob( this ); + connect( m_dirSizeJob, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(slotDirSizeDone(bool)) ); // try to start with a reasonable size resize( (int)( fontMetrics().width( caption() ) * 1.5 ), sizeHint().height() ); @@ -141,7 +141,7 @@ int K3bDataUrlAddingDialog::addUrls( const KURL::List& urls, 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 ) ); + dlg.m_urlQueue.append( qMakePair( K3b::convertToLocalUrl(*it), dir ) ); dlg.slotAddUrls(); int ret = TQDialog::Accepted; @@ -226,7 +226,7 @@ int K3bDataUrlAddingDialog::copyMoveItems( const TQValueList<K3bDataItem*>& item dlg.m_copyItems = copy; for( TQValueList<K3bDataItem*>::const_iterator it = items.begin(); it != items.end(); ++it ) { - dlg.m_items.append( tqMakePair( *it, dir ) ); + dlg.m_items.append( qMakePair( *it, dir ) ); ++dlg.m_totalFiles; if( (*it)->isDir() ) { dlg.m_totalFiles += static_cast<K3bDirItem*>( *it )->numFiles(); @@ -568,7 +568,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() dlist.remove( dotdot ); for( TQStringList::Iterator it = dlist.begin(); it != dlist.end(); ++it ) { - m_urlQueue.append( tqMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) ); + m_urlQueue.append( qMakePair( KURL::fromPathOrURL(absFilePath + '/' + *it), newDirItem ) ); } } else { @@ -583,7 +583,7 @@ void K3bDataUrlAddingDialog::slotAddUrls() } else { updateProgress(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotAddUrls()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAddUrls()) ); } } @@ -625,7 +625,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() if( oldItem->isDir() && item->isDir() ) { const TQPtrList<K3bDataItem>& cl = dynamic_cast<K3bDirItem*>( item )->children(); for( TQPtrListIterator<K3bDataItem> it( cl ); *it; ++it ) - m_items.append( tqMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); + m_items.append( qMakePair( *it, dynamic_cast<K3bDirItem*>( oldItem ) ) ); // FIXME: we need to remove the old dir item } @@ -736,7 +736,7 @@ void K3bDataUrlAddingDialog::slotCopyMoveItems() } else { updateProgress(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotCopyMoveItems()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotCopyMoveItems()) ); } } @@ -745,7 +745,7 @@ bool K3bDataUrlAddingDialog::getNewName( const TQString& oldName, K3bDirItem* di { bool ok = true; newName = oldName; - TQValidator* validator = K3bValidators::iso9660Validator( false, TQT_TQOBJECT(this) ); + TQValidator* validator = K3bValidators::iso9660Validator( false, this ); do { newName = KInputDialog::getText( i18n("Enter New Filename"), i18n("A file with that name already exists. Please enter a new name:"), diff --git a/src/projects/k3bdataurladdingdialog.h b/src/projects/k3bdataurladdingdialog.h index 4a6b081..2788428 100644 --- a/src/projects/k3bdataurladdingdialog.h +++ b/src/projects/k3bdataurladdingdialog.h @@ -33,7 +33,7 @@ class K3bDataDoc; class K3bDataUrlAddingDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index e42a966..c3f48ed 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -66,22 +66,22 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) setMainWidget( mainSplitter ); - connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), - m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( m_dataFileView, TQ_SIGNAL(dirSelected(K3bDirItem*)), + m_dataDirTree, TQ_SLOT(setCurrentDir(K3bDirItem*)) ); + connect( m_doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotDocChanged()) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); // the data actions - TDEAction* actionImportSession = new TDEAction(i18n("&Import Session..."), "gear", 0, TQT_TQOBJECT(this), TQT_SLOT(importSession()), + TDEAction* actionImportSession = new TDEAction(i18n("&Import Session..."), "gear", 0, this, TQ_SLOT(importSession()), actionCollection(), "project_data_import_session" ); - TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, TQT_TQOBJECT(this), - TQT_SLOT(clearImportedSession()), actionCollection(), + TDEAction* actionClearSession = new TDEAction(i18n("&Clear Imported Session"), "gear", 0, this, + TQ_SLOT(clearImportedSession()), actionCollection(), "project_data_clear_imported_session" ); - TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "application-x-cda", 0, TQT_TQOBJECT(this), - TQT_SLOT(editBootImages()), actionCollection(), + TDEAction* actionEditBootImages = new TDEAction(i18n("&Edit Boot Images..."), "application-x-cda", 0, this, + TQ_SLOT(editBootImages()), actionCollection(), "project_data_edit_boot_images" ); actionImportSession->setToolTip( i18n("Import a previously burned session into the current project") ); @@ -100,13 +100,13 @@ K3bDataView::K3bDataView(K3bDataDoc* doc, TQWidget *parent, const char *name ) toolBox()->addStretch(); m_volumeIDEdit = new TQLineEdit( doc->isoOptions().volumeID(), toolBox() ); - m_volumeIDEdit->setValidator( new K3bLatin1Validator( TQT_TQOBJECT(m_volumeIDEdit) ) ); + m_volumeIDEdit->setValidator( new K3bLatin1Validator( m_volumeIDEdit ) ); toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); - connect( m_volumeIDEdit, TQT_SIGNAL(textChanged(const TQString&)), + connect( m_volumeIDEdit, TQ_SIGNAL(textChanged(const TQString&)), m_doc, - TQT_SLOT(setVolumeID(const TQString&)) ); + TQ_SLOT(setVolumeID(const TQString&)) ); // this is just for testing (or not?) // most likely every project type will have it's rc file in the future diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h index 1291643..ad8576a 100644 --- a/src/projects/k3bdataview.h +++ b/src/projects/k3bdataview.h @@ -42,7 +42,7 @@ namespace K3bDevice { */ class K3bDataView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdatavolumedescwidget.cpp b/src/projects/k3bdatavolumedescwidget.cpp index 580fed6..1824096 100644 --- a/src/projects/k3bdatavolumedescwidget.cpp +++ b/src/projects/k3bdatavolumedescwidget.cpp @@ -29,7 +29,7 @@ K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* parent, const char* { // the maximal number of characters that can be inserted are set in the ui file! - TQValidator* isoValidator = new K3bLatin1Validator( TQT_TQOBJECT(this) ); + TQValidator* isoValidator = new K3bLatin1Validator( this ); m_editVolumeName->setValidator( isoValidator ); m_editVolumeSetName->setValidator( isoValidator ); @@ -38,8 +38,8 @@ K3bDataVolumeDescWidget::K3bDataVolumeDescWidget( TQWidget* parent, const char* m_editSystem->setValidator( isoValidator ); m_editApplication->setValidator( isoValidator ); - connect( m_spinVolumeSetSize, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotVolumeSetSizeChanged(int)) ); + connect( m_spinVolumeSetSize, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotVolumeSetSizeChanged(int)) ); // for now we hide the volume set size stuff since it's not working anymore in mkisofs 2.01a34 textLabel1->hide(); diff --git a/src/projects/k3bdatavolumedescwidget.h b/src/projects/k3bdatavolumedescwidget.h index 9c94345..3337c18 100644 --- a/src/projects/k3bdatavolumedescwidget.h +++ b/src/projects/k3bdatavolumedescwidget.h @@ -24,7 +24,7 @@ class K3bIsoOptions; class K3bDataVolumeDescWidget : public base_K3bDataVolumeDescWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index 3fccbed..39c64a0 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -77,8 +77,8 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char m_tempDirSelectionWidget->setDefaultImageFileName( doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), - m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQ_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQ_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -96,7 +96,7 @@ void K3bDvdBurnDialog::setupSettingsTab() // Multisession // //////////////////////////////////////////////////////////////////////// - TQGroupBox* groupMultiSession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession Mode"), frame ); + TQGroupBox* groupMultiSession = new TQGroupBox( 1, TQt::Vertical, i18n("Multisession Mode"), frame ); m_comboMultisession = new K3bDataMultiSessionCombobox( groupMultiSession ); frameLayout->addWidget( groupMultiSession, 0, 0 ); @@ -104,8 +104,8 @@ void K3bDvdBurnDialog::setupSettingsTab() addPage( frame, i18n("Misc") ); - connect( m_comboMultisession, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotMultiSessionModeChanged()) ); + connect( m_comboMultisession, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotMultiSessionModeChanged()) ); } diff --git a/src/projects/k3bdvdburndialog.h b/src/projects/k3bdvdburndialog.h index 69387b3..4fdebfd 100644 --- a/src/projects/k3bdvdburndialog.h +++ b/src/projects/k3bdvdburndialog.h @@ -31,7 +31,7 @@ class K3bDataMultiSessionCombobox; class K3bDvdBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bdvdview.h b/src/projects/k3bdvdview.h index 8e5804c..9fb5c6f 100644 --- a/src/projects/k3bdvdview.h +++ b/src/projects/k3bdvdview.h @@ -24,7 +24,7 @@ class K3bDvdDoc; class K3bDvdView : public K3bDataView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 3f3f9b8..9dfd1eb 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -118,7 +118,7 @@ TQSize K3bFillStatusDisplayWidget::minimumSizeHint() const void K3bFillStatusDisplayWidget::mousePressEvent( TQMouseEvent* e ) { - if( e->button() == Qt::RightButton ) + if( e->button() == TQt::RightButton ) emit contextMenu( e->globalPos() ); } @@ -129,7 +129,7 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) TQPixmap buffer( size() ); buffer.fill( colorGroup().base() ); TQPainter p; - p.begin( &buffer, TQT_TQOBJECT(this) ); + p.begin( &buffer, this ); p.setPen( TQt::black ); // we use a fixed bar color (which is not very nice btw, so we also fix the text color) long long docSize; @@ -344,7 +344,7 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const // d->buttonMenu->setIconSet( SmallIconSet("media-optical-cdrom-unmounted") ); // d->buttonMenu->setAutoRaise(true); // TQToolTip::add( d->buttonMenu, i18n("Fill display properties") ); -// connect( d->buttonMenu, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotMenuButtonClicked()) ); +// connect( d->buttonMenu, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMenuButtonClicked()) ); TQGridLayout* layout = new TQGridLayout( this ); layout->setSpacing(5); @@ -357,10 +357,10 @@ K3bFillStatusDisplay::K3bFillStatusDisplay( K3bDoc* doc, TQWidget *parent, const showDvdSizes( false ); - connect( d->doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); - connect( &d->updateTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDisplay()) ); - connect( k3bappcore->mediaCache(), TQT_SIGNAL(mediumChanged(K3bDevice::Device*)), - this, TQT_SLOT(slotMediumChanged(K3bDevice::Device*)) ); + connect( d->doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotDocChanged()) ); + connect( &d->updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateDisplay()) ); + connect( k3bappcore->mediaCache(), TQ_SIGNAL(mediumChanged(K3bDevice::Device*)), + this, TQ_SLOT(slotMediumChanged(K3bDevice::Device*)) ); } K3bFillStatusDisplay::~K3bFillStatusDisplay() @@ -378,32 +378,32 @@ void K3bFillStatusDisplay::setupPopupMenu() d->popup = new TDEPopupMenu( this, "popup" ); d->dvdPopup = new TDEPopupMenu( this, "dvdpopup" ); - d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showTime()), + d->actionShowMinutes = new TDERadioAction( i18n("Minutes"), 0, this, TQ_SLOT(showTime()), d->actionCollection, "fillstatus_show_minutes" ); - d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, TQT_TQOBJECT(this), TQT_SLOT(showSize()), + d->actionShowMegs = new TDERadioAction( i18n("Megabytes"), 0, this, TQ_SLOT(showSize()), d->actionCollection, "fillstatus_show_megabytes" ); d->actionShowMegs->setExclusiveGroup( "show_size_in" ); d->actionShowMinutes->setExclusiveGroup( "show_size_in" ); - d->actionAuto = new TDERadioAction( i18n("Auto"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSize()), + d->actionAuto = new TDERadioAction( i18n("Auto"), 0, this, TQ_SLOT(slotAutoSize()), d->actionCollection, "fillstatus_auto" ); - d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, TQT_TQOBJECT(this), TQT_SLOT(slot74Minutes()), + d->action74Min = new TDERadioAction( i18n("%1 MB").arg(650), 0, this, TQ_SLOT(slot74Minutes()), d->actionCollection, "fillstatus_74minutes" ); - d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, TQT_TQOBJECT(this), TQT_SLOT(slot80Minutes()), + d->action80Min = new TDERadioAction( i18n("%1 MB").arg(700), 0, this, TQ_SLOT(slot80Minutes()), d->actionCollection, "fillstatus_80minutes" ); - d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), + d->action100Min = new TDERadioAction( i18n("%1 MB").arg(880), 0, this, TQ_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); - d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), + d->actionDvd4_7GB = new TDERadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, this, TQ_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); d->actionDvdDoubleLayer = new TDERadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()), + 0, this, TQ_SLOT(slotDvdDoubleLayer()), d->actionCollection, "fillstatus_dvd_double_layer" ); - d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), + d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, this, TQ_SLOT(slotCustomSize()), d->actionCollection, "fillstatus_custom_size" ); d->actionCustomSize->setAlwaysEmitActivated(true); d->actionDetermineSize = new K3bRadioAction( i18n("From Medium..."), "media-optical-cdrom-unmounted", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotDetermineSize()), + this, TQ_SLOT(slotDetermineSize()), d->actionCollection, "fillstatus_size_from_disk" ); d->actionDetermineSize->setAlwaysEmitActivated(true); @@ -417,14 +417,14 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionDetermineSize->setExclusiveGroup( "cd_size" ); d->actionLoadUserDefaults = new TDEAction( i18n("User Defaults"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotLoadUserDefaults()), + this, TQ_SLOT(slotLoadUserDefaults()), d->actionCollection, "load_user_defaults" ); d->actionSaveUserDefaults = new TDEAction( i18n("Save User Defaults"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotSaveUserDefaults()), + this, TQ_SLOT(slotSaveUserDefaults()), d->actionCollection, "save_user_defaults" ); TDEAction* dvdSizeInfoAction = new TDEAction( i18n("Why 4.4 instead of 4.7?"), "", 0, - TQT_TQOBJECT(this), TQT_SLOT(slotWhy44()), + this, TQ_SLOT(slotWhy44()), d->actionCollection, "why_44_gb" ); d->popup->insertTitle( i18n("Show Size In") ); @@ -452,7 +452,7 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionLoadUserDefaults->plug( d->dvdPopup ); d->actionSaveUserDefaults->plug( d->dvdPopup ); - connect( d->displayWidget, TQT_SIGNAL(contextMenu(const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(slotPopupMenu(const TQPoint&)) ); + connect( d->displayWidget, TQ_SIGNAL(contextMenu(const TQPoint&)), this, TQ_SLOT(slotPopupMenu(const TQPoint&)) ); } @@ -551,7 +551,7 @@ void K3bFillStatusDisplay::slotCustomSize() d->showDvdSizes ? TQString("4%14%2").arg(TDEGlobal::locale()->decimalSymbol()).arg(gbS) : (d->showTime ? TQString("74")+minS : TQString("650")+mbS), &ok, this, (const char*)0, - new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) ); + new TQRegExpValidator( rx, this ) ); if( ok ) { // determine size if( rx.exactMatch( size ) ) { diff --git a/src/projects/k3bfillstatusdisplay.h b/src/projects/k3bfillstatusdisplay.h index 95f0940..2149ce6 100644 --- a/src/projects/k3bfillstatusdisplay.h +++ b/src/projects/k3bfillstatusdisplay.h @@ -44,7 +44,7 @@ namespace K3b { */ class K3bFillStatusDisplayWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -75,7 +75,7 @@ class K3bFillStatusDisplayWidget : public TQWidget class K3bFillStatusDisplay : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 43b798d..333a856 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -83,10 +83,10 @@ K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, cons TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); m_optionGroupLayout->addItem( spacer ); - connect( m_checkNormalize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNormalizeToggled(bool)) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCacheImageToggled(bool)) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_checkNormalize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotNormalizeToggled(bool)) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCacheImageToggled(bool)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); } @@ -94,13 +94,13 @@ void K3bMixedBurnDialog::setupSettingsPage() { TQWidget* w = new TQWidget( this ); - TQGroupBox* groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), w ); + TQGroupBox* groupDataMode = new TQGroupBox( 1, TQt::Vertical, i18n("Datatrack Mode"), w ); m_dataModeWidget = new K3bDataModeWidget( groupDataMode ); - TQGroupBox* groupNormalize = new TQGroupBox( 1, Qt::Vertical, i18n("Misc"), w ); + TQGroupBox* groupNormalize = new TQGroupBox( 1, TQt::Vertical, i18n("Misc"), w ); m_checkNormalize = K3bStdGuiItems::normalizeCheckBox( groupNormalize ); - TQGroupBox* groupMixedType = new TQGroupBox( 1, Qt::Vertical, i18n("Mixed Mode Type"), w ); + TQGroupBox* groupMixedType = new TQGroupBox( 1, TQt::Vertical, i18n("Mixed Mode Type"), w ); m_comboMixedModeType = new K3bIntMapComboBox( groupMixedType ); m_comboMixedModeType->insertItem( K3bMixedDoc::DATA_SECOND_SESSION, diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h index fc9a229..fafb4b3 100644 --- a/src/projects/k3bmixedburndialog.h +++ b/src/projects/k3bmixedburndialog.h @@ -36,7 +36,7 @@ class K3bIntMapComboBox; */ class K3bMixedBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp index 153ee89..86187c8 100644 --- a/src/projects/k3bmixeddirtreeview.cpp +++ b/src/projects/k3bmixeddirtreeview.cpp @@ -57,9 +57,9 @@ K3bMixedDirTreeView::K3bMixedDirTreeView( K3bView* view, K3bMixedDoc* doc, TQWid { m_audioRootItem = new PrivateAudioRootViewItem( doc, this, root() ); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( m_doc->audioDoc(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotNewAudioTracks()) ); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( m_doc->audioDoc(), TQ_SIGNAL(changed()), this, TQ_SLOT(slotNewAudioTracks()) ); } diff --git a/src/projects/k3bmixeddirtreeview.h b/src/projects/k3bmixeddirtreeview.h index 88735b2..958566c 100644 --- a/src/projects/k3bmixeddirtreeview.h +++ b/src/projects/k3bmixeddirtreeview.h @@ -28,7 +28,7 @@ class TQListViewItem; class K3bMixedDirTreeView : public K3bDataDirTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp index ee1b4f4..315b674 100644 --- a/src/projects/k3bmixedview.cpp +++ b/src/projects/k3bmixedview.cpp @@ -56,10 +56,10 @@ K3bMixedView::K3bMixedView( K3bMixedDoc* doc, TQWidget* parent, const char* name setMainWidget( splitter ); - connect( m_mixedDirTreeView, TQT_SIGNAL(audioTreeSelected()), - this, TQT_SLOT(slotAudioTreeSelected()) ); - connect( m_mixedDirTreeView, TQT_SIGNAL(dataTreeSelected()), - this, TQT_SLOT(slotDataTreeSelected()) ); + connect( m_mixedDirTreeView, TQ_SIGNAL(audioTreeSelected()), + this, TQ_SLOT(slotAudioTreeSelected()) ); + connect( m_mixedDirTreeView, TQ_SIGNAL(dataTreeSelected()), + this, TQ_SLOT(slotDataTreeSelected()) ); m_widgetStack->raiseWidget( m_dataFileView ); diff --git a/src/projects/k3bmixedview.h b/src/projects/k3bmixedview.h index f537334..5d07d2d 100644 --- a/src/projects/k3bmixedview.h +++ b/src/projects/k3bmixedview.h @@ -32,7 +32,7 @@ class K3bAudioTrackPlayer; class K3bMixedView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index a5ae170..1372df0 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -79,8 +79,8 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, cons m_tempDirSelectionWidget->setDefaultImageFileName( m_doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), - m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQ_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQ_SLOT(setDefaultImageFileName(const TQString&)) ); } @@ -96,10 +96,10 @@ void K3bMovixBurnDialog::setupSettingsPage() frameLayout->setSpacing( spacingHint() ); frameLayout->setMargin( marginHint() ); - TQGroupBox* groupDataMode = new TQGroupBox( 1, Qt::Vertical, i18n("Datatrack Mode"), frame ); + TQGroupBox* groupDataMode = new TQGroupBox( 1, TQt::Vertical, i18n("Datatrack Mode"), frame ); m_dataModeWidget = new K3bDataModeWidget( groupDataMode ); - TQGroupBox* groupMultisession = new TQGroupBox( 1, Qt::Vertical, i18n("Multisession"), frame ); + TQGroupBox* groupMultisession = new TQGroupBox( 1, TQt::Vertical, i18n("Multisession"), frame ); m_checkStartMultiSesssion = K3bStdGuiItems::startMultisessionCheckBox( groupMultisession ); frameLayout->addWidget( groupDataMode, 0, 0 ); diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h index 1be5d69..52601c7 100644 --- a/src/projects/k3bmovixburndialog.h +++ b/src/projects/k3bmovixburndialog.h @@ -29,7 +29,7 @@ class K3bDataModeWidget; class K3bMovixBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index c17bc7d..60652be 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -79,8 +79,8 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* par m_tempDirSelectionWidget->setDefaultImageFileName( m_doc->isoOptions().volumeID() + ".iso" ); } - connect( m_imageSettingsWidget->m_editVolumeName, TQT_SIGNAL(textChanged(const TQString&)), - m_tempDirSelectionWidget, TQT_SLOT(setDefaultImageFileName(const TQString&)) ); + connect( m_imageSettingsWidget->m_editVolumeName, TQ_SIGNAL(textChanged(const TQString&)), + m_tempDirSelectionWidget, TQ_SLOT(setDefaultImageFileName(const TQString&)) ); } diff --git a/src/projects/k3bmovixdvdburndialog.h b/src/projects/k3bmovixdvdburndialog.h index 7210389..8ea5b9c 100644 --- a/src/projects/k3bmovixdvdburndialog.h +++ b/src/projects/k3bmovixdvdburndialog.h @@ -28,7 +28,7 @@ class TQCheckBox; class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixdvdview.h b/src/projects/k3bmovixdvdview.h index c2c8b50..9ea56c5 100644 --- a/src/projects/k3bmovixdvdview.h +++ b/src/projects/k3bmovixdvdview.h @@ -24,7 +24,7 @@ class K3bMovixDvdDoc; class K3bMovixDvdView : public K3bMovixView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 2c9deda..2376260 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -189,12 +189,12 @@ K3bMovixListView::K3bMovixListView( K3bMovixDoc* doc, TQWidget* parent, const ch + i18n("To remove or rename files use the context menu.") + "\n" + i18n("After that press the burn button to write the CD.") ); - connect( m_doc, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); - connect( m_doc, TQT_SIGNAL(newMovixFileItems()), this, TQT_SLOT(slotNewFileItems()) ); - connect( m_doc, TQT_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); - connect( m_doc, TQT_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQT_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); - connect( this, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*, TQDropEvent*, TQListViewItem*)) ); + connect( m_doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotChanged()) ); + connect( m_doc, TQ_SIGNAL(newMovixFileItems()), this, TQ_SLOT(slotNewFileItems()) ); + connect( m_doc, TQ_SIGNAL(movixItemRemoved(K3bMovixFileItem*)), this, TQ_SLOT(slotFileItemRemoved(K3bMovixFileItem*)) ); + connect( m_doc, TQ_SIGNAL(subTitleItemRemoved(K3bMovixFileItem*)), this, TQ_SLOT(slotSubTitleItemRemoved(K3bMovixFileItem*)) ); + connect( this, TQ_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*, TQDropEvent*, TQListViewItem*)) ); // let's see what the doc already has slotNewFileItems(); diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index c2b4005..8ac9bf9 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -73,7 +73,7 @@ class K3bMovixSubTitleViewItem : public K3bMovixListViewItem, public KFileItem class K3bMovixListView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h index d589622..43aa833 100644 --- a/src/projects/k3bmovixoptionswidget.h +++ b/src/projects/k3bmovixoptionswidget.h @@ -26,7 +26,7 @@ class TDEConfigBase; class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 959c3d7..45abf19 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -45,22 +45,22 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name m_listView = new K3bMovixListView( m_doc, this ); setMainWidget( m_listView ); - connect( m_listView, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint& , int )), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint& , int )) ); + connect( m_listView, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint& , int )), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint& , int )) ); // setup actions m_actionProperties = new TDEAction( i18n("Properties"), "misc", - 0, TQT_TQOBJECT(this), TQT_SLOT(showPropertiesDialog()), + 0, this, TQ_SLOT(showPropertiesDialog()), actionCollection(), "movix_show_props" ); m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", - Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItems()), + Key_Delete, this, TQ_SLOT(slotRemoveItems()), actionCollection(), "movix_remove_item" ); m_actionRemoveSubTitle = new TDEAction( i18n( "Remove Subtitle File" ), "edit-delete", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveSubTitleItems()), + 0, this, TQ_SLOT(slotRemoveSubTitleItems()), actionCollection(), "movix_remove_subtitle_item" ); m_actionAddSubTitle = new TDEAction( i18n("Add Subtitle File..."), "", - 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSubTitleFile()), + 0, this, TQ_SLOT(slotAddSubTitleFile()), actionCollection(), "movix_add_subtitle" ); m_popupMenu = new TDEPopupMenu( this ); @@ -81,11 +81,11 @@ K3bMovixView::K3bMovixView( K3bMovixDoc* doc, TQWidget* parent, const char* name toolBox()->addLabel( i18n("Volume Name:") ); toolBox()->addSpacing(); toolBox()->addWidget( m_volumeIDEdit ); - connect( m_volumeIDEdit, TQT_SIGNAL(textChanged(const TQString&)), + connect( m_volumeIDEdit, TQ_SIGNAL(textChanged(const TQString&)), m_doc, - TQT_SLOT(setVolumeID(const TQString&)) ); + TQ_SLOT(setVolumeID(const TQString&)) ); - connect( m_doc, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotDocChanged()) ); + connect( m_doc, TQ_SIGNAL(changed()), this, TQ_SLOT(slotDocChanged()) ); } diff --git a/src/projects/k3bmovixview.h b/src/projects/k3bmovixview.h index 4f29c91..7fba393 100644 --- a/src/projects/k3bmovixview.h +++ b/src/projects/k3bmovixview.h @@ -31,7 +31,7 @@ class TQLineEdit; class K3bMovixView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp index 0a6ca8d..dffc54a 100644 --- a/src/projects/k3bmusicbrainzjob.cpp +++ b/src/projects/k3bmusicbrainzjob.cpp @@ -154,7 +154,7 @@ void K3bMusicBrainzJob::MusicBrainzThread::run() // 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 ), + : K3bJob( new K3bSimpleJobHandler( 0 ), parent, name ), m_canceled( false ) { m_trmThread = new TRMThread(); @@ -162,10 +162,10 @@ K3bMusicBrainzJob::K3bMusicBrainzJob( TQWidget* parent, const char* name ) m_trmJob = new K3bThreadJob( m_trmThread, this, this ); m_mbJob = new K3bThreadJob( m_mbThread, this, this ); - connect( m_trmJob, TQT_SIGNAL(percent(int)), this, TQT_SIGNAL(subPercent(int)) ); - connect( m_trmJob, TQT_SIGNAL(percent(int)), this, TQT_SLOT(slotTrmPercent(int)) ); - connect( m_trmJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotTrmJobFinished(bool)) ); - connect( m_mbJob, TQT_SIGNAL(finished(bool)), this, TQT_SLOT(slotMbJobFinished(bool)) ); + connect( m_trmJob, TQ_SIGNAL(percent(int)), this, TQ_SIGNAL(subPercent(int)) ); + connect( m_trmJob, TQ_SIGNAL(percent(int)), this, TQ_SLOT(slotTrmPercent(int)) ); + connect( m_trmJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotTrmJobFinished(bool)) ); + connect( m_mbJob, TQ_SIGNAL(finished(bool)), this, TQ_SLOT(slotMbJobFinished(bool)) ); } diff --git a/src/projects/k3bmusicbrainzjob.h b/src/projects/k3bmusicbrainzjob.h index 797c62c..f69266a 100644 --- a/src/projects/k3bmusicbrainzjob.h +++ b/src/projects/k3bmusicbrainzjob.h @@ -20,10 +20,6 @@ #include <config.h> #endif -#ifdef Q_MOC_RUN -#define HAVE_MUSICBRAINZ -#endif // Q_MOC_RUN - #ifdef HAVE_MUSICBRAINZ #include <k3bjob.h> @@ -40,7 +36,7 @@ class TQWidget; */ class K3bMusicBrainzJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index e03b175..a565c4c 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -264,11 +264,11 @@ void K3bProjectBurnDialog::prepareGui() TQWidget* w = new TQWidget( m_tabWidget ); m_tabWidget->addTab( w, i18n("Writing") ); - TQGroupBox* groupWritingMode = new TQGroupBox( 1, Qt::Vertical, i18n("Writing Mode"), w ); + TQGroupBox* groupWritingMode = new TQGroupBox( 1, TQt::Vertical, i18n("Writing Mode"), w ); groupWritingMode->setInsideMargin( marginHint() ); m_writingModeWidget = new K3bWritingModeWidget( groupWritingMode ); - m_optionGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Settings"), w ); + m_optionGroup = new TQGroupBox( 0, TQt::Vertical, i18n("Settings"), w ); m_optionGroup->layout()->setMargin(0); m_optionGroup->layout()->setSpacing(0); m_optionGroupLayout = new TQVBoxLayout( m_optionGroup->layout() ); @@ -286,7 +286,7 @@ void K3bProjectBurnDialog::prepareGui() m_optionGroupLayout->addWidget(m_checkOnlyCreateImage); m_optionGroupLayout->addWidget(m_checkRemoveBufferFiles); - TQGroupBox* groupCopies = new TQGroupBox( 2, Qt::Horizontal, i18n("Copies"), w ); + TQGroupBox* groupCopies = new TQGroupBox( 2, TQt::Horizontal, i18n("Copies"), w ); groupCopies->setInsideSpacing( spacingHint() ); groupCopies->setInsideMargin( marginHint() ); TQLabel* pixLabel = new TQLabel( groupCopies ); @@ -321,14 +321,14 @@ void K3bProjectBurnDialog::prepareGui() setTabOrder( groupCopies, m_optionGroup ); // some default connections that should always be useful - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged()), this, TQT_SLOT(slotWriterChanged()) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writerChanged(K3bDevice::Device*)), - m_writingModeWidget, TQT_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); - connect( m_writerSelectionWidget, TQT_SIGNAL(writingAppChanged(int)), this, TQT_SLOT(slotWritingAppChanged(int)) ); - connect( m_checkCacheImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkSimulate, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_checkOnlyCreateImage, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAll()) ); - connect( m_writingModeWidget, TQT_SIGNAL(writingModeChanged(int)), this, TQT_SLOT(slotToggleAll()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged()), this, TQ_SLOT(slotWriterChanged()) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writerChanged(K3bDevice::Device*)), + m_writingModeWidget, TQ_SLOT(determineSupportedModesFromMedium(K3bDevice::Device*)) ); + connect( m_writerSelectionWidget, TQ_SIGNAL(writingAppChanged(int)), this, TQ_SLOT(slotWritingAppChanged(int)) ); + connect( m_checkCacheImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkSimulate, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_checkOnlyCreateImage, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAll()) ); + connect( m_writingModeWidget, TQ_SIGNAL(writingModeChanged(int)), this, TQ_SLOT(slotToggleAll()) ); } diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h index 1dcaca3..e98a3be 100644 --- a/src/projects/k3bprojectburndialog.h +++ b/src/projects/k3bprojectburndialog.h @@ -38,7 +38,7 @@ class TDEConfigBase; */ class K3bProjectBurnDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bprojectplugindialog.h b/src/projects/k3bprojectplugindialog.h index cd87e10..fa9745c 100644 --- a/src/projects/k3bprojectplugindialog.h +++ b/src/projects/k3bprojectplugindialog.h @@ -26,7 +26,7 @@ class TDEConfigBase; class K3bProjectPluginDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 11a93d3..0dd4531 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -86,11 +86,11 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha setupLabelTab(); setupAdvancedTab(); - connect( m_spinVolumeCount, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotSpinVolumeCount() ) ); - connect( m_groupVcdFormat, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotVcdTypeClicked( int ) ) ); - connect( m_checkCdiSupport, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotCdiSupportChecked( bool ) ) ); - connect( m_checkAutoDetect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotAutoDetect( bool ) ) ); - connect( m_checkGaps, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotGapsChecked( bool ) ) ); + connect( m_spinVolumeCount, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotSpinVolumeCount() ) ); + connect( m_groupVcdFormat, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotVcdTypeClicked( int ) ) ); + connect( m_checkCdiSupport, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotCdiSupportChecked( bool ) ) ); + connect( m_checkAutoDetect, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotAutoDetect( bool ) ) ); + connect( m_checkGaps, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotGapsChecked( bool ) ) ); // ToolTips // ------------------------------------------------------------------------- @@ -296,7 +296,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() TQWidget * w = new TQWidget( this ); // ---------------------------------------------------- generic group ---- - m_groupGeneric = new TQGroupBox( 5, Qt::Vertical, i18n( "Generic" ), w ); + m_groupGeneric = new TQGroupBox( 5, TQt::Vertical, i18n( "Generic" ), w ); m_checkPbc = new TQCheckBox( i18n( "Playback Control (PBC)" ), m_groupGeneric ); m_checkSegmentFolder = new TQCheckBox( i18n( "SEGMENT Folder must always be present" ), m_groupGeneric ); @@ -306,7 +306,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() // -------------------------------------------- gaps & margins group ---- - m_groupGaps = new TQGroupBox( 0, Qt::Vertical, i18n( "Gaps" ), w ); + m_groupGaps = new TQGroupBox( 0, TQt::Vertical, i18n( "Gaps" ), w ); m_groupGaps->layout() ->setSpacing( spacingHint() ); m_groupGaps->layout() ->setMargin( marginHint() ); @@ -402,7 +402,7 @@ void K3bVcdBurnDialog::setupAdvancedTab() groupGapsLayout->setRowStretch( 4, 0 ); // ------------------------------------------------------- misc group ---- - m_groupMisc = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), w ); + m_groupMisc = new TQGroupBox( 0, TQt::Vertical, i18n( "Misc" ), w ); m_groupMisc->layout() ->setSpacing( spacingHint() ); m_groupMisc->layout() ->setMargin( marginHint() ); @@ -434,7 +434,7 @@ void K3bVcdBurnDialog::setupVideoCdTab() TQWidget * w = new TQWidget( this ); // ---------------------------------------------------- Format group ---- - m_groupVcdFormat = new TQButtonGroup( 4, Qt::Vertical, i18n( "Type" ), w ); + m_groupVcdFormat = new TQButtonGroup( 4, TQt::Vertical, i18n( "Type" ), w ); m_radioVcd11 = new TQRadioButton( i18n( "VideoCD 1.1" ), m_groupVcdFormat ); m_radioVcd20 = new TQRadioButton( i18n( "VideoCD 2.0" ), m_groupVcdFormat ); m_radioSvcd10 = new TQRadioButton( i18n( "Super-VideoCD" ), m_groupVcdFormat ); @@ -443,7 +443,7 @@ void K3bVcdBurnDialog::setupVideoCdTab() // ---------------------------------------------------- Options group --- - m_groupOptions = new TQGroupBox( 5, Qt::Vertical, i18n( "Settings" ), w ); + m_groupOptions = new TQGroupBox( 5, TQt::Vertical, i18n( "Settings" ), w ); m_checkAutoDetect = new TQCheckBox( i18n( "Autodetect VideoCD type" ), m_groupOptions ); m_checkNonCompliant = new TQCheckBox( i18n( "Enable broken SVCD mode" ), m_groupOptions ); @@ -461,7 +461,7 @@ void K3bVcdBurnDialog::setupVideoCdTab() m_checkCdiSupport = new TQCheckBox( i18n( "Enable CD-i support" ), m_groupOptions ); // ------------------------------------------------- CD-i Application --- - m_groupCdi = new TQGroupBox( 4, Qt::Vertical, i18n( "VideoCD on CD-i" ), w ); + m_groupCdi = new TQGroupBox( 4, TQt::Vertical, i18n( "VideoCD on CD-i" ), w ); m_editCdiCfg = new TQMultiLineEdit( m_groupCdi, "m_editCdiCfg" ); m_editCdiCfg->setFrameShape( TQTextEdit::NoFrame ); @@ -511,13 +511,13 @@ void K3bVcdBurnDialog::setupLabelTab() m_editPublisher = new TQLineEdit( w, "m_editPublisher" ); // only ISO646 d-Characters - m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); - m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, TQT_TQOBJECT(m_editVolumeId) ) ); + m_editVolumeId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); + m_editAlbumId->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_d, true, m_editVolumeId ) ); m_editVolumeId->setMaxLength( 32 ); m_editAlbumId->setMaxLength( 16 ); // only ISO646 a-Characters - m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, TQT_TQOBJECT(m_editVolumeId) ) ); + m_editPublisher->setValidator( K3bValidators::iso646Validator( K3bValidators::Iso646_a, true, m_editVolumeId ) ); m_editPublisher->setMaxLength( 128 ); m_spinVolumeNumber->setMinValue( 1 ); diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h index c43ac19..f0a0909 100644 --- a/src/projects/k3bvcdburndialog.h +++ b/src/projects/k3bvcdburndialog.h @@ -35,7 +35,7 @@ class K3bVcdOptions; class K3bVcdBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp index 289e858..e9ebdc2 100644 --- a/src/projects/k3bvcdlistview.cpp +++ b/src/projects/k3bvcdlistview.cpp @@ -60,15 +60,15 @@ K3bVcdListView::K3bVcdListView( K3bView* view, K3bVcdDoc* doc, TQWidget *parent, setupColumns(); header() ->setClickEnabled( false ); - connect( this, TQT_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), - this, TQT_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( showPopupMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( showPropertiesDialog() ) ); + connect( this, TQ_SIGNAL( dropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ), + this, TQ_SLOT( slotDropped( TDEListView*, TQDropEvent*, TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( showPopupMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( showPropertiesDialog() ) ); - connect( m_doc, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateItems() ) ); - connect( m_doc, TQT_SIGNAL( trackRemoved( K3bVcdTrack* ) ), TQT_TQOBJECT(this), TQT_SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); + connect( m_doc, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotUpdateItems() ) ); + connect( m_doc, TQ_SIGNAL( trackRemoved( K3bVcdTrack* ) ), this, TQ_SLOT( slotTrackRemoved( K3bVcdTrack* ) ) ); slotUpdateItems(); } @@ -94,8 +94,8 @@ void K3bVcdListView::setupColumns() void K3bVcdListView::setupActions() { m_actionCollection = new TDEActionCollection( this ); - m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, TQT_TQOBJECT(this), TQT_SLOT( showPropertiesDialog() ), actionCollection() ); - m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveTracks() ), actionCollection() ); + m_actionProperties = new TDEAction( i18n( "Properties" ), "misc", 0, this, TQ_SLOT( showPropertiesDialog() ), actionCollection() ); + m_actionRemove = new TDEAction( i18n( "Remove" ), "edit-delete", Key_Delete, this, TQ_SLOT( slotRemoveTracks() ), actionCollection() ); // disabled by default m_actionRemove->setEnabled( false ); diff --git a/src/projects/k3bvcdlistview.h b/src/projects/k3bvcdlistview.h index 4693a5b..6a8df1d 100644 --- a/src/projects/k3bvcdlistview.h +++ b/src/projects/k3bvcdlistview.h @@ -37,7 +37,7 @@ class TQPainter; class K3bVcdListView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index ef200e9..1db26c7 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// TQt Includes +// TQt includes #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqcombobox.h> @@ -374,7 +374,7 @@ void K3bVcdTrackDialog::prepareGui() /////////////////////////////////////////////////// // FILE-INFO BOX /////////////////////////////////////////////////// - TQGroupBox* groupFileInfo = new TQGroupBox( 0, Qt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); + TQGroupBox* groupFileInfo = new TQGroupBox( 0, TQt::Vertical, i18n( "File Info" ), frame, "groupFileInfo" ); groupFileInfo->layout() ->setSpacing( 0 ); groupFileInfo->layout() ->setMargin( 0 ); @@ -449,7 +449,7 @@ void K3bVcdTrackDialog::setupPbcTab() ////////////////////////////////////////////////////////////////////////////////////////// - TQGroupBox* groupOptions = new TQGroupBox( 3, Qt::Vertical, i18n( "Settings" ), w ); + TQGroupBox* groupOptions = new TQGroupBox( 3, TQt::Vertical, i18n( "Settings" ), w ); groupOptions->layout() ->setSpacing( spacingHint() ); groupOptions->layout() ->setMargin( marginHint() ); @@ -462,7 +462,7 @@ void K3bVcdTrackDialog::setupPbcTab() m_check_reactivity->setEnabled( false ); ////////////////////////////////////////////////////////////////////////////////////////// - m_groupPlay = new TQGroupBox( 0, Qt::Vertical, i18n( "Playing" ), w ); + m_groupPlay = new TQGroupBox( 0, TQt::Vertical, i18n( "Playing" ), w ); m_groupPlay->layout() ->setSpacing( spacingHint() ); m_groupPlay->layout() ->setMargin( marginHint() ); @@ -498,7 +498,7 @@ void K3bVcdTrackDialog::setupPbcTab() groupPlayLayout->addMultiCellWidget( m_comboAfterTimeout, 3, 3, 1, 3 ); ////////////////////////////////////////////////////////////////////////////////////////// - m_groupPbc = new TQGroupBox( 0, Qt::Vertical, i18n( "Key Pressed Interaction" ), w ); + m_groupPbc = new TQGroupBox( 0, TQt::Vertical, i18n( "Key Pressed Interaction" ), w ); m_groupPbc->layout() ->setSpacing( spacingHint() ); m_groupPbc->layout() ->setMargin( marginHint() ); @@ -539,10 +539,10 @@ void K3bVcdTrackDialog::setupPbcTab() m_groupPlay->setEnabled( false ); m_groupPbc->setEnabled( false ); - connect( m_check_pbc, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPbcToggled( bool ) ) ); - connect( m_spin_times, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotPlayTimeChanged( int ) ) ); - connect( m_spin_waittime, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotWaitTimeChanged( int ) ) ); - connect( m_check_usekeys, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseKeysToggled( bool ) ) ); + connect( m_check_pbc, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPbcToggled( bool ) ) ); + connect( m_spin_times, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotPlayTimeChanged( int ) ) ); + connect( m_spin_waittime, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWaitTimeChanged( int ) ) ); + connect( m_check_usekeys, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseKeysToggled( bool ) ) ); } void K3bVcdTrackDialog::setupPbcKeyTab() @@ -557,7 +557,7 @@ void K3bVcdTrackDialog::setupPbcKeyTab() grid->setSpacing( spacingHint() ); grid->setMargin( marginHint() ); - m_groupKey = new TQGroupBox( 3, Qt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); + m_groupKey = new TQGroupBox( 3, TQt::Vertical, i18n( "Numeric Keys" ), m_widgetnumkeys ); m_groupKey->setEnabled( false ); m_groupKey->layout() ->setSpacing( spacingHint() ); m_groupKey->layout() ->setMargin( marginHint() ); @@ -578,7 +578,7 @@ void K3bVcdTrackDialog::setupPbcKeyTab() m_mainTabbed->addTab( m_widgetnumkeys, i18n( "Numeric Keys" ) ); - connect( m_check_overwritekeys, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotGroupkeyToggled( bool ) ) ); + connect( m_check_overwritekeys, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotGroupkeyToggled( bool ) ) ); } diff --git a/src/projects/k3bvcdtrackdialog.h b/src/projects/k3bvcdtrackdialog.h index 70c015c..6e59832 100644 --- a/src/projects/k3bvcdtrackdialog.h +++ b/src/projects/k3bvcdtrackdialog.h @@ -36,7 +36,7 @@ class K3bCutComboBox; class K3bVcdTrackDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index 2df5c70..ac562b3 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// QT-includes +// TQt includes #include <tqlayout.h> #include <tqstring.h> @@ -45,8 +45,8 @@ K3bVcdView::K3bVcdView( K3bVcdDoc* pDoc, TQWidget* parent, const char *name ) setMainWidget( m_vcdlist ); fillStatusDisplay() ->showSize(); - connect( m_vcdlist, TQT_SIGNAL( lengthReady() ), fillStatusDisplay(), TQT_SLOT( update() ) ); - connect( m_doc, TQT_SIGNAL( newTracks() ), fillStatusDisplay(), TQT_SLOT( update() ) ); + connect( m_vcdlist, TQ_SIGNAL( lengthReady() ), fillStatusDisplay(), TQ_SLOT( update() ) ); + connect( m_doc, TQ_SIGNAL( newTracks() ), fillStatusDisplay(), TQ_SLOT( update() ) ); } K3bVcdView::~K3bVcdView() diff --git a/src/projects/k3bvcdview.h b/src/projects/k3bvcdview.h index 0dcbe87..39014ca 100644 --- a/src/projects/k3bvcdview.h +++ b/src/projects/k3bvcdview.h @@ -35,7 +35,7 @@ class K3bProjectBurnDialog; class K3bVcdView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h index 185c84b..008a930 100644 --- a/src/projects/k3bvideodvdburndialog.h +++ b/src/projects/k3bvideodvdburndialog.h @@ -27,7 +27,7 @@ class TQCheckBox; class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp index ae70fa0..2dd268c 100644 --- a/src/projects/k3bvideodvdview.cpp +++ b/src/projects/k3bvideodvdview.cpp @@ -44,7 +44,7 @@ K3bVideoDvdView::K3bVideoDvdView( K3bVideoDvdDoc* doc, TQWidget *parent, const c m_dataDirTree->setFileView( m_dataFileView ); setMainWidget( mainSplitter ); - connect( m_dataFileView, TQT_SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, TQT_SLOT(setCurrentDir(K3bDirItem*)) ); + connect( m_dataFileView, TQ_SIGNAL(dirSelected(K3bDirItem*)), m_dataDirTree, TQ_SLOT(setCurrentDir(K3bDirItem*)) ); m_dataDirTree->checkForNewItems(); m_dataFileView->checkForNewItems(); diff --git a/src/projects/k3bvideodvdview.h b/src/projects/k3bvideodvdview.h index f4b8980..5dd330a 100644 --- a/src/projects/k3bvideodvdview.h +++ b/src/projects/k3bvideodvdview.h @@ -26,7 +26,7 @@ class K3bDataFileView; class K3bVideoDvdView : public K3bView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp index df3384d..26caffa 100644 --- a/src/projects/k3bview.cpp +++ b/src/projects/k3bview.cpp @@ -57,10 +57,10 @@ K3bView::K3bView( K3bDoc* pDoc, TQWidget *parent, const char* name ) grid->setSpacing( 5 ); grid->setMargin( 2 ); - TDEAction* burnAction = new TDEAction( i18n("&Burn"), "cdburn", CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotBurn()), + TDEAction* burnAction = new TDEAction( i18n("&Burn"), "cdburn", CTRL + Key_B, this, TQ_SLOT(slotBurn()), actionCollection(), "project_burn"); burnAction->setToolTip( i18n("Open the burn dialog for the current project") ); - TDEAction* propAction = new TDEAction( i18n("&Properties"), "edit", CTRL + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotProperties()), + TDEAction* propAction = new TDEAction( i18n("&Properties"), "edit", CTRL + Key_P, this, TQ_SLOT(slotProperties()), actionCollection(), "project_properties"); propAction->setToolTip( i18n("Open the properties dialog") ); @@ -139,8 +139,8 @@ void K3bView::addPluginButtons( int projectType ) pp->icon(), pp->toolTip(), pp->whatsThis(), - TQT_TQOBJECT(this), - TQT_SLOT(slotPluginButtonClicked()) ); + this, + TQ_SLOT(slotPluginButtonClicked()) ); m_plugins.insert( static_cast<void*>(button), pp ); } } @@ -149,7 +149,7 @@ void K3bView::addPluginButtons( int projectType ) void K3bView::slotPluginButtonClicked() { - TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + TQObject* o = const_cast<TQObject*>(sender()); if( K3bProjectPlugin* p = m_plugins[static_cast<void*>(o)] ) { if( p->hasGUI() ) { K3bProjectPluginDialog dlg( p, doc(), this ); diff --git a/src/projects/k3bview.h b/src/projects/k3bview.h index 7c9ab9a..a7c1ade 100644 --- a/src/projects/k3bview.h +++ b/src/projects/k3bview.h @@ -41,7 +41,7 @@ class K3bProjectPlugin; */ class K3bView : public TQWidget, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/projects/kostore/koStore.cpp b/src/projects/kostore/koStore.cpp index 24fc737..c59ab0f 100644 --- a/src/projects/kostore/koStore.cpp +++ b/src/projects/kostore/koStore.cpp @@ -69,7 +69,7 @@ KoStore* KoStore::createStore( const TQString& fileName, Mode mode, const TQCStr { TQFile file( fileName ); if ( file.open( IO_ReadOnly ) ) - backend = determineBackend( TQT_TQIODEVICE(&file) ); + backend = determineBackend( &file ); else backend = DefaultFormat; // will create a "bad" store (bad()==true) } @@ -143,7 +143,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con TQFile file( tmpFile ); if ( file.open( IO_ReadOnly ) ) { - backend = determineBackend( TQT_TQIODEVICE(&file) ); + backend = determineBackend( &file ); file.close(); } } diff --git a/src/projects/kostore/koStoreDevice.h b/src/projects/kostore/koStoreDevice.h index df8cebf..2684cb6 100644 --- a/src/projects/kostore/koStoreDevice.h +++ b/src/projects/kostore/koStoreDevice.h @@ -46,16 +46,7 @@ public: void close() { } void flush() { } -#ifdef USE_QT4 - inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); } - inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); } -#endif // USE_QT4 - -#ifdef USE_QT4 - qint64 size() const { -#else // USE_QT4 Offset size() const { -#endif // USE_QT4 if ( m_store->mode() == KoStore::Read ) return m_store->size(); else |