diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-12 10:20:28 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 10:20:28 +0200 |
commit | a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3 (patch) | |
tree | 0bc15fb9c75bdb98ec58cb56b9cdb96f9c0e8496 /src/xmlpatterns/acceltree/qacceltree.cpp | |
parent | 141d12bd6d8c51bc92128654a084b36c6b747120 (diff) | |
parent | 3a44e86cdceba7acc6b830274968b0dfa482f5a8 (diff) | |
download | qtxmlpatterns-a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3.tar.gz |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Iea8a806a7fe03bc52ffdae10b8459ce6cc275cc6
Diffstat (limited to 'src/xmlpatterns/acceltree/qacceltree.cpp')
-rw-r--r-- | src/xmlpatterns/acceltree/qacceltree.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp index 1892745..23503fe 100644 --- a/src/xmlpatterns/acceltree/qacceltree.cpp +++ b/src/xmlpatterns/acceltree/qacceltree.cpp @@ -176,11 +176,8 @@ QUrl AccelTree::baseUri(const QXmlNodeModelIndex &ni) const return par.baseUri(); } case QXmlNodeModelIndex::ProcessingInstruction: - /* Fallthrough. */ case QXmlNodeModelIndex::Comment: - /* Fallthrough. */ case QXmlNodeModelIndex::Attribute: - /* Fallthrough. */ case QXmlNodeModelIndex::Text: { const QXmlNodeModelIndex par(ni.iterate(QXmlNodeModelIndex::AxisParent)->next()); @@ -256,22 +253,17 @@ QXmlNodeModelIndex::Iterator::Ptr AccelTree::iterate(const QXmlNodeModelIndex &n switch(kind(preNumber)) { case QXmlNodeModelIndex::Comment: - /* Fallthrough. */ case QXmlNodeModelIndex::ProcessingInstruction: - /* Fallthrough. */ case QXmlNodeModelIndex::Element: - /* Fallthrough. */ case QXmlNodeModelIndex::Text: return makeSingletonIterator(ni); case QXmlNodeModelIndex::Attribute: - /* Fallthrough. */ case QXmlNodeModelIndex::Document: - /* Fallthrough. */ case QXmlNodeModelIndex::Namespace: /* Do nothing. */; } } - /* Else, fallthrough to AxisChild. */ + Q_FALLTHROUGH(); } case QXmlNodeModelIndex::AxisChild: { @@ -316,7 +308,7 @@ QXmlNodeModelIndex::Iterator::Ptr AccelTree::iterate(const QXmlNodeModelIndex &n { if(!hasParent(preNumber) && kind(preNumber) == QXmlNodeModelIndex::Attribute) return makeSingletonIterator(ni); - /* Else, falthrough to AxisAttribute. */ + Q_FALLTHROUGH(); } case QXmlNodeModelIndex::AxisAttribute: { @@ -522,12 +514,11 @@ QString AccelTree::stringValue(const QXmlNodeModelIndex &ni) const { if(isCompressed(preNumber)) return CompressedWhitespace::decompress(data.value(preNumber)); - /* Else, fallthrough. It's not compressed so use it as it is. */ + /* It's not compressed so use it as it is. */ + Q_FALLTHROUGH(); } case QXmlNodeModelIndex::Attribute: - /* Fallthrough */ case QXmlNodeModelIndex::ProcessingInstruction: - /* Fallthrough */ case QXmlNodeModelIndex::Comment: return data.value(preNumber); case QXmlNodeModelIndex::Document: @@ -591,16 +582,12 @@ Item::Iterator::Ptr AccelTree::sequencedTypedValue(const QXmlNodeModelIndex &n) switch(kind(preNumber)) { case QXmlNodeModelIndex::Element: - /* Fallthrough. */ case QXmlNodeModelIndex::Document: - /* Fallthrough. */ case QXmlNodeModelIndex::Attribute: return makeSingletonIterator(Item(UntypedAtomic::fromValue(stringValue(n)))); case QXmlNodeModelIndex::Text: - /* Fallthrough. */ case QXmlNodeModelIndex::ProcessingInstruction: - /* Fallthrough. */ case QXmlNodeModelIndex::Comment: return makeSingletonIterator(Item(AtomicString::fromValue(stringValue(n)))); default: |