diff options
| author | Andrew Christian <andrew.christian@nokia.com> | 2012-02-17 15:38:23 -0500 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-18 18:08:06 +0100 |
| commit | 908a080006faff333b061b69b0dc0fd9cab36114 (patch) | |
| tree | 3b9a1ee39a3d44643180a74febb7dd441d56326f /src/corelib/json/qjsonparser_p.h | |
| parent | f63b23afdac47bbf71a7b72fdd965c55b2f60602 (diff) | |
Added error reporting to QJsonParser
Change-Id: Ib2390c0faf1ed7ada3fc185abce83740ad112929
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/json/qjsonparser_p.h')
| -rw-r--r-- | src/corelib/json/qjsonparser_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/json/qjsonparser_p.h b/src/corelib/json/qjsonparser_p.h index eae6c08718..20e57dcf26 100644 --- a/src/corelib/json/qjsonparser_p.h +++ b/src/corelib/json/qjsonparser_p.h @@ -65,7 +65,7 @@ class Parser public: Parser(const char *json, int length); - QJsonDocument parse(); + QJsonDocument parse(QJsonParseError *error); class ParsedObject { @@ -93,12 +93,14 @@ private: bool parseString(bool *latin1); bool parseValue(QJsonPrivate::Value *val, int baseOffset); bool parseNumber(QJsonPrivate::Value *val, int baseOffset); + const char *head; const char *json; const char *end; char *data; int dataLength; int current; + QJsonParseError::ParseError lastError; inline int reserveSpace(int space) { if (current + space >= dataLength) { |