Migrates remaining proxies to generated rtiddsgen API

Converts accessor calls to plain member access in bld, cmo, gna, hla, whg and wls.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:26 +02:00
1 parent 3ec4208139
commit 6a8c31b735
34 files changed
+218 -214

No files matched your search

@@ -133,12 +133,12 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
const qint64 tNow = dtNow.toMSecsSinceEpoch() + 5000;
AreaEffectSimulation::ExplosionClusterSingleEffectOnlyRequest ecReq;
ecReq.id(0);
ecReq.effectStart(impactTimeMsec > tNow ? impactTimeMsec : tNow);
ecReq.name(QStringLiteral("NASAT_%1_%2_%3").arg(nasatId).arg(munitionCode).arg(dtNow.toString(QStringLiteral("dd hh:mm:ss"))).toStdString());
ecReq.element(ecReq.name());
ecReq.impactPosition(Core::GeoPosition2D(pos.lon(), pos.lat()));
ecReq.chargeTypeId(chargeTypeIdVal);
ecReq.id = 0;
ecReq.effectStart = impactTimeMsec > tNow ? impactTimeMsec : tNow;
ecReq.name = QStringLiteral("NASAT_%1_%2_%3").arg(nasatId).arg(munitionCode).arg(dtNow.toString(QStringLiteral("dd hh:mm:ss"))).toStdString();
ecReq.element = ecReq.name;
ecReq.impactPosition(Core::GeoPosition2D(pos.lon, pos.lat));
ecReq.chargeTypeId = chargeTypeIdVal;
@@ -153,31 +153,31 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
AreaEffectSimulation::ExplosionClusterModifyRequest ecCommonModifyRequest;
ecCommonModifyRequest.id(0);
ecCommonModifyRequest.id = 0;
ecCommonModifyRequest.effectStart(impactTimeMsec > tNow ? impactTimeMsec : tNow);
ecCommonModifyRequest.effectDuration(1000);
ecCommonModifyRequest.effectSourceId(ProjectDataManagement::EffectSource::ES_Internal);
ecCommonModifyRequest.effectStart = impactTimeMsec > tNow ? impactTimeMsec : tNow;
ecCommonModifyRequest.effectDuration = 1000;
ecCommonModifyRequest.effectSourceId = ProjectDataManagement::EffectSource::ES_Internal;
ecCommonModifyRequest.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry_def::EgPoint);
ecCommonModifyRequest.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint;
ecCommonModifyRequest.chargeStruct().chargeTypeId(chargeTypeIdVal);
ecCommonModifyRequest.chargeStruct().igniterTypeId(fuseTypeToPdmIgniterType(fuseType));
ecCommonModifyRequest.chargeStruct.chargeTypeId = chargeTypeIdVal;
ecCommonModifyRequest.chargeStruct.igniterTypeId = fuseTypeToPdmIgniterType(fuseType);
ecCommonModifyRequest.area().cornerBottomLeft(Core::GeoPosition2D(pos.lon(), pos.lat()));
ecCommonModifyRequest.area.cornerBottomLeft(Core::GeoPosition2D(pos.lon, pos.lat));
ecCommonModifyRequest.name(QStringLiteral("NASAT_%1_%2_%3").arg(nasatId).arg(munitionCode).arg(dtNow.toString(QStringLiteral("dd hh:mm:ss"))).toStdString());
ecCommonModifyRequest.element(ecReq.name());
ecCommonModifyRequest.name = QStringLiteral("NASAT_%1_%2_%3").arg(nasatId).arg(munitionCode).arg(dtNow.toString(QStringLiteral("dd hh:mm:ss"))).toStdString();
ecCommonModifyRequest.element = ecReq.name;
ecCommonModifyRequest.mhpCount(1);
ecCommonModifyRequest.impactCount(1);
ecCommonModifyRequest.mhpCount = 1;
ecCommonModifyRequest.impactCount = 1;
ecCommonModifyRequest.flightDuration(flightTimeMsec);
ecCommonModifyRequest.flightDuration = flightTimeMsec;
@@ -197,10 +197,10 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
ecReq.partyId(nap->partyId());
ecReq.partyId = nap->partyId();
ecCommonModifyRequest.partyId(nap->partyId());
ecCommonModifyRequest.participantId(nap->participantId());
ecCommonModifyRequest.partyId = nap->partyId();
ecCommonModifyRequest.participantId = nap->participantId();
int success = nap->publisher()->publish(ecCommonModifyRequest, this);
@@ -247,17 +247,17 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos,
void HandlerNasatImpact::onChargeTypeChanged(const ProjectDataManagement::ChargeType &ct)
{
const QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromRawData(ct.properties().c_str(), ct.properties().size())));
const QJsonDocument doc(QJsonDocument::fromJson(QByteArray::fromRawData(ct.properties.c_str(), ct.properties.size())));
const QJsonObject obj(doc.object());
if (!obj.contains(QLatin1String("nasatId")))
return;
int nasatId = obj.value(QLatin1String("nasatId")).toInt();
if (nasatId == 0)
{
WARNING_LOG(m_logger) << "Found charge with an invalid property 'nasatId', id: " << ct.id();
WARNING_LOG(m_logger) << "Found charge with an invalid property 'nasatId', id: " << ct.id;
return;
}
m_chargeMapping.insert(nasatId, ct.id());
m_chargeMapping.insert(nasatId, ct.id);
}