diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-03 15:13:46 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 17:30:35 +0200 |
commit | fd43e238233142bdd6b045c69f9cbb56b3601984 (patch) | |
tree | 2d6262f47899458054faa9e4a278db45c3c7ab0f /src | |
parent | aa38299ebe4d330b786d09003e5c06909447eae4 (diff) | |
download | qtxmlpatterns-fd43e238233142bdd6b045c69f9cbb56b3601984.tar.gz |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [other]
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: Ib84e307f486cb3049f0b61a667caa40799394f86
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/xmlpatterns/functions/qpatternmatchingfns.cpp | 2 | ||||
-rw-r--r-- | src/xmlpatterns/parser/qxquerytokenizer.cpp | 10 | ||||
-rw-r--r-- | src/xmlpatterns/parser/qxquerytokenizer_p.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns.cpp b/src/xmlpatterns/functions/qpatternmatchingfns.cpp index 27c7dd4..4e5848d 100644 --- a/src/xmlpatterns/functions/qpatternmatchingfns.cpp +++ b/src/xmlpatterns/functions/qpatternmatchingfns.cpp @@ -111,7 +111,7 @@ QString ReplaceFN::parseReplacement(const int, for(int i = 0; i < len; ++i) { const QChar ch(input.at(i)); - switch(ch.toAscii()) + switch(ch.toLatin1()) { case '$': { diff --git a/src/xmlpatterns/parser/qxquerytokenizer.cpp b/src/xmlpatterns/parser/qxquerytokenizer.cpp index 9988c7d..0c8960d 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer.cpp +++ b/src/xmlpatterns/parser/qxquerytokenizer.cpp @@ -83,7 +83,7 @@ const QChar XQueryTokenizer::current() const char XQueryTokenizer::peekCurrent() const { - return current().toAscii(); + return current().toLatin1(); } int XQueryTokenizer::peekForColonColon() const @@ -94,7 +94,7 @@ int XQueryTokenizer::peekForColonColon() const while(pos < m_length) { - switch(m_data.at(pos).toAscii()) + switch(m_data.at(pos).toLatin1()) { /* Fallthrough these four. */ case ' ': @@ -317,7 +317,7 @@ Tokenizer::TokenType XQueryTokenizer::consumeWhitespace() char XQueryTokenizer::peekAhead(const int length) const { if(m_pos + length < m_length) - return m_data.at(m_pos + length).toAscii(); + return m_data.at(m_pos + length).toLatin1(); else return 0; } @@ -702,7 +702,7 @@ bool XQueryTokenizer::aheadEquals(const char *const chs, for(int i = offset; i < (len + offset); ++i) { - if(m_data.at(m_pos + i).toAscii() != chs[i - offset]) + if(m_data.at(m_pos + i).toLatin1() != chs[i - offset]) return false; } @@ -711,7 +711,7 @@ bool XQueryTokenizer::aheadEquals(const char *const chs, const TokenMap *XQueryTokenizer::lookupKeyword(const QString &keyword) { - return TokenLookup::value(keyword.toAscii().constData(), keyword.length()); + return TokenLookup::value(keyword.toLatin1().constData(), keyword.length()); } XQueryTokenizer::State XQueryTokenizer::state() const diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h index b0ac364..3949047 100644 --- a/src/xmlpatterns/parser/qxquerytokenizer_p.h +++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h @@ -173,7 +173,7 @@ namespace QPatternist * Equivalent to calling: * * @code - * current().toAscii(); + * current().toLatin1(); * @endcode */ inline char peekCurrent() const; |