summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 13:21:14 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 13:21:21 +0200
commit2964bffaa5a8b9f5a11428548a1922b9389f0df1 (patch)
treed8b0b2d56300a16b3b8dd519c26bbee48cf408a9
parent678502cce013a01a344e7a54d06bbf2aa816af13 (diff)
parent9661c2a29f4bacf77170eb6b3cf016fdb6631f82 (diff)
downloadqtxmlpatterns-2964bffaa5a8b9f5a11428548a1922b9389f0df1.tar.gz
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I6b681aee6f87beca37f532daea8380580098c3e9
-rw-r--r--src/xmlpatterns/api/qabstractmessagehandler.h2
-rw-r--r--src/xmlpatterns/api/qabstracturiresolver.h2
-rw-r--r--src/xmlpatterns/api/qabstractxmlnodemodel.h2
-rw-r--r--src/xmlpatterns/parser/qxslttokenlookup.cpp240
-rw-r--r--src/xmlpatterns/xmlpatterns.pro4
-rw-r--r--tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp4
-rw-r--r--tests/auto/xmlpatternssdk/ExpressionInfo.cpp4
-rw-r--r--tests/auto/xmlpatternssdk/ExpressionInfo.h8
8 files changed, 137 insertions, 129 deletions
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h
index bd07c82..c6f84a2 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/src/xmlpatterns/api/qabstractmessagehandler.h
@@ -51,7 +51,7 @@ class Q_XMLPATTERNS_EXPORT QAbstractMessageHandler : public QObject
{
Q_OBJECT
public:
- QAbstractMessageHandler(QObject *parent = 0);
+ QAbstractMessageHandler(QObject *parent = Q_NULLPTR);
virtual ~QAbstractMessageHandler();
void message(QtMsgType type,
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index e668ea8..7fc08c2 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.h
+++ b/src/xmlpatterns/api/qabstracturiresolver.h
@@ -53,7 +53,7 @@ class Q_XMLPATTERNS_EXPORT QAbstractUriResolver : public QObject
{
Q_OBJECT
public:
- QAbstractUriResolver(QObject *parent = 0);
+ QAbstractUriResolver(QObject *parent = Q_NULLPTR);
virtual ~QAbstractUriResolver();
virtual QUrl resolve(const QUrl &relative,
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index 603c01c..6b6593d 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h
@@ -104,7 +104,7 @@ namespace QPatternist
{
data = 0;
additionalData = 0;
- model = 0;
+ model = Q_NULLPTR;
}
};
}
diff --git a/src/xmlpatterns/parser/qxslttokenlookup.cpp b/src/xmlpatterns/parser/qxslttokenlookup.cpp
index fe6fff3..9a557cc 100644
--- a/src/xmlpatterns/parser/qxslttokenlookup.cpp
+++ b/src/xmlpatterns/parser/qxslttokenlookup.cpp
@@ -48,23 +48,23 @@ using namespace QPatternist;
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
{
- if (data[0] == 97)
+ if (data[0].unicode() == 97)
{
-
- if(data[1] == 115)
+
+ if (data[1].unicode() == 115)
return As;
}
- else if (data[0] == 105)
+ else if (data[0].unicode() == 105)
{
- if (data[1] == 100)
+ if (data[1].unicode() == 100)
{
@@ -74,7 +74,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[1] == 102)
+ else if (data[1].unicode() == 102)
{
@@ -94,7 +94,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier3(const QChar *data)
{
- if (data[0] == 107)
+ if (data[0].unicode() == 107)
{
@@ -110,7 +110,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 117)
+ else if (data[0].unicode() == 117)
{
@@ -133,7 +133,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier4(const QChar *data)
{
- if (data[0] == 99)
+ if (data[0].unicode() == 99)
{
@@ -149,7 +149,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 104)
+ else if (data[0].unicode() == 104)
{
@@ -165,7 +165,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 108)
+ else if (data[0].unicode() == 108)
{
@@ -181,7 +181,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 109)
+ else if (data[0].unicode() == 109)
{
@@ -197,7 +197,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 110)
+ else if (data[0].unicode() == 110)
{
@@ -213,7 +213,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 115)
+ else if (data[0].unicode() == 115)
{
@@ -229,32 +229,32 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 116)
+ else if (data[0].unicode() == 116)
{
- if (data[1] == 101)
+ if (data[1].unicode() == 101)
{
- if (data[2] == 115)
+ if (data[2].unicode() == 115)
{
- if(data[3] == 116)
+ if (data[3].unicode() == 116)
return Test;
}
- else if (data[2] == 120)
+ else if (data[2].unicode() == 120)
{
- if(data[3] == 116)
+ if (data[3].unicode() == 116)
return Text;
@@ -264,7 +264,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[1] == 121)
+ else if (data[1].unicode() == 121)
{
@@ -283,7 +283,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 119)
+ else if (data[0].unicode() == 119)
{
@@ -306,7 +306,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier5(const QChar *data)
{
- if (data[0] == 102)
+ if (data[0].unicode() == 102)
{
@@ -322,7 +322,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 109)
+ else if (data[0].unicode() == 109)
{
@@ -338,7 +338,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 111)
+ else if (data[0].unicode() == 111)
{
@@ -354,7 +354,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 112)
+ else if (data[0].unicode() == 112)
{
@@ -370,7 +370,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 114)
+ else if (data[0].unicode() == 114)
{
@@ -393,7 +393,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier6(const QChar *data)
{
- if (data[0] == 99)
+ if (data[0].unicode() == 99)
{
@@ -409,7 +409,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 102)
+ else if (data[0].unicode() == 102)
{
@@ -425,11 +425,11 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 105)
+ else if (data[0].unicode() == 105)
{
- if (data[1] == 109)
+ if (data[1].unicode() == 109)
{
@@ -445,7 +445,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[1] == 110)
+ else if (data[1].unicode() == 110)
{
@@ -464,7 +464,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 109)
+ else if (data[0].unicode() == 109)
{
@@ -480,7 +480,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 111)
+ else if (data[0].unicode() == 111)
{
@@ -496,11 +496,11 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 115)
+ else if (data[0].unicode() == 115)
{
- if (data[1] == 101)
+ if (data[1].unicode() == 101)
{
@@ -516,7 +516,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[1] == 116)
+ else if (data[1].unicode() == 116)
{
@@ -535,7 +535,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 116)
+ else if (data[0].unicode() == 116)
{
@@ -558,15 +558,15 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier7(const QChar *data)
{
- if (data[0] == 99)
+ if (data[0].unicode() == 99)
{
- if (data[1] == 111)
+ if (data[1].unicode() == 111)
{
- if (data[2] == 109)
+ if (data[2].unicode() == 109)
{
@@ -582,7 +582,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[2] == 112)
+ else if (data[2].unicode() == 112)
{
@@ -604,7 +604,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 101)
+ else if (data[0].unicode() == 101)
{
@@ -620,7 +620,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 105)
+ else if (data[0].unicode() == 105)
{
@@ -636,7 +636,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 109)
+ else if (data[0].unicode() == 109)
{
@@ -652,7 +652,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 118)
+ else if (data[0].unicode() == 118)
{
@@ -675,7 +675,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier8(const QChar *data)
{
- if (data[0] == 100)
+ if (data[0].unicode() == 100)
{
@@ -691,11 +691,11 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 101)
+ else if (data[0].unicode() == 101)
{
- if (data[1] == 108)
+ if (data[1].unicode() == 108)
{
@@ -711,7 +711,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[1] == 110)
+ else if (data[1].unicode() == 110)
{
@@ -730,11 +730,11 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 102)
+ else if (data[0].unicode() == 102)
{
- if (data[1] == 111)
+ if (data[1].unicode() == 111)
{
@@ -750,7 +750,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[1] == 117)
+ else if (data[1].unicode() == 117)
{
@@ -769,7 +769,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 111)
+ else if (data[0].unicode() == 111)
{
@@ -785,7 +785,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 112)
+ else if (data[0].unicode() == 112)
{
@@ -801,7 +801,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 114)
+ else if (data[0].unicode() == 114)
{
@@ -817,7 +817,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 115)
+ else if (data[0].unicode() == 115)
{
@@ -833,7 +833,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 116)
+ else if (data[0].unicode() == 116)
{
@@ -849,7 +849,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 117)
+ else if (data[0].unicode() == 117)
{
@@ -865,15 +865,15 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 118)
+ else if (data[0].unicode() == 118)
{
- if (data[1] == 97)
+ if (data[1].unicode() == 97)
{
- if (data[2] == 108)
+ if (data[2].unicode() == 108)
{
@@ -889,7 +889,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[2] == 114)
+ else if (data[2].unicode() == 114)
{
@@ -918,7 +918,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier9(const QChar *data)
{
- if (data[0] == 97)
+ if (data[0].unicode() == 97)
{
@@ -934,7 +934,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 99)
+ else if (data[0].unicode() == 99)
{
@@ -950,7 +950,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 100)
+ else if (data[0].unicode() == 100)
{
@@ -966,7 +966,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 110)
+ else if (data[0].unicode() == 110)
{
@@ -982,7 +982,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 111)
+ else if (data[0].unicode() == 111)
{
@@ -998,7 +998,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 115)
+ else if (data[0].unicode() == 115)
{
@@ -1014,11 +1014,11 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 116)
+ else if (data[0].unicode() == 116)
{
- if (data[1] == 101)
+ if (data[1].unicode() == 101)
{
@@ -1034,7 +1034,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[1] == 114)
+ else if (data[1].unicode() == 114)
{
@@ -1060,7 +1060,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier10(const QChar *data)
{
- if (data[0] == 99)
+ if (data[0].unicode() == 99)
{
@@ -1076,7 +1076,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 109)
+ else if (data[0].unicode() == 109)
{
@@ -1092,15 +1092,15 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 115)
+ else if (data[0].unicode() == 115)
{
- if (data[1] == 116)
+ if (data[1].unicode() == 116)
{
- if (data[2] == 97)
+ if (data[2].unicode() == 97)
{
@@ -1116,7 +1116,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[2] == 121)
+ else if (data[2].unicode() == 121)
{
@@ -1138,7 +1138,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 118)
+ else if (data[0].unicode() == 118)
{
@@ -1154,7 +1154,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 119)
+ else if (data[0].unicode() == 119)
{
@@ -1209,7 +1209,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier13(const QChar *data)
{
- if (data[0] == 97)
+ if (data[0].unicode() == 97)
{
@@ -1225,7 +1225,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 99)
+ else if (data[0].unicode() == 99)
{
@@ -1241,7 +1241,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 105)
+ else if (data[0].unicode() == 105)
{
@@ -1264,7 +1264,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier14(const QChar *data)
{
- if (data[0] == 97)
+ if (data[0].unicode() == 97)
{
@@ -1280,39 +1280,39 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 100)
+ else if (data[0].unicode() == 100)
{
- if (data[1] == 111)
+ if (data[1].unicode() == 111)
{
- if (data[2] == 99)
+ if (data[2].unicode() == 99)
{
- if (data[3] == 116)
+ if (data[3].unicode() == 116)
{
- if (data[4] == 121)
+ if (data[4].unicode() == 121)
{
- if (data[5] == 112)
+ if (data[5].unicode() == 112)
{
- if (data[6] == 101)
+ if (data[6].unicode() == 101)
{
- if (data[7] == 45)
+ if (data[7].unicode() == 45)
{
- if (data[8] == 112)
+ if (data[8].unicode() == 112)
{
@@ -1328,7 +1328,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[8] == 115)
+ else if (data[8].unicode() == 115)
{
@@ -1368,7 +1368,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 111)
+ else if (data[0].unicode() == 111)
{
@@ -1384,7 +1384,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 112)
+ else if (data[0].unicode() == 112)
{
@@ -1407,7 +1407,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier15(const QChar *data)
{
- if (data[0] == 97)
+ if (data[0].unicode() == 97)
{
@@ -1423,7 +1423,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 98)
+ else if (data[0].unicode() == 98)
{
@@ -1439,7 +1439,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 99)
+ else if (data[0].unicode() == 99)
{
@@ -1455,7 +1455,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 114)
+ else if (data[0].unicode() == 114)
{
@@ -1471,7 +1471,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 115)
+ else if (data[0].unicode() == 115)
{
@@ -1510,7 +1510,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier18(const QChar *data)
{
- if (data[0] == 100)
+ if (data[0].unicode() == 100)
{
@@ -1526,7 +1526,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 105)
+ else if (data[0].unicode() == 105)
{
@@ -1542,7 +1542,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 109)
+ else if (data[0].unicode() == 109)
{
@@ -1558,7 +1558,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 110)
+ else if (data[0].unicode() == 110)
{
@@ -1574,11 +1574,11 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 117)
+ else if (data[0].unicode() == 117)
{
- if (data[1] == 110)
+ if (data[1].unicode() == 110)
{
@@ -1594,19 +1594,19 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[1] == 115)
+ else if (data[1].unicode() == 115)
{
- if (data[2] == 101)
+ if (data[2].unicode() == 101)
{
- if (data[3] == 45)
+ if (data[3].unicode() == 45)
{
- if (data[4] == 97)
+ if (data[4].unicode() == 97)
{
@@ -1622,7 +1622,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[4] == 99)
+ else if (data[4].unicode() == 99)
{
@@ -1657,7 +1657,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier20(const QChar *data)
{
- if (data[0] == 105)
+ if (data[0].unicode() == 105)
{
@@ -1673,7 +1673,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 111)
+ else if (data[0].unicode() == 111)
{
@@ -1712,7 +1712,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier22(const QChar *data)
{
- if (data[0] == 99)
+ if (data[0].unicode() == 99)
{
@@ -1728,7 +1728,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 105)
+ else if (data[0].unicode() == 105)
{
@@ -1744,7 +1744,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 110)
+ else if (data[0].unicode() == 110)
{
@@ -1760,7 +1760,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 112)
+ else if (data[0].unicode() == 112)
{
@@ -1783,7 +1783,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
XSLTTokenLookup::NodeName XSLTTokenLookup::classifier23(const QChar *data)
{
- if (data[0] == 101)
+ if (data[0].unicode() == 101)
{
@@ -1799,7 +1799,7 @@ XSLTTokenLookup::NodeName XSLTTokenLookup::classifier2(const QChar *data)
}
- else if (data[0] == 120)
+ else if (data[0].unicode() == 120)
{
diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro
index b646928..1b53673 100644
--- a/src/xmlpatterns/xmlpatterns.pro
+++ b/src/xmlpatterns/xmlpatterns.pro
@@ -7,8 +7,6 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
QMAKE_DOCS = $$PWD/doc/qtxmlpatterns.qdocconf
-load(qt_module)
-
include($$PWD/common.pri)
include($$PWD/acceltree/acceltree.pri)
include($$PWD/api/api.pri)
@@ -37,3 +35,5 @@ wince* {
QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/
}
}
+
+load(qt_module)
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
index 8973739..079bc2c 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.cpp
@@ -70,8 +70,8 @@ ASTItem *DebugExpressionFactory::buildASTTree(const QPatternist::Expression::Ptr
const QPatternist::ExpressionVisitorResult::Ptr exprInfo(expr->accept(namer));
Q_ASSERT(exprInfo);
const ExpressionInfo *const constExprInfo = static_cast<const ExpressionInfo *>(exprInfo.data());
- const QString name(constExprInfo->first);
- const QString details(constExprInfo->second);
+ const QString name(constExprInfo->name());
+ const QString details(constExprInfo->details());
const QString rType(reqType ? reqType->displayName(Global::namePool()) : QLatin1String("Not specified"));
/* ---------- Handle its staticType() -------- */
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.cpp b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
index 35a1128..2aed6d9 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.cpp
@@ -33,7 +33,9 @@
using namespace QPatternistSDK;
ExpressionInfo::ExpressionInfo(const QString &name,
- const QString &details) : QPair<QString, QString>(name, details)
+ const QString &details)
+ : m_name(name)
+ , m_details(details)
{
}
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index 5eb5b66..3705529 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.h
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h
@@ -50,10 +50,16 @@ namespace QPatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
class Q_PATTERNISTSDK_EXPORT ExpressionInfo : public QPatternist::ExpressionVisitorResult
- , public QPair<QString, QString>
{
public:
ExpressionInfo(const QString &name, const QString &details);
+
+ QString name() const { return m_name; }
+ QString details() const { return m_details; }
+
+ private:
+ QString m_name;
+ QString m_details;
};
}