AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tests: Add more QChar::unicode() calls to brush over deprecation warning.

Browse Source 
Amends change e0ea0f6178

Change-Id: I19e505b2aac9c26173508d75bbf60a45db825fe4
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2016-04-07 15:28:20 +02:00
parent 1ed8a7bff5
commit e1d44b531d
6 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/auto/other/qtokenautomaton/tokenizers/basic/basic.cpp
View File

@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE
Basic::Token Basic::classifier3(const QChar *data) Basic::Token Basic::classifier3(const QChar *data)
{ {
if (data[0] == 100) if (data[0].unicode() == 100)
{ {
@ -50,7 +50,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[0] == 97) else if (data[0].unicode() == 97)
{ {
@ -66,7 +66,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[0] == 103) else if (data[0].unicode() == 103)
{ {
@ -89,19 +89,19 @@ Basic::Token Basic::classifier3(const QChar *data)
Basic::Token Basic::classifier4(const QChar *data) Basic::Token Basic::classifier4(const QChar *data)
{ {
if (data[0] == 70) if (data[0].unicode() == 70)
{ {
if (data[1] == 70) if (data[1].unicode() == 70)
{ {
if (data[2] == 70) if (data[2].unicode() == 70)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -111,7 +111,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -124,11 +124,11 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[2] == 71) else if (data[2].unicode() == 71)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -138,7 +138,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -151,12 +151,12 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[2] == 76) else if (data[2].unicode() == 76)
{ {
if(data[3] == 77) if (data[3].unicode() == 77)
return FFLM; return FFLM;
@ -192,7 +192,7 @@ Basic::Token Basic::classifier3(const QChar *data)
Basic::Token Basic::classifier14(const QChar *data) Basic::Token Basic::classifier14(const QChar *data)
{ {
if (data[0] == 119) if (data[0].unicode() == 119)
{ {
@ -208,7 +208,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[0] == 99) else if (data[0].unicode() == 99)
{ {

26
tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
View File

@ -36,7 +36,7 @@ using namespace BasicNamespace;
Basic::Token Basic::classifier3(const QChar *data) Basic::Token Basic::classifier3(const QChar *data)
{ {
if (data[0] == 100) if (data[0].unicode() == 100)
{ {
@ -52,7 +52,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[0] == 97) else if (data[0].unicode() == 97)
{ {
@ -68,7 +68,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[0] == 103) else if (data[0].unicode() == 103)
{ {
@ -91,19 +91,19 @@ Basic::Token Basic::classifier3(const QChar *data)
Basic::Token Basic::classifier4(const QChar *data) Basic::Token Basic::classifier4(const QChar *data)
{ {
if (data[0] == 70) if (data[0].unicode() == 70)
{ {
if (data[1] == 70) if (data[1].unicode() == 70)
{ {
if (data[2] == 70) if (data[2].unicode() == 70)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -113,7 +113,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -126,11 +126,11 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[2] == 71) else if (data[2].unicode() == 71)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -140,7 +140,7 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -153,12 +153,12 @@ Basic::Token Basic::classifier3(const QChar *data)
} }
else if (data[2] == 76) else if (data[2].unicode() == 76)
{ {
if(data[3] == 77) if (data[3].unicode() == 77)
return FFLM; return FFLM;

26
tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
View File

@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
Boilerplate::Token Boilerplate::classifier3(const QChar *data) Boilerplate::Token Boilerplate::classifier3(const QChar *data)
{ {
if (data[0] == 100) if (data[0].unicode() == 100)
{ {
@ -52,7 +52,7 @@ Boilerplate::Token Boilerplate::classifier3(const QChar *data)
} }
else if (data[0] == 97) else if (data[0].unicode() == 97)
{ {
@ -68,7 +68,7 @@ Boilerplate::Token Boilerplate::classifier3(const QChar *data)
} }
else if (data[0] == 103) else if (data[0].unicode() == 103)
{ {
@ -91,19 +91,19 @@ Boilerplate::Token Boilerplate::classifier3(const QChar *data)
Boilerplate::Token Boilerplate::classifier4(const QChar *data) Boilerplate::Token Boilerplate::classifier4(const QChar *data)
{ {
if (data[0] == 70) if (data[0].unicode() == 70)
{ {
if (data[1] == 70) if (data[1].unicode() == 70)
{ {
if (data[2] == 70) if (data[2].unicode() == 70)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -113,7 +113,7 @@ Boilerplate::Token Boilerplate::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -126,11 +126,11 @@ Boilerplate::Token Boilerplate::classifier3(const QChar *data)
} }
else if (data[2] == 71) else if (data[2].unicode() == 71)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -140,7 +140,7 @@ Boilerplate::Token Boilerplate::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -153,12 +153,12 @@ Boilerplate::Token Boilerplate::classifier3(const QChar *data)
} }
else if (data[2] == 76) else if (data[2].unicode() == 76)
{ {
if(data[3] == 77) if (data[3].unicode() == 77)
return FFLM; return FFLM;

30
tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
View File

@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE
NoNamespace::Token NoNamespace::classifier3(const QChar *data) NoNamespace::Token NoNamespace::classifier3(const QChar *data)
{ {
if (data[0] == 100) if (data[0].unicode() == 100)
{ {
@ -50,7 +50,7 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
} }
else if (data[0] == 97) else if (data[0].unicode() == 97)
{ {
@ -66,7 +66,7 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
} }
else if (data[0] == 103) else if (data[0].unicode() == 103)
{ {
@ -89,19 +89,19 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
NoNamespace::Token NoNamespace::classifier4(const QChar *data) NoNamespace::Token NoNamespace::classifier4(const QChar *data)
{ {
if (data[0] == 70) if (data[0].unicode() == 70)
{ {
if (data[1] == 70) if (data[1].unicode() == 70)
{ {
if (data[2] == 70) if (data[2].unicode() == 70)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -111,7 +111,7 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -124,11 +124,11 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
} }
else if (data[2] == 71) else if (data[2].unicode() == 71)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -138,7 +138,7 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -151,12 +151,12 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
} }
else if (data[2] == 76) else if (data[2].unicode() == 76)
{ {
if(data[3] == 77) if (data[3].unicode() == 77)
return FFLM; return FFLM;
@ -176,7 +176,7 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
NoNamespace::Token NoNamespace::classifier14(const QChar *data) NoNamespace::Token NoNamespace::classifier14(const QChar *data)
{ {
if (data[0] == 119) if (data[0].unicode() == 119)
{ {
@ -192,7 +192,7 @@ NoNamespace::Token NoNamespace::classifier3(const QChar *data)
} }
else if (data[0] == 99) else if (data[0].unicode() == 99)
{ {

26
tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.cpp
View File

@ -36,7 +36,7 @@ using namespace NoToStringNS;
NoToString::Token NoToString::classifier3(const QChar *data) NoToString::Token NoToString::classifier3(const QChar *data)
{ {
if (data[0] == 100) if (data[0].unicode() == 100)
{ {
@ -52,7 +52,7 @@ NoToString::Token NoToString::classifier3(const QChar *data)
} }
else if (data[0] == 97) else if (data[0].unicode() == 97)
{ {
@ -68,7 +68,7 @@ NoToString::Token NoToString::classifier3(const QChar *data)
} }
else if (data[0] == 103) else if (data[0].unicode() == 103)
{ {
@ -91,19 +91,19 @@ NoToString::Token NoToString::classifier3(const QChar *data)
NoToString::Token NoToString::classifier4(const QChar *data) NoToString::Token NoToString::classifier4(const QChar *data)
{ {
if (data[0] == 70) if (data[0].unicode() == 70)
{ {
if (data[1] == 70) if (data[1].unicode() == 70)
{ {
if (data[2] == 70) if (data[2].unicode() == 70)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -113,7 +113,7 @@ NoToString::Token NoToString::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -126,11 +126,11 @@ NoToString::Token NoToString::classifier3(const QChar *data)
} }
else if (data[2] == 71) else if (data[2].unicode() == 71)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -140,7 +140,7 @@ NoToString::Token NoToString::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -153,12 +153,12 @@ NoToString::Token NoToString::classifier3(const QChar *data)
} }
else if (data[2] == 76) else if (data[2].unicode() == 76)
{ {
if(data[3] == 77) if (data[3].unicode() == 77)
return FFLM; return FFLM;

30
tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
View File

@ -36,7 +36,7 @@ using namespace TheNamespace;
WithNamespace::Token WithNamespace::classifier3(const QChar *data) WithNamespace::Token WithNamespace::classifier3(const QChar *data)
{ {
if (data[0] == 100) if (data[0].unicode() == 100)
{ {
@ -52,7 +52,7 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
} }
else if (data[0] == 97) else if (data[0].unicode() == 97)
{ {
@ -68,7 +68,7 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
} }
else if (data[0] == 103) else if (data[0].unicode() == 103)
{ {
@ -91,19 +91,19 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
WithNamespace::Token WithNamespace::classifier4(const QChar *data) WithNamespace::Token WithNamespace::classifier4(const QChar *data)
{ {
if (data[0] == 70) if (data[0].unicode() == 70)
{ {
if (data[1] == 70) if (data[1].unicode() == 70)
{ {
if (data[2] == 70) if (data[2].unicode() == 70)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -113,7 +113,7 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -126,11 +126,11 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
} }
else if (data[2] == 71) else if (data[2].unicode() == 71)
{ {
if (data[3] == 70) if (data[3].unicode() == 70)
{ {
@ -140,7 +140,7 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
} }
else if (data[3] == 71) else if (data[3].unicode() == 71)
{ {
@ -153,12 +153,12 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
} }
else if (data[2] == 76) else if (data[2].unicode() == 76)
{ {
if(data[3] == 77) if (data[3].unicode() == 77)
return FFLM; return FFLM;
@ -178,7 +178,7 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
WithNamespace::Token WithNamespace::classifier14(const QChar *data) WithNamespace::Token WithNamespace::classifier14(const QChar *data)
{ {
if (data[0] == 119) if (data[0].unicode() == 119)
{ {
@ -194,7 +194,7 @@ WithNamespace::Token WithNamespace::classifier3(const QChar *data)
} }
else if (data[0] == 99) else if (data[0].unicode() == 99)
{ {