summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--src/xmlpatterns/parser/qxquerytokenizer.cpp20
-rw-r--r--src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h16
3 files changed, 13 insertions, 25 deletions
diff --git a/.qmake.conf b/.qmake.conf
index d860bee..e1c4e49 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
CONFIG += warning_clean
DEFINES += QT_NO_FOREACH
-MODULE_VERSION = 5.9.1
+MODULE_VERSION = 5.9.2
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:
{
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
index 2583bb9..1cb2e72 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h
@@ -111,7 +111,9 @@ template <typename TransitionType>
void XsdStateMachine<TransitionType>::reset()
{
// reset the machine to the start state
- for (auto it = m_states.cbegin(), end = m_states.cend(); it != end; ++it) {
+ auto it = m_states.cbegin();
+ auto end = m_states.cend();
+ for ( ; it != end; ++it) {
if (it.value() == StartState || it.value() == StartEndState) {
m_currentState = it.key();
return;
@@ -175,7 +177,9 @@ bool XsdStateMachine<TransitionType>::proceed(InputType input)
// fetch the transition entry for the current state
const QHash<TransitionType, QVector<StateId> > &entry = m_transitions[m_currentState];
- for (auto it = entry.cbegin(), end = entry.cend(); it != end; ++it) {
+ auto it = entry.cbegin();
+ auto end = entry.cend();
+ for ( ; it != end; ++it) {
if (inputEqualsTransition(input, it.key())) {
m_currentState = it.value().first();
m_lastTransition = it.key();
@@ -212,7 +216,9 @@ TransitionType XsdStateMachine<TransitionType>::lastTransition() const
template <typename TransitionType>
typename XsdStateMachine<TransitionType>::StateId XsdStateMachine<TransitionType>::startState() const
{
- for (auto it = m_states.cbegin(), end = m_states.cend(); it != end; ++it) {
+ auto it = m_states.cbegin();
+ auto end = m_states.cend();
+ for ( ; it != end; ++it) {
if (it.value() == StartState || it.value() == StartEndState)
return it.key();
}
@@ -339,7 +345,9 @@ XsdStateMachine<TransitionType> XsdStateMachine<TransitionType>::toDFA() const
// search the start state as the algorithm starts with it...
StateId startState = -1;
- for (auto it = m_states.cbegin(), end = m_states.cend(); it != end; ++it) {
+ auto it = m_states.cbegin();
+ auto end = m_states.cend();
+ for ( ; it != end; ++it) {
if (it.value() == StartState) {
startState = it.key();
break;