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 --- kmix/viewbase.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kmix/viewbase.cpp') diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp index 58767073..01e1b9cf 100644 --- a/kmix/viewbase.cpp +++ b/kmix/viewbase.cpp @@ -47,11 +47,11 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, setMixSet( & mixer->getMixSet()); C++ does not use overloaded methods like getMixSet() as long as the constructor has not completed :-((( */ - _actions = new KActionCollection( this ); + _actions = new TDEActionCollection( this ); // Plug in the "showMenubar" action, if the caller wants it. Typically this is only neccesary for views in the KMix main window. if ( vflags & ViewBase::HasMenuBar ) { - KToggleAction *m = static_cast(KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions )); + TDEToggleAction *m = static_cast(KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions )); if ( vflags & ViewBase::MenuBarVisible ) { m->setChecked(true); } @@ -59,7 +59,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption, m->setChecked(false); } } - new KAction(i18n("&Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(configureView()), _actions, "toggle_channels"); + new TDEAction(i18n("&Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(configureView()), _actions, "toggle_channels"); connect ( _mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(refreshVolumeLevels()) ); } @@ -120,7 +120,7 @@ void ViewBase::mousePressEvent( TQMouseEvent *e ) * Return a popup menu. This contains basic entries. * More can be added by the caller. */ -KPopupMenu* ViewBase::getPopup() +TDEPopupMenu* ViewBase::getPopup() { popupReset(); return _popMenu; @@ -128,9 +128,9 @@ KPopupMenu* ViewBase::getPopup() void ViewBase::popupReset() { - KAction *a; + TDEAction *a; - _popMenu = new KPopupMenu( this ); + _popMenu = new TDEPopupMenu( this ); _popMenu->insertTitle( SmallIcon( "kmix" ), i18n("Device Settings") ); a = _actions->action( "toggle_channels" ); -- cgit v1.2.3