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

Remove more uses of deprecated QStyleOptionViewItemV4

Browse Source 
Change-Id: I5b8463e3f5d2d4688865987bf03cfc569fd5fc19
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
hjk
2016-01-21 15:00:33 +01:00
parent ff502ba6ef
commit aded97cd8a
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddevicedialog.cpp
View File

@@ -118,7 +118,7 @@ public:
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
QStyleOptionViewItemV4 opt = option; QStyleOptionViewItem opt = option;
initStyleOption(&opt, index); initStyleOption(&opt, index);
painter->save(); painter->save();
@@ -222,7 +222,7 @@ public:
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
QStyleOptionViewItemV4 opt = option; QStyleOptionViewItem opt = option;
initStyleOption(&opt, index); initStyleOption(&opt, index);
QFontMetrics fm(option.font); QFontMetrics fm(option.font);

7
src/plugins/debugger/console/consoleitemdelegate.cpp
View File

@@ -125,7 +125,7 @@ QColor ConsoleItemDelegate::drawBackground(QPainter *painter, const QRect &rect,
void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const const QModelIndex &index) const
{ {
QStyleOptionViewItemV4 opt = option; QStyleOptionViewItem opt = option;
initStyleOption(&opt, index); initStyleOption(&opt, index);
painter->save(); painter->save();
@@ -253,7 +253,7 @@ void ConsoleItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
QSize ConsoleItemDelegate::sizeHint(const QStyleOptionViewItem &option, QSize ConsoleItemDelegate::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 QTreeView *view = qobject_cast<const QTreeView *>(opt.widget); const QTreeView *view = qobject_cast<const QTreeView *>(opt.widget);
@@ -343,8 +343,7 @@ void ConsoleItemDelegate::updateEditorGeometry(QWidget *editor,
const QStyleOptionViewItem &option, const QStyleOptionViewItem &option,
const QModelIndex &/*index*/) const const QModelIndex &/*index*/) const
{ {
QStyleOptionViewItemV4 opt = option; editor->setGeometry(QRect(option.rect.x(), option.rect.top(), option.rect.width(), option.rect.bottom()));
editor->setGeometry(QRect(opt.rect.x(), opt.rect.top(), opt.rect.width(), opt.rect.bottom()));
} }
void ConsoleItemDelegate::currentChanged(const QModelIndex &current, void ConsoleItemDelegate::currentChanged(const QModelIndex &current,

4
src/plugins/valgrind/callgrindcostdelegate.cpp
View File

@@ -124,7 +124,7 @@ CostDelegate::CostFormat CostDelegate::format() const
void CostDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, void CostDelegate::paint(QPainter *painter, 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 = opt.widget ? opt.widget->style() : QApplication::style(); QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
@@ -157,7 +157,7 @@ void CostDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
QSize CostDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const QSize CostDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
QStyleOptionViewItemV4 opt(option); QStyleOptionViewItem opt(option);
initStyleOption(&opt, index); initStyleOption(&opt, index);
const QString text = d->displayText(index, opt.locale); const QString text = d->displayText(index, opt.locale);