readded missing isVersioned check in VersionControlObserver::actions()

[dolphin.git] / src / settings / startup / startupsettingspage.cpp

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 3bf922dfe4deeb8c4aa34716ef3a84760ae6e293..baba7f8a1370d35835e79b88c01949596e898036 100644 (file)
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -24,7 +24,6 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <KDialog>
 #include <KFileDialog>
 #include <KLocalizedString>
 #include <QLineEdit>
@@ -49,13 +48,10 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     m_showFullPath(0),
     m_filterBar(0)
 {
-    const int spacing = KDialog::spacingHint();
-
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     QWidget* vBox = new QWidget(this);
     QVBoxLayout *vBoxLayout = new QVBoxLayout(vBox);
     vBoxLayout->setMargin(0);
-    vBoxLayout->setSpacing(spacing);
     vBoxLayout->setAlignment(Qt::AlignTop);
 
     // create 'Home URL' editor
@@ -65,7 +61,6 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     QWidget* homeUrlBox = new QWidget(homeBox);
     QHBoxLayout *homeUrlBoxLayout = new QHBoxLayout(homeUrlBox);
     homeUrlBoxLayout->setMargin(0);
-    homeUrlBoxLayout->setSpacing(spacing);
 
     QLabel* homeUrlLabel = new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);
     homeUrlBoxLayout->addWidget(homeUrlLabel);
@@ -86,7 +81,6 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     QWidget* buttonBox = new QWidget(homeBox);
     QHBoxLayout *buttonBoxLayout = new QHBoxLayout(buttonBox);
     buttonBoxLayout->setMargin(0);
-    buttonBoxLayout->setSpacing(spacing);
 
     QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location"), buttonBox);
     buttonBoxLayout->addWidget(useCurrentButton);
@@ -148,7 +142,7 @@ void StartupSettingsPage::applySettings()
     settings->setShowFullPath(m_showFullPath->isChecked());
     settings->setFilterBar(m_filterBar->isChecked());
 
-    settings->writeConfig();
+    settings->save();
 }
 
 void StartupSettingsPage::restoreDefaults()