From 26a226630443a20bb2d3015431c019614e33a061 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 18 Jun 2020 19:59:41 +0200 Subject: Remove deprecated QStyleOption::init() Even it was not marked as deprecated the replacement function initFrom() is available since Qt4 times (and init() is deprecated since then) Change-Id: I09a4ebbf66b01fbe7aec67691dc68d2e42d1cd78 Reviewed-by: Volker Hilsheimer --- src/widgets/widgets/qtabbar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets/widgets/qtabbar.cpp') diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 777ff688e2..a3b926e549 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -580,7 +580,7 @@ void QTabBarPrivate::layoutTabs() Q_Q(QTabBar); QStyleOption opt; - opt.init(q); + opt.initFrom(q); QRect scrollButtonLeftRect = q->style()->subElementRect(QStyle::SE_TabBarScrollLeftButton, &opt, q); QRect scrollButtonRightRect = q->style()->subElementRect(QStyle::SE_TabBarScrollRightButton, &opt, q); int scrollButtonWidth = q->style()->pixelMetric(QStyle::PM_TabBarScrollButtonWidth, &opt, q); @@ -2120,7 +2120,7 @@ void QTabBar::mousePressEvent(QMouseEvent *event) if (d->validIndex(d->pressedIndex)) { QStyleOptionTabBarBase optTabBase; - optTabBase.init(this); + optTabBase.initFrom(this); optTabBase.documentMode = d->documentMode; if (event->type() == style()->styleHint(QStyle::SH_TabBar_SelectMouseType, &optTabBase, this)) setCurrentIndex(d->pressedIndex); @@ -2820,7 +2820,7 @@ void CloseButton::paintEvent(QPaintEvent *) { QPainter p(this); QStyleOption opt; - opt.init(this); + opt.initFrom(this); opt.state |= QStyle::State_AutoRaise; if (isEnabled() && underMouse() && !isChecked() && !isDown()) opt.state |= QStyle::State_Raised; -- cgit v1.2.3