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/itemviews | |
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/itemviews')
-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 |
4 files changed, 4 insertions, 4 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; |