summaryrefslogtreecommitdiffstats
path: root/kmix
diff options
context:
space:
mode:
Diffstat (limited to 'kmix')
-rw-r--r--kmix/KMixApp.cpp2
-rw-r--r--kmix/kmix.cpp20
-rw-r--r--kmix/kmix.h6
-rw-r--r--kmix/kmixdockwidget.cpp16
-rw-r--r--kmix/kmixdockwidget.h2
-rw-r--r--kmix/kmixerwidget.h10
-rw-r--r--kmix/mdwenum.cpp10
-rw-r--r--kmix/mdwenum.h6
-rw-r--r--kmix/mdwslider.cpp36
-rw-r--r--kmix/mdwslider.h6
-rw-r--r--kmix/mdwswitch.cpp10
-rw-r--r--kmix/mdwswitch.h6
-rw-r--r--kmix/mixdevicewidget.cpp4
-rw-r--r--kmix/mixdevicewidget.h8
-rw-r--r--kmix/viewapplet.cpp2
-rw-r--r--kmix/viewbase.cpp12
-rw-r--r--kmix/viewbase.h10
17 files changed, 83 insertions, 83 deletions
diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
index 10e7b6ae..40bf6cfb 100644
--- a/kmix/KMixApp.cpp
+++ b/kmix/KMixApp.cpp
@@ -50,7 +50,7 @@ KMixApp::newInstance()
{
m_kmix = new KMixWindow;
connect(this, TQT_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQT_SLOT(stopVisibilityUpdates()));
- if ( isRestored() && KMainWindow::canBeRestored(0) )
+ if ( isRestored() && TDEMainWindow::canBeRestored(0) )
{
m_kmix->restore(0, FALSE);
}
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index f583c352..c0643331 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -61,7 +61,7 @@
* Constructs a mixer window (KMix main window)
*/
KMixWindow::KMixWindow()
- : KMainWindow(0, 0, 0, 0), m_showTicks( true ),
+ : TDEMainWindow(0, 0, 0, 0), m_showTicks( true ),
m_dockWidget( 0L )
{
m_visibilityUpdateAllowed = true;
@@ -112,20 +112,20 @@ KMixWindow::initActions()
// settings menu
KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBar()), actionCollection());
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
- new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
+ new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" );
KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- (void) new KAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
- (void) new KAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
+ (void) new TDEAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
+ (void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(),
- KShortcut(TQString("XF86AudioRaiseVolume")), KShortcut(TQString("XF86AudioRaiseVolume")), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
+ TDEShortcut(TQString("XF86AudioRaiseVolume")), TDEShortcut(TQString("XF86AudioRaiseVolume")), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(),
- KShortcut(TQString("XF86AudioLowerVolume")), KShortcut(TQString("XF86AudioLowerVolume")), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
+ TDEShortcut(TQString("XF86AudioLowerVolume")), TDEShortcut(TQString("XF86AudioLowerVolume")), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(),
- KShortcut(TQString("XF86AudioMute")), KShortcut(TQString("XF86AudioMute")), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
+ TDEShortcut(TQString("XF86AudioMute")), TDEShortcut(TQString("XF86AudioMute")), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
m_globalAccel->readSettings();
m_globalAccel->updateConnections();
@@ -201,10 +201,10 @@ KMixWindow::updateDocking()
/* Belongs in KMixDockWidget
// create RMB menu
- KPopupMenu *menu = m_dockWidget->contextMenu();
+ TDEPopupMenu *menu = m_dockWidget->contextMenu();
// !! check this
- KAction *a = actionCollection()->action( "dock_mute" );
+ TDEAction *a = actionCollection()->action( "dock_mute" );
if ( a ) a->plug( menu );
*/
@@ -327,7 +327,7 @@ KMixWindow::loadConfig()
// show/hide menu bar
m_showMenubar = config->readBoolEntry("Menubar", true);
- KToggleAction *a = static_cast<KToggleAction*>(actionCollection()->action("options_show_menubar"));
+ TDEToggleAction *a = static_cast<TDEToggleAction*>(actionCollection()->action("options_show_menubar"));
if (a) a->setChecked( m_showMenubar );
// restore window size and position
diff --git a/kmix/kmix.h b/kmix/kmix.h
index 870fcb2e..3b2786c3 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -37,7 +37,7 @@ class TQWidgetStack;
// include files for KDE
#include <kmainwindow.h>
-class KAccel;
+class TDEAccel;
class TDEGlobalAccel;
class KComboBox;
class KMixerWidget;
@@ -52,7 +52,7 @@ class Mixer;
class
-KMixWindow : public KMainWindow
+KMixWindow : public TDEMainWindow
{
Q_OBJECT
@@ -91,7 +91,7 @@ KMixWindow : public KMainWindow
void stopVisibilityUpdates();
private:
- KAccel *m_keyAccel;
+ TDEAccel *m_keyAccel;
TDEGlobalAccel *m_globalAccel;
TQPopupMenu *m_fileMenu;
TQPopupMenu *m_viewMenu;
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index aff3e500..e4f30b05 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -81,17 +81,17 @@ KMixDockWidget::~KMixDockWidget()
void KMixDockWidget::createActions()
{
// Put "Mute" selector in context menu
- (void)new KToggleAction( i18n( "M&ute" ), 0, TQT_TQOBJECT(this), TQT_SLOT( dockMute() ),
+ (void)new TDEToggleAction( i18n( "M&ute" ), 0, TQT_TQOBJECT(this), TQT_SLOT( dockMute() ),
actionCollection(), "dock_mute" );
- KAction *a = actionCollection()->action( "dock_mute" );
- KPopupMenu *popupMenu = contextMenu();
+ TDEAction *a = actionCollection()->action( "dock_mute" );
+ TDEPopupMenu *popupMenu = contextMenu();
if ( a ) a->plug( popupMenu );
// Put "Select Master Channel" dialog in context menu
if ( m_mixer != 0 ) {
- (void)new KAction( i18n("Select Master Channel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()),
+ (void)new TDEAction( i18n("Select Master Channel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()),
actionCollection(), "select_master");
- KAction *a2 = actionCollection()->action( "select_master" );
+ TDEAction *a2 = actionCollection()->action( "select_master" );
if (a2) a2->plug( popupMenu );
}
@@ -381,9 +381,9 @@ KMixDockWidget::dockMute()
}
void
-KMixDockWidget::contextMenuAboutToShow( KPopupMenu* /* menu */ )
+KMixDockWidget::contextMenuAboutToShow( TDEPopupMenu* /* menu */ )
{
- KAction* showAction = actionCollection()->action("minimizeRestore");
+ TDEAction* showAction = actionCollection()->action("minimizeRestore");
if ( parentWidget() && showAction )
{
if ( parentWidget()->isVisible() )
@@ -401,7 +401,7 @@ KMixDockWidget::contextMenuAboutToShow( KPopupMenu* /* menu */ )
if ( _dockAreaPopup != 0 )
{
md = _dockAreaPopup->dockDevice();
- KToggleAction *dockMuteAction = static_cast<KToggleAction*>(actionCollection()->action("dock_mute"));
+ TDEToggleAction *dockMuteAction = static_cast<TDEToggleAction*>(actionCollection()->action("dock_mute"));
//kdDebug(67100) << "---> md=" << md << "dockMuteAction=" << dockMuteAction << "isMuted=" << md->isMuted() << endl;
if ( md != 0 && dockMuteAction != 0 ) {
dockMuteAction->setChecked( md->isMuted() );
diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h
index 102df725..2315a087 100644
--- a/kmix/kmixdockwidget.h
+++ b/kmix/kmixdockwidget.h
@@ -66,7 +66,7 @@ class KMixDockWidget : public KSystemTray {
void mousePressEvent(TQMouseEvent *);
void mouseReleaseEvent(TQMouseEvent *);
void wheelEvent(TQWheelEvent *);
- void contextMenuAboutToShow( KPopupMenu* menu );
+ void contextMenuAboutToShow( TDEPopupMenu* menu );
void toggleMinimizeRestore();
void resizeEvent ( TQResizeEvent * );
diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h
index 03e3195e..e07808b6 100644
--- a/kmix/kmixerwidget.h
+++ b/kmix/kmixerwidget.h
@@ -30,7 +30,7 @@ class TQString;
class TQGridLayout;
#include <kpanelapplet.h>
-class KPopupMenu;
+class TDEPopupMenu;
#include "mixer.h"
#include "mixdevicewidget.h"
@@ -40,8 +40,8 @@ class TQSlider;
// KDE
-class KActionCollection;
-class KActionMenu;
+class TDEActionCollection;
+class TDEActionMenu;
class TDEConfig;
class KTabWidget;
@@ -73,7 +73,7 @@ class KMixerWidget : public TQWidget
int id() const { return m_id; };
- KActionCollection* getActionCollection() const { return 0; /* m_actions; */ }
+ TDEActionCollection* getActionCollection() const { return 0; /* m_actions; */ }
signals:
void masterMuted( bool );
@@ -104,7 +104,7 @@ class KMixerWidget : public TQWidget
std::vector<ViewBase*> _views;
int m_id;
- KActionMenu *m_toggleMixerChannels;
+ TDEActionMenu *m_toggleMixerChannels;
bool _iconsEnabled;
bool _labelsEnabled;
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index d4381b04..b4b803e1 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -53,15 +53,15 @@ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md,
// create actions (on _mdwActions, see MixDeviceWidget)
// KStdAction::showMenubar() is in MixDeviceWidget now
- new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
/* !!! remove this for production version */
m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) );
installEventFilter( this ); // filter for popup
}
@@ -121,7 +121,7 @@ void MDWEnum::showContextMenu()
if( m_mixerwidget == NULL )
return;
- KPopupMenu *menu = m_mixerwidget->getPopup();
+ TDEPopupMenu *menu = m_mixerwidget->getPopup();
TQPoint pos = TQCursor::pos();
menu->popup( pos );
@@ -140,7 +140,7 @@ TQSize MDWEnum::sizeHint() const {
/**
This slot is called, when a user has clicked the mute button. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWEnum::nextEnumId() {
if( m_mixdevice->isEnum() ) {
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index b25b116b..30e3b1a4 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -28,8 +28,8 @@
class TQBoxLayout;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class KComboBox;
class TDEGlobalAccel;
@@ -50,7 +50,7 @@ public:
TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWEnum();
- void addActionToPopup( KAction *action );
+ void addActionToPopup( TDEAction *action );
TQSize sizeHint() const;
bool eventFilter( TQObject* obj, TQEvent* e );
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 7664811d..3bfb6bdf 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -64,29 +64,29 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
{
// create actions (on _mdwActions, see MixDeviceWidget)
- new KToggleAction( i18n("&Split Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleStereoLinked()),
+ new TDEToggleAction( i18n("&Split Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleStereoLinked()),
_mdwActions, "stereo" );
- new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- KToggleAction *a = new KToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" );
+ TDEToggleAction *a = new TDEToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" );
connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) );
if( m_mixdevice->isRecordable() ) {
- a = new KToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" );
+ a = new TDEToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" );
connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) );
}
- new KAction( i18n("C&onfigure Global Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets( showMuteLED, showRecordLED );
m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
installEventFilter( this ); // filter for popup
@@ -708,7 +708,7 @@ void MDWSlider::volumeChange( int )
/**
This slot is called, when a user has clicked the recsrc button. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSlider::toggleRecsrc() {
setRecsrc( !m_mixdevice->isRecSource() );
@@ -725,7 +725,7 @@ void MDWSlider::setRecsrc(bool value )
/**
This slot is called, when a user has clicked the mute button. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSlider::toggleMuted() {
setMuted( !m_mixdevice->isMuted() );
@@ -756,7 +756,7 @@ void MDWSlider::setDisabled( bool value )
/**
This slot is called on a MouseWheel event. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSlider::increaseVolume()
{
@@ -773,7 +773,7 @@ void MDWSlider::increaseVolume()
/**
This slot is called on a MouseWheel event. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSlider::decreaseVolume()
{
@@ -894,38 +894,38 @@ void MDWSlider::showContextMenu()
if( m_mixerwidget == NULL )
return;
- KPopupMenu *menu = m_mixerwidget->getPopup();
+ TDEPopupMenu *menu = m_mixerwidget->getPopup();
menu->insertTitle( SmallIcon( "kmix" ), m_mixdevice->name() );
if ( m_sliders.count()>1 ) {
- KToggleAction *stereo = (KToggleAction *)_mdwActions->action( "stereo" );
+ TDEToggleAction *stereo = (TDEToggleAction *)_mdwActions->action( "stereo" );
if ( stereo ) {
stereo->setChecked( !isStereoLinked() );
stereo->plug( menu );
}
}
- KToggleAction *ta = (KToggleAction *)_mdwActions->action( "recsrc" );
+ TDEToggleAction *ta = (TDEToggleAction *)_mdwActions->action( "recsrc" );
if ( ta ) {
ta->setChecked( m_mixdevice->isRecSource() );
ta->plug( menu );
}
if ( m_mixdevice->hasMute() ) {
- ta = ( KToggleAction* )_mdwActions->action( "mute" );
+ ta = ( TDEToggleAction* )_mdwActions->action( "mute" );
if ( ta ) {
ta->setChecked( m_mixdevice->isMuted() );
ta->plug( menu );
}
}
- KAction *a = _mdwActions->action( "hide" );
+ TDEAction *a = _mdwActions->action( "hide" );
if ( a )
a->plug( menu );
a = _mdwActions->action( "keys" );
if ( a && m_keys ) {
- KActionSeparator sep( TQT_TQOBJECT(this) );
+ TDEActionSeparator sep( TQT_TQOBJECT(this) );
sep.plug( menu );
a->plug( menu );
}
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index 0f8c70a5..72b9546c 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -39,8 +39,8 @@ class TQSlider;
class KLed;
class KLedButton;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class KSmallSlider;
class TDEGlobalAccel;
@@ -65,7 +65,7 @@ public:
TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWSlider() {}
- void addActionToPopup( KAction *action );
+ void addActionToPopup( TDEAction *action );
bool isStereoLinked() const { return m_linked; };
bool isLabeled() const;
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 5c931048..709a6d8c 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -54,14 +54,14 @@ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md,
// create actions (on _mdwActions, see MixDeviceWidget)
// KStdAction::showMenubar() is in MixDeviceWidget now
- new KToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new KAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString(),
- KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleSwitch() ) );
+ TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleSwitch() ) );
// The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp)
//m_keys->readSettings();
@@ -158,7 +158,7 @@ void MDWSwitch::showContextMenu()
if( m_mixerwidget == NULL )
return;
- KPopupMenu *menu = m_mixerwidget->getPopup();
+ TDEPopupMenu *menu = m_mixerwidget->getPopup();
TQPoint pos = TQCursor::pos();
menu->popup( pos );
@@ -177,7 +177,7 @@ TQSize MDWSwitch::sizeHint() const {
/**
This slot is called, when a user has clicked the mute button. Also it is called by any other
- associated KAction like the context menu.
+ associated TDEAction like the context menu.
*/
void MDWSwitch::toggleSwitch() {
if( m_mixdevice->isRecordable() )
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index d584bda4..e7759546 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -37,8 +37,8 @@ class TQPopupMenu;
class TQSlider;
class KLedButton;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class KSmallSlider;
class TDEGlobalAccel;
@@ -60,7 +60,7 @@ public:
TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MDWSwitch();
- void addActionToPopup( KAction *action );
+ void addActionToPopup( TDEAction *action );
TQSize sizeHint() const;
void setBackgroundMode(BackgroundMode m);
bool eventFilter( TQObject* obj, TQEvent* e );
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index 19b20514..979708ea 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -58,7 +58,7 @@ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md,
TQWidget( parent, name ), m_mixer(mixer), m_mixdevice( md ), m_mixerwidget( mw ),
m_disabled( false ), _orientation( orientation ), m_small( small )
{
- _mdwActions = new KActionCollection( this );
+ _mdwActions = new TDEActionCollection( this );
m_keys = new TDEGlobalAccel( TQT_TQOBJECT(this), "Keys" );
}
@@ -67,7 +67,7 @@ MixDeviceWidget::~MixDeviceWidget()
}
-void MixDeviceWidget::addActionToPopup( KAction *action )
+void MixDeviceWidget::addActionToPopup( TDEAction *action )
{
_mdwActions->insert( action );
}
diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h
index c9c62d6a..676199e1 100644
--- a/kmix/mixdevicewidget.h
+++ b/kmix/mixdevicewidget.h
@@ -40,8 +40,8 @@ class TQSlider;
class KLed;
class KLedButton;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
class KSmallSlider;
class TDEGlobalAccel;
@@ -64,7 +64,7 @@ public:
TQWidget* parent = 0, ViewBase* mw = 0, const char* name = 0);
~MixDeviceWidget();
- void addActionToPopup( KAction *action );
+ void addActionToPopup( TDEAction *action );
virtual bool isDisabled() const;
MixDevice* mixDevice() { return m_mixdevice; };
@@ -102,7 +102,7 @@ protected slots:
protected:
Mixer* m_mixer;
MixDevice* m_mixdevice;
- KActionCollection* _mdwActions;
+ TDEActionCollection* _mdwActions;
TDEGlobalAccel* m_keys;
ViewBase* m_mixerwidget;
bool m_disabled;
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 702dae82..1d4de379 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -41,7 +41,7 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas
{
setBackgroundOrigin(AncestorOrigin);
// remove the menu bar action, that is put by the "ViewBase" constructor in _actions.
- //KToggleAction *m = static_cast<KToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
+ //TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
_actions->remove( KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions) );
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<KToggleAction*>(KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions ));
+ TDEToggleAction *m = static_cast<TDEToggleAction*>(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" );
diff --git a/kmix/viewbase.h b/kmix/viewbase.h
index a514e325..96840d88 100644
--- a/kmix/viewbase.h
+++ b/kmix/viewbase.h
@@ -5,8 +5,8 @@
#include "tqwidget.h"
// KDE
-class KActionCollection;
-class KPopupMenu;
+class TDEActionCollection;
+class TDEPopupMenu;
class MixSet;
class Mixer;
class MixDevice;
@@ -78,7 +78,7 @@ public:
/**
* Popup stuff
*/
- virtual KPopupMenu* getPopup();
+ virtual TDEPopupMenu* getPopup();
virtual void popupReset();
virtual void showContextMenu();
@@ -99,8 +99,8 @@ protected:
Mixer *_mixer;
MixSet *_mixSet;
- KPopupMenu *_popMenu;
- KActionCollection* _actions;
+ TDEPopupMenu *_popMenu;
+ TDEActionCollection* _actions;
ViewFlags _vflags;
public slots:
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 21:57:17 +0000