diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:13:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:13:25 -0600 |
| commit | 940c092f32d40263ad6b24f948eaf4c48b01e99a (patch) | |
| tree | f5235b5c44e8aaedd3484a00551e29993d548590 /kmix/kmix.cpp | |
| parent | ced2058eaf8e5af831ebc02812a18937ff7e1de3 (diff) | |
| download | tdemultimedia-940c092f32d40263ad6b24f948eaf4c48b01e99a.tar.gz tdemultimedia-940c092f32d40263ad6b24f948eaf4c48b01e99a.zip | |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kmix/kmix.cpp')
| -rw-r--r-- | kmix/kmix.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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 |