From 246f82bfadef9d20262101c7b74d3544e3b1123b Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Tue, 18 Sep 2018 22:17:28 +0200
Subject: [PATCH] Replace obsolete QStyleOptionViewItemV2-4

---
 src/device/deviceview.cpp          | 2 +-
 src/playlist/playlistdelegates.cpp | 4 ++--
 src/playlist/playlistdelegates.h   | 2 +-
 src/playlist/playlistview.cpp      | 4 ++--
 src/playlist/playlistview.h        | 2 +-
 src/widgets/groupediconview.cpp    | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/device/deviceview.cpp b/src/device/deviceview.cpp
index 3d84f1f05..6f02f8aa1 100644
--- a/src/device/deviceview.cpp
+++ b/src/device/deviceview.cpp
@@ -81,7 +81,7 @@ void DeviceItemDelegate::paint(QPainter *p, const QStyleOptionViewItem &opt, con
   }
 
   // Draw the background
-  const QStyleOptionViewItemV3 *vopt = qstyleoption_cast<const QStyleOptionViewItemV3*>(&opt);
+  const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem*>(&opt);
   const QWidget *widget = vopt->widget;
   QStyle *style = widget->style() ? widget->style() : QApplication::style();
   style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, p, widget);
diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp
index 4b7edbd1f..40bb36301 100644
--- a/src/playlist/playlistdelegates.cpp
+++ b/src/playlist/playlistdelegates.cpp
@@ -218,7 +218,7 @@ void PlaylistDelegateBase::paint(QPainter *painter, const QStyleOptionViewItem &
 
 }
 
-QStyleOptionViewItemV4 PlaylistDelegateBase::Adjusted(const QStyleOptionViewItem &option, const QModelIndex &index) const {
+QStyleOptionViewItem PlaylistDelegateBase::Adjusted(const QStyleOptionViewItem &option, const QModelIndex &index) const {
 
   if (!view_) return option;
 
@@ -227,7 +227,7 @@ QStyleOptionViewItemV4 PlaylistDelegateBase::Adjusted(const QStyleOptionViewItem
   if (view_->header()->logicalIndexAt(top_left) != index.column())
     return option;
 
-  QStyleOptionViewItemV4 ret(option);
+  QStyleOptionViewItem ret(option);
 
   if (index.data(Playlist::Role_IsCurrent).toBool()) {
     // Move the text in a bit on the first column for the song that's currently playing
diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h
index 12d27d94b..027465d5a 100644
--- a/src/playlist/playlistdelegates.h
+++ b/src/playlist/playlistdelegates.h
@@ -84,7 +84,7 @@ class PlaylistDelegateBase : public QueuedItemDelegate {
   QString displayText(const QVariant &value, const QLocale &locale) const;
   QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
-  QStyleOptionViewItemV4 Adjusted(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+  QStyleOptionViewItem Adjusted(const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
   static const int kMinHeight;
 
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index 39fa211b9..5fe5cec2f 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -382,7 +382,7 @@ void PlaylistView::drawTree(QPainter *painter, const QRegion &region) const {
 
 void PlaylistView::drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
 
-  QStyleOptionViewItemV4 opt(option);
+  QStyleOptionViewItem opt(option);
 
   bool is_current = index.data(Playlist::Role_IsCurrent).toBool();
   bool is_paused = index.data(Playlist::Role_IsPaused).toBool();
@@ -452,7 +452,7 @@ void PlaylistView::drawRow(QPainter *painter, const QStyleOptionViewItem &option
 
 }
 
-void PlaylistView::UpdateCachedCurrentRowPixmap(QStyleOptionViewItemV4 option, const QModelIndex &index) {
+void PlaylistView::UpdateCachedCurrentRowPixmap(QStyleOptionViewItem option, const QModelIndex &index) {
 
   cached_current_row_rect_ = option.rect;
   cached_current_row_row_ = index.row();
diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h
index 59ddd977d..100724ef5 100644
--- a/src/playlist/playlistview.h
+++ b/src/playlist/playlistview.h
@@ -189,7 +189,7 @@ class PlaylistView : public QTreeView {
  private:
   void ReloadBarPixmaps();
   QList<QPixmap> LoadBarPixmap(const QString &filename);
-  void UpdateCachedCurrentRowPixmap(QStyleOptionViewItemV4 option, const QModelIndex &index);
+  void UpdateCachedCurrentRowPixmap(QStyleOptionViewItem option, const QModelIndex &index);
 
   void set_background_image_type(BackgroundImageType bg) {
     background_image_type_ = bg;
diff --git a/src/widgets/groupediconview.cpp b/src/widgets/groupediconview.cpp
index 8be94923f..33f97ca22 100644
--- a/src/widgets/groupediconview.cpp
+++ b/src/widgets/groupediconview.cpp
@@ -233,9 +233,9 @@ QModelIndex GroupedIconView::indexAt(const QPoint &p) const {
 void GroupedIconView::paintEvent(QPaintEvent *e) {
   // This code was adapted from QListView::paintEvent(), changed to use the visualRect() of items, and to draw headers.
 
-  QStyleOptionViewItemV4 option(viewOptions());
+  QStyleOptionViewItem option(viewOptions());
   if (isWrapping())
-    option.features = QStyleOptionViewItemV2::WrapText;
+    option.features = QStyleOptionViewItem::WrapText;
   option.locale = locale();
   option.locale.setNumberOptions(QLocale::OmitGroupSeparator);
   option.widget = this;