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/styles/qcommonstyle_p.h | |
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/styles/qcommonstyle_p.h')
-rw-r--r-- | src/widgets/styles/qcommonstyle_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h index 0c783324e2..6a031abf3b 100644 --- a/src/widgets/styles/qcommonstyle_p.h +++ b/src/widgets/styles/qcommonstyle_p.h @@ -78,14 +78,14 @@ public: { delete cachedOption; } - void viewItemDrawText(QPainter *p, const QStyleOptionViewItemV4 *option, const QRect &rect) const; - void viewItemLayout(const QStyleOptionViewItemV4 *opt, QRect *checkRect, + void viewItemDrawText(QPainter *p, const QStyleOptionViewItem *option, const QRect &rect) const; + void viewItemLayout(const QStyleOptionViewItem *opt, QRect *checkRect, QRect *pixmapRect, QRect *textRect, bool sizehint) const; - QSize viewItemSize(const QStyleOptionViewItemV4 *option, int role) const; + QSize viewItemSize(const QStyleOptionViewItem *option, int role) const; mutable QRect decorationRect, displayRect, checkRect; - mutable QStyleOptionViewItemV4 *cachedOption; - bool isViewItemCached(const QStyleOptionViewItemV4 &option) const { + mutable QStyleOptionViewItem *cachedOption; + bool isViewItemCached(const QStyleOptionViewItem &option) const { return cachedOption && (option.rect == cachedOption->rect && option.direction == cachedOption->direction && option.state == cachedOption->state |