From 3464290338fb7aaf8057d229221abf96ce349929 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 8 Aug 2012 15:05:40 +0200 Subject: Restore rekonq settings --- src/settings/settingsdialog.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/settings/settingsdialog.cpp') diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index 9f6b372a..99922e54 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -47,7 +47,6 @@ #include #include #include -#include #include #include @@ -70,8 +69,6 @@ private: KCModuleProxy *ebrowsingModule; - KShortcutsEditor *shortcutsEditor; - friend class SettingsDialog; }; @@ -118,12 +115,7 @@ Private::Private(SettingsDialog *parent) pageItem = parent->addPage(advancedWidg, i18n("Advanced")); pageItem->setIcon(KIcon("applications-system")); -// // -- 7 -// shortcutsEditor = new KShortcutsEditor(rApp->mainWindow()->actionCollection(), parent); -// pageItem = parent->addPage(shortcutsEditor , i18n("Shortcuts")); -// pageItem->setIcon(KIcon("configure-shortcuts")); - - // -- 8 + // -- 7 KCModuleInfo ebrowsingInfo("ebrowsing.desktop"); ebrowsingModule = new KCModuleProxy(ebrowsingInfo, parent); pageItem = parent->addPage(ebrowsingModule, i18n("Search Engines")); @@ -160,8 +152,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) connect(d->advancedWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); connect(d->privacyWidg, SIGNAL(changed(bool)), this, SLOT(updateButtons())); - connect(d->shortcutsEditor, SIGNAL(keyChange()), this, SLOT(updateButtons())); - // save settings connect(this, SIGNAL(applyClicked()), this, SLOT(saveSettings())); connect(this, SIGNAL(okClicked()), this, SLOT(saveSettings())); @@ -187,7 +177,6 @@ void SettingsDialog::saveSettings() d->webkitWidg->save(); d->advancedWidg->save(); d->privacyWidg->save(); - d->shortcutsEditor->save(); d->ebrowsingModule->save(); d->privacyWidg->reload(); @@ -209,7 +198,6 @@ bool SettingsDialog::hasChanged() || d->advancedWidg->changed() || d->privacyWidg->changed() || d->ebrowsingModule->changed() - || d->shortcutsEditor->isModified(); ; } -- cgit v1.2.1