diff options
author | Valery Kotov <[email protected]> | 2015-04-07 20:34:44 +0300 |
---|---|---|
committer | Simon Hausmann <[email protected]> | 2015-04-16 17:44:29 +0000 |
commit | 43961057a973715856486c596959213bd911df73 (patch) | |
tree | 95a93b3f273a0540c5063331e942da738207bd27 /src/qml/jsruntime/qv4jsonobject.cpp | |
parent | 4930941197576c6017451856beb59a0ff8d045bd (diff) |
QML Engine: JSON XHR response type support
Support for "json" response type for QQmlXMLHttpRequest was
added.
[ChangeLog][QtQml][QQmlXMLHttpRequest] QQmlXMLHttpRequest now
supports "json" binary response type.
Change-Id: I21b7659c02dfdc6b64a73e1d2003e269d90b3b23
Reviewed-by: Simon Hausmann <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 4580ff16d8..e826261010 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -39,7 +39,6 @@ #include <qv4scopedvalue_p.h> #include <qv4runtime_p.h> -#include <qjsondocument.h> #include <qstack.h> #include <qstringlist.h> @@ -62,33 +61,6 @@ static int indent = 0; DEFINE_OBJECT_VTABLE(JsonObject); -class JsonParser -{ -public: - JsonParser(ExecutionEngine *engine, const QChar *json, int length); - - ReturnedValue parse(QJsonParseError *error); - -private: - inline bool eatSpace(); - inline QChar nextToken(); - - ReturnedValue parseObject(); - ReturnedValue parseArray(); - bool parseMember(Object *o); - bool parseString(QString *string); - bool parseValue(Value *val); - bool parseNumber(Value *val); - - ExecutionEngine *engine; - const QChar *head; - const QChar *json; - const QChar *end; - - int nestingLevel; - QJsonParseError::ParseError lastError; -}; - static const int nestingLimit = 1024; |