1 files changed, 19 insertions, 11 deletions
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index d661c2ae96..f90e0fee68 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -61,11 +61,10 @@
 #include "QtGui/qmime.h"
 #include "QtGui/qpainter.h"
 #include "QtCore/qpair.h"
-#include "QtCore/qtimer.h"
-#include "QtCore/qtimeline.h"
 #include "QtGui/qregion.h"
 #include "QtCore/qdebug.h"
 #include "QtGui/qpainter.h"
+#include "QtCore/qbasictimer.h"
 
 #ifndef QT_NO_ITEMVIEWS
 
@@ -87,6 +86,9 @@ struct QEditorInfo
 
 };
 
+typedef QPair<QRect, QModelIndex> QItemViewPaintPair;
+typedef QList<QItemViewPaintPair> QItemViewPaintPairs;
+
 class QEmptyModel : public QAbstractItemModel
 {
 public:
@@ -109,13 +111,14 @@ public:
 
     void init();
 
-    void _q_rowsRemoved(const QModelIndex &parent, int start, int end);
-    void _q_columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
-    void _q_columnsRemoved(const QModelIndex &parent, int start, int end);
-    void _q_columnsInserted(const QModelIndex &parent, int start, int end);
-    void _q_modelDestroyed();
-    void _q_layoutChanged();
-    void _q_fetchMore();
+    virtual void _q_rowsRemoved(const QModelIndex &parent, int start, int end);
+    virtual void _q_columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
+    virtual void _q_columnsRemoved(const QModelIndex &parent, int start, int end);
+    virtual void _q_columnsInserted(const QModelIndex &parent, int start, int end);
+    virtual void _q_modelDestroyed();
+    virtual void _q_layoutChanged();
+    
+    void fetchMore();
 
     bool shouldEdit(QAbstractItemView::EditTrigger trigger, const QModelIndex &index) const;
     bool shouldForwardEvent(QAbstractItemView::EditTrigger trigger, const QEvent *event) const;
@@ -139,6 +142,9 @@ public:
                                                                    const QEvent *event) const;
     virtual void selectAll(QItemSelectionModel::SelectionFlags command);
 
+    void checkMouseMove(const QPersistentModelIndex &index);
+    inline void checkMouseMove(const QPoint &pos) { checkMouseMove(q_func()->indexAt(pos)); }
+
     inline QItemSelectionModel::SelectionFlags selectionBehaviorFlags() const
     {
         switch (selectionBehavior) {
@@ -173,7 +179,9 @@ public:
             q_func()->style()->drawPrimitive(QStyle::PE_IndicatorItemViewItemDrop, &opt, painter, q_func());
         }
     }
+
 #endif
+    virtual QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const;
 
     inline void releaseEditor(QWidget *editor) const {
         if (editor) {
@@ -218,7 +226,7 @@ public:
     void clearOrRemove();
     void checkPersistentEditorFocus();
 
-    QPixmap renderToPixmap(const QModelIndexList &indexes, QRect *r = 0) const;
+    QPixmap renderToPixmap(const QModelIndexList &indexes, QRect *r) const;
 
     inline QPoint offset() const {
         const Q_Q(QAbstractItemView);
@@ -372,7 +380,6 @@ public:
     QBasicTimer updateTimer;
     QBasicTimer delayedEditing;
     QBasicTimer delayedAutoScroll; //used when an item is clicked
-    QTimeLine timeline;
 
     QAbstractItemView::ScrollMode verticalScrollMode;
     QAbstractItemView::ScrollMode horizontalScrollMode;
@@ -384,6 +391,7 @@ public:
 
 private:
     mutable QBasicTimer delayedLayout;
+    mutable QBasicTimer fetchMoreTimer;
 };
 
 QT_BEGIN_INCLUDE_NAMESPACE