Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
4c2f6035
Commit
4c2f6035
authored
Apr 20, 2017
by
Don Gagne
Browse files
Fix error handling
parent
82aa7678
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/JsonHelper.cc
View file @
4c2f6035
...
...
@@ -127,19 +127,16 @@ bool JsonHelper::parseEnum(const QJsonObject& jsonObject, QStringList& enumStrin
bool
JsonHelper
::
isJsonFile
(
const
QByteArray
&
bytes
,
QJsonDocument
&
jsonDoc
,
QString
&
errorString
)
{
QJsonParseError
e
rror
;
QJsonParseError
parseE
rror
;
jsonDoc
=
QJsonDocument
::
fromJson
(
bytes
,
&
e
rror
);
jsonDoc
=
QJsonDocument
::
fromJson
(
bytes
,
&
parseE
rror
);
if
(
e
rror
.
error
==
QJsonParseError
::
NoError
)
{
if
(
parseE
rror
.
error
==
QJsonParseError
::
NoError
)
{
return
true
;
}
if
(
error
.
error
==
QJsonParseError
::
MissingObject
&&
error
.
offset
==
0
)
{
}
else
{
errorString
=
parseError
.
errorString
();
return
false
;
}
return
true
;
}
bool
JsonHelper
::
validateQGCJsonFile
(
const
QJsonObject
&
jsonObject
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment