Fix Dolphin session management regression

[dolphin.git] / src / views / dolphindetailsviewexpander.cpp

diff --git a/src/views/dolphindetailsviewexpander.cpp b/src/views/dolphindetailsviewexpander.cpp
index 0f3d3fde19046e61b50022aa2e5ff47f97606828..cc4bc67be3d7917ac3db457e88467ad2b2350d81 100644 (file)
--- a/src/views/dolphindetailsviewexpander.cpp
+++ b/src/views/dolphindetailsviewexpander.cpp
@@ -23,8 +23,8 @@
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 
-#include <kdirlister.h>
-#include <kdirmodel.h>
+#include <KDirLister>
+#include <KDirModel>
 
 DolphinDetailsViewExpander::DolphinDetailsViewExpander(DolphinDetailsView* parent,
                                                        const QSet<KUrl>& urlsToExpand) :
@@ -34,16 +34,16 @@ DolphinDetailsViewExpander::DolphinDetailsViewExpander(DolphinDetailsView* paren
     m_dolphinModel(0),
     m_proxyModel(0)
 {
-    Q_ASSERT(parent != 0);
+    Q_ASSERT(parent);
 
     m_proxyModel = qobject_cast<const DolphinSortFilterProxyModel*>(parent->model());
-    Q_ASSERT(m_proxyModel != 0);
+    Q_ASSERT(m_proxyModel);
 
     m_dolphinModel = qobject_cast<const DolphinModel*>(m_proxyModel->sourceModel());
-    Q_ASSERT(m_dolphinModel != 0);
+    Q_ASSERT(m_dolphinModel);
 
     m_dirLister = m_dolphinModel->dirLister();
-    Q_ASSERT(m_dirLister != 0);
+    Q_ASSERT(m_dirLister);
 
     // The URLs must be sorted. E.g. /home/user/ cannot be expanded before /home/
     // because it is not known to the dir model before.