diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 05:05:50 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 05:05:50 (GMT) |
commit | 0958910671d9e792c3e2b419cb71d5568c93aee2 (patch) | |
tree | 85080b2cbee7ae5fb76d934b4e76b8645549767a /src/declarative/util/qdeclarativelistmodel_p.h | |
parent | 76aa88cef4000ae7c635611dd78467195a9f8997 (diff) | |
parent | cd62795fc3282e34d0f37c935a5ec1c45e4eb483 (diff) | |
download | Qt-0958910671d9e792c3e2b419cb71d5568c93aee2.zip Qt-0958910671d9e792c3e2b419cb71d5568c93aee2.tar.gz Qt-0958910671d9e792c3e2b419cb71d5568c93aee2.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (151 commits)
Skip until after CI succeeds
Fixed install of qml imports when doing a vcproj build.
Disable tests temporarily
Remove warnings
Add missing semicolons. moc was confused and positionViewAtIndex not invokable.
Use the correct base URL in resolveUri
Remove timing sensitivity.
Optimize id checking.
Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Don't use QScriptValueIterator to iterate over arrays.
Skip test, to be fixed.
Only release the binding once we're finished with its memory
Make it harder to accidentally delete a binding
Adjust test now that redundant contexts are not create due
Block modifications to internal QDeclarativeContexts
Don't destroy cookie jar until while someone may be using it.
Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Another fix to find
Improve implicit "." import
Fix auto test
...
Diffstat (limited to 'src/declarative/util/qdeclarativelistmodel_p.h')
-rw-r--r-- | src/declarative/util/qdeclarativelistmodel_p.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h index 8eb6583..6a0426b 100644 --- a/src/declarative/util/qdeclarativelistmodel_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p.h @@ -59,6 +59,9 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class FlatListModel; +class NestedListModel; +class QDeclarativeListModelWorkerAgent; struct ModelNode; class Q_DECLARATIVE_EXPORT QDeclarativeListModel : public QListModelInterface { @@ -83,20 +86,26 @@ public: Q_INVOKABLE void set(int index, const QScriptValue&); Q_INVOKABLE void setProperty(int index, const QString& property, const QVariant& value); Q_INVOKABLE void move(int from, int to, int count); + Q_INVOKABLE void sync(); + + QDeclarativeListModelWorkerAgent *agent(); Q_SIGNALS: void countChanged(int); private: - QVariant valueForNode(ModelNode *) const; - mutable QStringList roleStrings; friend class QDeclarativeListModelParser; + friend class QDeclarativeListModelWorkerAgent; friend struct ModelNode; - void checkRoles() const; - void addRole(const QString &) const; - mutable bool _rolesOk; - ModelNode *_root; + QDeclarativeListModel(bool workerCopy, QObject *parent=0); + bool flatten(); + bool modifyCheck(); + + QDeclarativeListModelWorkerAgent *m_agent; + NestedListModel *m_nested; + FlatListModel *m_flat; + bool m_isWorkerCopy; }; // ### FIXME |