Merge branch 'frameworks'

1 files changed, 2 insertions, 8 deletions

diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
index 2de195017..93f714799 100644
--- a/src/settings/dolphinsettingsdialog.h
+++ b/src/settings/dolphinsettingsdialog.h
@@ -23,7 +23,7 @@
 
 #include <kpagedialog.h>
 
-class KUrl;
+class QUrl;
 class SettingsPageBase;
 
 /**
@@ -36,21 +36,15 @@ class DolphinSettingsDialog : public KPageDialog
     Q_OBJECT
 
 public:
-    explicit DolphinSettingsDialog(const KUrl& url, QWidget* parent = 0);
+    explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = 0);
     virtual ~DolphinSettingsDialog();
 
 signals:
     void settingsChanged();
 
-protected slots:
-    /** @see KDialog::slotButtonClicked() */
-    virtual void slotButtonClicked(int button);
-
 private slots:
     /** Enables the Apply button. */
     void enableApply();
-
-private:
     void applySettings();
     void restoreDefaults();