First show folders when sorting by type, then sort categories alphabetically. Yeah !

[dolphin.git] / src / generalviewsettingspage.cpp

diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index 48b9b653bea0769578c3f17be6d54d6d76341af8..6b484f120069b5a3b5a112e64ba4c349e1e1b031 100644 (file)
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -20,15 +20,17 @@
 #include "generalviewsettingspage.h"
 #include "dolphinmainwindow.h"
 #include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
+#include "dolphinviewcontainer.h"
 #include "viewproperties.h"
 
-#include <QtGui/QLabel>
-#include <QtGui/QGroupBox>
-#include <QtGui/QRadioButton>
-#include <QtGui/QSlider>
-#include <QtGui/QSpinBox>
-#include <QtGui/QBoxLayout>
+#include "dolphin_generalsettings.h"
+
+#include <QLabel>
+#include <QGroupBox>
+#include <QRadioButton>
+#include <QSlider>
+#include <QSpinBox>
+#include <QBoxLayout>
 
 #include <kconfiggroup.h>
 #include <kdialog.h>
@@ -100,7 +102,7 @@ GeneralViewSettingsPage::~GeneralViewSettingsPage()
 
 void GeneralViewSettingsPage::applySettings()
 {
-    const KUrl& url = m_mainWindow->activeView()->url();
+    const KUrl& url = m_mainWindow->activeViewContainer()->url();
     ViewProperties props(url);  // read current view properties
 
     const bool useGlobalProps = m_globalProps->isChecked();