summaryrefslogtreecommitdiff
path: root/src/settings
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@gmail.com>2011-02-24 18:35:20 +0100
committerAndrea Diamantini <adjam7@gmail.com>2011-02-24 18:38:45 +0100
commit23b44d0344304499ba8e1f199720202381920827 (patch)
treeedd144e38d6dc3619b8b889f3a80a69a8dc52180 /src/settings
parentSave one updateRightIcons call from the bookmark icon. (diff)
downloadrekonq-23b44d0344304499ba8e1f199720202381920827.tar.xz
No more static members in the Application class,
an rApp shortcut for Application::instance, clean up code switching to use the new shortcut Reviewed by: adjam
Diffstat (limited to 'src/settings')
-rw-r--r--src/settings/generalwidget.cpp2
-rw-r--r--src/settings/settingsdialog.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/settings/generalwidget.cpp b/src/settings/generalwidget.cpp
index 0128830c..812ae244 100644
--- a/src/settings/generalwidget.cpp
+++ b/src/settings/generalwidget.cpp
@@ -73,7 +73,7 @@ void GeneralWidget::hasChanged()
void GeneralWidget::setHomeToCurrentPage()
{
- MainWindow *mw = Application::instance()->mainWindow();
+ MainWindow *mw = rApp->mainWindow();
WebTab *webTab = mw->currentTab();
if (webTab)
{
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 84c6da12..f5ade187 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -123,7 +123,7 @@ Private::Private(SettingsDialog *parent)
pageItem->setIcon(KIcon("preferences-web-browser-adblock"));
// -- 7
- shortcutsEditor = new KShortcutsEditor(Application::instance()->mainWindow()->actionCollection(), parent);
+ shortcutsEditor = new KShortcutsEditor(rApp->mainWindow()->actionCollection(), parent);
pageItem = parent->addPage(shortcutsEditor , i18n("Shortcuts"));
pageItem->setIcon(KIcon("configure-shortcuts"));
@@ -204,7 +204,7 @@ void SettingsDialog::saveSettings()
d->ebrowsingModule->save();
SearchEngine::reload();
- Application::opensearchManager()->removeDeletedEngines();
+ rApp->opensearchManager()->removeDeletedEngines();
updateButtons();
emit settingsChanged("ReKonfig");