From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 20 Jul 2008 02:11:27 +0000 (+0000)
Subject: revert fix for bug 167044 - although the crash is fixed the autoscroll does not work... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f28ee3152a05f09abd117df19bb99d0966947e6b?ds=inline

revert fix for bug 167044 - although the crash is fixed the autoscroll does not work as expected anymore...

CCBUG: 167044

svn path=/trunk/KDE/kdebase/apps/; revision=835179
---

diff --git a/src/ktreeview.cpp b/src/ktreeview.cpp
index 5c665ee99..7109e2755 100644
--- a/src/ktreeview.cpp
+++ b/src/ktreeview.cpp
@@ -23,7 +23,6 @@
 
 #include <KGlobalSettings>
 
-#include <QEvent>
 #include <QItemSelectionModel>
 #include <QScrollBar>
 #include <QTimer>
@@ -38,15 +37,10 @@ KTreeView::KTreeViewPrivate::KTreeViewPrivate(KTreeView *parent) :
     startScrollTimer = new QTimer(this);
     startScrollTimer->setSingleShot(true);
     startScrollTimer->setInterval(300);
-
-    timeLine = new QTimeLine(300, this);
-}
-
-void KTreeView::KTreeViewPrivate::connectScrollTimers()
-{
     connect(startScrollTimer, SIGNAL(timeout()),
             this, SLOT(startScrolling()));
 
+    timeLine = new QTimeLine(300, this);
     connect(timeLine, SIGNAL(frameChanged(int)),
             this, SLOT(updateVerticalScrollBar(int)));
 
@@ -175,13 +169,5 @@ void KTreeView::scrollTo(const QModelIndex& index, ScrollHint hint)
     }
 }
 
-bool KTreeView::event(QEvent* event)
-{
-    if (event->type() == QEvent::Polish) {
-        d->connectScrollTimers();
-    }
-    return QTreeView::event(event);
-}
-
 #include "ktreeview.moc"
 #include "ktreeview_p.moc"
diff --git a/src/ktreeview.h b/src/ktreeview.h
index 4d7dad4ea..0e9841fb3 100644
--- a/src/ktreeview.h
+++ b/src/ktreeview.h
@@ -37,9 +37,6 @@ public:
     virtual void setSelectionModel(QItemSelectionModel *selectionModel);
     virtual void scrollTo(const QModelIndex& index, ScrollHint hint = EnsureVisible);
 
-protected:
-    virtual bool event(QEvent* event);
-
 private:
     class KTreeViewPrivate;
     KTreeViewPrivate *d;
diff --git a/src/ktreeview_p.h b/src/ktreeview_p.h
index bea4788db..1cfa463cd 100644
--- a/src/ktreeview_p.h
+++ b/src/ktreeview_p.h
@@ -32,9 +32,6 @@ class KTreeView::KTreeViewPrivate : public QObject
 {
     Q_OBJECT
 
-public:
-    void connectScrollTimers();
-
 public Q_SLOTS:
     void startScrolling();
     void updateVerticalScrollBar(int value);