Respect Shift- and Control-key for the rubberband selection

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

diff --git a/src/views/folderexpander.cpp b/src/views/folderexpander.cpp
index a2dfb137b29a2bfdc4c4ab45f7c2f5b807408e94..a9f5971c2f7ca93efd390d09547fbc626c29429c 100644 (file)
--- a/src/views/folderexpander.cpp
+++ b/src/views/folderexpander.cpp
@@ -19,17 +19,17 @@
 
 #include "folderexpander.h"
 
-#include <QtCore/QTimer>
-#include <QtGui/QAbstractItemView>
-#include <QtGui/QTreeView>
-#include <QtGui/QScrollBar>
+#include <QTimer>
+#include <QAbstractItemView>
+#include <QTreeView>
+#include <QScrollBar>
 
-#include <QtCore/QEvent>
-#include <QtGui/QDragMoveEvent>
+#include <QEvent>
+#include <QDragMoveEvent>
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
 
-#include <kdirmodel.h>
+#include <KDirModel>
 
 FolderExpander::FolderExpander(QAbstractItemView *view, QSortFilterProxyModel *proxyModel) :
     QObject(view),
@@ -39,14 +39,11 @@ FolderExpander::FolderExpander(QAbstractItemView *view, QSortFilterProxyModel *p
     m_autoExpandTriggerTimer(0),
     m_autoExpandPos()
 {
-    if (m_view == 0)  {
-        return;
-    }
-    if (m_proxyModel == 0)  {
+    if (!m_view || !m_proxyModel)  {
         return;
     }
     KDirModel *m_dirModel = qobject_cast<KDirModel*>(m_proxyModel->sourceModel());
-    if (m_dirModel == 0) {
+    if (!m_dirModel) {
         return;
     }
 
@@ -100,7 +97,7 @@ void FolderExpander::autoExpandTimeout()
     QModelIndex proxyIndexToExpand = m_view->indexAt(m_autoExpandPos);
     QModelIndex indexToExpand = m_proxyModel->mapToSource(proxyIndexToExpand);
     KDirModel* m_dirModel = qobject_cast< KDirModel* >(m_proxyModel->sourceModel());
-    Q_ASSERT(m_dirModel != 0);
+    Q_ASSERT(m_dirModel);
     KFileItem itemToExpand = m_dirModel->itemForIndex(indexToExpand);
 
     if (itemToExpand.isNull() || itemToExpand == m_dirModel->itemForIndex(QModelIndex())) {
@@ -111,7 +108,7 @@ void FolderExpander::autoExpandTimeout()
 
     if (itemToExpand.isDir()) {
         QTreeView* treeView = qobject_cast<QTreeView*>(m_view);
-        if ((treeView != 0) && treeView->itemsExpandable()) {
+        if (treeView && treeView->itemsExpandable()) {
             // Toggle expanded state of this directory.
             treeView->setExpanded(proxyIndexToExpand, !treeView->isExpanded(proxyIndexToExpand));
         }