| serializer.h | serializer.h | |||
|---|---|---|---|---|
| skipping to change at line 133 | skipping to change at line 133 | |||
| void serialize( const QVariant& variant, QIODevice* out, bool* ok); | void serialize( const QVariant& variant, QIODevice* out, bool* ok); | |||
| /** | /** | |||
| * This is a method provided for convenience. It turns the passed in i n-memory | * This is a method provided for convenience. It turns the passed in i n-memory | |||
| * representation of the JSON document into a textual one, which is re turned. | * representation of the JSON document into a textual one, which is re turned. | |||
| * If the returned string is empty, the document was empty. If it was null, there | * If the returned string is empty, the document was empty. If it was null, there | |||
| * was a parsing error. | * was a parsing error. | |||
| * | * | |||
| * @param variant The JSON document in its in-memory representation as generated by the | * @param variant The JSON document in its in-memory representation as generated by the | |||
| * parser. | * parser. | |||
| * | ||||
| * \deprecated This method is going to be removed with the next major | ||||
| release of QJson. | ||||
| */ | ||||
| QByteArray serialize( const QVariant& variant); | ||||
| /** | ||||
| * This is a method provided for convenience. It turns the passed in i | ||||
| n-memory | ||||
| * representation of the JSON document into a textual one, which is re | ||||
| turned. | ||||
| * If the returned string is empty, the document was empty. If it was | ||||
| null, there | ||||
| * was a parsing error. | ||||
| * | ||||
| * @param variant The JSON document in its in-memory representation as | ||||
| generated by the | ||||
| * parser. | ||||
| * @param ok if a conversion error occurs, *ok is set to false; otherw ise *ok is set to true | * @param ok if a conversion error occurs, *ok is set to false; otherw ise *ok is set to true | |||
| */ | */ | |||
| QByteArray serialize( const QVariant& variant, bool *ok = 0); | QByteArray serialize( const QVariant& variant, bool *ok); | |||
| /** | /** | |||
| * Allow or disallow writing of NaN and/or Infinity (as an extension to QJson) | * Allow or disallow writing of NaN and/or Infinity (as an extension to QJson) | |||
| */ | */ | |||
| void allowSpecialNumbers(bool allow); | void allowSpecialNumbers(bool allow); | |||
| /** | /** | |||
| * Is Nan and/or Infinity allowed? | * Is Nan and/or Infinity allowed? | |||
| */ | */ | |||
| bool specialNumbersAllowed() const; | bool specialNumbersAllowed() const; | |||
| End of changes. 2 change blocks. | ||||
| 1 lines changed or deleted | 19 lines changed or added | |||