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/Services/ExerciseEventManagement/handler_participant_event.cpp
+50 -50
View File
@@ -111,7 +111,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId().underlying());
eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
eData.eventTypeId = ProjectDataManagement::EventType::Borderline;
eData.eventTypeId = ProjectDataManagement::PdmEventType::Borderline;
eData.position = LtsUtils::QPoint3D(data.boundingBoxBottomLeft().lon(),
data.boundingBoxBottomLeft().lat(), 0.0);
@@ -145,39 +145,39 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
switch (data.aesTypeId().underlying())
{
case AreaEffectSimulation::AesType::AtMineArea:
eData.eventTypeId = ProjectDataManagement::EventType::MineArea;
eData.eventTypeId = ProjectDataManagement::PdmEventType::MineArea;
break;
case AreaEffectSimulation::AesType::AtExplosionArea:
eData.eventTypeId = ProjectDataManagement::EventType::HitEffectSimulation;
eData.eventTypeId = ProjectDataManagement::PdmEventType::HitEffectSimulation;
break;
case AreaEffectSimulation::AesType::AtExplosionCluster:
eData.eventTypeId = ProjectDataManagement::EventType::ExplosionCluster;
eData.eventTypeId = ProjectDataManagement::PdmEventType::ExplosionCluster;
break;
case AreaEffectSimulation::AesType::AtMineAreaSingleMines:
return;
case AreaEffectSimulation::AesType::AtNContamination:
eData.eventTypeId = ProjectDataManagement::EventType::NContamination;
eData.eventTypeId = ProjectDataManagement::PdmEventType::NContamination;
break;
case AreaEffectSimulation::AesType::AtBCContamination:
eData.eventTypeId = ProjectDataManagement::EventType::BCContamination;
eData.eventTypeId = ProjectDataManagement::PdmEventType::BCContamination;
break;
case AreaEffectSimulation::AesType::AtBorderline:
eData.eventTypeId = ProjectDataManagement::EventType::Borderline;
eData.eventTypeId = ProjectDataManagement::PdmEventType::Borderline;
break;
case AreaEffectSimulation::AesType::AtDangerArea:
eData.eventTypeId = ProjectDataManagement::EventType::DangerArea;
eData.eventTypeId = ProjectDataManagement::PdmEventType::DangerArea;
break;
case AreaEffectSimulation::AesType::AtFunctionalArea:
eData.eventTypeId = ProjectDataManagement::EventType::FunctionalArea;
eData.eventTypeId = ProjectDataManagement::PdmEventType::FunctionalArea;
break;
case AreaEffectSimulation::AesType::AtMineCorridor:
eData.eventTypeId = ProjectDataManagement::EventType::MineCorridor;
eData.eventTypeId = ProjectDataManagement::PdmEventType::MineCorridor;
break;
case AreaEffectSimulation::AesType::AtTechnicalArea:
eData.eventTypeId = ProjectDataManagement::EventType::TechnicalArea;
eData.eventTypeId = ProjectDataManagement::PdmEventType::TechnicalArea;
break;
case AreaEffectSimulation::AesType::AtGasPipe:
eData.eventTypeId = ProjectDataManagement::EventType::GasPipe;
eData.eventTypeId = ProjectDataManagement::PdmEventType::GasPipe;
break;
// No ExerciseEvent for AesType
default:
@@ -190,11 +190,11 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A
AreaEffectSimulation::AesItem aesItem;
m_aesDtc->aesItemFromId(data.aesItemId(), aesItem);
if (eData.eventTypeId == ProjectDataManagement::EventType::ExplosionCluster)
if (eData.eventTypeId == ProjectDataManagement::PdmEventType::ExplosionCluster)
{
ProjectDataManagement::GearClass gearClass = m_pdmDtc->gearClassFromChargeTypeId(aesItem.chargeStruct().chargeTypeId());
if (gearClass == ProjectDataManagement::GearClass_def::AirSupport)
eData.eventTypeId = ProjectDataManagement::EventType::AirSupport;
eData.eventTypeId = ProjectDataManagement::PdmEventType::AirSupport;
}
QJsonObject obj;
@@ -269,7 +269,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio
m_aesEffectState.insert(data.id(), data.effectStateId());
//m_itemViews.insert(data.id(), data.aesTypeId());
eData.eventTypeId = ProjectDataManagement::EventType::FireEvent;
eData.eventTypeId = ProjectDataManagement::PdmEventType::FireEvent;
AreaEffectSimulation::AesItem aesItem;
m_aesDtc->aesItemFromId(data.id(), aesItem);
@@ -328,7 +328,7 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
<< " position=" << data.position()
<< " eData.position=" << eData.position;
eData.eventTypeId = ProjectDataManagement::EventType_def::Unknown;
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::Unknown;
QJsonObject obj;
obj[QStringLiteral("AesId")] = QJsonValue(data.aesItemId());
@@ -338,58 +338,58 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul
switch(data.eventTypeId().underlying())
{
case ProjectDataManagement::EventType_def::HitEffectSimulation:
eData.eventTypeId = ProjectDataManagement::EventType_def::HitEffectSimulation;
case ProjectDataManagement::PdmEventType_def::HitEffectSimulation:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitEffectSimulation;
break;
case ProjectDataManagement::EventType_def::HitMine:
eData.eventTypeId = ProjectDataManagement::EventType_def::HitMine;
case ProjectDataManagement::PdmEventType_def::HitMine:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitMine;
break;
case ProjectDataManagement::EventType_def::HitN:
eData.eventTypeId = ProjectDataManagement::EventType_def::HitN;
case ProjectDataManagement::PdmEventType_def::HitN:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitN;
break;
case ProjectDataManagement::EventType_def::HitC:
eData.eventTypeId = ProjectDataManagement::EventType_def::HitC;
case ProjectDataManagement::PdmEventType_def::HitC:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitC;
break;
case ProjectDataManagement::EventType_def::EnterDangerArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterDangerArea;
case ProjectDataManagement::PdmEventType_def::EnterDangerArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterDangerArea;
break;
case ProjectDataManagement::EventType_def::LeaveDangerArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveDangerArea;
case ProjectDataManagement::PdmEventType_def::LeaveDangerArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveDangerArea;
break;
case ProjectDataManagement::EventType_def::EnterMineArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterMineArea;
case ProjectDataManagement::PdmEventType_def::EnterMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterMineArea;
break;
case ProjectDataManagement::EventType_def::LeaveMineArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveMineArea;
case ProjectDataManagement::PdmEventType_def::LeaveMineArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveMineArea;
break;
case ProjectDataManagement::EventType_def::EnterNuclear:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterNuclear;
case ProjectDataManagement::PdmEventType_def::EnterNuclear:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterNuclear;
break;
case ProjectDataManagement::EventType_def::LeaveNuclear:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveNuclear;
case ProjectDataManagement::PdmEventType_def::LeaveNuclear:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveNuclear;
break;
case ProjectDataManagement::EventType_def::CrossLocalBorderline:
eData.eventTypeId = ProjectDataManagement::EventType_def::CrossLocalBorderline;
case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::CrossLocalBorderline;
obj[QStringLiteral("Global")] = QJsonValue(false);
break;
case ProjectDataManagement::EventType_def::CrossGlobalBorderline:
eData.eventTypeId = ProjectDataManagement::EventType_def::CrossGlobalBorderline;
case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline;
obj[QStringLiteral("Global")] = QJsonValue(true);
break;
case ProjectDataManagement::EventType_def::EnterFunctionalArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterFunctionalArea;
case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea;
break;
case ProjectDataManagement::EventType_def::LeaveFunctionalArea:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveFunctionalArea;
case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea;
break;
case ProjectDataManagement::EventType_def::EnterHazardDistance:
eData.eventTypeId = ProjectDataManagement::EventType_def::EnterHazardDistance;
case ProjectDataManagement::PdmEventType_def::EnterHazardDistance:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterHazardDistance;
break;
case ProjectDataManagement::EventType_def::LeaveHazardDistance:
eData.eventTypeId = ProjectDataManagement::EventType_def::LeaveHazardDistance;
case ProjectDataManagement::PdmEventType_def::LeaveHazardDistance:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveHazardDistance;
break;
case ProjectDataManagement::EventType_def::AirSupport:
eData.eventTypeId = ProjectDataManagement::EventType_def::AirSupport;
case ProjectDataManagement::PdmEventType_def::AirSupport:
eData.eventTypeId = ProjectDataManagement::PdmEventType_def::AirSupport;
break;
default:
return;