Remove unused code from the Release 2 scope modules
Trim mostly-deletion changes (~700 lines) across the modules the Release 2 build compiles: unused telegrams and receiver/handler code in TrainingAreaBase (telegrams, recv_from_dds_aes/fts, ism/main/pdm/position handlers), dead members in SqlBrowser and ProjectDataManagement, unused LtsPluginManager loader paths, LtsSession unit-test, WlsTetra and DdsView cleanups, plus the stale include_directories removal in Lts/CMakeLists.txt. Continues the Release 2 source prune (keep only what the build compiles). Excluded from this commit by design: the machine-specific .envrc (MIGRATE_PIPELINE_ROOT path fix stays uncommitted) and the untracked qt5-before/ reference tree.
This commit is contained in:
1 parent
e60a860283
commit
84f8cfb41f
45 files changed
+30
-724
No files matched your search
-25
@@ -1,9 +1,6 @@
|
||||
|
||||
|
||||
|
||||
#include "training_area_telegrams.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
@@ -12,7 +9,6 @@ namespace TrainingAreaBase
|
||||
{
|
||||
namespace TetraIcd
|
||||
{
|
||||
|
||||
JsonException::JsonException(const QJsonObject &obj, const QString &key)
|
||||
: m_obj(obj)
|
||||
, m_key(key)
|
||||
@@ -3063,10 +3059,8 @@ namespace TrainingAreaBase
|
||||
UAVAction UAVAction::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
UAVAction ret;
|
||||
|
||||
get(obj, TASK(), ret.task);
|
||||
get(obj, POSITION(), ret.absPosition);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -3075,16 +3069,13 @@ namespace TrainingAreaBase
|
||||
return QJsonObject{{TASK(), enumToJson(task)}, {POSITION(), absPosition.toJson()}};
|
||||
}
|
||||
|
||||
|
||||
UAVPerformMission UAVPerformMission::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
UAVPerformMission ret;
|
||||
|
||||
get(obj, HEADER(), ret.header);
|
||||
get(obj, ACTIONS(), ret.actions);
|
||||
get(obj, MISSION_NAME(), ret.missionName);
|
||||
get(obj, MISSION_ID(), ret.missionId);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -3093,14 +3084,11 @@ namespace TrainingAreaBase
|
||||
return QJsonObject{{HEADER(), header.toJson()}, {ACTIONS(), arrayToJson(actions)}, {MISSION_NAME(), missionName}, {MISSION_ID(), missionId}};
|
||||
}
|
||||
|
||||
|
||||
UAVStatus UAVStatus::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
UAVStatus ret;
|
||||
|
||||
get(obj, HEADER(), ret.header);
|
||||
get(obj, UAVSTATE(), ret.uavState);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -3109,14 +3097,11 @@ namespace TrainingAreaBase
|
||||
return QJsonObject{{HEADER(), header.toJson()}, {UAVSTATE(), enumToJson(uavState)}};
|
||||
}
|
||||
|
||||
|
||||
UAVRadioLinkConnectionStatus UAVRadioLinkConnectionStatus::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
UAVRadioLinkConnectionStatus ret;
|
||||
|
||||
get(obj, HEADER(), ret.header);
|
||||
get(obj, UAVCONNECTIONSTATE(), ret.uavConnectionState);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -3125,16 +3110,13 @@ namespace TrainingAreaBase
|
||||
return QJsonObject{{HEADER(), header.toJson()}, {UAVCONNECTIONSTATE(), enumToJson(uavConnectionState)}};
|
||||
}
|
||||
|
||||
|
||||
UAVMissionStatus UAVMissionStatus::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
UAVMissionStatus ret;
|
||||
|
||||
get(obj, HEADER(), ret.header);
|
||||
get(obj, CURRENT_ACTION(), ret.currentAction);
|
||||
get(obj, CURRENT_MISSION_NAME(), ret.currentMissionName);
|
||||
get(obj, MISSION_ENDED(), ret.missionEnded);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -3146,14 +3128,11 @@ namespace TrainingAreaBase
|
||||
{MISSION_ENDED(), missionEnded}};
|
||||
}
|
||||
|
||||
|
||||
UAVChangeState UAVChangeState::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
UAVChangeState ret;
|
||||
|
||||
get(obj, HEADER(), ret.header);
|
||||
get(obj, REQUESTED_STATE(), ret.requestedState);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -3165,11 +3144,9 @@ namespace TrainingAreaBase
|
||||
ExFireReadiness ExFireReadiness::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
ExFireReadiness ret;
|
||||
|
||||
get(obj, HEADER(), ret.header);
|
||||
get(obj, PARTY_ID(), ret.partyId);
|
||||
get(obj, REFERENCE(), ret.reference);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -3181,7 +3158,6 @@ namespace TrainingAreaBase
|
||||
ExFiredReport ExFiredReport::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
ExFiredReport ret;
|
||||
|
||||
get(obj, HEADER(), ret.header);
|
||||
get(obj, PARTY_ID(), ret.partyId);
|
||||
get(obj, REFERENCE(), ret.reference);
|
||||
@@ -3198,7 +3174,6 @@ namespace TrainingAreaBase
|
||||
ExConfirmationReport ExConfirmationReport::fromJson(const QJsonObject &obj)
|
||||
{
|
||||
ExConfirmationReport ret;
|
||||
|
||||
get(obj, HEADER(), ret.header);
|
||||
get(obj, PARTY_ID(), ret.partyId);
|
||||
get(obj, REFERENCE(), ret.reference);
|
||||
|
||||
Reference in new issue
Block a user