From 509ab6375e029460bad2694d38c8f35b050cfd09 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 19 Sep 2012 17:34:12 +0200 Subject: 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 --- src/widgets/itemviews/qitemdelegate.cpp | 9 +-------- 1 file changed, 1 insertion(+), 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(&option); - opt.features = v2 ? v2->features - : QStyleOptionViewItemV2::ViewItemFeatures(QStyleOptionViewItemV2::None); - const QStyleOptionViewItemV3 *v3 = qstyleoption_cast(&option); - opt.locale = v3 ? v3->locale : QLocale(); - opt.widget = v3 ? v3->widget : 0; + QStyleOptionViewItem opt = setOptions(index, option); // prepare painter->save(); -- cgit v1.2.3