From d111e78497c1f65d3f0f18c6250d14b852c83651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Fri, 5 Jun 2020 14:25:40 -0300 Subject: [PATCH] ComplexMissionItem: Move away from deprecated QJsonDocument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/MissionManager/ComplexMissionItem.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/ComplexMissionItem.cc b/src/MissionManager/ComplexMissionItem.cc index 0d5ab8347..29399a8e9 100644 --- a/src/MissionManager/ComplexMissionItem.cc +++ b/src/MissionManager/ComplexMissionItem.cc @@ -15,6 +15,7 @@ #include "FlightPathSegment.h" #include "MissionController.h" +#include #include const char* ComplexMissionItem::jsonComplexItemTypeKey = "complexItemType"; @@ -78,7 +79,7 @@ void ComplexMissionItem::_savePresetJson(const QString& name, QJsonObject& prese QSettings settings; settings.beginGroup(presetsSettingsGroup()); settings.beginGroup(_presetSettingsKey); - settings.setValue(name, QJsonDocument(presetObject).toBinaryData()); + settings.setValue(name, QCborMap::fromJsonObject(presetObject).toCborValue().toByteArray()); // Use this to save a survey preset as a JSON file to be included in the build // as a built-in survey preset that cannot be deleted. @@ -107,7 +108,7 @@ QJsonObject ComplexMissionItem::_loadPresetJson(const QString& name) QSettings settings; settings.beginGroup(presetsSettingsGroup()); settings.beginGroup(_presetSettingsKey); - return QJsonDocument::fromBinaryData(settings.value(name).toByteArray()).object(); + return QCborValue(settings.value(name).toByteArray()).toMap().toJsonObject(); } void ComplexMissionItem::addKMLVisuals(KMLPlanDomDocument& /* domDocument */) -- 2.22.0