diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-09-19 14:06:11 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-21 02:44:22 +0200 |
commit | f4a8383a9a01f94262fef8049cabb4e0972f68e8 (patch) | |
tree | 5a535b3e08db9ce68206284019e1e6f48f241514 /src/widgets/itemviews/qtableview.cpp | |
parent | 5ad378859a185c681cdea39a21c850b46e1369bb (diff) |
Replace QStyleOptionViewItemV? with QStyleOptionViewItem
The former are a typedef for the latter in Qt 5. This only touches
internal implementation, as the API was migrated long ago.
Change-Id: Ided73021ebecc00508e6325c3d988b6c6ad336cd
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/widgets/itemviews/qtableview.cpp')
-rw-r--r-- | src/widgets/itemviews/qtableview.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index b851907b08..a70103efd1 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -797,7 +797,7 @@ QRect QTableViewPrivate::visualSpanRect(const QSpanCollection::Span &span) const \a drawn is a QBitArray of visualRowCountxvisualCoulumnCount which say if particular cell has been drawn */ void QTableViewPrivate::drawAndClipSpans(const QRegion &area, QPainter *painter, - const QStyleOptionViewItemV4 &option, QBitArray *drawn, + const QStyleOptionViewItem &option, QBitArray *drawn, int firstVisualRow, int lastVisualRow, int firstVisualColumn, int lastVisualColumn) { bool alternateBase = false; @@ -828,13 +828,13 @@ void QTableViewPrivate::drawAndClipSpans(const QRegion &area, QPainter *painter, rect.translate(scrollDelayOffset); if (!area.intersects(rect)) continue; - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; opt.rect = rect; alternateBase = alternatingColors && (span->top() & 1); if (alternateBase) - opt.features |= QStyleOptionViewItemV2::Alternate; + opt.features |= QStyleOptionViewItem::Alternate; else - opt.features &= ~QStyleOptionViewItemV2::Alternate; + opt.features &= ~QStyleOptionViewItem::Alternate; drawCell(painter, opt, index); region -= rect; for (int r = span->top(); r <= span->bottom(); ++r) { @@ -898,10 +898,10 @@ void QTableViewPrivate::_q_updateSpanRemovedColumns(const QModelIndex &parent, i \internal Draws a table cell. */ -void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItemV4 &option, const QModelIndex &index) +void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) { Q_Q(QTableView); - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; if (selectionModel && selectionModel->isSelected(index)) opt.state |= QStyle::State_Selected; @@ -1307,7 +1307,7 @@ void QTableView::paintEvent(QPaintEvent *event) { Q_D(QTableView); // setup temp variables for the painting - QStyleOptionViewItemV4 option = d->viewOptionsV4(); + QStyleOptionViewItem option = d->viewOptions(); const QPoint offset = d->scrollDelayOffset; const bool showGrid = d->showGrid; const int gridSize = showGrid ? 1 : 0; @@ -1423,9 +1423,9 @@ void QTableView::paintEvent(QPaintEvent *event) option.rect = QRect(colp + (showGrid && rightToLeft ? 1 : 0), rowY, colw, rowh); if (alternate) { if (alternateBase) - option.features |= QStyleOptionViewItemV2::Alternate; + option.features |= QStyleOptionViewItem::Alternate; else - option.features &= ~QStyleOptionViewItemV2::Alternate; + option.features &= ~QStyleOptionViewItem::Alternate; } d->drawCell(&painter, option, index); } @@ -2177,7 +2177,7 @@ int QTableView::sizeHintForRow(int row) const if (right == -1) // the table don't have enough columns to fill the viewport right = d->model->columnCount(d->root) - 1; - QStyleOptionViewItemV4 option = d->viewOptionsV4(); + QStyleOptionViewItem option = d->viewOptions(); int hint = 0; QModelIndex index; @@ -2236,7 +2236,7 @@ int QTableView::sizeHintForColumn(int column) const if (!isVisible() || bottom == -1) // the table don't have enough rows to fill the viewport bottom = d->model->rowCount(d->root) - 1; - QStyleOptionViewItemV4 option = d->viewOptionsV4(); + QStyleOptionViewItem option = d->viewOptions(); int hint = 0; QModelIndex index; |