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 | |
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')
-rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qabstractitemview_p.h | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qheaderview.cpp | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qtableview.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qtooltip.cpp | 4 | ||||
-rw-r--r-- | src/widgets/styles/qstyleoption.cpp | 8 | ||||
-rw-r--r-- | src/widgets/styles/qstyleoption.h | 3 | ||||
-rw-r--r-- | src/widgets/widgets/qabstractscrollarea.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qcombobox_p.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 8 | ||||
-rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qmainwindowlayout.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmenu.cpp | 10 | ||||
-rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qsizegrip.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qsplitter.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 6 | ||||
-rw-r--r-- | src/widgets/widgets/qtabbar_p.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qtoolbarextension.cpp | 2 |
19 files changed, 31 insertions, 38 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index b99dbb109b..d531eb1607 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -3694,7 +3694,7 @@ QStyleOptionViewItem QAbstractItemView::viewOptions() const { Q_D(const QAbstractItemView); QStyleOptionViewItem option; - option.init(this); + option.initFrom(this); option.state &= ~QStyle::State_MouseOver; option.font = font(); diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index 4b29b68b66..6fb4a252b9 100644 --- a/src/widgets/itemviews/qabstractitemview_p.h +++ b/src/widgets/itemviews/qabstractitemview_p.h @@ -198,7 +198,7 @@ public: #endif ) { QStyleOption opt; - opt.init(q_func()); + opt.initFrom(q_func()); opt.rect = dropIndicatorRect; q_func()->style()->drawPrimitive(QStyle::PE_IndicatorItemViewItemDrop, &opt, painter, q_func()); } diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp index e127f7bba4..60020e2072 100644 --- a/src/widgets/itemviews/qheaderview.cpp +++ b/src/widgets/itemviews/qheaderview.cpp @@ -2478,7 +2478,7 @@ void QHeaderView::paintEvent(QPaintEvent *e) } QStyleOption opt; - opt.init(this); + opt.initFrom(this); // Paint the area beyond where there are indexes if (d->reverse()) { opt.state |= QStyle::State_Horizontal; diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index b27103674e..f8ff319516 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -589,7 +589,7 @@ public: QTableCornerButton(QWidget *parent) : QAbstractButton(parent) {} void paintEvent(QPaintEvent*) override { QStyleOptionHeader opt; - opt.init(this); + opt.initFrom(this); QStyle::State state = QStyle::State_None; if (isEnabled()) state |= QStyle::State_Enabled; diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index d46bf3b2bf..af5fbadf22 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -242,7 +242,7 @@ void QTipLabel::paintEvent(QPaintEvent *ev) { QStylePainter p(this); QStyleOptionFrame opt; - opt.init(this); + opt.initFrom(this); p.drawPrimitive(QStyle::PE_PanelTipLabel, opt); p.end(); @@ -253,7 +253,7 @@ void QTipLabel::resizeEvent(QResizeEvent *e) { 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/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index 1b2e0772c7..88e4f1aa52 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -176,13 +176,7 @@ QStyleOption::~QStyleOption() \sa QWidget::layoutDirection(), QWidget::rect(), QWidget::palette(), QWidget::fontMetrics() */ - -/*! - \obsolete - - Use initFrom(\a widget) instead. -*/ -void QStyleOption::init(const QWidget *widget) +void QStyleOption::initFrom(const QWidget *widget) { QWidget *window = widget->window(); state = QStyle::State_None; diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index ab95efa9e1..b81e48c669 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -103,8 +103,7 @@ public: QStyleOption(const QStyleOption &other); ~QStyleOption(); - void init(const QWidget *w); - inline void initFrom(const QWidget *w) { init(w); } + void initFrom(const QWidget *w); QStyleOption &operator=(const QStyleOption &other); }; diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index d69bd04141..bbf76ab553 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -340,7 +340,7 @@ void QAbstractScrollAreaPrivate::layoutChildren_helper(bool *needHorizontalScrol && vbar->minimum() < vbar->maximum() && !vbar->sizeHint().isEmpty()))); QStyleOption opt(0); - opt.init(q); + opt.initFrom(q); const int hscrollOverlap = hbar->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarOverlap, &opt, hbar); const int vscrollOverlap = vbar->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarOverlap, &opt, vbar); diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 4bcc741615..b24c1e0ddf 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -190,7 +190,7 @@ protected: void paintEvent(QPaintEvent *) override { QPainter p(this); QStyleOptionMenuItem menuOpt; - menuOpt.init(this); + menuOpt.initFrom(this); menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.menuRect = rect(); menuOpt.maxIconWidth = 0; diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 60ed4b4798..d5ce003067 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -2374,7 +2374,7 @@ void QDateTimeEdit::paintEvent(QPaintEvent *event) QStyleOptionComboBox optCombo; - optCombo.init(this); + optCombo.initFrom(this); optCombo.editable = true; optCombo.frame = opt.frame; optCombo.subControls = opt.subControls; @@ -2522,7 +2522,7 @@ QStyle::SubControl QDateTimeEditPrivate::newHoverControl(const QPoint &pos) Q_Q(QDateTimeEdit); QStyleOptionComboBox optCombo; - optCombo.init(q); + optCombo.initFrom(q); optCombo.editable = true; optCombo.subControls = QStyle::SC_All; hoverControl = q->style()->hitTestComplexControl(QStyle::CC_ComboBox, &optCombo, pos, q); @@ -2539,7 +2539,7 @@ void QDateTimeEditPrivate::updateEditFieldGeometry() Q_Q(QDateTimeEdit); QStyleOptionComboBox optCombo; - optCombo.init(q); + optCombo.initFrom(q); optCombo.editable = true; optCombo.subControls = QStyle::SC_ComboBoxEditField; edit->setGeometry(q->style()->subControlRect(QStyle::CC_ComboBox, &optCombo, @@ -2707,7 +2707,7 @@ void QCalendarPopup::mousePressEvent(QMouseEvent *event) QDateTimeEdit *dateTime = qobject_cast<QDateTimeEdit *>(parentWidget()); if (dateTime) { QStyleOptionComboBox opt; - opt.init(dateTime); + opt.initFrom(dateTime); QRect arrowRect = dateTime->style()->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, dateTime); arrowRect.moveTo(dateTime->mapToGlobal(arrowRect .topLeft())); diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 2dbc35457a..41c57eebc1 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -222,7 +222,7 @@ void QDockWidgetTitleButton::paintEvent(QPaintEvent *) QPainter p(this); QStyleOptionToolButton opt; - opt.init(this); + opt.initFrom(this); opt.state |= QStyle::State_AutoRaise; if (style()->styleHint(QStyle::SH_DockWidget_ButtonsHaveFrame, nullptr, this)) @@ -1480,7 +1480,7 @@ void QDockWidget::paintEvent(QPaintEvent *event) // when not floating. if (isFloating()) { QStyleOptionFrame framOpt; - framOpt.init(this); + framOpt.initFrom(this); p.drawPrimitive(QStyle::PE_FrameDockWidget, framOpt); } diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index e23c491eea..017e33692b 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -341,7 +341,7 @@ void QDockWidgetGroupWindow::paintEvent(QPaintEvent *) if (!nativeDeco) { QStyleOptionFrame framOpt; - framOpt.init(this); + framOpt.initFrom(this); QStylePainter p(this); p.drawPrimitive(QStyle::PE_FrameDockWidget, framOpt); } 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; diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index b0731df50a..9cffdc4ac1 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -1737,7 +1737,7 @@ int QMenuBar::heightForWidth(int) const height = qMax(d->rightWidget->sizeHint().height() + margin, height); if(as_gui_menubar) { QStyleOptionMenuItem opt; - opt.init(this); + opt.initFrom(this); opt.menuRect = rect(); opt.state = QStyle::State_None; opt.menuItemType = QStyleOptionMenuItem::Normal; diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp index baebd009e4..02d9b4f3f1 100644 --- a/src/widgets/widgets/qsizegrip.cpp +++ b/src/widgets/widgets/qsizegrip.cpp @@ -228,7 +228,7 @@ QSizeGrip::~QSizeGrip() QSize QSizeGrip::sizeHint() const { QStyleOption opt(0); - opt.init(this); + opt.initFrom(this); return style()->sizeFromContents(QStyle::CT_SizeGrip, &opt, QSize(13, 13), this); } @@ -245,7 +245,7 @@ void QSizeGrip::paintEvent(QPaintEvent *event) Q_D(QSizeGrip); QPainter painter(this); QStyleOptionSizeGrip opt; - opt.init(this); + opt.initFrom(this); opt.corner = d->m_corner; style()->drawControl(QStyle::CE_SizeGrip, &opt, &painter, this); } diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 8f98bcdedd..a91fcda446 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -228,7 +228,7 @@ QSize QSplitterHandle::sizeHint() const Q_D(const QSplitterHandle); int hw = d->s->handleWidth(); QStyleOption opt(0); - opt.init(d->s); + opt.initFrom(d->s); opt.state = QStyle::State_None; return parentWidget()->style()->sizeFromContents(QStyle::CT_Splitter, &opt, QSize(hw, hw), d->s); } 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; diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 63a80d687c..7bca487d72 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -241,7 +241,7 @@ public: tabOverlap.shape = tabbar->shape(); int overlap = tabbar->style()->pixelMetric(QStyle::PM_TabBarBaseOverlap, &tabOverlap, tabbar); QWidget *theParent = tabbar->parentWidget(); - optTabBase->init(tabbar); + optTabBase->initFrom(tabbar); optTabBase->shape = tabbar->shape(); optTabBase->documentMode = tabbar->documentMode(); if (theParent && overlap > 0) { diff --git a/src/widgets/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp index 165c7f274b..76bc5a4773 100644 --- a/src/widgets/widgets/qtoolbarextension.cpp +++ b/src/widgets/widgets/qtoolbarextension.cpp @@ -59,7 +59,7 @@ QToolBarExtension::QToolBarExtension(QWidget *parent) void QToolBarExtension::setOrientation(Qt::Orientation o) { QStyleOption opt; - opt.init(this); + opt.initFrom(this); if (o == Qt::Horizontal) { setIcon(style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton, &opt)); } else { |