From f799a226b1025bf7158bc00dff35ee060f57a137 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 29 Mar 2017 12:59:19 +0200
Subject: Cleanup implicit fallthroughs in xmlpatterns

Use Q_FALLTHOUGH instead of comments, and use it consistently.

Change-Id: Ieaf4867b612e624774011275b90cdd3678a29fe9
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/xmlpatterns/acceltree/qacceltree.cpp | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'src/xmlpatterns/acceltree/qacceltree.cpp')

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:
-- 
cgit v1.2.1