summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-20 08:50:53 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-20 20:17:09 (GMT)
commit1dc7a444e24ff13ebbc3747fd9be5ee6bfd3e430 (patch)
treebd5881420e2077ec7ac4f06aeb795456ca352c31
parent988fb7ba66b1c9ab014de625b5037203b3516495 (diff)
downloadqtxmlpatterns-1dc7a444e24ff13ebbc3747fd9be5ee6bfd3e430.tar.gz
qxquerytokenizer.cpp: Fix -Wimplicit-fallthrough
Remove the Q_ASSERT following the return statements in the switch. Fixes numerous warnings: parser\qxquerytokenizer.cpp:825:28: warning: this statement may fall through [-Wimplicit-fallthrough=] Q_ASSERT(false); Change-Id: I921b4a61f7751f7a55c708ed182806e76e7d75e7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/xmlpatterns/parser/qxquerytokenizer.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/xmlpatterns/parser/qxquerytokenizer.cpp b/src/xmlpatterns/parser/qxquerytokenizer.cpp
index a88e2d1..ab1cfdc 100644
--- a/src/xmlpatterns/parser/qxquerytokenizer.cpp
+++ b/src/xmlpatterns/parser/qxquerytokenizer.cpp
@@ -821,8 +821,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
}
else
return id;
-
- Q_ASSERT(false);
}
case NamespaceDecl:
{
@@ -848,8 +846,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
return tokenAndChangeState(t->token, Default, 0);
else
return nc;
-
- Q_ASSERT(false);
}
case Axis:
{
@@ -1428,9 +1424,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
return id;
}
}
-
- Q_ASSERT(false);
-
}
case VarName:
{
@@ -1439,7 +1432,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
setState(Operator);
return tokenizeNCNameOrQName();
- Q_ASSERT(false);
}
case ItemType:
{
@@ -1476,7 +1468,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
return name;
}
}
- Q_ASSERT(false);
}
case KindTest:
{
@@ -1521,7 +1512,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
}
else
return nc;
- Q_ASSERT(false);
}
case KindTestForPI:
{
@@ -1538,7 +1528,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
default:
return tokenizeNCName();
}
- Q_ASSERT(false);
}
case OccurrenceIndicator:
{
@@ -1556,7 +1545,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
return nextToken();
}
}
- Q_ASSERT(false);
}
case XQueryVersion:
{
@@ -1579,7 +1567,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
return tokenAndChangeState(keyword->token, Default);
else
return id;
- Q_ASSERT(false);
}
case StartTag:
{
@@ -1629,7 +1616,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
default:
return tokenizeNCNameOrQName();
}
- Q_ASSERT(false);
}
case AposAttributeContent:
case QuotAttributeContent:
@@ -1765,7 +1751,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
++m_pos;
}
- Q_ASSERT(false);
}
case ElementContent:
{
@@ -1918,7 +1903,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
}
++m_pos;
}
- Q_ASSERT(false);
}
case ProcessingInstructionName:
{
@@ -1937,7 +1921,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
ProcessingInstructionContent);
}
}
- Q_ASSERT(false);
}
case ProcessingInstructionContent:
{
@@ -1956,7 +1939,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
popState();
return Token(T_PI_CONTENT, normalizeEOL(m_data.mid(start, len), CharacterSkips()));
}
- Q_ASSERT(false);
}
case EndTag:
{
@@ -1970,7 +1952,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
}
else
return tokenizeNCNameOrQName();
- Q_ASSERT(false);
}
case XMLComment:
{
@@ -1992,7 +1973,6 @@ Tokenizer::Token XQueryTokenizer::nextToken()
else
return error();
}
- Q_ASSERT(false);
}
case Pragma:
{