QtQuick1: Fix warnings about QWeakPointer usage.

- Use getPointer to get a weak pointer for the binding.
- Change QWeakPointer<QObject> to a QPointer.

Change-Id: I6c362a51c398f73817b5f4545d21f4845d625e13
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
index 13be5a8e..a6dbbd1d 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
@@ -558,10 +558,11 @@ void QDeclarativeEngineDebugService::setBinding(int objectId,
     if (object && context) {
         QDeclarativeProperty property(object, propertyName, context);
         if (property.isValid()) {
+            typedef QPointer<QDeclarativeState> DeclarativeStatePointer;
 
             bool inBaseState = true;
 
-            foreach(QWeakPointer<QDeclarativeState> statePointer, m_allStates) {
+            foreach (const DeclarativeStatePointer &statePointer, m_allStates) {
                 if (QDeclarativeState *state = statePointer.data()) {
                     // here we assume that the revert list on itself defines the base state
                     if (state->isStateActive() && state->containsPropertyInRevertList(object, propertyName)) {
diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
index e0dfdea8..cd268c7d 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
-#include <QWeakPointer>
+#include <QtCore/qpointer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -121,7 +121,7 @@ private:
 
     QList<QDeclarativeEngine *> m_engines;
     QDeclarativeWatcher *m_watch;
-    QList<QWeakPointer<QDeclarativeState> > m_allStates;
+    QList<QPointer<QDeclarativeState> > m_allStates;
 };
 Q_QUICK1_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectData &);
 Q_QUICK1_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectData &);