diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/xml | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/dom/qdom.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 38a44024aa..c503302fbb 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -172,14 +172,16 @@ public: bool isDocumentType() const { return nodeType() == QDomNode::DocumentTypeNode; } bool isElement() const { return nodeType() == QDomNode::ElementNode; } bool isEntityReference() const { return nodeType() == QDomNode::EntityReferenceNode; } - bool isText() const { return (nodeType() == QDomNode::TextNode) - || (nodeType() == QDomNode::CDATASectionNode); } + bool isText() const { const QDomNode::NodeType nt = nodeType(); + return (nt == QDomNode::TextNode) + || (nt == QDomNode::CDATASectionNode); } bool isEntity() const { return nodeType() == QDomNode::EntityNode; } bool isNotation() const { return nodeType() == QDomNode::NotationNode; } bool isProcessingInstruction() const { return nodeType() == QDomNode::ProcessingInstructionNode; } - bool isCharacterData() const { return (nodeType() == QDomNode::CharacterDataNode) - || (nodeType() == QDomNode::TextNode) - || (nodeType() == QDomNode::CommentNode); } + bool isCharacterData() const { const QDomNode::NodeType nt = nodeType(); + return (nt == QDomNode::CharacterDataNode) + || (nt == QDomNode::TextNode) + || (nt == QDomNode::CommentNode); } bool isComment() const { return nodeType() == QDomNode::CommentNode; } virtual QDomNode::NodeType nodeType() const { return QDomNode::BaseNode; } |