diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-19 21:45:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-19 21:45:34 +0200 |
commit | d88be9b70cfecb0ec525216c1bb6267c9d1aa17d (patch) | |
tree | f0493f77faaea415faab110fe00cb71d27ebea0e /editor/export_template_manager.cpp | |
parent | d7a42a44be107d048447dcaeba7c508402096d90 (diff) | |
parent | 2bafcd3422bea8baf2282f5de87538a59f0bb254 (diff) | |
download | redot-engine-d88be9b70cfecb0ec525216c1bb6267c9d1aa17d.tar.gz |
Merge pull request #44806 from madmiraal/consolidate_json
Consolidate JSON, JSONParseResults and JSONParser into JSON
Diffstat (limited to 'editor/export_template_manager.cpp')
-rw-r--r-- | editor/export_template_manager.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 76c6fcc3d3..dd4ce74406 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -242,10 +242,8 @@ void ExportTemplateManager::_refresh_mirrors_completed(int p_status, int p_code, response_json.parse_utf8((const char *)r, p_data.size()); } - Variant response; - String errs; - int errline; - Error err = JSON::parse(response_json, response, errs, errline); + JSON json; + Error err = json.parse(response_json); if (err != OK) { EditorNode::get_singleton()->show_warning(TTR("Error parsing JSON with the list of mirrors. Please report this issue!")); is_refreshing_mirrors = false; @@ -260,7 +258,7 @@ void ExportTemplateManager::_refresh_mirrors_completed(int p_status, int p_code, mirrors_available = false; - Dictionary data = response; + Dictionary data = json.get_data(); if (data.has("mirrors")) { Array mirrors = data["mirrors"]; |