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

Removes .IDL warnings: multiple enum definitons and builtin-type collisions

Browse Source
This commit is contained in:
torsten committed 2026-09-14 15:45:58 +00:00
1 parent eb02c1f001
commit be912de9d6
135 files changed
+1122 -1122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp
+8 -8
View File
@@ -250,7 +250,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
{
DEBUG_LOG(m_logger) << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime()
<< " request.chargeTypeId=" << request.chargeTypeId()
<< " request.eventType()=" << request.eventType()
<< " request.pdmEventType()=" << request.pdmEventType()
<< " request.aesId()=" << request.aesId()
<< " aesTypeFromId=" << m_mainHandler->aesHandler()->aesTypeFromId(request.aesId());
@@ -283,7 +283,7 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) && (ct.legacyId() > 0))
if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::HitBuilding) && (ct.legacyId() > 0))
{
data.chargeTasCodeDirect = 201;
data.chargeTasCodeIndirect = 201;
@@ -309,14 +309,14 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if ((request.eventType() == ProjectDataManagement::EventType::LeaveHazardDistance) ||
(request.eventType() == ProjectDataManagement::EventType::EnterHazardDistance))
if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::LeaveHazardDistance) ||
(request.pdmEventType() == ProjectDataManagement::PdmEventType::EnterHazardDistance))
{
INFO_LOG(m_logger) << "HarzardArea: " << request.effectTime();
data.reserve1 = request.mineId();
data.aesType = TetraIcd::AreaEffectSimulationType::DangerZoneExplosion;
}
else if (request.eventType() == ProjectDataManagement::EventType::AirSupport)
else if (request.pdmEventType() == ProjectDataManagement::PdmEventType::AirSupport)
{
data.aesType = TetraIcd::AreaEffectSimulationType::AirSupport;
}
@@ -333,12 +333,12 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie
if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId(),0,0}))
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
else if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) ||
(request.eventType() == ProjectDataManagement::EventType::HitEffectSimulation)
else if ((request.pdmEventType() == ProjectDataManagement::PdmEventType::HitBuilding) ||
(request.pdmEventType() == ProjectDataManagement::PdmEventType::HitEffectSimulation)
)
{
data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent());
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.eventType()
DEBUG_LOG(m_logger) << "PDM::EventType = " << request.pdmEventType()
<< " equipmentNumber=" << request.equipmentNumber()
<< " originatorEquipmentNumber=" << data.originatorEquipmentNumber
<< " chargeType=" << ct.id()