diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-16 14:56:59 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-16 16:53:50 +0200 |
| commit | ea7cc7f6f95030c38d86c4430ac8ee4386099d6b (patch) | |
| tree | 1823a7f260b154e7e24a298313a467f57a24f657 /src/widgets/kernel/qwidget.cpp | |
| parent | 09dd94091f88ca29b4f829b881fcedda4013e28d (diff) | |
Remove deprecated members from QtWidgets/kernel classes
Cleaning up those that are trivial to remove because they have direct
replacements.
Change-Id: Ie8ac02c3d6273110f1f11e17fdeae496bc66321f
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 08479a4a374..e79c4b9bcdc 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -3194,13 +3194,6 @@ QList<QAction*> QWidget::actions() const #endif // QT_NO_ACTION /*! - \fn bool QWidget::isEnabledToTLW() const - \obsolete - - This function is deprecated. It is equivalent to isEnabled() -*/ - -/*! \property QWidget::enabled \brief whether the widget is enabled @@ -7420,29 +7413,6 @@ void QWidgetPrivate::updateContentsRect() QCoreApplication::sendEvent(q, &e); } -#if QT_DEPRECATED_SINCE(5, 14) -/*! - \obsolete - Use contentsMargins(). - - Returns the widget's contents margins for \a left, \a top, \a - right, and \a bottom. - - \sa setContentsMargins(), contentsRect() - */ -void QWidget::getContentsMargins(int *left, int *top, int *right, int *bottom) const -{ - QMargins m = contentsMargins(); - if (left) - *left = m.left(); - if (top) - *top = m.top(); - if (right) - *right = m.right(); - if (bottom) - *bottom = m.bottom(); -} -#endif // FIXME: Move to qmargins.h for next minor Qt release QMargins operator|(const QMargins &m1, const QMargins &m2) |