equal
deleted
inserted
replaced
99 { |
99 { |
100 Q_DECLARE_PUBLIC(QDeclarativeState) |
100 Q_DECLARE_PUBLIC(QDeclarativeState) |
101 |
101 |
102 public: |
102 public: |
103 QDeclarativeStatePrivate() |
103 QDeclarativeStatePrivate() |
104 : when(0), inState(false), group(0) {} |
104 : when(0), named(false), inState(false), group(0) {} |
105 |
105 |
106 typedef QList<QDeclarativeSimpleAction> SimpleActionList; |
106 typedef QList<QDeclarativeSimpleAction> SimpleActionList; |
107 |
107 |
108 QString name; |
108 QString name; |
109 QDeclarativeBinding *when; |
109 QDeclarativeBinding *when; |
|
110 bool named; |
110 |
111 |
111 struct OperationGuard : public QDeclarativeGuard<QDeclarativeStateOperation> |
112 struct OperationGuard : public QDeclarativeGuard<QDeclarativeStateOperation> |
112 { |
113 { |
113 OperationGuard(QObject *obj, QList<OperationGuard> *l) : list(l) { (QDeclarativeGuard<QObject>&)*this = obj; } |
114 OperationGuard(QObject *obj, QList<OperationGuard> *l) : list(l) { (QDeclarativeGuard<QObject>&)*this = obj; } |
114 QList<OperationGuard> *list; |
115 QList<OperationGuard> *list; |