Port Dolphin away from KApplication, KCmdLineArgs and K4AboutData

[dolphin.git] / src / settings / general / behaviorsettingspage.cpp

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 635a1b2c4143b0f82b4caea4259fc0877fb6abf9..093a1f4e160a1c84f7d2104df7b360e809f66b3d 100644 (file)
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -22,20 +22,16 @@
 
 #include "dolphin_generalsettings.h"
 
 
 #include "dolphin_generalsettings.h"
 

-#include <KComboBox>
-#include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>

 
 #include <QCheckBox>
 #include <QGroupBox>
 
 #include <QCheckBox>
 #include <QGroupBox>

-#include <QHBoxLayout>
-#include <QLabel>

 #include <QRadioButton>
 #include <QVBoxLayout>
 
 #include <views/viewproperties.h>
 
 #include <QRadioButton>
 #include <QVBoxLayout>
 
 #include <views/viewproperties.h>
 

-BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
+BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :

     SettingsPageBase(parent),
     m_url(url),
     m_localViewProps(0),
     SettingsPageBase(parent),
     m_url(url),
     m_localViewProps(0),


@@ -101,8 +97,9 @@ void BehaviorSettingsPage::applySettings()
 
     settings->setShowToolTips(m_showToolTips->isChecked());
     settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
 
     settings->setShowToolTips(m_showToolTips->isChecked());
     settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());

+    settings->setNaturalSorting(m_naturalSorting->isChecked());

     settings->setRenameInline(m_renameInline->isChecked());
     settings->setRenameInline(m_renameInline->isChecked());

-    settings->writeConfig();
+    settings->save();

 
     if (useGlobalViewProps) {
         // Remember the global view properties by applying the current view properties.
 
     if (useGlobalViewProps) {
         // Remember the global view properties by applying the current view properties.


@@ -112,13 +109,6 @@ void BehaviorSettingsPage::applySettings()
         ViewProperties globalProps(m_url);
         globalProps.setDirProperties(props);
     }
         ViewProperties globalProps(m_url);
         globalProps.setDirProperties(props);
     }

-
-    const bool naturalSorting = m_naturalSorting->isChecked();
-    if (KGlobalSettings::naturalSorting() != naturalSorting) {
-        KConfigGroup group(KSharedConfig::openConfig(), "KDE");
-        group.writeEntry("NaturalSorting", naturalSorting, KConfig::Persistent | KConfig::Global);
-        KGlobalSettings::emitChange(KGlobalSettings::NaturalSortingChanged);
-    }

 }
 
 void BehaviorSettingsPage::restoreDefaults()
 }
 
 void BehaviorSettingsPage::restoreDefaults()


@@ -137,7 +127,7 @@ void BehaviorSettingsPage::loadSettings()
 
     m_showToolTips->setChecked(GeneralSettings::showToolTips());
     m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
 
     m_showToolTips->setChecked(GeneralSettings::showToolTips());
     m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());

-    m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());
+    m_naturalSorting->setChecked(GeneralSettings::naturalSorting());

     m_renameInline->setChecked(GeneralSettings::renameInline());
 }
 
     m_renameInline->setChecked(GeneralSettings::renameInline());
 }