summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2020-06-18 19:59:41 +0200
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2020-06-21 12:51:24 +0200
commit26a226630443a20bb2d3015431c019614e33a061 (patch)
treeb5dc22b1696ba0ee14311e41c3903344f6e92404 /src/widgets/styles
parentb1433a6988d79c162ab5bed116be1ffeedca2ea9 (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/styles')
-rw-r--r--src/widgets/styles/qstyleoption.cpp8
-rw-r--r--src/widgets/styles/qstyleoption.h3
2 files changed, 2 insertions, 9 deletions
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);
};