From 940c092f32d40263ad6b24f948eaf4c48b01e99a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:13:25 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- krec/krecfileviewhelpers.cpp | 8 ++++---- krec/krecfileviewhelpers.h | 4 ++-- krec/krecfilewidgets.cpp | 10 +++++----- krec/krecfilewidgets.h | 4 ++-- krec/krecord.cpp | 24 ++++++++++++------------ krec/krecord.h | 2 +- krec/krecord_private.h | 16 ++++++++-------- 7 files changed, 34 insertions(+), 34 deletions(-) (limited to 'krec') diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp index a064dfea..eabd63ef 100644 --- a/krec/krecfileviewhelpers.cpp +++ b/krec/krecfileviewhelpers.cpp @@ -220,7 +220,7 @@ void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) { menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _posvalue ) ), -1, 0 ); menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _posvalue ) ), -1, 0 ); menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _posvalue ) ), -1, 0 ); - KPopupTitle *tmp = new KPopupTitle( menu ); + TDEPopupTitle *tmp = new TDEPopupTitle( menu ); tmp->setTitle( i18n( "Position" ) ); menu->insertItem( tmp, -1, 0 ); } else @@ -228,7 +228,7 @@ void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) { } void KRecTimeDisplay::timeContextMenu( const TQPoint &point ) { if ( _posmenu ) delete _posmenu; - _posmenu = new KPopupMenu( this ); + _posmenu = new TDEPopupMenu( this ); timeContextMenu( _posmenu ); _posmenu->exec( point ); } @@ -239,7 +239,7 @@ void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) { menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _sizevalue ) ), -1, 0 ); menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _sizevalue ) ), -1, 0 ); menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _sizevalue ) ), -1, 0 ); - KPopupTitle *tmp = new KPopupTitle( menu ); + TDEPopupTitle *tmp = new TDEPopupTitle( menu ); tmp->setTitle( i18n( "Size" ) ); menu->insertItem( tmp, -1, 0 ); } else @@ -247,7 +247,7 @@ void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) { } void KRecTimeDisplay::sizeContextMenu( const TQPoint &point ) { if ( _sizemenu ) delete _sizemenu; - _sizemenu = new KPopupMenu( this ); + _sizemenu = new TDEPopupMenu( this ); sizeContextMenu( _sizemenu ); _sizemenu->exec( point ); } diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h index c7f16131..85e0f48e 100644 --- a/krec/krecfileviewhelpers.h +++ b/krec/krecfileviewhelpers.h @@ -23,7 +23,7 @@ class TQBoxLayout; class AKLabel; class TQPopupMenu; -class KPopupMenu; +class TDEPopupMenu; class KRecTimeBar : public TQFrame { Q_OBJECT @@ -86,7 +86,7 @@ private: TQString _filename; TQBoxLayout *_layout; AKLabel *_position, *_size; - KPopupMenu *_posmenu, *_sizemenu; + TDEPopupMenu *_posmenu, *_sizemenu; int _sizevalue, _posvalue; int _samplingRate, _bits, _channels; }; diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index 82eac246..255eebd2 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -118,13 +118,13 @@ void KRecFileWidget::deleteBuffer( KRecBuffer* buffer ) { } void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) { - KPopupMenu tmp( this ); - KToggleAction* _activeaction = new KToggleAction( i18n( "Toggle Active/Disabled State" ), KShortcut(), TQT_TQOBJECT(this) ); + TDEPopupMenu tmp( this ); + TDEToggleAction* _activeaction = new TDEToggleAction( i18n( "Toggle Active/Disabled State" ), TDEShortcut(), TQT_TQOBJECT(this) ); _activeaction->setChecked( bw->buffer()->active() ); connect( _activeaction, TQT_SIGNAL( toggled( bool ) ), bw->buffer(), TQT_SLOT( setActive( bool ) ) ); - KAction* _removeaction = new KAction( i18n( "Remove This Part" ), "fileremove", KShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) ); - KAction* _changetitle = new KAction( i18n( "Change Title of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) ); - KAction* _changecomment = new KAction( i18n( "Change Comment of This Part" ), KShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) ); + TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), TQT_TQOBJECT(this) ); + TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) ); + TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) ); _activeaction->plug( &tmp ); _changetitle->plug( &tmp ); _changecomment->plug( &tmp ); diff --git a/krec/krecfilewidgets.h b/krec/krecfilewidgets.h index 73a493b4..daea0c41 100644 --- a/krec/krecfilewidgets.h +++ b/krec/krecfilewidgets.h @@ -32,8 +32,8 @@ class KRecTimeDisplay; class TQRegion; class TQPainter; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class KRecFileWidget : public TQFrame { Q_OBJECT diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 164a38df..66737d32 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -265,7 +265,7 @@ void KRecPrivate::execKMix() { */ KRecord::KRecord(TQWidget *parent, const char *name ) - : KMainWindow(parent,name) + : TDEMainWindow(parent,name) , d( new KRecPrivate( this ) ) { kdDebug( 60005 ) << k_funcinfo << endl; @@ -294,33 +294,33 @@ KRecord::KRecord(TQWidget *parent, const char *name ) KStdAction::tipOfDay( d, TQT_SLOT( forceTipOfDay() ), actionCollection() ); - d->aExportFile = new KAction( i18n( "Export..." ), KShortcut(), + d->aExportFile = new TDEAction( i18n( "Export..." ), TDEShortcut(), d, TQT_SLOT( exportFile() ), actionCollection(), "export_file" ); - d->aRecord = new KAction( i18n( "&Record" ), KShortcut( Key_R ), + d->aRecord = new TDEAction( i18n( "&Record" ), TDEShortcut( Key_R ), TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" ); - d->aPlay = new KAction( i18n( "&Play" ), KShortcut( Key_P ), + d->aPlay = new TDEAction( i18n( "&Play" ), TDEShortcut( Key_P ), TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "player_play" ); - d->aStop = new KAction( i18n( "&Stop" ), KShortcut( Key_S ), + d->aStop = new TDEAction( i18n( "&Stop" ), TDEShortcut( Key_S ), TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "player_stop" ); - d->aThru = new KToggleAction( i18n( "Play Through" ), KShortcut( CTRL + Key_P), actionCollection(), "play_thru" ); + d->aThru = new TDEToggleAction( i18n( "Play Through" ), TDEShortcut( CTRL + Key_P), actionCollection(), "play_thru" ); connect( d->aThru, TQT_SIGNAL( toggled( bool ) ), d, TQT_SLOT( playthru( bool ) ) ); - d->aBegin = new KAction( i18n( "Go to &Beginning" ), KShortcut( SHIFT + Key_Left ), + d->aBegin = new TDEAction( i18n( "Go to &Beginning" ), TDEShortcut( SHIFT + Key_Left ), d, TQT_SLOT( toBegin() ), actionCollection(), "player_gobegin" ); - d->aEnd = new KAction( i18n( "Go to &End" ), KShortcut( SHIFT + Key_Right ), + d->aEnd = new TDEAction( i18n( "Go to &End" ), TDEShortcut( SHIFT + Key_Right ), d, TQT_SLOT( toEnd() ), actionCollection(), "player_goend" ); ( void* ) d->artsactions->actionAudioManager(); - d->aExecaRtsControl = new KAction( i18n( "Start aRts Control Tool" ), KShortcut(), + d->aExecaRtsControl = new TDEAction( i18n( "Start aRts Control Tool" ), TDEShortcut(), d, TQT_SLOT( execaRtsControl() ), actionCollection(), "exec_artscontrol" ); - d->aExecKMix = new KAction( i18n( "Start KMix" ), KShortcut(), + d->aExecKMix = new TDEAction( i18n( "Start KMix" ), TDEShortcut(), d, TQT_SLOT( execKMix() ), actionCollection(), "exec_kmix" ); // * * * GUI * * * // TODO Fix toolbar config so this line can just be setupGUI() - setupGUI(KMainWindow::Keys | StatusBar | Save | Create ); + setupGUI(TDEMainWindow::Keys | StatusBar | Save | Create ); setStandardToolBarMenuEnabled( true ); // TODO Fix the arts toolbar to know it own minium size, this app shouldn't care! setMinimumWidth( 400 ); @@ -333,7 +333,7 @@ KRecord::KRecord(TQWidget *parent, const char *name ) d->w->setName( "kde toolbar widget" ); toolBar( "compressor" )->insertWidget( 1, 400, d->w ); - toolBar( "compressor" )->setBarPos( KToolBar::Bottom ); + toolBar( "compressor" )->setBarPos( TDEToolBar::Bottom ); } else { diff --git a/krec/krecord.h b/krec/krecord.h index f050c2b7..96173238 100644 --- a/krec/krecord.h +++ b/krec/krecord.h @@ -29,7 +29,7 @@ class KRecPrivate; @author Arnold Krille */ -class KRecord : public KMainWindow { +class KRecord : public TDEMainWindow { Q_OBJECT public: diff --git a/krec/krecord_private.h b/krec/krecord_private.h index e0d80c3e..bf68bfb9 100644 --- a/krec/krecord_private.h +++ b/krec/krecord_private.h @@ -36,10 +36,10 @@ class KAudioRecordStream; class KAudioPlayStream; class TDEConfig; class ArtsActions; -class KAction; -class KActionMenu; -class KToggleAction; -class KRecentFilesAction; +class TDEAction; +class TDEActionMenu; +class TDEToggleAction; +class TDERecentFilesAction; namespace KSettings { class Dialog; } @@ -100,10 +100,10 @@ private: void pNewFile( KRecFile* ); void pSaveFile( const TQString &); public: - KAction *aRecord, *aPlay, *aStop, *aExportFile; - KAction *aBegin, *aEnd; - KToggleAction *aThru, *aStartUpWindow; - KAction *aExecaRtsControl, *aExecKMix; + TDEAction *aRecord, *aPlay, *aStop, *aExportFile; + TDEAction *aBegin, *aEnd; + TDEToggleAction *aThru, *aStartUpWindow; + TDEAction *aExecaRtsControl, *aExecKMix; KSettings::Dialog *_confdlg; -- cgit v1.2.1