diff options
| -rw-r--r-- | demos/declarative/flickr/flickr.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/flickr/flickr2.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/xmldata/daringfireball.qml | 1 | ||||
| -rw-r--r-- | examples/declarative/xmldata/yahoonews.qml | 1 | ||||
| -rw-r--r-- | src/declarative/extra/qmlxmllistmodel.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/extra/qmlxmllistmodel.h | 12 |
6 files changed, 5 insertions, 17 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index da77d93..83448ee 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -16,7 +16,7 @@ Item { Role { name: "title"; query: "title/string()" } Role { name: "imagePath"; query: "media:thumbnail/@url/string()" } Role { name: "url"; query: "media:content/@url/string()" } - Role { name: "description"; query: "description/string()"; isCData: true } + Role { name: "description"; query: "description/string()" } Role { name: "tags"; query: "media:category/string()" } Role { name: "photoWidth"; query: "media:content/@width/string()" } Role { name: "photoHeight"; query: "media:content/@height/string()" } diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml index 52f8675..79f7a32 100644 --- a/demos/declarative/flickr/flickr2.qml +++ b/demos/declarative/flickr/flickr2.qml @@ -18,7 +18,7 @@ Item { Role { name: "title"; query: "title/string()" } Role { name: "imagePath"; query: "media:thumbnail/@url/string()" } Role { name: "url"; query: "media:content/@url/string()" } - Role { name: "description"; query: "description/string()"; isCData: true } + Role { name: "description"; query: "description/string()" } Role { name: "tags"; query: "media:category/string()" } Role { name: "photoWidth"; query: "media:content/@width/string()" } Role { name: "photoHeight"; query: "media:content/@height/string()" } diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml index 3877adf..b14dfbf 100644 --- a/examples/declarative/xmldata/daringfireball.qml +++ b/examples/declarative/xmldata/daringfireball.qml @@ -19,7 +19,6 @@ Rect { Role { name: "content" query: "content/string()" - isCData: true } }, Component { diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml index 206c85f..b465ef1 100644 --- a/examples/declarative/xmldata/yahoonews.qml +++ b/examples/declarative/xmldata/yahoonews.qml @@ -21,7 +21,6 @@ Rect { Role { name: "description" query: "description/string()" - isCData: true } }, Component { diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp index b10f5fd..51905fa 100644 --- a/src/declarative/extra/qmlxmllistmodel.cpp +++ b/src/declarative/extra/qmlxmllistmodel.cpp @@ -230,7 +230,7 @@ void QmlXmlQuery::doSubQueryJob() QXmlItem item(output3.next()); QList<QVariant> resultList; while (!item.isNull()) { - resultList << item.toAtomicValue(); + resultList << item.toAtomicValue(); //### we used to trim strings item = output3.next(); } m_modelData << resultList; @@ -346,7 +346,7 @@ void QmlXmlRoleList::insert(int i, XmlListModelRole *role) query: "doc($src)/rss/channel/item" Role { name: "title"; query: "title/string()" } Role { name: "link"; query: "link/string()" } - Role { name: "description"; query: "description/string()"; isCData: true } + Role { name: "description"; query: "description/string()" } } \endqml \note The model is currently static, so the above is really just a snapshot of an RSS feed. diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index bdbba47..c6aae4a 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -57,11 +57,9 @@ class Q_DECLARATIVE_EXPORT XmlListModelRole : public QObject Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString query READ query WRITE setQuery) - Q_PROPERTY(bool isCData READ isCData WRITE setIsCData) - Q_PROPERTY(bool isStringList READ isStringList WRITE setIsStringList) public: - XmlListModelRole() : m_isList(false), m_isCData(false) {} + XmlListModelRole() {} ~XmlListModelRole() {} QString name() const { return m_name; } @@ -70,17 +68,9 @@ public: QString query() const { return m_query; } void setQuery(const QString &query) { m_query = query; } - bool isStringList() const { return m_isList; } - void setIsStringList(bool b) { m_isList = b; } - - bool isCData() const { return m_isCData; } - void setIsCData(bool b) { m_isCData = b; } - private: QString m_name; QString m_query; - bool m_isList; - bool m_isCData; }; QML_DECLARE_TYPE(XmlListModelRole) |