X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d39451d6d17cda145527ef1bdc05277de164d765..148282e2d856b47ceb191eeef4c834118c8cdffd:/src/folderexpander.cpp

diff --git a/src/folderexpander.cpp b/src/folderexpander.cpp
index 777f7ffa3..e742972d3 100644
--- a/src/folderexpander.cpp
+++ b/src/folderexpander.cpp
@@ -34,7 +34,6 @@
 #include <QtGui/QSortFilterProxyModel>
 
 #include <kdirmodel.h>
-#include <kdebug.h>
 
 FolderExpander::FolderExpander(QAbstractItemView *view, QSortFilterProxyModel *proxyModel) :
     QObject(view),
@@ -94,13 +93,6 @@ FolderExpander::~FolderExpander()
 void FolderExpander::viewScrolled()
 {
     if (m_autoExpandTriggerTimer->isActive())  {
-        kDebug() << "Resetting time due to scrolling!"; 
-        // (Re-)set the timer while we're scrolling the view
-        // (or it's being scrolled by some external mechanism).
-        // TODO - experiment with this.  Cancelling the timer,
-        // or adding a "penalty" on top of AUTO_EXPAND_DELAY
-        // might work more nicely when drilling down through the sidebar
-        // tree.
         m_autoExpandTriggerTimer->start(AUTO_EXPAND_DELAY);
     }
 }
@@ -123,8 +115,6 @@ void FolderExpander::autoExpandTimeout()
     if (itemToExpand.isNull()) {
         return;
     }
-    
-    kDebug() << "Need to expand: " << itemToExpand.targetUrl() << " isDir? = " << itemToExpand.isDir();
 
     if (itemToExpand.isDir()) {
         QTreeView *viewAsTreeView = qobject_cast<QTreeView*>(m_view);
@@ -133,8 +123,7 @@ void FolderExpander::autoExpandTimeout()
             viewAsTreeView->setExpanded(proxyIndexToExpand, !viewAsTreeView->isExpanded(proxyIndexToExpand));
         }
         else {
-            // Enter this directory.
-            emit enterDir(proxyIndexToExpand);
+            emit enterDir(proxyIndexToExpand, m_view);
         }
     }
 }