diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-28 18:39:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-29 05:28:25 +0200 |
| commit | 4a9c50b9c119dc47cf35a4e96a007ce4dd3825e2 (patch) | |
| tree | 10c03fe49a8bd6b5f96f72476a36715f6af6a294 /src/declarative/util | |
| parent | d08fb44d8f1414bbf519875fd872d742c41300ec (diff) | |
Fix alias warnings in QDeclarativeGuard
Task-number: QTBUG-19736 QTBUG-19693
Change-Id: Id3aefe56bc1e33757b8c407f2022b49cc136f00b
Reviewed-on: http://codereview.qt.nokia.com/2359
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativestate_p_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h index ec18f59b08..195b935cdb 100644 --- a/src/declarative/util/qdeclarativestate_p_p.h +++ b/src/declarative/util/qdeclarativestate_p_p.h @@ -206,7 +206,9 @@ public: struct OperationGuard : public QDeclarativeGuard<QDeclarativeStateOperation> { - OperationGuard(QObject *obj, QList<OperationGuard> *l) : list(l) { (QDeclarativeGuard<QObject>&)*this = obj; } + OperationGuard(QObject *obj, QList<OperationGuard> *l) : list(l) { + setObject(static_cast<QDeclarativeStateOperation *>(obj)); + } QList<OperationGuard> *list; void objectDestroyed(QDeclarativeStateOperation *) { // we assume priv will always be destroyed after objectDestroyed calls |