diff options
| author | Peter Penz <[email protected]> | 2011-11-06 11:58:48 +0100 |
|---|---|---|
| committer | Peter Penz <[email protected]> | 2011-11-06 11:59:26 +0100 |
| commit | 3c77ffe832a00f405e474f11da7b39d37a410a5b (patch) | |
| tree | 2d84d23b993e759710127a296b9f5a19d62cea90 /src/settings/navigation | |
| parent | 4fcb5662a784b8490c989cfda84e5ee649334418 (diff) | |
Delete obsolete class DolphinSettings
Diffstat (limited to 'src/settings/navigation')
| -rw-r--r-- | src/settings/navigation/navigationsettingspage.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index 1d9c8950f..8076d705d 100644 --- a/src/settings/navigation/navigationsettingspage.cpp +++ b/src/settings/navigation/navigationsettingspage.cpp @@ -19,8 +19,6 @@ #include "navigationsettingspage.h" -#include "settings/dolphinsettings.h" - #include "dolphin_generalsettings.h" #include <KDialog> @@ -88,7 +86,7 @@ void NavigationSettingsPage::applySettings() config.sync(); KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_MOUSE); - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + GeneralSettings* settings = GeneralSettings::self(); settings->setBrowseThroughArchives(m_openArchivesAsFolder->isChecked()); settings->setAutoExpandFolders(m_autoExpandFolders->isChecked()); @@ -97,7 +95,7 @@ void NavigationSettingsPage::applySettings() void NavigationSettingsPage::restoreDefaults() { - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + GeneralSettings* settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); @@ -113,9 +111,8 @@ void NavigationSettingsPage::loadSettings() const bool singleClick = KGlobalSettings::singleClick(); m_singleClick->setChecked(singleClick); m_doubleClick->setChecked(!singleClick); - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - m_openArchivesAsFolder->setChecked(settings->browseThroughArchives()); - m_autoExpandFolders->setChecked(settings->autoExpandFolders()); + m_openArchivesAsFolder->setChecked(GeneralSettings::browseThroughArchives()); + m_autoExpandFolders->setChecked(GeneralSettings::autoExpandFolders()); } #include "navigationsettingspage.moc" |
