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

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

No files matched your search

@@ -944,24 +944,24 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie,
void CesTests::checkParticipantEvent()
{
ProjectDataManagement::EventType expectedType = ProjectDataManagement::EventType::Unknown;
ProjectDataManagement::PdmEventType expectedType = ProjectDataManagement::PdmEventType::Unknown;
switch (m_testId)
{
case 8:
expectedType = ProjectDataManagement::EventType::EnterMineArea;
expectedType = ProjectDataManagement::PdmEventType::EnterMineArea;
break;
case 10:
expectedType = ProjectDataManagement::EventType::EnterFunctionalArea;
expectedType = ProjectDataManagement::PdmEventType::EnterFunctionalArea;
break;
case 11:
case 12:
expectedType = ProjectDataManagement::EventType::LeaveFunctionalArea;
expectedType = ProjectDataManagement::PdmEventType::LeaveFunctionalArea;
break;
case 13:
expectedType = ProjectDataManagement::EventType::CrossLocalBorderline;
expectedType = ProjectDataManagement::PdmEventType::CrossLocalBorderline;
break;
case 14:
expectedType = ProjectDataManagement::EventType::EnterDangerArea;
expectedType = ProjectDataManagement::PdmEventType::EnterDangerArea;
break;
default:
// nothing
@@ -303,7 +303,7 @@ void CesTestsBoobyTrap::onEventChanged(const CentralEffectSimulation::Participan
if (modType == DataModification::eRemoved ||
modType == DataModification::eModified)
return;
if (eventData.eventTypeId() == ProjectDataManagement::EventType_def::HitMine)
if (eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::HitMine)
{
m_countEventBoobyTrap ++;
DEBUG_LOG(m_logger) << "m_countEventBoobyTrap=" << m_countEventBoobyTrap
@@ -360,7 +360,7 @@ void CesTestsGasPipe::onEventChanged(const CentralEffectSimulation::ParticipantE
if (modType == DataModification::eRemoved ||
modType == DataModification::eModified)
return;
if (eventData.eventTypeId() == ProjectDataManagement::EventType_def::HitGasPipe)
if (eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::HitGasPipe)
{
m_countEventGasPipe ++;
DEBUG_LOG(m_logger) << "m_countEventGasPipe=" << m_countEventGasPipe;
@@ -399,7 +399,7 @@ void CesTestsMineAreas::onEventChanged(const CentralEffectSimulation::Participan
if (modType == DataModification::eRemoved ||
modType == DataModification::eModified)
return;
if (eventData.eventTypeId() == ProjectDataManagement::EventType_def::HitGasPipe)
if (eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::HitGasPipe)
{
m_countEventMineAreas ++;
DEBUG_LOG(m_logger) << "m_countEventMineAreas=" << m_countEventMineAreas;
@@ -110,8 +110,8 @@ void cesTestsSimulatedMovement::checkParticipantEvent()
{
case 1:
case 2:
if (participantEvent0.eventTypeId() == ProjectDataManagement::EventType::HitEffectSimulation
&& participantEvent1.eventTypeId() == ProjectDataManagement::EventType::HitEffectSimulation)
if (participantEvent0.eventTypeId() == ProjectDataManagement::PdmEventType::HitEffectSimulation
&& participantEvent1.eventTypeId() == ProjectDataManagement::PdmEventType::HitEffectSimulation)
ExitSuccess();
break;
default:
@@ -255,8 +255,8 @@ void CesTestsSmart::checkParticipantEvent()
switch (m_testId)
{
case 1:
if ( participantEvent0.eventTypeId()==ProjectDataManagement::EventType::HitEffectSimulation
&& participantEvent1.eventTypeId()==ProjectDataManagement::EventType::HitEffectSimulation)
if ( participantEvent0.eventTypeId()==ProjectDataManagement::PdmEventType::HitEffectSimulation
&& participantEvent1.eventTypeId()==ProjectDataManagement::PdmEventType::HitEffectSimulation)
{
ExitSuccess();
}