diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-14 04:59:52 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-14 04:59:52 (GMT) |
| commit | 6a99fc240fc0644065d775d7f764792bdf6ee717 (patch) | |
| tree | 5852b308b70df4a6e34d5f97309d0eeffd4f1e29 /src | |
| parent | 0dcab84aa2ec72afbfe4834cd98f70daded77bf4 (diff) | |
| parent | d9468a93f27fa32df36ec9ee32f6282336dc59b9 (diff) | |
| download | Qt-6a99fc240fc0644065d775d7f764792bdf6ee717.zip Qt-6a99fc240fc0644065d775d7f764792bdf6ee717.tar.gz Qt-6a99fc240fc0644065d775d7f764792bdf6ee717.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/util/qmlstate_p_p.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h index ee08949..04c5264 100644 --- a/src/declarative/util/qmlstate_p_p.h +++ b/src/declarative/util/qmlstate_p_p.h @@ -116,16 +116,15 @@ public: } }; - typedef QList<OperationGuard> GuardedOpList; - class OperationList : public GuardedOpList, public QmlList<QmlStateOperation*> + class OperationList : public QList<OperationGuard>, public QmlList<QmlStateOperation*> { public: - virtual void append(QmlStateOperation* v) { GuardedOpList::append(OperationGuard(v, this)); } - virtual void insert(int i, QmlStateOperation* v) { GuardedOpList::insert(i, OperationGuard(v, this)); } - virtual void clear() { GuardedOpList::clear(); } - virtual QmlStateOperation* at(int i) const { return GuardedOpList::at(i); } - virtual void removeAt(int i) { GuardedOpList::removeAt(i); } - virtual int count() const { return GuardedOpList::count(); } + virtual void append(QmlStateOperation* v) { QList<OperationGuard>::append(OperationGuard(v, this)); } + virtual void insert(int i, QmlStateOperation* v) { QList<OperationGuard>::insert(i, OperationGuard(v, this)); } + virtual void clear() { QList<OperationGuard>::clear(); } + virtual QmlStateOperation* at(int i) const { return QList<OperationGuard>::at(i); } + virtual void removeAt(int i) { QList<OperationGuard>::removeAt(i); } + virtual int count() const { return QList<OperationGuard>::count(); } }; OperationList operations; |