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/api/qabstractxmlnodemodel.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/api/qabstractxmlnodemodel.cpp')
-rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp index 7cb2a46..b574427 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp @@ -657,23 +657,18 @@ QAbstractXmlNodeModel::iterate(const QXmlNodeModelIndex &ni, switch(kind(ni)) { 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: { @@ -699,14 +694,13 @@ QAbstractXmlNodeModel::iterate(const QXmlNodeModelIndex &ni, if(kind(ni) == QXmlNodeModelIndex::Attribute && nextFromSimpleAxis(Parent, ni).isNull()) return makeSingletonIterator(ni); - /* Else, fallthrough to AxisAttribute. */ + Q_FALLTHROUGH(); } case QXmlNodeModelIndex::AxisAttribute: return makeVectorIterator(attributes(ni)); case QXmlNodeModelIndex::AxisDescendantOrSelf: return mergeIterators(ni, iterate(ni, QXmlNodeModelIndex::AxisDescendant)); case QXmlNodeModelIndex::AxisFollowing: - /* Fallthrough. */ case QXmlNodeModelIndex::AxisPreceding: { /* We walk up along the ancestors, and for each parent, we grab its preceding/following @@ -1041,6 +1035,7 @@ bool QAbstractXmlNodeModel::isDeepEqual(const QXmlNodeModelIndex &n1, } /* Fallthrough, so we check the children. */ + Q_FALLTHROUGH(); } case QXmlNodeModelIndex::Document: { @@ -1070,11 +1065,8 @@ bool QAbstractXmlNodeModel::isDeepEqual(const QXmlNodeModelIndex &n1, return true; } case QXmlNodeModelIndex::Attribute: - /* Fallthrough */ case QXmlNodeModelIndex::ProcessingInstruction: - /* Fallthrough. */ case QXmlNodeModelIndex::Text: - /* Fallthrough. */ case QXmlNodeModelIndex::Comment: return n1.stringValue() == n2.stringValue(); case QXmlNodeModelIndex::Namespace: |