From 99d3eecce2f9545290d4eb09d048c36ca84e1b0e Mon Sep 17 00:00:00 2001 From: Geir Vattekar Date: Fri, 7 Sep 2012 16:04:28 +0200 Subject: Doc: Remove references to the deprecated QGraphicsItemAnimation Task-number: QTBUG-23711 Change-Id: I1c1ce049016d0bea03d43631493ed8d248162eee Reviewed-by: Qt Doc Bot Reviewed-by: Thomas McGuire Reviewed-by: Andreas Aardal Hanssen Reviewed-by: Jason Barron --- src/corelib/tools/qtimeline.cpp | 7 +------ src/widgets/graphicsview/qgraphicsitem.cpp | 9 ++++----- src/widgets/graphicsview/qgraphicsscene.cpp | 5 ++++- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/corelib/tools/qtimeline.cpp b/src/corelib/tools/qtimeline.cpp index 164061a685..9a36a14668 100644 --- a/src/corelib/tools/qtimeline.cpp +++ b/src/corelib/tools/qtimeline.cpp @@ -185,11 +185,6 @@ void QTimeLinePrivate::setCurrentTime(int msecs) \snippet code/src_corelib_tools_qtimeline.cpp 0 - You can also use QTimeLine with the - \l{Graphics View}{Graphics View framework} for - animations. The QGraphicsItemAnimation class implements animation - of \l{QGraphicsItem}{QGraphicsItems} with a timeline. - By default the timeline runs once, from the beginning and towards the end, upon which you must call start() again to restart from the beginning. To make the timeline loop, you can call setLoopCount(), passing the number of @@ -218,7 +213,7 @@ void QTimeLinePrivate::setCurrentTime(int msecs) finally grows slowly. For a custom timeline, you can reimplement valueForTime(), in which case QTimeLine's curveShape property is ignored. - \sa QProgressBar, QProgressDialog, QGraphicsItemAnimation + \sa QProgressBar, QProgressDialog */ /*! diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index b82190575f..44b620ee3b 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -4498,12 +4498,11 @@ void QGraphicsItem::resetTransform() The default implementation does nothing. - For individual item animation, an alternative to this function is to - either use QGraphicsItemAnimation, or to multiple-inherit from QObject and - QGraphicsItem, and animate your item using QObject::startTimer() and - QObject::timerEvent(). + This function is intended for animations. An alternative is to + multiple-inherit from QObject and QGraphicsItem and use the \l{The Animation + Framework}{Animation Framework}. - \sa QGraphicsItemAnimation, QTimeLine + \sa QGraphicsScene::advance(), QTimeLine */ void QGraphicsItem::advance(int phase) { diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 07f1119dde..15b1fe51a0 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -3221,7 +3221,10 @@ QList QGraphicsScene::views() const move. In the first phase, QGraphicsItem::advance() is called passing a value of 0 as an argument, and 1 is passed in the second phase. - \sa QGraphicsItem::advance(), QGraphicsItemAnimation, QTimeLine + Note that you can also use the \l{The Animation Framework}{Animation + Framework} for animations. + + \sa QGraphicsItem::advance(), QTimeLine */ void QGraphicsScene::advance() { -- cgit v1.2.3