diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-28 08:39:34 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-29 02:35:45 (GMT) |
| commit | 35bf26aba421eb36d8d308a0a5138388faf67ef4 (patch) | |
| tree | b4bfac33cc445ab2f065a98c009bd552cb612302 /src/declarative/util | |
| parent | d4740963fa6284407c74c49ea587b0511c9bc4c9 (diff) | |
| download | Qt-35bf26aba421eb36d8d308a0a5138388faf67ef4.zip Qt-35bf26aba421eb36d8d308a0a5138388faf67ef4.tar.gz Qt-35bf26aba421eb36d8d308a0a5138388faf67ef4.tar.bz2 | |
Fix alias warnings in QDeclarativeGuard
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 ec18f59..195b935 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 |