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/statemachine | |
| 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/statemachine')
| -rw-r--r-- | src/corelib/statemachine/qabstracttransition_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/statemachine/qstate.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h index 64a0af7cfb..442398825a 100644 --- a/src/corelib/statemachine/qabstracttransition_p.h +++ b/src/corelib/statemachine/qabstracttransition_p.h @@ -80,7 +80,7 @@ public: QStateMachine *machine() const; void emitTriggered(); - QList<QWeakPointer<QAbstractState> > targetStates; + QList<QPointer<QAbstractState> > targetStates; #ifndef QT_NO_ANIMATION QList<QAbstractAnimation*> animations; diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index 0230acbab6..14432edd7c 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -299,7 +299,7 @@ void QState::addTransition(QAbstractTransition *transition) } transition->setParent(this); - const QList<QWeakPointer<QAbstractState> > &targets = QAbstractTransitionPrivate::get(transition)->targetStates; + const QList<QPointer<QAbstractState> > &targets = QAbstractTransitionPrivate::get(transition)->targetStates; for (int i = 0; i < targets.size(); ++i) { QAbstractState *t = targets.at(i).data(); if (!t) { |