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 --- arts/tools/artsactions.cpp | 64 +++++++++++++++++----------------- arts/tools/artsactions.h | 52 +++++++++++++-------------- arts/tools/artscontrolapplet_private.h | 10 +++--- arts/tools/audiomanager.cpp | 2 +- arts/tools/audiomanager.h | 4 +-- arts/tools/environmentview.cpp | 2 +- arts/tools/environmentview.h | 4 +-- arts/tools/fftscopeview.cpp | 4 +-- arts/tools/fftscopeview.h | 12 +++---- arts/tools/main.cpp | 6 ++-- arts/tools/main.h | 4 +-- arts/tools/mediatypesview.cpp | 2 +- arts/tools/midimanagerview.cpp | 4 +-- arts/tools/midimanagerview.h | 2 +- 14 files changed, 86 insertions(+), 86 deletions(-) (limited to 'arts/tools') diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp index 2a85fc45..4dd331b8 100644 --- a/arts/tools/artsactions.cpp +++ b/arts/tools/artsactions.cpp @@ -36,7 +36,7 @@ #include "environmentview.h" #include "mediatypesview.h" -ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name ) +ArtsActions::ArtsActions( KArtsServer* server, TDEActionCollection* col, TQWidget* parent, const char* name ) : TQObject( parent,name ) , _kartsserver( server ) , _actioncollection( col ) @@ -61,59 +61,59 @@ ArtsActions::~ArtsActions() { if ( _mtv ) viewMediaTypesView(); } -KAction* ArtsActions::actionScopeView() { - if ( !_a_sv ) _a_sv = new KAction( i18n( "&FFT Scope" ), "artsfftscope", KShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" ); +TDEAction* ArtsActions::actionScopeView() { + if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" ); return _a_sv; } -KAction* ArtsActions::actionAudioManager() { - if ( !_a_am ) _a_am = new KAction( i18n( "&Audio Manager" ), "artsaudiomanager", KShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" ); +TDEAction* ArtsActions::actionAudioManager() { + if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" ); return _a_am; } -KAction* ArtsActions::actionArtsStatusView() { - if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &Status" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); +TDEAction* ArtsActions::actionArtsStatusView() { + if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" ); return _a_asv; } -KAction* ArtsActions::actionMidiManagerView() { - if ( !_a_mmv ) _a_mmv = new KAction( i18n( "&MIDI Manager" ), "artsmidimanager", KShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" ); +TDEAction* ArtsActions::actionMidiManagerView() { + if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" ); return _a_mmv; } -KAction* ArtsActions::actionEnvironmentView() { - if ( !_a_ev ) _a_ev = new KAction( i18n( "&Environment" ), "artsenvironment", KShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" ); +TDEAction* ArtsActions::actionEnvironmentView() { + if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" ); return _a_ev; } -KAction* ArtsActions::actionMediaTypesView() { - if ( !_a_mtv ) _a_mtv = new KAction( i18n( "Available Media &Types" ), "artsmediatypes", KShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" ); +TDEAction* ArtsActions::actionMediaTypesView() { + if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" ); return _a_mtv; } -KAction* ArtsActions::actionStyleNormal() { - if ( !_a_style_normal ) _a_style_normal = new KAction( i18n( "Style: NormalBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" ); +TDEAction* ArtsActions::actionStyleNormal() { + if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" ); return _a_style_normal; } -KAction* ArtsActions::actionStyleFire() { - if ( !_a_style_fire ) _a_style_fire = new KAction( i18n( "Style: FireBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" ); +TDEAction* ArtsActions::actionStyleFire() { + if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" ); return _a_style_fire; } -KAction* ArtsActions::actionStyleLine() { - if ( !_a_style_line ) _a_style_line = new KAction( i18n( "Style: LineBars" ), "", KShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" ); +TDEAction* ArtsActions::actionStyleLine() { + if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" ); return _a_style_line; } -KAction* ArtsActions::actionStyleLED() { - if ( !_a_style_led ) _a_style_led = new KAction( i18n( "Style: LEDs" ), "", KShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" ); +TDEAction* ArtsActions::actionStyleLED() { + if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" ); return _a_style_led; } -KAction* ArtsActions::actionStyleAnalog() { - if ( !_a_style_analog ) _a_style_analog = new KAction( i18n( "Style: Analog" ), "", KShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" ); +TDEAction* ArtsActions::actionStyleAnalog() { + if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" ); return _a_style_analog; } -KAction* ArtsActions::actionStyleSmall() { - if ( !_a_style_small ) _a_style_small = new KAction( i18n( "Style: Small" ), "", KShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" ); +TDEAction* ArtsActions::actionStyleSmall() { + if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" ); return _a_style_small; } -KPopupMenu* ArtsActions::stylemenu() { +TDEPopupMenu* ArtsActions::stylemenu() { if ( !_stylemenu ) { - _stylemenu = new KPopupMenu(); - KAction *tmp; + _stylemenu = new TDEPopupMenu(); + TDEAction *tmp; tmp = actionStyleNormal(); tmp->plug( _stylemenu ); tmp = actionStyleFire(); tmp->plug( _stylemenu ); tmp = actionStyleLine(); tmp->plug( _stylemenu ); @@ -124,12 +124,12 @@ KPopupMenu* ArtsActions::stylemenu() { return _stylemenu; } -KAction* ArtsActions::actionMoreBars( const TQObject* receiver, const char* slot, KActionCollection *actioncollection ) { - static KAction *_a_morebars = new KAction( i18n( "More Bars in VU-Meters" ), "up", KShortcut(), receiver, slot, actioncollection, "artssupport_morebars" ); +TDEAction* ArtsActions::actionMoreBars( const TQObject* receiver, const char* slot, TDEActionCollection *actioncollection ) { + static TDEAction *_a_morebars = new TDEAction( i18n( "More Bars in VU-Meters" ), "up", TDEShortcut(), receiver, slot, actioncollection, "artssupport_morebars" ); return _a_morebars; } -KAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* slot, KActionCollection *actioncollection ) { - static KAction *_a_lessbars = new KAction( i18n( "Less Bars in VU-Meters" ), "down", KShortcut(), receiver, slot, actioncollection, "artssupport_lessbars" ); +TDEAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* slot, TDEActionCollection *actioncollection ) { + static TDEAction *_a_lessbars = new TDEAction( i18n( "Less Bars in VU-Meters" ), "down", TDEShortcut(), receiver, slot, actioncollection, "artssupport_lessbars" ); return _a_lessbars; } diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h index ea290f8c..b3005aa6 100644 --- a/arts/tools/artsactions.h +++ b/arts/tools/artsactions.h @@ -24,9 +24,9 @@ #include #include class KArtsServer; -class KAction; -class KActionCollection; -class KPopupMenu; +class TDEAction; +class TDEActionCollection; +class TDEPopupMenu; class FFTScopeView; class Gui_AUDIO_MANAGER; class ArtsStatusView; @@ -42,42 +42,42 @@ public: /** Constructs a ArtsActions-object. - Use the KActions you get from it to obtain a unique Style for all menus. + Use the TDEActions you get from it to obtain a unique Style for all menus. It also provides an easy way to have FFT-ScopeView, Audiomanager and other things available. @param artsserver a pointer to a existing KArtsServer. If 0 a new is created. - @param actioncollection the KActionCollection all the actions should belong to. Names of the actions are then: artssupport_* + @param actioncollection the TDEActionCollection all the actions should belong to. Names of the actions are then: artssupport_* @param qwidget the parent TQWidget @param name the name of the object */ - ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); + ArtsActions( KArtsServer* artsserver, TDEActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 ); /** Destructor */ ~ArtsActions(); /** Returns an Action for showing the ScopeView. Unless otherwise connected it also toggles a ScopeView. */ - KAction* actionScopeView(); + TDEAction* actionScopeView(); /** Returns an Action for showing the Audiomanager. Unless otherwise connected it also toggles a Audiomanager. */ - KAction* actionAudioManager(); + TDEAction* actionAudioManager(); /** Returns an Action for showing the StatusView. Unless otherwise connected it also toggles a StatusView. */ - KAction* actionArtsStatusView(); + TDEAction* actionArtsStatusView(); /** Returns an Action for showing the MidiManager. Unless otherwise connected it also toggles a MidiManager. */ - KAction* actionMidiManagerView(); + TDEAction* actionMidiManagerView(); /** Returns an Action for showing the EnvironmentView. Unless otherwise connected it also toggles a EnvironmentView. */ - KAction* actionEnvironmentView(); + TDEAction* actionEnvironmentView(); /** Returns an Action for showing the MediaTypesView. Unless otherwise connected it also toggles a MediaTypesView. */ - KAction* actionMediaTypesView(); + TDEAction* actionMediaTypesView(); - KAction* actionStyleNormal(); - KAction* actionStyleFire(); - KAction* actionStyleLine(); - KAction* actionStyleLED(); - KAction* actionStyleAnalog(); - KAction* actionStyleSmall(); - KPopupMenu* stylemenu(); + TDEAction* actionStyleNormal(); + TDEAction* actionStyleFire(); + TDEAction* actionStyleLine(); + TDEAction* actionStyleLED(); + TDEAction* actionStyleAnalog(); + TDEAction* actionStyleSmall(); + TDEPopupMenu* stylemenu(); - static KAction* actionMoreBars( const TQObject*, const char*, KActionCollection* ); - static KAction* actionLessBars( const TQObject*, const char*, KActionCollection* ); + static TDEAction* actionMoreBars( const TQObject*, const char*, TDEActionCollection* ); + static TDEAction* actionLessBars( const TQObject*, const char*, TDEActionCollection* ); public slots: void viewScopeView(); @@ -102,11 +102,11 @@ signals: void styleSmall(); private: KArtsServer* _kartsserver; - KActionCollection* _actioncollection; - KAction *_a_sv, *_a_am, *_a_asv, *_a_mmv, *_a_ev, *_a_mtv; - //KAction *_a_morebars, *_a_lessbars; - KAction *_a_style_normal, *_a_style_fire, *_a_style_line, *_a_style_led, *_a_style_analog, *_a_style_small; - KPopupMenu* _stylemenu; + TDEActionCollection* _actioncollection; + TDEAction *_a_sv, *_a_am, *_a_asv, *_a_mmv, *_a_ev, *_a_mtv; + //TDEAction *_a_morebars, *_a_lessbars; + TDEAction *_a_style_normal, *_a_style_fire, *_a_style_line, *_a_style_led, *_a_style_analog, *_a_style_small; + TDEPopupMenu* _stylemenu; FFTScopeView *_sv; Gui_AUDIO_MANAGER *_am; ArtsStatusView *_asv; diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index b602d8f4..08959f16 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -62,9 +62,9 @@ public: KArtsWidget *vuw; Arts::StereoVolumeControlGui vu; - KPopupMenu *menu; - KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; - KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; + TDEPopupMenu *menu; + TDEAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; + TDEAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; ArtsControlAppletPrivate( ArtsControlApplet *parent ) : TQObject(parent) @@ -80,10 +80,10 @@ public: _artsactions = new ArtsActions( arts, 0, parent ); - menu = new KPopupMenu( 0 ); + menu = new TDEPopupMenu( 0 ); _showSV = _artsactions->actionScopeView(); _showSV->plug( menu ); - _showSVinline = new KAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", KShortcut(), this, TQT_SLOT( SVinline() ), this ); + _showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( SVinline() ), this ); _showSVinline->plug( menu ); _showAM = _artsactions->actionAudioManager(); _showAM->plug( menu ); diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index eff4f6f9..25acaf5a 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -95,7 +95,7 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/) // list - listview = new KListView(parent); + listview = new TDEListView(parent); listview->addColumn(i18n("Title"),175); listview->addColumn(i18n("Type"),50); diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h index fea2ae53..d787cf37 100644 --- a/arts/tools/audiomanager.h +++ b/arts/tools/audiomanager.h @@ -30,7 +30,7 @@ #include "templateview.h" -class KListView; +class TDEListView; class GuiAudioManagerProxy; class TQBoxLayout; @@ -40,7 +40,7 @@ class Gui_AUDIO_MANAGER : public Template_ArtsView protected: TQWidget *ParentWidget; - KListView *listview; + TDEListView *listview; GuiAudioManagerProxy *proxy; Arts::AudioManager AudioManager; diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index 9cedfed1..d8c21224 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -69,7 +69,7 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c _layout->setAutoAdd( true ); defaultEnvFileName = DEFAULT_ENV_FILENAME; defaultEnvFileName.replace('~', TQDir::homeDirPath()); - listBox = new KListBox(this); + listBox = new TDEListBox(this); update(); connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)), this,TQT_SLOT(view(TQListBoxItem*))); diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h index 8ef82184..792ae2f8 100644 --- a/arts/tools/environmentview.h +++ b/arts/tools/environmentview.h @@ -29,14 +29,14 @@ #include "templateview.h" class TQListBoxItem; -class KListBox; +class TDEListBox; class EnvironmentView : public Template_ArtsView { Q_OBJECT protected: Arts::Environment::Container container; - KListBox *listBox; + TDEListBox *listBox; TQString defaultEnvFileName; public: diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp index ab15dc59..9eb1c019 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -82,9 +82,9 @@ kdDebug()<plug( _menu ); _lessBars->plug( _menu ); - _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) ); + _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) ); _substyle->plug( _menu ); _menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() ); diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h index b5662297..723f14a4 100644 --- a/arts/tools/fftscopeview.h +++ b/arts/tools/fftscopeview.h @@ -33,8 +33,8 @@ #include class TQTimer; -class KPopupMenu; -class KAction; +class TDEPopupMenu; +class TDEAction; class KArtsWidget; class ArtsActions; @@ -53,10 +53,10 @@ protected: TQTimer *updatetimer; ArtsActions* _artsactions; - KPopupMenu *_menu, *_stylemenu; - KAction *_moreBars, *_lessBars; - KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; - KAction *_substyle; + TDEPopupMenu *_menu, *_stylemenu; + TDEAction *_moreBars, *_lessBars; + TDEAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; + TDEAction *_substyle; void mousePressEvent( TQMouseEvent* ); public: diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp index 0037be6e..4f508d98 100644 --- a/arts/tools/main.cpp +++ b/arts/tools/main.cpp @@ -158,7 +158,7 @@ void MainWindow::toggleVolumeBar() { vc->useOldVolumeBar(showOldVolumeDisplay->isChecked()); } -MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) { +MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) { kdDebug() << k_funcinfo << endl; connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) ); @@ -172,9 +172,9 @@ kdDebug() << k_funcinfo << endl; ( void ) artsactions->actionMidiManagerView(); ( void ) artsactions->actionEnvironmentView(); ( void ) artsactions->actionMediaTypesView(); - ( void ) new KAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); + ( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" ); showOldVolumeDisplay= - new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this), + new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" ); ( void ) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" ); diff --git a/arts/tools/main.h b/arts/tools/main.h index 5019e535..a92c4061 100644 --- a/arts/tools/main.h +++ b/arts/tools/main.h @@ -91,12 +91,12 @@ private slots: #include "artsactions.h" -class MainWindow : public KMainWindow { +class MainWindow : public TDEMainWindow { Q_OBJECT protected: VControl *vc; - KToggleAction *showOldVolumeDisplay; + TDEToggleAction *showOldVolumeDisplay; ArtsActions* artsactions; KArtsServer *kartsserver; diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp index 9353cda6..683e8152 100644 --- a/arts/tools/mediatypesview.cpp +++ b/arts/tools/mediatypesview.cpp @@ -40,7 +40,7 @@ MediaTypesView::MediaTypesView( TQWidget* parent, const char* name ) : Template_ TQBoxLayout *l= new TQHBoxLayout(this); l->setAutoAdd(true); - KListView *listView = new KListView(this); + TDEListView *listView = new TDEListView(this); listView->addColumn(i18n("Media Type")); Arts::TraderQuery q; diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index 270df3c6..ae729347 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -122,9 +122,9 @@ MidiManagerView::MidiManagerView() setCaption(i18n("MIDI Manager")); setIcon( MainBarIcon( "artsfftscope", 32 ) ); - (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()), + (void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()), actionCollection(), "add_oss_midi_port"); - (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this), + (void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this), TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output"); (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h index 660c00c3..5b05936d 100644 --- a/arts/tools/midimanagerview.h +++ b/arts/tools/midimanagerview.h @@ -34,7 +34,7 @@ class ConnectionWidget; class MidiManagerItem; class MidiManagerWidget; -class MidiManagerView : public KMainWindow { +class MidiManagerView : public TDEMainWindow { Q_OBJECT protected: -- cgit v1.2.3