diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp index 8b4cd1063..16a1e3504 100644 --- a/src/plasma/corona.cpp +++ b/src/plasma/corona.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include "containment.h" @@ -383,54 +382,6 @@ void CoronaPrivate::init() //fake containment/applet actions KActionCollection *containmentActions = AppletPrivate::defaultActions(q); //containment has to start with applet stuff ContainmentPrivate::addDefaultActions(containmentActions); //now it's really containment - actionCollections << &actions << AppletPrivate::defaultActions(q) << containmentActions; - - //Update the shortcuts - QMutableListIterator > it(actionCollections); - while (it.hasNext()) { - it.next(); - KActionCollection *collection = it.value().data(); - if (!collection) { - // get rid of KActionCollections that have been deleted behind our backs - it.remove(); - continue; - } - - collection->readSettings(); - if (shortcutsDlg) { - shortcutsDlg.data()->addCollection(collection); - } - } -} - -void CoronaPrivate::showShortcutConfig() -{ - //show a kshortcutsdialog with the actions - KShortcutsDialog *dlg = shortcutsDlg.data(); - if (!dlg) { - dlg = new KShortcutsDialog(); - dlg->setModal(false); - dlg->setAttribute(Qt::WA_DeleteOnClose, true); - QObject::connect(dlg, SIGNAL(saved()), q, SIGNAL(shortcutsChanged())); - - dlg->addCollection(&actions); - QMutableListIterator > it(actionCollections); - while (it.hasNext()) { - it.next(); - KActionCollection *collection = it.value().data(); - if (!collection) { - // get rid of KActionCollections that have been deleted behind our backs - it.remove(); - continue; - } - - dlg->addCollection(collection); - } - } - - KWindowSystem::setOnDesktop(dlg->winId(), KWindowSystem::currentDesktop()); - dlg->configure(); - dlg->raise(); } void CoronaPrivate::toggleImmutability() diff --git a/src/plasma/corona.h b/src/plasma/corona.h index e60cc2d29..410a0ec13 100644 --- a/src/plasma/corona.h +++ b/src/plasma/corona.h @@ -311,7 +311,6 @@ private: Q_PRIVATE_SLOT(d, void containmentDestroyed(QObject*)) Q_PRIVATE_SLOT(d, void syncConfig()) Q_PRIVATE_SLOT(d, void toggleImmutability()) - Q_PRIVATE_SLOT(d, void showShortcutConfig()) friend class CoronaPrivate; friend class View; diff --git a/src/plasma/private/corona_p.h b/src/plasma/private/corona_p.h index 97c60932f..d84c48513 100644 --- a/src/plasma/private/corona_p.h +++ b/src/plasma/private/corona_p.h @@ -41,7 +41,6 @@ public: ~CoronaPrivate(); void init(); - void showShortcutConfig(); void toggleImmutability(); void saveLayout(KSharedConfigPtr cg) const; void updateContainmentImmutability(); @@ -64,9 +63,7 @@ public: QHash offscreenWidgets; KActionCollection actions; QMap > containmentActionsDefaults; - QWeakPointer shortcutsDlg; QHash toolBoxPlugins; - QList > actionCollections; }; }