1 files changed, 13 insertions, 17 deletions

diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index ee0d41ce15..88090f1e45 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -46,6 +46,7 @@
 #include <qabstractbutton.h>
 #include <private/qtableview_p.h>
 #include <private/qheaderview_p.h>
+#include <private/qscrollbar_p.h>
 #ifndef QT_NO_ACCESSIBILITY
 #include <qaccessible.h>
 #endif
@@ -661,7 +662,7 @@ void QTableViewPrivate::trimHiddenSelections(QItemSelectionRange *range) const
 */
 void QTableViewPrivate::setSpan(int row, int column, int rowSpan, int columnSpan)
 {
-    if (row < 0 || column < 0 || rowSpan <= 0 || columnSpan <= 0) {
+    if (Q_UNLIKELY(row < 0 || column < 0 || rowSpan <= 0 || columnSpan <= 0)) {
         qWarning("QTableView::setSpan: invalid span given: (%d, %d, %d, %d)",
                  row, column, rowSpan, columnSpan);
         return;
@@ -680,7 +681,7 @@ void QTableViewPrivate::setSpan(int row, int column, int rowSpan, int columnSpan
         sp->m_right = column + columnSpan - 1;
         spans.updateSpan(sp, old_height);
         return;
-    } else if (rowSpan == 1 && columnSpan == 1) {
+    } else if (Q_UNLIKELY(rowSpan == 1 && columnSpan == 1)) {
         qWarning("QTableView::setSpan: single cell span won't be added");
         return;
     }
@@ -1369,9 +1370,6 @@ void QTableView::paintEvent(QPaintEvent *event)
     uint x = horizontalHeader->length() - horizontalHeader->offset() - (rightToLeft ? 0 : 1);
     uint y = verticalHeader->length() - verticalHeader->offset() - 1;
 
-    const QRegion region = event->region().translated(offset);
-    const QVector<QRect> rects = region.rects();
-
     //firstVisualRow is the visual index of the first visible row.  lastVisualRow is the visual index of the last visible Row.
     //same goes for ...VisualColumn
     int firstVisualRow = qMax(verticalHeader->visualIndexAt(0),0);
@@ -1390,13 +1388,15 @@ void QTableView::paintEvent(QPaintEvent *event)
 
     QBitArray drawn((lastVisualRow - firstVisualRow + 1) * (lastVisualColumn - firstVisualColumn + 1));
 
+    const QRegion region = event->region().translated(offset);
+
     if (d->hasSpans()) {
         d->drawAndClipSpans(region, &painter, option, &drawn,
                              firstVisualRow, lastVisualRow, firstVisualColumn, lastVisualColumn);
     }
 
-    for (int i = 0; i < rects.size(); ++i) {
-        QRect dirtyArea = rects.at(i);
+    const QVector<QRect> rects = region.rects();
+    for (auto dirtyArea : rects) {
         dirtyArea.setBottom(qMin(dirtyArea.bottom(), int(y)));
         if (rightToLeft) {
             dirtyArea.setLeft(qMax(dirtyArea.left(), d->viewport->width() - int(x)));
@@ -1951,8 +1951,7 @@ QRegion QTableView::visualRegionForSelection(const QItemSelection &selection) co
     bool horizontalMoved = horizontalHeader()->sectionsMoved();
 
     if ((verticalMoved && horizontalMoved) || (d->hasSpans() && (verticalMoved || horizontalMoved))) {
-        for (int i = 0; i < selection.count(); ++i) {
-            QItemSelectionRange range = selection.at(i);
+        for (const auto &range : selection) {
             if (range.parent() != d->root || !range.isValid())
                 continue;
             for (int r = range.top(); r <= range.bottom(); ++r)
@@ -1963,8 +1962,7 @@ QRegion QTableView::visualRegionForSelection(const QItemSelection &selection) co
                 }
         }
     } else if (horizontalMoved) {
-        for (int i = 0; i < selection.count(); ++i) {
-            QItemSelectionRange range = selection.at(i);
+        for (const auto &range : selection) {
             if (range.parent() != d->root || !range.isValid())
                 continue;
             int top = rowViewportPosition(range.top());
@@ -1979,8 +1977,7 @@ QRegion QTableView::visualRegionForSelection(const QItemSelection &selection) co
             }
         }
     } else if (verticalMoved) {
-        for (int i = 0; i < selection.count(); ++i) {
-            QItemSelectionRange range = selection.at(i);
+        for (const auto &range : selection) {
             if (range.parent() != d->root || !range.isValid())
                 continue;
             int left = columnViewportPosition(range.left());
@@ -1996,8 +1993,7 @@ QRegion QTableView::visualRegionForSelection(const QItemSelection &selection) co
         }
     } else { // nothing moved
         const int gridAdjust = showGrid() ? 1 : 0;
-        for (int i = 0; i < selection.count(); ++i) {
-            QItemSelectionRange range = selection.at(i);
+        for (auto range : selection) {
             if (range.parent() != d->root || !range.isValid())
                 continue;
             d->trimHiddenSelections(&range);
@@ -2166,7 +2162,7 @@ void QTableView::updateGeometries()
     } else { // ScrollPerPixel
         horizontalScrollBar()->setPageStep(vsize.width());
         horizontalScrollBar()->setRange(0, horizontalLength - vsize.width());
-        horizontalScrollBar()->setSingleStep(qMax(vsize.width() / (columnsInViewport + 1), 2));
+        horizontalScrollBar()->d_func()->itemviewChangeSingleStep(qMax(vsize.width() / (columnsInViewport + 1), 2));
     }
 
     // vertical scroll bar
@@ -2194,7 +2190,7 @@ void QTableView::updateGeometries()
     } else { // ScrollPerPixel
         verticalScrollBar()->setPageStep(vsize.height());
         verticalScrollBar()->setRange(0, verticalLength - vsize.height());
-        verticalScrollBar()->setSingleStep(qMax(vsize.height() / (rowsInViewport + 1), 2));
+        verticalScrollBar()->d_func()->itemviewChangeSingleStep(qMax(vsize.height() / (rowsInViewport + 1), 2));
     }
 
     d->geometryRecursionBlock = false;