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

Remove even more uses of deprecated typedefs

Browse Source 
Change-Id: Icb48d484f760eb11ef2d41d8271e43f4f51c2e91
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
hjk
2016-01-22 14:00:08 +01:00
parent 74eb8db29f
commit 677effda78
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/find/searchresulttreeitemdelegate.cpp
View File

@@ -46,7 +46,7 @@ void SearchResultTreeItemDelegate::paint(QPainter *painter, const QStyleOptionVi
painter->save(); painter->save();
QStyleOptionViewItemV3 opt = setOptions(index, option); QStyleOptionViewItem opt = setOptions(index, option);
painter->setFont(opt.font); painter->setFont(opt.font);
QItemDelegate::drawBackground(painter, opt, index); QItemDelegate::drawBackground(painter, opt, index);
@@ -102,7 +102,7 @@ void SearchResultTreeItemDelegate::setTabWidth(int width)
} }
// returns the width of the line number area // returns the width of the line number area
int SearchResultTreeItemDelegate::drawLineNumber(QPainter *painter, const QStyleOptionViewItemV3 &option, int SearchResultTreeItemDelegate::drawLineNumber(QPainter *painter, const QStyleOptionViewItem &option,
const QRect &rect, const QRect &rect,
const QModelIndex &index) const const QModelIndex &index) const
{ {
@@ -128,7 +128,7 @@ int SearchResultTreeItemDelegate::drawLineNumber(QPainter *painter, const QStyle
option.palette.brush(cg, QPalette::Highlight) : option.palette.brush(cg, QPalette::Highlight) :
option.palette.color(cg, QPalette::Base).darker(111))); option.palette.color(cg, QPalette::Base).darker(111)));
QStyleOptionViewItemV3 opt = option; QStyleOptionViewItem opt = option;
opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
opt.palette.setColor(cg, QPalette::Text, Qt::darkGray); opt.palette.setColor(cg, QPalette::Text, Qt::darkGray);

2
src/plugins/coreplugin/find/searchresulttreeitemdelegate.h
View File

@@ -39,7 +39,7 @@ public:
void setTabWidth(int width); void setTabWidth(int width);
private: private:
int drawLineNumber(QPainter *painter, const QStyleOptionViewItemV3 &option, const QRect &rect, const QModelIndex &index) const; int drawLineNumber(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect, const QModelIndex &index) const;
void drawText(QPainter *painter, const QStyleOptionViewItem &option, void drawText(QPainter *painter, const QStyleOptionViewItem &option,
const QRect &rect, const QModelIndex &index) const; const QRect &rect, const QModelIndex &index) const;

6
src/plugins/projectexplorer/taskwindow.cpp
View File

@@ -112,7 +112,7 @@ private:
class Positions class Positions
{ {
public: public:
Positions(const QStyleOptionViewItemV4 &options, TaskModel *model) : Positions(const QStyleOptionViewItem &options, TaskModel *model) :
m_totalWidth(options.rect.width()), m_totalWidth(options.rect.width()),
m_maxFileLength(model->sizeOfFile(options.font)), m_maxFileLength(model->sizeOfFile(options.font)),
m_maxLineLength(model->sizeOfLineNumber(options.font)), m_maxLineLength(model->sizeOfLineNumber(options.font)),
@@ -670,7 +670,7 @@ TaskDelegate::~TaskDelegate()
QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
{ {
QStyleOptionViewItemV4 opt = option; QStyleOptionViewItem opt = option;
initStyleOption(&opt, index); initStyleOption(&opt, index);
const QAbstractItemView * view = qobject_cast<const QAbstractItemView *>(opt.widget); const QAbstractItemView * view = qobject_cast<const QAbstractItemView *>(opt.widget);
@@ -738,7 +738,7 @@ void TaskDelegate::currentChanged(const QModelIndex &current, const QModelIndex
void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const void TaskDelegate::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();

2
src/plugins/texteditor/texteditor.cpp
View File

@@ -4647,7 +4647,7 @@ void TextEditorWidgetPrivate::drawFoldingMarker(QPainter *painter, const QPalett
painter->drawPolygon(a); painter->drawPolygon(a);
painter->restore(); painter->restore();
} else { } else {
QStyleOptionViewItemV2 opt; QStyleOptionViewItem opt;
opt.rect = rect; opt.rect = rect;
opt.state = QStyle::State_Active | QStyle::State_Item | QStyle::State_Children; opt.state = QStyle::State_Active | QStyle::State_Item | QStyle::State_Children;
if (expanded) if (expanded)

2
src/plugins/valgrind/callgrindnamedelegate.cpp
View File

@@ -42,7 +42,7 @@ void NameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const const QModelIndex &index) const
{ {
// init // init
QStyleOptionViewItemV4 opt(option); QStyleOptionViewItem opt(option);
initStyleOption(&opt, index); initStyleOption(&opt, index);
const int margin = 2; const int margin = 2;