feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove deprecated use of style options

Browse Source 
Change-Id: I4403e459f700d2cc52f7d475a9c6d89ab2896485
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
hjk
2016-01-19 17:20:52 +01:00
parent dc6968d1b8
commit aac1fa5e9f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/annotateditemdelegate.cpp
View File

@@ -60,7 +60,7 @@ void AnnotatedItemDelegate::paint(QPainter *painter,
const QStyleOptionViewItem &option, const QStyleOptionViewItem &option,
const QModelIndex &index) const const QModelIndex &index) const
{ {
QStyleOptionViewItemV4 opt = option; QStyleOptionViewItem opt = option;
initStyleOption(&opt, index); initStyleOption(&opt, index);
QStyle *style = QApplication::style(); QStyle *style = QApplication::style();
@@ -103,7 +103,7 @@ void AnnotatedItemDelegate::paint(QPainter *painter,
QSize AnnotatedItemDelegate::sizeHint(const QStyleOptionViewItem &option, QSize AnnotatedItemDelegate::sizeHint(const QStyleOptionViewItem &option,
const QModelIndex &index) const const QModelIndex &index) const
{ {
QStyleOptionViewItemV4 opt = option; QStyleOptionViewItem opt = option;
initStyleOption(&opt, index); initStyleOption(&opt, index);
const QString &annotation = index.data(m_annotationRole).toString(); const QString &annotation = index.data(m_annotationRole).toString();

4
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -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 // 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 // single pixel dark separator so we adjust the first tab to compensate for this
if (const QStyleOptionTabV3 *tab = qstyleoption_cast<const QStyleOptionTabV3 *>(option)) { if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(option)) {
QStyleOptionTabV3 adjustedTab = *tab; QStyleOptionTab adjustedTab = *tab;
if (tab->cornerWidgets == QStyleOptionTab::NoCornerWidgets && ( if (tab->cornerWidgets == QStyleOptionTab::NoCornerWidgets && (
tab->position == QStyleOptionTab::Beginning || tab->position == QStyleOptionTab::Beginning ||
tab->position == QStyleOptionTab::OnlyOneTab)) tab->position == QStyleOptionTab::OnlyOneTab))