From 4b397ebfc0946c61681d2cd28c482520ac0c79f8 Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Sat, 11 Feb 2017 14:04:26 +0300
Subject: [PATCH] Switch from deprecated QStyleOptionViewItemV* to
 QStyleOptionViewItem

---
 qt/FileTreeDelegate.cc          | 4 ++--
 qt/FilterBarComboBoxDelegate.cc | 5 ++---
 qt/Utils.cc                     | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/qt/FileTreeDelegate.cc b/qt/FileTreeDelegate.cc
index 48e4ecd67..59545911f 100644
--- a/qt/FileTreeDelegate.cc
+++ b/qt/FileTreeDelegate.cc
@@ -69,8 +69,8 @@ FileTreeDelegate::paint (QPainter                    * painter,
     }
   else if(column == FileTreeModel::COL_WANTED)
     {
-      QStyleOptionViewItemV4 vi (option);
-      vi.features |= QStyleOptionViewItemV4::HasCheckIndicator;
+      QStyleOptionViewItem vi (option);
+      vi.features |= QStyleOptionViewItem::HasCheckIndicator;
       QRect checkRect = style->subElementRect (QStyle::SE_ItemViewItemCheckIndicator, &vi, nullptr);
       checkRect.moveCenter (option.rect.center ());
       drawCheck (painter, vi, checkRect, static_cast<Qt::CheckState> (index.data ().toInt ()));
diff --git a/qt/FilterBarComboBoxDelegate.cc b/qt/FilterBarComboBoxDelegate.cc
index ff67c27b9..f872d92bb 100644
--- a/qt/FilterBarComboBoxDelegate.cc
+++ b/qt/FilterBarComboBoxDelegate.cc
@@ -54,9 +54,8 @@ FilterBarComboBoxDelegate::paint (QPainter                    * painter,
   if (isSeparator (index))
     {
       QRect rect = option.rect;
-      if (const QStyleOptionViewItemV3 *v3 = qstyleoption_cast<const QStyleOptionViewItemV3*> (&option))
-        if (const QAbstractItemView *view = qobject_cast<const QAbstractItemView*> (v3->widget))
-          rect.setWidth (view->viewport ()->width ());
+      if (const QAbstractItemView *view = qobject_cast<const QAbstractItemView*> (option.widget))
+        rect.setWidth (view->viewport ()->width ());
       QStyleOption opt;
       opt.rect = rect;
       myCombo->style ()->drawPrimitive (QStyle::PE_IndicatorToolBarSeparator, &opt, painter, myCombo);
diff --git a/qt/Utils.cc b/qt/Utils.cc
index 8c097a1df..a599e0106 100644
--- a/qt/Utils.cc
+++ b/qt/Utils.cc
@@ -170,9 +170,9 @@ Utils::removeTrailingDirSeparator (const QString& path)
 int
 Utils::measureViewItem (QAbstractItemView * view, const QString& text)
 {
-  QStyleOptionViewItemV4 option;
+  QStyleOptionViewItem option;
   option.initFrom (view);
-  option.features = QStyleOptionViewItemV2::HasDisplay;
+  option.features = QStyleOptionViewItem::HasDisplay;
   option.text = text;
   option.textElideMode = Qt::ElideNone;
   option.font = view->font ();