Added const bools for a few settings that were referenced more than once. Otherwise...

svn path=/trunk/KDE/kdebase/apps/; revision=920920

diff --git a/src/settings/behaviorsettingspage.cpp b/src/settings/behaviorsettingspage.cpp
index f128613fc586fa05c9d3e2644bdae94ccb9da932..d69a7514facc5b6aa5dfc33f2a1510e1c12d35c5 100644 (file)
--- a/src/settings/behaviorsettingspage.cpp
+++ b/src/settings/behaviorsettingspage.cpp
@@ -35,6 +35,9 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 
+const bool CONFIRM_TRASH = false;
+const bool CONFIRM_DELETE = true;
+
 BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
@@ -136,8 +139,8 @@ void BehaviorSettingsPage::restoreDefaults()
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
-    m_confirmMoveToTrash->setChecked(false);
-    m_confirmDelete->setChecked(true);
+    m_confirmMoveToTrash->setChecked(CONFIRM_TRASH);
+    m_confirmDelete->setChecked(CONFIRM_DELETE);
 }
 
 void BehaviorSettingsPage::loadSettings()
@@ -151,8 +154,8 @@ void BehaviorSettingsPage::loadSettings()
 
     KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::IncludeGlobals);
     const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
-    m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", false));
-    m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", true));
+    m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", CONFIRM_TRASH));
+    m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", CONFIRM_DELETE));
 
     m_renameInline->setChecked(settings->renameInline());
     m_showToolTips->setChecked(settings->showToolTips());

diff --git a/src/settings/contextmenusettingspage.cpp b/src/settings/contextmenusettingspage.cpp
index 6812354cf91874c0108f984faed22387269d567f..06072ecbec180f066d49974bb7a7dd06149d7302 100644 (file)
--- a/src/settings/contextmenusettingspage.cpp
+++ b/src/settings/contextmenusettingspage.cpp
@@ -28,6 +28,8 @@
 #include <QCheckBox>
 #include <QVBoxLayout>
 
+const bool SHOW_DELETE = false;
+
 ContextMenuSettingsPage::ContextMenuSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_showDeleteCommand(0),
@@ -74,14 +76,14 @@ void ContextMenuSettingsPage::restoreDefaults()
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
-    m_showDeleteCommand->setChecked(false);
+    m_showDeleteCommand->setChecked(SHOW_DELETE);
 }
 
 void ContextMenuSettingsPage::loadSettings()
 {
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
-    m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", false));
+    m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", SHOW_DELETE));
 
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu());