diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:47:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:47:46 -0600 |
| commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
| tree | 493c1095950b7f0a82690cedac1b749666be1b47 /juk/keydialog.cpp | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'juk/keydialog.cpp')
| -rw-r--r-- | juk/keydialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp index 80e7c1bd..be469a6c 100644 --- a/juk/keydialog.cpp +++ b/juk/keydialog.cpp @@ -74,7 +74,7 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = { const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]); -KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, +KeyDialog::KeyDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok) { @@ -82,7 +82,7 @@ KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, int selectedButton; - KConfigGroup config(KGlobal::config(), "Shortcuts"); + KConfigGroup config(TDEGlobal::config(), "Shortcuts"); selectedButton = config.readNumEntry("GlobalKeys", StandardKeys); // Create widgets for key chooser - widget stack used to replace key chooser @@ -114,7 +114,7 @@ KeyDialog::~KeyDialog() } -void KeyDialog::newDialog(KGlobalAccel *keys, KActionCollection *actionCollection, +void KeyDialog::newDialog(TDEGlobalAccel *keys, KActionCollection *actionCollection, int selectedButton) { m_keys = keys; @@ -137,9 +137,9 @@ int KeyDialog::configure() int retcode = exec(); if(retcode == Accepted) { - KConfigGroup config(KGlobal::config(), "Shortcuts"); + KConfigGroup config(TDEGlobal::config(), "Shortcuts"); config.writeEntry("GlobalKeys", m_group->id(m_group->selected())); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); m_pKeyChooser->save(); } @@ -148,7 +148,7 @@ int KeyDialog::configure() void KeyDialog::slotKeys(int group) { - bool fourModKeys = KGlobalAccel::useFourModifierKeys(); + bool fourModKeys = TDEGlobalAccel::useFourModifierKeys(); // Set modifier keys according to key group and modifier keys @@ -171,7 +171,7 @@ void KeyDialog::slotDefault() m_pKeyChooser->allDefault(); } -int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection, +int KeyDialog::configure(TDEGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent) { // Create and show dialog - update connections if accepted @@ -183,7 +183,7 @@ int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection return retcode; } -void KeyDialog::insert(KGlobalAccel *keys, const TQString &action, const TQString &label, +void KeyDialog::insert(TDEGlobalAccel *keys, const TQString &action, const TQString &label, const TQObject *objSlot, const char *methodSlot) { KShortcut def3 = KShortcut::null(); |