diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-05-30 13:53:24 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 18:42:26 +0200 |
commit | 7d28f7772cd8f5aad63359ed0b9c57c12923dc85 (patch) | |
tree | 71e1cc4d972f7417b0d510451aacfce2e98eafa7 /src/corelib/animation | |
parent | fa7c9bbe1cc71a16835c373095515513ab5949db (diff) |
Use QPointer instead of QWeakPointer.
The use of QWeakPointer for tracking QObject pointers is to be
deprecated.
Change-Id: If460ca7f515db77af24030152f4bd56e1a5fae7c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/animation')
-rw-r--r-- | src/corelib/animation/qabstractanimation.cpp | 2 | ||||
-rw-r--r-- | src/corelib/animation/qpropertyanimation_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 969a54775b..e56d1e26d3 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -925,7 +925,7 @@ void QAbstractAnimationPrivate::setState(QAbstractAnimation::State newState) } state = newState; - QWeakPointer<QAbstractAnimation> guard(q); + QPointer<QAbstractAnimation> guard(q); //(un)registration of the animation must always happen before calls to //virtual function (updateState) to ensure a correct state of the timer diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h index c413c683ff..d6c0f9057c 100644 --- a/src/corelib/animation/qpropertyanimation_p.h +++ b/src/corelib/animation/qpropertyanimation_p.h @@ -70,7 +70,7 @@ public: { } - QWeakPointer<QObject> target; + QPointer<QObject> target; //we use targetValue to be able to unregister the target from the global hash QObject *targetValue; |