From de50a6da9fb2d001eb64512612686ae77ce0d5dc Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Mon, 2 Nov 2015 16:12:44 +0100
Subject: bb10style: remove use of obsolete QStyleOption*V<N>

They are obsolete since Qt 5.0.

Change-Id: I0f375b6dbc3def659d084e94081ad0e9dcfd1ca0
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
---
 src/plugins/styles/bb10style/qpixmapstyle.cpp | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'src/plugins/styles')

diff --git a/src/plugins/styles/bb10style/qpixmapstyle.cpp b/src/plugins/styles/bb10style/qpixmapstyle.cpp
index 759f57eb1c..3090c42959 100644
--- a/src/plugins/styles/bb10style/qpixmapstyle.cpp
+++ b/src/plugins/styles/bb10style/qpixmapstyle.cpp
@@ -616,9 +616,9 @@ void QPixmapStyle::drawProgressBarBackground(const QStyleOption *option,
                                              QPainter *painter, const QWidget *) const
 {
     bool vertical = false;
-    if (const QStyleOptionProgressBarV2 *pb2 =
-            qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
-        vertical = (pb2->orientation == Qt::Vertical);
+    if (const QStyleOptionProgressBar *pb =
+            qstyleoption_cast<const QStyleOptionProgressBar *>(option)) {
+        vertical = pb->orientation == Qt::Vertical;
     }
     drawCachedPixmap(vertical ? PB_VBackground : PB_HBackground, option->rect, painter);
 }
@@ -628,11 +628,7 @@ void QPixmapStyle::drawProgressBarLabel(const QStyleOption *option,
 {
     if (const QStyleOptionProgressBar *pb =
                     qstyleoption_cast<const QStyleOptionProgressBar *>(option)) {
-        bool vertical = false;
-        if (const QStyleOptionProgressBarV2 *pb2 =
-                        qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
-            vertical = (pb2->orientation == Qt::Vertical);
-        }
+        const bool vertical = pb->orientation == Qt::Vertical;
         if (!vertical) {
             QPalette::ColorRole textRole = QPalette::ButtonText;
             proxy()->drawItemText(painter, pb->rect,
@@ -647,13 +643,8 @@ void QPixmapStyle::drawProgressBarFill(const QStyleOption *option,
 {
     const QStyleOptionProgressBar *pbar =
                 qstyleoption_cast<const QStyleOptionProgressBar*>(option);
-    bool vertical = false;
-    bool flip = pbar->direction == Qt::RightToLeft;
-    if (const QStyleOptionProgressBarV2 *pb2 =
-            qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
-        vertical = (pb2->orientation == Qt::Vertical);
-        flip = flip ^ pb2->invertedAppearance;
-    }
+    const bool vertical = pbar->orientation == Qt::Vertical;
+    const bool flip = (pbar->direction == Qt::RightToLeft) ^ pbar->invertedAppearance;
 
     if (pbar->progress == pbar->maximum) {
         drawCachedPixmap(vertical ? PB_VComplete : PB_HComplete, option->rect, painter);
@@ -801,9 +792,9 @@ QSize QPixmapStyle::progressBarSizeFromContents(const QStyleOption *option,
                                                 const QWidget *widget) const
 {
     bool vertical = false;
-    if (const QStyleOptionProgressBarV2 *pb2 =
-                    qstyleoption_cast<const QStyleOptionProgressBarV2 *>(option)) {
-        vertical = (pb2->orientation == Qt::Vertical);
+    if (const QStyleOptionProgressBar *pb =
+                    qstyleoption_cast<const QStyleOptionProgressBar *>(option)) {
+        vertical = pb->orientation == Qt::Vertical;
     }
     QSize result = QCommonStyle::sizeFromContents(CT_Slider, option, contentsSize, widget);
     if (vertical) {
-- 
cgit v1.2.3