Forward QJsonParseError when parsing raw JSON data

Author: oblivioncth

lib/core/include/qx/core/qx-json.h

@@ -98,8 +98,11 @@ class QX_CORE_EXPORT File
 
 class QX_CORE_EXPORT Data
 {
+private:
+    QString mDataError;
+
 public:
-    Data();
+    Data(const QString& dataError = {});
 
     QString string() const;
 };
@@ -812,7 +815,7 @@ JsonError parseJson(T& parsed, const QByteArray& data)
     QJsonDocument jd = QJsonDocument::fromJson(data, &jpe);
 
     if(jpe.error != jpe.NoError)
-        return JsonError(QxJsonPrivate::ERR_READ_DATA, JsonError::InvalidData).withContext(QxJson::Data());
+        return JsonError(QxJsonPrivate::ERR_READ_DATA, JsonError::InvalidData).withContext(QxJson::Data(jpe.errorString()));
 
     // True parse
     return parseJson(parsed, jd).withContext(QxJson::Data());

lib/core/src/qx-json.cpp

@@ -509,14 +509,24 @@ QString File::string() const
  */
 
 /*!
- *  Constructs a data element node.
+ *  Constructs a data element node with data specific error information @a dataError,
+ *  if any.
  */
-Data::Data() {}
+Data::Data(const QString& dataError) :
+    mDataError(dataError)
+{}
 
 /*!
  *  Returns the string representation of the node.
  */
-QString Data::string() const { return u"Data"_s; }
+QString Data::string() const
+{
+    QString str = u"Data:"_s;
+    if(!mDataError.isEmpty())
+        str += (u"\n  [%1]"_s).arg(mDataError);
+
+    return str;
+}
 
 /*!
  *  @class Document