summaryrefslogtreecommitdiffstats
path: root/juk/keydialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'juk/keydialog.cpp')
-rw-r--r--juk/keydialog.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index ea73277f..3e8d7e83 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -27,54 +27,54 @@
const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
{ "PlayPause",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_P, KKey::QtWIN+TQt::ALT+TQt::Key_P },
{ TQt::Key_MediaPlay, TQt::Key_MediaPlay } } },
{ "Stop",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_S, KKey::QtWIN+TQt::ALT+TQt::Key_S },
{ TQt::Key_MediaStop, TQt::Key_MediaStop } } },
{ "Back",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::ALT+TQt::Key_Left },
{ TQt::Key_MediaPrev, TQt::Key_MediaPrev } } },
{ "Forward",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::ALT+TQt::Key_Right },
{ TQt::Key_MediaNext, TQt::Key_MediaNext } } },
{ "ForwardAlbum",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::Key_Up },
{ TQt::CTRL+TQt::Key_MediaNext, TQt::CTRL+TQt::Key_MediaNext } } },
{ "SeekBack",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Left, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Left },
{ TQt::SHIFT+TQt::Key_MediaPrev, TQt::SHIFT+TQt::Key_MediaPrev } } },
{ "SeekForward",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_Right, KKey::QtWIN+TQt::SHIFT+TQt::ALT+TQt::Key_Right },
{ TQt::SHIFT+TQt::Key_MediaNext, TQt::SHIFT+TQt::Key_MediaNext } } },
{ "VolumeUp",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Up, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Up },
{ TQt::Key_VolumeUp, TQt::Key_VolumeUp } } },
{ "VolumeDown",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::SHIFT+TQt::Key_Down, KKey::QtWIN+TQt::ALT+TQt::SHIFT+TQt::Key_Down },
{ TQt::Key_VolumeDown, TQt::Key_VolumeDown } } },
{ "Mute",
- { { KShortcut::null(), KShortcut::null() },
+ { { TDEShortcut::null(), TDEShortcut::null() },
{ TQt::CTRL+TQt::ALT+TQt::Key_M, KKey::QtWIN+TQt::ALT+TQt::Key_M },
{ TQt::Key_VolumeMute, TQt::Key_VolumeMute } } },
{ "ShowHide",
- { { KShortcut::null(), KShortcut::null() },
- { KShortcut::null(), KShortcut::null() },
- { KShortcut::null(), KShortcut::null() } } }
+ { { TDEShortcut::null(), TDEShortcut::null() },
+ { TDEShortcut::null(), TDEShortcut::null() },
+ { TDEShortcut::null(), TDEShortcut::null() } } }
};
const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]);
-KeyDialog::KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection,
+KeyDialog::KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection,
TQWidget *parent, const char *name)
: KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
{
@@ -114,7 +114,7 @@ KeyDialog::~KeyDialog()
}
-void KeyDialog::newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection,
+void KeyDialog::newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection,
int selectedButton)
{
m_keys = keys;
@@ -171,7 +171,7 @@ void KeyDialog::slotDefault()
m_pKeyChooser->allDefault();
}
-int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollection,
+int KeyDialog::configure(TDEGlobalAccel *keys, TDEActionCollection *actionCollection,
TQWidget *parent)
{
// Create and show dialog - update connections if accepted
@@ -186,8 +186,8 @@ int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollecti
void KeyDialog::insert(TDEGlobalAccel *keys, const TQString &action, const TQString &label,
const TQObject *objSlot, const char *methodSlot)
{
- KShortcut def3 = KShortcut::null();
- KShortcut def4 = KShortcut::null();
+ TDEShortcut def3 = TDEShortcut::null();
+ TDEShortcut def4 = TDEShortcut::null();
// Find and insert a standard key