summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-09-19 17:34:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-19 19:54:44 +0200
commit509ab6375e029460bad2694d38c8f35b050cfd09 (patch)
tree9716e304c4a55a617a08004f1aab2f83a4e39e5b
parent89d9f8fe949e65e7455fabe288ea284aa6de06b1 (diff)
Remove casting of QStyleOptionViewItems to set data.
The correct values are already set inside setOptions, because the multiple versions of QStyleOptionViewItem were squashed in Qt 5. Change-Id: If0faf4b35bbf476e00905905376868814b8b095a Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-rw-r--r--src/widgets/itemviews/qitemdelegate.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index f5700746b8..2972202406 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -418,14 +418,7 @@ void QItemDelegate::paint(QPainter *painter,
Q_D(const QItemDelegate);
Q_ASSERT(index.isValid());
- QStyleOptionViewItemV4 opt = setOptions(index, option);
-
- const QStyleOptionViewItemV2 *v2 = qstyleoption_cast<const QStyleOptionViewItemV2 *>(&option);
- opt.features = v2 ? v2->features
- : QStyleOptionViewItemV2::ViewItemFeatures(QStyleOptionViewItemV2::None);
- const QStyleOptionViewItemV3 *v3 = qstyleoption_cast<const QStyleOptionViewItemV3 *>(&option);
- opt.locale = v3 ? v3->locale : QLocale();
- opt.widget = v3 ? v3->widget : 0;
+ QStyleOptionViewItem opt = setOptions(index, option);
// prepare
painter->save();