Merge branch 'frameworks'

1 files changed, 9 insertions, 4 deletions

diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index 6b0e9ff48..5490be85b 100644
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -21,9 +21,9 @@
 #ifndef VIEWPROPERTIESDIALOG_H
 #define VIEWPROPERTIESDIALOG_H
 
-#include "libdolphin_export.h"
+#include "dolphin_export.h"
 
-#include <KDialog>
+#include <QDialog>
 
 class QCheckBox;
 class KComboBox;
@@ -39,7 +39,7 @@ class DolphinView;
  * and previews should be shown. The properties can be assigned to the current folder,
  * or recursively to all sub folders.
  */
-class LIBDOLPHINPRIVATE_EXPORT ViewPropertiesDialog : public KDialog
+class DOLPHIN_EXPORT ViewPropertiesDialog : public QDialog
 {
     Q_OBJECT
 
@@ -47,8 +47,10 @@ public:
     explicit ViewPropertiesDialog(DolphinView* dolphinView);
     virtual ~ViewPropertiesDialog();
 
+public slots:
+    void accept() Q_DECL_OVERRIDE;
+
 private slots:
-    void slotOk();
     void slotApply();
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
@@ -60,6 +62,9 @@ private slots:
     void markAsDirty(bool isDirty);
     void configureAdditionalInfo();
 
+signals:
+    void isDirtyChanged(bool isDirty);
+
 private:
     void applyViewProperties();
     void loadSettings();