SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h
index 1f1a5145649079a347f2a506b0b8877895036339..f0322c5f0c6fd021c2b93aba323c707ec787284a 100644 (file)
--- a/src/settings/dolphinsettingsdialog.h
+++ b/src/settings/dolphinsettingsdialog.h
@@ -7,8 +7,8 @@
 #ifndef DOLPHINSETTINGSDIALOG_H
 #define DOLPHINSETTINGSDIALOG_H
 
-#include <KPageDialog>
 #include <KActionCollection>
+#include <KPageDialog>
 
 class QUrl;
 class SettingsPageBase;
@@ -23,25 +23,27 @@ class DolphinSettingsDialog : public KPageDialog
     Q_OBJECT
 
 public:
-    explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = nullptr, KActionCollection* actions = {});
+    explicit DolphinSettingsDialog(const QUrl &url, QWidget *parent = nullptr, KActionCollection *actions = {});
     ~DolphinSettingsDialog() override;
 
-signals:
+    KPageWidgetItem *trashSettings;
+
+Q_SIGNALS:
     void settingsChanged();
 
-private slots:
+private Q_SLOTS:
     /** Enables the Apply button. */
     void enableApply();
     void applySettings();
     void restoreDefaults();
 
 protected:
-    void closeEvent(QCloseEvent* event) override;
+    void closeEvent(QCloseEvent *event) override;
 
 private:
     static SettingsPageBase *createTrashSettingsPage(QWidget *parent);
 
-    QList<SettingsPageBase*> m_pages;
+    QList<SettingsPageBase *> m_pages;
     bool m_unsavedChanges;
 };