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

Use QStyleOption::initFrom() instead of init()

Browse Source 
Avalaible since Qt 4.1.

Task-number: QTCREATORBUG-24098
Change-Id: I0dda1d78fc75070b6cbbef76d66bc54ccfca8f09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-07-07 13:14:34 +02:00
parent 770b07f71c
commit 2ddc752762
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ void FakeToolTip::paintEvent(QPaintEvent *)
{ {
QStylePainter p(this); QStylePainter p(this);
QStyleOptionFrame opt; QStyleOptionFrame opt;
opt.init(this); opt.initFrom(this);
p.drawPrimitive(QStyle::PE_PanelTipLabel, opt); p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
p.end(); p.end();
} }
@@ -70,7 +70,7 @@ void FakeToolTip::resizeEvent(QResizeEvent *)
{ {
QStyleHintReturnMask frameMask; QStyleHintReturnMask frameMask;
QStyleOption option; QStyleOption option;
option.init(this); option.initFrom(this);
if (style()->styleHint(QStyle::SH_ToolTip_Mask, &option, this, &frameMask)) if (style()->styleHint(QStyle::SH_ToolTip_Mask, &option, this, &frameMask))
setMask(frameMask.region); setMask(frameMask.region);
} }

2
src/libs/utils/fancymainwindow.cpp
View File

@@ -136,7 +136,7 @@ void DockWidgetTitleButton::paintEvent(QPaintEvent *)
QPainter p(this); QPainter p(this);
QStyleOptionToolButton opt; QStyleOptionToolButton opt;
opt.init(this); opt.initFrom(this);
opt.state |= QStyle::State_AutoRaise; opt.state |= QStyle::State_AutoRaise;
opt.icon = icon(); opt.icon = icon();
opt.subControls = {}; opt.subControls = {};

4
src/libs/utils/tooltip/tips.cpp
View File

@@ -222,7 +222,7 @@ void TextTip::paintEvent(QPaintEvent *event)
{ {
QStylePainter p(this); QStylePainter p(this);
QStyleOptionFrame opt; QStyleOptionFrame opt;
opt.init(this); opt.initFrom(this);
p.drawPrimitive(QStyle::PE_PanelTipLabel, opt); p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
p.end(); p.end();
@@ -233,7 +233,7 @@ void TextTip::resizeEvent(QResizeEvent *event)
{ {
QStyleHintReturnMask frameMask; QStyleHintReturnMask frameMask;
QStyleOption option; QStyleOption option;
option.init(this); option.initFrom(this);
if (style()->styleHint(QStyle::SH_ToolTip_Mask, &option, this, &frameMask)) if (style()->styleHint(QStyle::SH_ToolTip_Mask, &option, this, &frameMask))
setMask(frameMask.region); setMask(frameMask.region);