From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Wed, 19 Sep 2012 15:34:12 +0000 (+0200)
Subject: Remove casting of QStyleOptionViewItems to set data.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=509ab6375e029460bad2694d38c8f35b050cfd09;p=profile%2Fivi%2Fqtbase.git

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>
---

diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index f570074..2972202 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();