summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2021-05-25 15:04:48 +0200
committerPaul Wicking <paul.wicking@qt.io>2021-05-26 13:06:56 +0200
commita1dfe27955ab2da27551d19500c2d2a01d46e470 (patch)
treee1ebc6b2f9a255f5b0c3f2df0833f2f6f431fe74 /src/gui/kernel
parentae021882330abc5f6fbaadca290e6e5670c89028 (diff)
Doc: Use \deprecated instead of \obsolete
Task-number: QTBUG-93990 Change-Id: I4e512354a49dde6678ca89cabc56bc76ba666bb3 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qaction.cpp10
-rw-r--r--src/gui/kernel/qcursor.cpp4
-rw-r--r--src/gui/kernel/qevent.cpp6
-rw-r--r--src/gui/kernel/qeventpoint.cpp8
-rw-r--r--src/gui/kernel/qguiapplication.cpp4
-rw-r--r--src/gui/kernel/qpalette.cpp3
6 files changed, 18 insertions, 17 deletions
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index f16cf5d1b7..a31fef1ed3 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -548,14 +548,14 @@ QList<QObject*> QAction::associatedObjects() const
/*!
\fn QWidget *QAction::parentWidget() const
- \obsolete Use parent() with qobject_cast() instead.
+ \deprecated Use parent() with qobject_cast() instead.
Returns the parent widget.
*/
/*!
\fn QList<QWidget*> QAction::associatedWidgets() const
- \obsolete Use associatedObjects() with qobject_cast() instead.
+ \deprecated Use associatedObjects() with qobject_cast() instead.
Returns a list of widgets this action has been added to.
@@ -564,7 +564,7 @@ QList<QObject*> QAction::associatedObjects() const
/*!
\fn QList<QWidget*> QAction::associatedGraphicsWidgets() const
- \obsolete Use associatedObjects() with qobject_cast() instead.
+ \deprecated Use associatedObjects() with qobject_cast() instead.
Returns a list of graphics widgets this action has been added to.
@@ -1225,7 +1225,7 @@ QAction::MenuRole QAction::menuRole() const
/*!
\fn QMenu *QAction::menu() const
- \obsolete
+ \deprecated
Returns the menu contained by this action.
@@ -1242,7 +1242,7 @@ QObject* QAction::menuObject() const
/*!
\fn void QAction::setMenu(QMenu *menu)
- \obsolete
+ \deprecated
Sets the menu contained by this action to the specified \a menu.
*/
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index 5dcb526847..20511ef8e6 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -565,7 +565,7 @@ void QCursor::setShape(Qt::CursorShape shape)
/*!
\fn QBitmap QCursor::bitmap(Qt::ReturnByValueConstant) const
\since 5.15
- \obsolete Use the overload without argument instead.
+ \deprecated Use the overload without argument instead.
Returns the cursor bitmap, or a null bitmap if it is one of the
standard cursors.
@@ -592,7 +592,7 @@ QBitmap QCursor::bitmap() const
/*!
\fn QBitmap QCursor::mask(Qt::ReturnByValueConstant) const
\since 5.15
- \obsolete Use the overload without argument instead.
+ \deprecated Use the overload without argument instead.
Returns the cursor bitmap mask, or a null bitmap if it is one of the
standard cursors.
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 858a7cba2e..833fa92082 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -2770,7 +2770,7 @@ QTabletEvent::~QTabletEvent()
*/
/*!
- \obsolete
+ \deprecated
Use the other constructor, because \a intValue is no longer stored separately.
Constructs a native gesture event of type \a type originating from \a device.
@@ -4462,7 +4462,7 @@ QTouchEvent::QTouchEvent(QEvent::Type eventType,
}
/*!
- \obsolete
+ \deprecated
Try to use another constructor, because \a touchPointStates
can be calculated from the given \a touchPoints.
@@ -4527,7 +4527,7 @@ bool QTouchEvent::isEndEvent() const
*/
/*! \fn const QList<QEventPoint> &QTouchEvent::touchPoints() const
- \obsolete
+ \deprecated
Deprecated since Qt 6.0. Use points() instead.
Returns a reference to the list of touch points contained in the touch event.
diff --git a/src/gui/kernel/qeventpoint.cpp b/src/gui/kernel/qeventpoint.cpp
index 41f8dd90a2..0c8428286a 100644
--- a/src/gui/kernel/qeventpoint.cpp
+++ b/src/gui/kernel/qeventpoint.cpp
@@ -142,7 +142,7 @@ bool QEventPoint::operator==(const QEventPoint &other) const noexcept
QEventPoint::~QEventPoint() = default;
/*! \fn QPointF QEventPoint::pos() const
- \obsolete
+ \deprecated
Deprecated since Qt 6.0. Use position() instead.
Returns the position of this point, relative to the widget
@@ -443,7 +443,7 @@ bool QEventPoint::isAccepted() const
/*!
- \obsolete
+ \deprecated
\fn QPointF QEventPoint::normalizedPos() const
Deprecated since Qt 6.0. Use normalizedPosition() instead.
@@ -470,7 +470,7 @@ QPointF QEventPoint::normalizedPosition() const
}
/*!
- \obsolete
+ \deprecated
Deprecated since Qt 6.0. Use globalPressPosition() instead.
Returns the normalized press position of this point.
@@ -487,7 +487,7 @@ QPointF QEventPoint::startNormalizedPos() const
}
/*!
- \obsolete
+ \deprecated
Deprecated since Qt 6.0. Use globalLastPosition() instead.
Returns the normalized position of this point from the previous press or
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index e8308d3b8c..22faa6a024 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -3285,7 +3285,7 @@ QClipboard * QGuiApplication::clipboard()
/*!
\since 5.4
\fn void QGuiApplication::paletteChanged(const QPalette &palette)
- \obsolete
+ \deprecated
This signal is emitted when the \a palette of the application changes. Use
QEvent::ApplicationPaletteChanged instead.
@@ -3396,7 +3396,7 @@ void QGuiApplicationPrivate::applyWindowGeometrySpecificationTo(QWindow *window)
/*!
\since 5.11
\fn void QGuiApplication::fontChanged(const QFont &font)
- \obsolete
+ \deprecated
This signal is emitted when the \a font of the application changes. Use
QEvent::ApplicationFontChanged instead.
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index 2cdc9fddc6..43521e1182 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -595,7 +595,8 @@ QPalette::QPalette(const QBrush &windowText, const QBrush &button,
}
-/*!\obsolete
+/*!
+ \deprecated
Constructs a palette with the specified \a windowText, \a
window, \a light, \a dark, \a mid, \a text, and \a base colors.