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/ModuleTests/eem_tests.cpp
+7 -7
View File
@@ -108,7 +108,7 @@ void EemTests::startTest()
tryCreateDynamicParticipantData(1, ProjectDataManagement::VulnerabilityState::CatastrophicKill, time + 3000 * 60, 70, ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice);
QTest::qWait(5000);
checkEvents(ProjectDataManagement::EventType::HitEffectSimulation, 3);
checkEvents(ProjectDataManagement::PdmEventType::HitEffectSimulation, 3);
}
if (m_testId == 3)
@@ -130,7 +130,7 @@ void EemTests::startTest()
tryCreateDynamicParticipantData(2, ProjectDataManagement::VulnerabilityState::LightDamage, time - 5000 * 30, 0, ProjectDataManagement::StateChangeOriginator::Sanitation);
QTest::qWait(500);
checkEvents(ProjectDataManagement::EventType::Sanitation, 3);
checkEvents(ProjectDataManagement::PdmEventType::Sanitation, 3);
}
if (m_testId <= 0 || m_testId > 6)
@@ -264,8 +264,8 @@ void EemTests::trySendFireEvent()
for(const ExerciseEventManagement::Event &e : events)
{
INFO_LOG(m_logger) << "eventId: " << e.id() << ", eventType: " << e.eventTypeId().underlying();
if (e.eventTypeId() == ProjectDataManagement::EventType_def::WeaponAssignment ||
e.eventTypeId() == ProjectDataManagement::EventType_def::FireEvent)
if (e.eventTypeId() == ProjectDataManagement::PdmEventType_def::WeaponAssignment ||
e.eventTypeId() == ProjectDataManagement::PdmEventType_def::FireEvent)
noEvents ++;
}
@@ -368,7 +368,7 @@ void EemTests::tryCreateIed(qint64 time)
}
//-----------------------------------------------------------------------------------------------------------------------
void EemTests::checkEvents(const ProjectDataManagement::EventType &et, int expected)
void EemTests::checkEvents(const ProjectDataManagement::PdmEventType &et, int expected)
{
const QMap<qint64, ExerciseEventManagement::Event> events = m_dtc->events();
@@ -383,9 +383,9 @@ void EemTests::checkEvents(const ProjectDataManagement::EventType &et, int expec
QJsonObject prop = LtsUtils::JsonObject::fromJson(e.properties());
int ot = prop[QStringLiteral("OriginatorType")].toInt();
if (et == ProjectDataManagement::EventType::HitEffectSimulation && ot == 20) //ImprovisedExplosiveDevice
if (et == ProjectDataManagement::PdmEventType::HitEffectSimulation && ot == 20) //ImprovisedExplosiveDevice
noEvents ++;
if (et == ProjectDataManagement::EventType::Sanitation && ot == 10) // Sanitation
if (et == ProjectDataManagement::PdmEventType::Sanitation && ot == 10) // Sanitation
noEvents ++;
}
}