diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-06-18 19:59:41 +0200 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2020-06-21 12:51:24 +0200 |
| commit | 26a226630443a20bb2d3015431c019614e33a061 (patch) | |
| tree | b5dc22b1696ba0ee14311e41c3903344f6e92404 /src/widgets/widgets/qmenu.cpp | |
| parent | b1433a6988d79c162ab5bed116be1ffeedca2ea9 (diff) | |
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 <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index b8e01a3b03..0aed6edfd7 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -263,7 +263,7 @@ void QMenuPrivate::copyActionToPlatformItem(const QAction *action, QPlatformMenu item->setIcon(action->icon()); if (QWidget *w = action->parentWidget()) { QStyleOption opt; - opt.init(w); + opt.initFrom(w); item->setIconSize(w->style()->pixelMetric(QStyle::PM_SmallIconSize, &opt, w)); } else { QStyleOption opt; @@ -379,7 +379,7 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const QStyle *style = q->style(); QStyleOption opt; - opt.init(q); + opt.initFrom(q); const int hmargin = style->pixelMetric(QStyle::PM_MenuHMargin, &opt, q), vmargin = style->pixelMetric(QStyle::PM_MenuVMargin, &opt, q), icone = style->pixelMetric(QStyle::PM_SmallIconSize, &opt, q); @@ -1007,7 +1007,7 @@ QRect QMenuPrivate::rect() const Q_Q(const QMenu); QStyle *style = q->style(); QStyleOption opt(0); - opt.init(q); + opt.initFrom(q); const int hmargin = style->pixelMetric(QStyle::PM_MenuHMargin, &opt, q); const int vmargin = style->pixelMetric(QStyle::PM_MenuVMargin, &opt, q); const int fw = style->pixelMetric(QStyle::PM_MenuPanelWidth, &opt, q); @@ -1306,7 +1306,7 @@ bool QMenuPrivate::mouseEventTaken(QMouseEvent *e) QStyle *style = q->style(); QStyleOption opt(0); - opt.init(q); + opt.initFrom(q); const int hmargin = style->pixelMetric(QStyle::PM_MenuHMargin, &opt, q); const int vmargin = style->pixelMetric(QStyle::PM_MenuVMargin, &opt, q); const int fw = style->pixelMetric(QStyle::PM_MenuPanelWidth, &opt, q); @@ -2339,7 +2339,7 @@ QSize QMenu::sizeHint() const // the top and left margins, so we only need to add margins for // the bottom and right. QStyleOption opt(0); - opt.init(this); + opt.initFrom(this); const int fw = style()->pixelMetric(QStyle::PM_MenuPanelWidth, &opt, this); s.rwidth() += style()->pixelMetric(QStyle::PM_MenuHMargin, &opt, this) + fw + d->rightmargin; s.rheight() += style()->pixelMetric(QStyle::PM_MenuVMargin, &opt, this) + fw + d->bottommargin; |