From b9afea167aaf98f9fadb2b73b129d6631399217e Mon Sep 17 00:00:00 2001 From: Kevin Simons Date: Sat, 28 Apr 2012 17:58:22 +0200 Subject: Improve error output when loading .json files with -load Change-Id: Ib490ef0f6cfb3b1a72d73b920fb8e1f335345420 Reviewed-by: Jamey Hicks --- tools/jsondb-client/client.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/jsondb-client/client.cpp b/tools/jsondb-client/client.cpp index ccb9d43a..60103b15 100644 --- a/tools/jsondb-client/client.cpp +++ b/tools/jsondb-client/client.cpp @@ -671,9 +671,16 @@ void Client::loadJsonFile(const QString &jsonFile) } json.open(QFile::ReadOnly); - QJsonDocument doc = QJsonDocument::fromJson(json.readAll()); + QJsonParseError error; + QJsonDocument doc = QJsonDocument::fromJson(json.readAll(), &error); json.close(); + if (error.error != QJsonParseError::NoError) { + qDebug() << "Unable to parse file:" << error.errorString(); + fileLoadError(); + return; + } + QList objects; if (doc.isArray()) { QJsonArray objectArray = doc.array(); @@ -691,6 +698,8 @@ void Client::loadJsonFile(const QString &jsonFile) connect(write, SIGNAL(finished()), this, SLOT(fileLoadSuccess())); connect(write, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), this, SLOT(fileLoadError())); + connect(write, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)), + this, SLOT(onRequestError(QtJsonDb::QJsonDbRequest::ErrorCode,QString))); mConnection->send(write); } -- cgit v1.2.3