Merge branch 'Applications/18.04'

[dolphin.git] / src / settings / dolphinsettingsdialog.h

diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
index 09ad22454c04e8047da92f8914935600f866a530..4c8768fde5ca473b0e67f643fc2b64805b12f77d 100644 (file)
--- a/src/settings/dolphinsettingsdialog.h
+++ b/src/settings/dolphinsettingsdialog.h
@@ -23,8 +23,7 @@
 
 #include <kpagedialog.h>
 
-class KUrl;
-class DolphinMainWindow;
+class QUrl;
 class SettingsPageBase;
 
 /**
@@ -37,22 +36,21 @@ class DolphinSettingsDialog : public KPageDialog
     Q_OBJECT
 
 public:
-    explicit DolphinSettingsDialog(const KUrl& url, QWidget* parent);
-    virtual ~DolphinSettingsDialog();
+    explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = nullptr);
+    ~DolphinSettingsDialog() override;
 
-protected slots:
-    /** @see KDialog::slotButtonClicked() */
-    virtual void slotButtonClicked(int button);
+signals:
+    void settingsChanged();
 
 private slots:
     /** Enables the Apply button. */
     void enableApply();
-
-private:
     void applySettings();
     void restoreDefaults();
 
 private:
+    static SettingsPageBase *createTrashSettingsPage(QWidget *parent);
+
     QList<SettingsPageBase*> m_pages;
 };