Commit d111e784 authored by Patrick José Pereira's avatar Patrick José Pereira

ComplexMissionItem: Move away from deprecated QJsonDocument

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent dd290fdd
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "FlightPathSegment.h" #include "FlightPathSegment.h"
#include "MissionController.h" #include "MissionController.h"
#include <QCborValue>
#include <QSettings> #include <QSettings>
const char* ComplexMissionItem::jsonComplexItemTypeKey = "complexItemType"; const char* ComplexMissionItem::jsonComplexItemTypeKey = "complexItemType";
...@@ -78,7 +79,7 @@ void ComplexMissionItem::_savePresetJson(const QString& name, QJsonObject& prese ...@@ -78,7 +79,7 @@ void ComplexMissionItem::_savePresetJson(const QString& name, QJsonObject& prese
QSettings settings; QSettings settings;
settings.beginGroup(presetsSettingsGroup()); settings.beginGroup(presetsSettingsGroup());
settings.beginGroup(_presetSettingsKey); 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 // 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. // as a built-in survey preset that cannot be deleted.
...@@ -107,7 +108,7 @@ QJsonObject ComplexMissionItem::_loadPresetJson(const QString& name) ...@@ -107,7 +108,7 @@ QJsonObject ComplexMissionItem::_loadPresetJson(const QString& name)
QSettings settings; QSettings settings;
settings.beginGroup(presetsSettingsGroup()); settings.beginGroup(presetsSettingsGroup());
settings.beginGroup(_presetSettingsKey); settings.beginGroup(_presetSettingsKey);
return QJsonDocument::fromBinaryData(settings.value(name).toByteArray()).object(); return QCborValue(settings.value(name).toByteArray()).toMap().toJsonObject();
} }
void ComplexMissionItem::addKMLVisuals(KMLPlanDomDocument& /* domDocument */) void ComplexMissionItem::addKMLVisuals(KMLPlanDomDocument& /* domDocument */)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment