FCL/sf/mw/qt: comparison src/declarative/util/qdeclarativelistmodel.cpp

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 Q_DECLARE_METATYPE(QListModelInterface *)
 QT_BEGIN_NAMESPACE
-#define DATA_ROLE_ID 1
-#define DATA_ROLE_NAME "data"
 QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListModelData::instructions() const
 {
 return (QDeclarativeListModelParser::ListInstruction *)((char *)this + sizeof(ListModelData));
 }
 /*!
 \qmlclass ListModel QDeclarativeListModel
+\ingroup qml-working-with-data
 \since 4.7
 \brief The ListModel element defines a free-form list data source.
 The ListModel is a simple hierarchy of elements containing data roles. The contents can
 be defined dynamically, or explicitly in QML:
 The content of a ListModel may be created and modified using the clear(),
 append(), set() and setProperty() methods.  For example:
 \snippet doc/src/snippets/declarative/listmodel-modify.qml delegate
-When creating content dynamically, note that the set of available properties cannot be changed
+Note that when creating content dynamically the set of available properties cannot be changed
-except by first clearing the model. Whatever properties are first added to the model are then the
+once set. Whatever properties are first added to the model are the
-only permitted properties in the model until it is cleared.
+only permitted properties in the model.
 \section2 Using threaded list models with WorkerScript
 ListModel can be used together with WorkerScript access a list model
 The included file, \tt dataloader.js, looks like this:
 \snippet examples/declarative/threading/threadedlistmodel/dataloader.js 0
-The application's \tt Timer object periodically sends a message to the
+working-with-data
 worker script by calling \l WorkerScript::sendMessage(). When this message
 is received, \l {WorkerScript::onMessage}{WorkerScript.onMessage()} is invoked in
 \tt dataloader.js, which appends the current time to the list model.
 Note the call to sync() from the \l {WorkerScript::onMessage}{WorkerScript.onMessage()} handler.
 }
 /*!
 \qmlmethod ListModel::clear()
-Deletes all content from the model. The properties are cleared such that
+Deletes all content from the model.
-different properties may be set on subsequent additions.
 \sa append() remove()
 */
 void QDeclarativeListModel::clear()
 {
 }
 QList<QDeclarativeCustomParserProperty> props = node.properties();
 for(int jj = 0; jj < props.count(); ++jj) {
 const QDeclarativeCustomParserProperty &nodeProp = props.at(jj);
-if (nodeProp.name() == "") {
+if (nodeProp.name().isEmpty()) {
 error(nodeProp, QDeclarativeListModel::tr("ListElement: cannot contain nested elements"));
 return false;
 }
 if (nodeProp.name() == "id") {
 error(nodeProp, QDeclarativeListModel::tr("ListElement: cannot use reserved \"id\" property"));
 QByteArray data;
 listElementTypeName = QByteArray(); // unknown
 for(int ii = 0; ii < customProps.count(); ++ii) {
 const QDeclarativeCustomParserProperty &prop = customProps.at(ii);
-if(prop.name() != "") { // isn't default property
+if(!prop.name().isEmpty()) { // isn't default property
 error(prop, QDeclarativeListModel::tr("ListModel: undefined property '%1'").arg(QString::fromUtf8(prop.name())));
 return QByteArray();
 }
 if(!compileProperty(prop, instr, data)) {
 return false;
 }
 /*!
 \qmlclass ListElement
+\ingroup qml-working-with-data
 \since 4.7
 \brief The ListElement element defines a data item in a ListModel.
 \sa ListModel
 */
 }
 return true;
 }
 NestedListModel::NestedListModel(QDeclarativeListModel *base)
-: _root(0), m_listModel(base), _rolesOk(false)
+: _root(0), m_ownsRoot(false), m_listModel(base), _rolesOk(false)
 {
 }
 NestedListModel::~NestedListModel()
 {
-delete _root;
+if (m_ownsRoot)
+delete _root;
 }
 QVariant NestedListModel::valueForNode(ModelNode *node, bool *hasNested) const
 {
 QObject *rv = 0;
 void NestedListModel::clear()
 {
 _rolesOk = false;
 roleStrings.clear();
-delete _root;
+if (_root)
-_root = 0;
+_root->clear();
 }
 void NestedListModel::remove(int index)
 {
 if (!_root)
 delete node;
 }
 bool NestedListModel::insert(int index, const QScriptValue& valuemap)
 {
-if (!_root)
+if (!_root) {
 _root = new ModelNode;
+m_ownsRoot = true;
+}
 ModelNode *mn = new ModelNode;
 mn->setObjectValue(valuemap);
 _root->values.insert(index,qVariantFromValue(mn));
 return true;
 }
 }
 bool NestedListModel::append(const QScriptValue& valuemap)
 {
-if (!_root)
+if (!_root) {
 _root = new ModelNode;
+m_ownsRoot = true;
+}
 ModelNode *mn = new ModelNode;
 mn->setObjectValue(valuemap);
 _root->values << qVariantFromValue(mn);
 return true;
 }
 {
 }
 ModelNode::~ModelNode()
 {
-qDeleteAll(properties.values());
+clear();
+if (modelCache) { modelCache->m_nested->_root = 0/* ==this */; delete modelCache; modelCache = 0; }
+if (objectCache) { delete objectCache; objectCache = 0; }
+}
+void ModelNode::clear()
+{
 ModelNode *node;
 for (int ii = 0; ii < values.count(); ++ii) {
 node = qvariant_cast<ModelNode *>(values.at(ii));
 if (node) { delete node; node = 0; }
 }
+values.clear();
-if (modelCache) { modelCache->m_nested->_root = 0/* ==this */; delete modelCache; modelCache = 0; }
-if (objectCache) { delete objectCache; objectCache = 0; }
+qDeleteAll(properties.values());
+properties.clear();
 }
 void ModelNode::setObjectValue(const QScriptValue& valuemap) {
 QScriptValueIterator it(valuemap);
 while (it.hasNext()) {

changeset 37	758a864f9613
parent 33	3e2da88830cd