2 files changed, 16 insertions, 13 deletions
diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index 8076d705d..69feed3ee 100644
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@@ -23,12 +23,10 @@
 
 #include <KDialog>
 #include <KGlobalSettings>
-#include <KLocale>
-#include <KVBox>
+#include <KLocalizedString>
 
 #include <QCheckBox>
 #include <QGroupBox>
-#include <QLabel>
 #include <QRadioButton>
 #include <QVBoxLayout>
 
@@ -40,11 +38,15 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
     const int spacing = KDialog::spacingHint();
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(spacing);
+    QWidget* vBox = new QWidget(this);
+    QVBoxLayout *vBoxLayout = new QVBoxLayout(vBox);
+    vBoxLayout->setMargin(0);
+    vBoxLayout->setSpacing(spacing);
+    vBoxLayout->setAlignment(Qt::AlignTop);
 
     // create 'Mouse' group
     QGroupBox* mouseBox = new QGroupBox(i18nc("@title:group", "Mouse"), vBox);
+    vBoxLayout->addWidget(mouseBox);
     mouseBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_singleClick = new QRadioButton(i18nc("@option:check Mouse Settings",
                                            "Single-click to open files and folders"), mouseBox);
@@ -56,8 +58,10 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
     mouseBoxLayout->addWidget(m_doubleClick);
 
     m_openArchivesAsFolder = new QCheckBox(i18nc("@option:check", "Open archives as folder"), vBox);
+    vBoxLayout->addWidget(m_openArchivesAsFolder);
 
     m_autoExpandFolders = new QCheckBox(i18nc("option:check", "Open folders during drag operations"), vBox);
+    vBoxLayout->addWidget(m_autoExpandFolders);
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
@@ -68,10 +72,10 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
 
     loadSettings();
 
-    connect(m_singleClick, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_doubleClick, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_openArchivesAsFolder, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_autoExpandFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_singleClick, &QRadioButton::toggled, this, &NavigationSettingsPage::changed);
+    connect(m_doubleClick, &QRadioButton::toggled, this, &NavigationSettingsPage::changed);
+    connect(m_openArchivesAsFolder, &QCheckBox::toggled, this, &NavigationSettingsPage::changed);
+    connect(m_autoExpandFolders, &QCheckBox::toggled, this, &NavigationSettingsPage::changed);
 }
 
 NavigationSettingsPage::~NavigationSettingsPage()
@@ -90,7 +94,7 @@ void NavigationSettingsPage::applySettings()
     settings->setBrowseThroughArchives(m_openArchivesAsFolder->isChecked());
     settings->setAutoExpandFolders(m_autoExpandFolders->isChecked());
 
-    settings->writeConfig();
+    settings->save();
 }
 
 void NavigationSettingsPage::restoreDefaults()
@@ -115,4 +119,3 @@ void NavigationSettingsPage::loadSettings()
     m_autoExpandFolders->setChecked(GeneralSettings::autoExpandFolders());
 }
 
-#include "navigationsettingspage.moc"
diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h
index 7d5b981d4..ff1ed31ef 100644
--- a/src/settings/navigation/navigationsettingspage.h
+++ b/src/settings/navigation/navigationsettingspage.h
@@ -36,10 +36,10 @@ public:
     virtual ~NavigationSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 private:
     void loadSettings();