Merge branch '4.9'

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

diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index d2170f33181978ee4a32debc888dff2ad9598386..6b0e9ff48075c0e1fc907b3a3b17ced3c600892b 100644 (file)
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -53,7 +53,7 @@ private slots:
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);
-    void slotCategorizedSortingChanged();
+    void slotGroupedSortingChanged();
     void slotSortFoldersFirstChanged();
     void slotShowPreviewChanged();
     void slotShowHiddenFilesChanged();
@@ -73,7 +73,7 @@ private:
     KComboBox* m_sortOrder;
     KComboBox* m_sorting;
     QCheckBox* m_sortFoldersFirst;
-    QCheckBox* m_showPreview;
+    QCheckBox* m_previewsShown;
     QCheckBox* m_showInGroups;
     QCheckBox* m_showHiddenFiles;
     QPushButton* m_additionalInfo;