Merge commit 'refs/merge-requests/160' of git://gitorious.org/rekonq/mainline into m160

1 files changed, 18 insertions, 1 deletions

diff --git a/src/webview.h b/src/webview.h
index 1fd40f92..b9c04e47 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -32,6 +32,9 @@
 // Rekonq Includes
 #include "rekonq_defines.h"
 
+//Qt Includes
+#include <QTime>
+
 // KDE Includes
 #include <KWebView>
 
@@ -71,6 +74,11 @@ private slots:
     void inspect();
 
     void scrollFrameChanged();
+    void scrollTick();
+
+    void setupSmoothScrolling(int posY);
+
+    void stopScrolling();
 
 signals:
     void loadUrl(const KUrl &, const Rekonq::OpenType &);
@@ -80,11 +88,20 @@ private:
     QPoint _mousePos;
     QPoint _clickPos;
 
-    QTimer *_scrollTimer;
+    // Auto Scroll
+    QTimer *_autoScrollTimer;
     int _VScrollSpeed;
     int _HScrollSpeed;
     bool _canEnableAutoScroll;
     bool _isAutoScrollEnabled;
+
+    // Smooth Scroll
+    QTimer *_smoothScrollTimer;
+    QTime _smoothScrollTime;
+    bool _scrollBottom;
+    bool _smoothScrolling;
+    int _dy;
+    int _smoothScrollSteps;
 };
 
 #endif