Changeset 846 for trunk/src/gui/itemviews/qabstractitemview.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/itemviews/qabstractitemview.cpp (modified) (18 diffs)

trunk/src/gui/itemviews/qabstractitemview.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -105 +105 @@
         currentIndexSet(false),
         wrapItemText(false),
-        delayedPendingLayout(false)
-{
+        delayedPendingLayout(true),
+        moveCursorUpdatedView(false)
+{
+    keyboardInputTime.invalidate();
 }
 
@@ -131 +133 @@
 
     viewport->setBackgroundRole(QPalette::Base);
-
-    doDelayedItemsLayout();
 
     q->setAttribute(Qt::WA_InputMethodEnabled);
@@ -596 +596 @@
 QAbstractItemView::~QAbstractItemView()
 {
+    Q_D(QAbstractItemView);
+    // stop these timers here before ~QObject
+    d->delayedReset.stop();
+    d->updateTimer.stop();
+    d->delayedEditing.stop();
+    d->delayedAutoScroll.stop();
+    d->autoScrollTimer.stop();
+    d->delayedLayout.stop();
+    d->fetchMoreTimer.stop();
 }
 
@@ -680 +689 @@
         connect(d->model, SIGNAL(layoutChanged()), this, SLOT(_q_layoutChanged()));
     }
-    setSelectionModel(new QItemSelectionModel(d->model, this));
+
+    QItemSelectionModel *selection_model = new QItemSelectionModel(d->model, this);
+    connect(d->model, SIGNAL(destroyed()), selection_model, SLOT(deleteLater()));
+    setSelectionModel(selection_model);
+
     reset(); // kill editors, set new root and do layout
 }
@@ -824 +837 @@
 
     \note If a delegate has been assigned to both a row and a column, the row
-    delegate (i.e., this delegate) will take presedence and manage the
+    delegate (i.e., this delegate) will take precedence and manage the
     intersecting cell index.
 
@@ -882 +895 @@
 
     \note If a delegate has been assigned to both a row and a column, the row
-    delegate will take presedence and manage the intersecting cell index.
+    delegate will take precedence and manage the intersecting cell index.
 
     \warning You should not share the same instance of a delegate between views.
@@ -1163 +1176 @@
     \brief how the view scrolls its contents in the vertical direction
 
-    This property controlls how the view scroll its contents vertically.
+    This property controls how the view scroll its contents vertically.
     Scrolling can be done either per pixel or per item.
 */
@@ -1189 +1202 @@
     \brief how the view scrolls its contents in the horizontal direction
 
-    This property controlls how the view scroll its contents horizontally.
+    This property controls how the view scroll its contents horizontally.
     Scrolling can be done either per pixel or per item.
 */
@@ -1272 +1285 @@
     \brief the size of the area when auto scrolling is triggered
 
-    This property controlls the size of the area at the edge of the viewport that
+    This property controls the size of the area at the edge of the viewport that
     triggers autoscrolling. The default value is 16 pixels.
 */
@@ -1360 +1373 @@
     Note that the model used needs to provide support for drag and drop operations.
 
-    \sa setDragDropMode() {Using Drag and Drop with Item Views}
+    \sa setDragDropMode() {Using drag and drop with item views}
 */
 
@@ -2094 +2107 @@
         d->autoScroll = false;
         QModelIndex index = moveCursor(MoveNext, Qt::NoModifier); // first visible index
-        if (index.isValid() && d->isIndexEnabled(index))
+        if (index.isValid() && d->isIndexEnabled(index) && event->reason() != Qt::MouseFocusReason)
             selectionModel()->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
         d->autoScroll = autoScroll;
@@ -2214 +2227 @@
 
     QPersistentModelIndex newCurrent;
+    d->moveCursorUpdatedView = false;
     switch (event->key()) {
     case Qt::Key_Down:
@@ -2266 +2280 @@
                 d->selectionModel->setCurrentIndex(newCurrent, command);
                 d->pressedPosition = visualRect(newCurrent).center() + d->offset();
-                // We copy the same behaviour as for mousePressEvent().
-                QRect rect(d->pressedPosition - d->offset(), QSize(1, 1));
-                setSelection(rect, command);
+                if (newCurrent.isValid()) {
+                    // We copy the same behaviour as for mousePressEvent().
+                    QRect rect(d->pressedPosition - d->offset(), QSize(1, 1));
+                    setSelection(rect, command);
+                }
             }
+            event->accept();
             return;
         }
@@ -2301 +2318 @@
     case Qt::Key_Shift:
     case Qt::Key_Control:
+    case Qt::Key_Delete:
+    case Qt::Key_Backspace:
         event->ignore();
         break;
@@ -2365 +2384 @@
         break; }
     }
+    if (d->moveCursorUpdatedView)
+        event->accept();
 }
 
@@ -2841 +2862 @@
     QModelIndex start = currentIndex().isValid() ? currentIndex()
                         : d->model->index(0, 0, d->root);
-    QTime now(QTime::currentTime());
     bool skipRow = false;
-    if (search.isEmpty()
-        || (d->keyboardInputTime.msecsTo(now) > QApplication::keyboardInputInterval())) {
+    bool keyboardTimeWasValid = d->keyboardInputTime.isValid();
+    qint64 keyboardInputTimeElapsed = d->keyboardInputTime.restart();
+    if (search.isEmpty() || !keyboardTimeWasValid
+        || keyboardInputTimeElapsed > QApplication::keyboardInputInterval()) {
         d->keyboardInput = search;
         skipRow = currentIndex().isValid(); //if it is not valid we should really start at QModelIndex(0,0)
@@ -2850 +2872 @@
         d->keyboardInput += search;
     }
-    d->keyboardInputTime = now;
 
     // special case for searches with same key like 'aaaaa'