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

CCBUG: 167044

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

diff --git a/src/ktreeview.cpp b/src/ktreeview.cpp
index 5c665ee997b945d7bd301c8ff6018222e5bec2f7..7109e27553a5d94db427ca8c218fd00b34191b57 100644 (file)
--- 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 4d7dad4eaed77198d5f847105f0bcae9f383df52..0e9841fb394b09d0922a410b0eb642deb9c58360 100644 (file)
--- 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 bea4788db56e46c731eee66c74de4f46e059da9e..1cfa463cd89e9e3b6669db3d8e1f5faa54352564 100644 (file)
--- 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);