lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 API fixes: QJsonObject and QJsonDocument serialization

Browse Source 
- training_area_telegrams.cpp:3168: Fixed QJsonObject initializer list syntax
  - Changed QJsonObject({{...}}) to QJsonObject{{...}} (double braces)
  - Changed header.toJson() to header().toJson() (method call)

- track_content_widget.cpp:37,51: Fixed QJsonDocument serialization
  - Replaced toBinaryData() with toJson(QJsonDocument::Compact)
  - Replaced fromBinaryData() with fromJson()
  - Qt6 removed binary serialization methods

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-23 18:38:42 +02:00
1 parent 8d456c7d1a
commit 3d3c3b48fe
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/track_content_widget.cpp
+2 -2
View File
@@ -34,7 +34,7 @@ namespace LtsScriptTimeline
QDataStream& operator<<(QDataStream& ds, const TrackEntry& te) QDataStream& operator<<(QDataStream& ds, const TrackEntry& te)
{ {
const QByteArray jsonContent = QJsonDocument(te.m_detailData).toBinaryData(); const QByteArray jsonContent = QJsonDocument(te.m_detailData).toJson(QJsonDocument::Compact);
ds << te.m_topicId << te.m_startTime << te.m_length << static_cast<quint8>(te.m_type) << te.isSet << te.index ds << te.m_topicId << te.m_startTime << te.m_length << static_cast<quint8>(te.m_type) << te.isSet << te.index
<< jsonContent << te.x << te.y << te.h << te.w << te.m_channelName << te.m_description; << jsonContent << te.x << te.y << te.h << te.w << te.m_channelName << te.m_description;
return ds; return ds;
@@ -48,7 +48,7 @@ QDataStream& operator>>(QDataStream& ds, TrackEntry& te)
te.y >> te.h >> te.w >> te.m_channelName >> te.m_description; te.y >> te.h >> te.w >> te.m_channelName >> te.m_description;
te.m_type = static_cast<TrackEntryType>(type); te.m_type = static_cast<TrackEntryType>(type);
te.m_detailData = QJsonDocument::fromBinaryData(jsonContent).object(); te.m_detailData = QJsonDocument::fromJson(jsonContent).object();
return ds; return ds;
} }
qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp
+2 -2
View File
@@ -3165,14 +3165,14 @@ BatteryAlarm BatteryAlarm::fromJson(const QJsonObject &obj)
QJsonObject BatteryAlarm::toJson() const QJsonObject BatteryAlarm::toJson() const
{ {
return QJsonObject({{QStringLiteral("header"), header.toJson()}, return QJsonObject{{QStringLiteral("header"), header().toJson()},
{QStringLiteral("id"), id}, {QStringLiteral("id"), id},
{QStringLiteral("description"), description}, {QStringLiteral("description"), description},
{QStringLiteral("acknowledge"), acknowledge}, {QStringLiteral("acknowledge"), acknowledge},
{QStringLiteral("condition"), condition}, {QStringLiteral("condition"), condition},
{QStringLiteral("uniqueAlarmNumber"), uniqueAlarmNumber}, {QStringLiteral("uniqueAlarmNumber"), uniqueAlarmNumber},
{QStringLiteral("alarmTime"), alarmTime} {QStringLiteral("alarmTime"), alarmTime}
}); };
} }
ServiceControl ServiceControl::fromJson(const QJsonObject &obj) ServiceControl ServiceControl::fromJson(const QJsonObject &obj)