From aac1fa5e9f485c7f00ba0747207990ceab8a6f67 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 19 Jan 2016 17:20:52 +0100 Subject: [PATCH] Utils: Remove deprecated use of style options Change-Id: I4403e459f700d2cc52f7d475a9c6d89ab2896485 Reviewed-by: Alessandro Portale --- src/libs/utils/annotateditemdelegate.cpp | 4 ++-- src/plugins/coreplugin/manhattanstyle.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/utils/annotateditemdelegate.cpp b/src/libs/utils/annotateditemdelegate.cpp index 4cf341f4767..0756f000f7c 100644 --- a/src/libs/utils/annotateditemdelegate.cpp +++ b/src/libs/utils/annotateditemdelegate.cpp @@ -60,7 +60,7 @@ void AnnotatedItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; initStyleOption(&opt, index); QStyle *style = QApplication::style(); @@ -103,7 +103,7 @@ void AnnotatedItemDelegate::paint(QPainter *painter, QSize AnnotatedItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { - QStyleOptionViewItemV4 opt = option; + QStyleOptionViewItem opt = option; initStyleOption(&opt, index); const QString &annotation = index.data(m_annotationRole).toString(); diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index d5e6fd6ea90..aaf842247f6 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -622,8 +622,8 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt // Most styles draw a single dark outline. This looks rather ugly when combined with our // single pixel dark separator so we adjust the first tab to compensate for this - if (const QStyleOptionTabV3 *tab = qstyleoption_cast(option)) { - QStyleOptionTabV3 adjustedTab = *tab; + if (const QStyleOptionTab *tab = qstyleoption_cast(option)) { + QStyleOptionTab adjustedTab = *tab; if (tab->cornerWidgets == QStyleOptionTab::NoCornerWidgets && ( tab->position == QStyleOptionTab::Beginning || tab->position == QStyleOptionTab::OnlyOneTab))