From 2ddc75276212b7a8dccabbfede790023425afb3c Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 7 Jul 2020 13:14:34 +0200 Subject: [PATCH] Use QStyleOption::initFrom() instead of init() Avalaible since Qt 4.1. Task-number: QTCREATORBUG-24098 Change-Id: I0dda1d78fc75070b6cbbef76d66bc54ccfca8f09 Reviewed-by: Eike Ziller --- src/libs/utils/faketooltip.cpp | 4 ++-- src/libs/utils/fancymainwindow.cpp | 2 +- src/libs/utils/tooltip/tips.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/utils/faketooltip.cpp b/src/libs/utils/faketooltip.cpp index 0fd15966c77..43127aa64af 100644 --- a/src/libs/utils/faketooltip.cpp +++ b/src/libs/utils/faketooltip.cpp @@ -61,7 +61,7 @@ void FakeToolTip::paintEvent(QPaintEvent *) { QStylePainter p(this); QStyleOptionFrame opt; - opt.init(this); + opt.initFrom(this); p.drawPrimitive(QStyle::PE_PanelTipLabel, opt); p.end(); } @@ -70,7 +70,7 @@ void FakeToolTip::resizeEvent(QResizeEvent *) { QStyleHintReturnMask frameMask; QStyleOption option; - option.init(this); + option.initFrom(this); if (style()->styleHint(QStyle::SH_ToolTip_Mask, &option, this, &frameMask)) setMask(frameMask.region); } diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index be073198d90..b271095effb 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -136,7 +136,7 @@ void DockWidgetTitleButton::paintEvent(QPaintEvent *) QPainter p(this); QStyleOptionToolButton opt; - opt.init(this); + opt.initFrom(this); opt.state |= QStyle::State_AutoRaise; opt.icon = icon(); opt.subControls = {}; diff --git a/src/libs/utils/tooltip/tips.cpp b/src/libs/utils/tooltip/tips.cpp index 496876bdbb7..7b9f4541cf4 100644 --- a/src/libs/utils/tooltip/tips.cpp +++ b/src/libs/utils/tooltip/tips.cpp @@ -222,7 +222,7 @@ void TextTip::paintEvent(QPaintEvent *event) { QStylePainter p(this); QStyleOptionFrame opt; - opt.init(this); + opt.initFrom(this); p.drawPrimitive(QStyle::PE_PanelTipLabel, opt); p.end(); @@ -233,7 +233,7 @@ void TextTip::resizeEvent(QResizeEvent *event) { QStyleHintReturnMask frameMask; QStyleOption option; - option.init(this); + option.initFrom(this); if (style()->styleHint(QStyle::SH_ToolTip_Mask, &option, this, &frameMask)) setMask(frameMask.region);