tsiry-sandratraina.com / rockbox-zig
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
fork atom

regtools/qeditor: replace deprecated QStyleOptionViewItemV4

...by QStyleOptionViewItem. Yes Qt got it right, in 5.7 they deprecated
QStyleOptionViewItemV4 and recommend using QStyleOptionViewItem which contains
less fields except on newer Qt where it contains all fields. Hopefully it still
works on Qt>4.x for a large enough value of x.

Change-Id: I013c383d2424b04c1c0745f0d7b1d5e62a29d324

Amaury Pouly 2ea0ccb6 2a3a6bb4

+5 -5
+4 -4
utils/regtools/qeditor/utils.cpp
··· 1042 1042 Q_UNUSED(event); 1043 1043 QPainter painter(this); 1044 1044 /* reuse delegate code to paint */ 1045 - QStyleOptionViewItemV4 opt = m_display->viewOptions(); 1045 + QStyleOptionViewItem opt = m_display->viewOptions(); 1046 1046 opt.state |= QStyle::State_HasFocus | QStyle::State_Selected | QStyle::State_Active; 1047 1047 opt.displayAlignment = Qt::AlignHCenter | Qt::AlignVCenter; 1048 1048 opt.rect = rect(); ··· 1060 1060 { 1061 1061 } 1062 1062 1063 - void YRegDisplayItemDelegate::MyPaint(QPainter *painter, const QStyleOptionViewItemV4& option) const 1063 + void YRegDisplayItemDelegate::MyPaint(QPainter *painter, const QStyleOptionViewItem& option) const 1064 1064 { 1065 - QStyleOptionViewItemV4 opt = option; 1065 + QStyleOptionViewItem opt = option; 1066 1066 painter->save(); 1067 1067 // draw everything rotated, requires careful manipulation of the 1068 1068 // rects involved ··· 1077 1077 void YRegDisplayItemDelegate::paint(QPainter *painter, 1078 1078 const QStyleOptionViewItem& option, const QModelIndex& index) const 1079 1079 { 1080 - QStyleOptionViewItemV4 opt = option; 1080 + QStyleOptionViewItem opt = option; 1081 1081 // default alignment is centered unless specified 1082 1082 opt.displayAlignment = Qt::AlignHCenter | Qt::AlignVCenter; 1083 1083 initStyleOption(&opt, index);
+1 -1
utils/regtools/qeditor/utils.h
··· 443 443 YRegDisplayItemDelegate(QObject *parent = 0); 444 444 virtual void paint(QPainter *painter, const QStyleOptionViewItem& option, 445 445 const QModelIndex& index) const; 446 - virtual void MyPaint(QPainter *painter, const QStyleOptionViewItemV4& option) const; 446 + virtual void MyPaint(QPainter *painter, const QStyleOptionViewItem& option) const; 447 447 virtual QSize sizeHint(const QStyleOptionViewItem& option, 448 448 const QModelIndex& index) const; 449 449 /* don't bother using the item factory and such, we only use this delegate