summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2017-01-27 18:21:04 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2017-02-04 17:19:50 +0100
commit2ea0ccb6c5fb029aa8db997bdab7e1ef43df1406 (patch)
treef56b31b530ff490a71fa1faee2ff0e4431d21228
parent2a3a6bb4b343c95c2928dfa998c4edcf100774f9 (diff)
downloadrockbox-2ea0ccb6c5fb029aa8db997bdab7e1ef43df1406.tar.gz
rockbox-2ea0ccb6c5fb029aa8db997bdab7e1ef43df1406.tar.bz2
rockbox-2ea0ccb6c5fb029aa8db997bdab7e1ef43df1406.zip
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
-rw-r--r--utils/regtools/qeditor/utils.cpp8
-rw-r--r--utils/regtools/qeditor/utils.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/utils/regtools/qeditor/utils.cpp b/utils/regtools/qeditor/utils.cpp
index 748a989512..ada52fd07a 100644
--- a/utils/regtools/qeditor/utils.cpp
+++ b/utils/regtools/qeditor/utils.cpp
@@ -1042,7 +1042,7 @@ void YRegDisplayItemEditor::paintEvent(QPaintEvent *event)
Q_UNUSED(event);
QPainter painter(this);
/* reuse delegate code to paint */
- QStyleOptionViewItemV4 opt = m_display->viewOptions();
+ QStyleOptionViewItem opt = m_display->viewOptions();
opt.state |= QStyle::State_HasFocus | QStyle::State_Selected | QStyle::State_Active;
opt.displayAlignment = Qt::AlignHCenter | Qt::AlignVCenter;
opt.rect = rect();
@@ -1060,9 +1060,9 @@ YRegDisplayItemDelegate::YRegDisplayItemDelegate(QObject *parent)
{
}
-void YRegDisplayItemDelegate::MyPaint(QPainter *painter, const QStyleOptionViewItemV4& option) const
+void YRegDisplayItemDelegate::MyPaint(QPainter *painter, const QStyleOptionViewItem& option) const
{
- QStyleOptionViewItemV4 opt = option;
+ QStyleOptionViewItem opt = option;
painter->save();
// draw everything rotated, requires careful manipulation of the
// rects involved
@@ -1077,7 +1077,7 @@ void YRegDisplayItemDelegate::MyPaint(QPainter *painter, const QStyleOptionViewI
void YRegDisplayItemDelegate::paint(QPainter *painter,
const QStyleOptionViewItem& option, const QModelIndex& index) const
{
- QStyleOptionViewItemV4 opt = option;
+ QStyleOptionViewItem opt = option;
// default alignment is centered unless specified
opt.displayAlignment = Qt::AlignHCenter | Qt::AlignVCenter;
initStyleOption(&opt, index);
diff --git a/utils/regtools/qeditor/utils.h b/utils/regtools/qeditor/utils.h
index 83992274b7..b9755cf3c3 100644
--- a/utils/regtools/qeditor/utils.h
+++ b/utils/regtools/qeditor/utils.h
@@ -443,7 +443,7 @@ public:
YRegDisplayItemDelegate(QObject *parent = 0);
virtual void paint(QPainter *painter, const QStyleOptionViewItem& option,
const QModelIndex& index) const;
- virtual void MyPaint(QPainter *painter, const QStyleOptionViewItemV4& option) const;
+ virtual void MyPaint(QPainter *painter, const QStyleOptionViewItem& option) const;
virtual QSize sizeHint(const QStyleOptionViewItem& option,
const QModelIndex& index) const;
/* don't bother using the item factory and such, we only use this delegate