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/AreaEffectSimulation/handler_effect_cluster.cpp
+10 -10
View File
@@ -90,7 +90,7 @@ bool HandlerEffectCluster::init()
}
// Context NASAT: check via chargeTypeId:
const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport;
const bool bChargeIsAirSupport = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(ifs->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport;
ifs->setAirSupportSource(bChargeIsAirSupport);
// Charge Effects are alwazs Central!
@@ -488,7 +488,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
// Context NASAT: check via chargeTypeId:
const bool bChargeIsAirSupport = gearClass == ProjectDataManagement::GearClass::AirSupport;
const bool bChargeIsAirSupport = gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport;
ifs->setAirSupportSource(bChargeIsAirSupport);
// Now we always need to send fire ready, never without
newData.effectorState = AesEffectorState::EsNotReadyToFire;
@@ -503,7 +503,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const
DEBUG_LOG(m_logger) << "New EffectCluster";
if (gearClass == ProjectDataManagement::GearClass::AirSupport)
if (gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport)
{
if (s_currentAirSupportCount >= s_maxAirSupportCount)
{
@@ -571,7 +571,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterModifyRequest(const
// Context NASAT: check via chargeTypeId:
const ProjectDataManagement::GearClass gc = m_mainHandler->gearClassOfChargeTypeId(request.effectors().at(0).chargeStruct().chargeTypeId());
const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::AirSupport);
const bool bChargeIsAirSupport = (gc == ProjectDataManagement::GearClass::GearClass_AirSupport);
ifs->setAirSupportSource(bChargeIsAirSupport);
// For counting, only Elements being at least prepared are important:
if (request.effectStart().is_set() && ifs->isObjectModifiable()) // ToDo: check
@@ -636,7 +636,7 @@ void HandlerEffectCluster::recountActiveAreas()
{
if (area->isObjectInTrainingArea()) // meanwhile an ugly name, means EsPrepared, EsActivated, EsPaused
{
if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::AirSupport)
if (m_mainHandler->gearClassOfChargeTypeId(area->data().chargeTypeId) == ProjectDataManagement::GearClass::GearClass_AirSupport)
++s_currentAirSupportCount;
}
}
@@ -698,7 +698,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
switch (categorie.underlying())
{
case ProjectDataManagement::L22_FireHaltCategory::A: // Feuer Halt Allgemein
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_A: // Feuer Halt Allgemein
{
// all control operations are halted
for (auto *ifs : qAsConst(effectClusterPartyMap))
@@ -714,7 +714,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
break;
}
case ProjectDataManagement::L22_FireHaltCategory::R: // Feuer Halt Referenziert
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_R: // Feuer Halt Referenziert
{
// Ongoing combat operations are halted after comparing the extent of
// the fire hold with the corresponding target coordinate and circular area.
@@ -740,7 +740,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
}
break;
}
case ProjectDataManagement::L22_FireHaltCategory::E: // Feuer Einstellen
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_E: // Feuer Einstellen
{
// Cease Fire (Category E) messages are issued when continuing an engagement is no longer viable.
// Unlike "Check Fire" (Feuer Halt), any rounds already loaded in a Panzerhaubitze (PzH) are still fired,
@@ -754,7 +754,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
}
break;
}
case ProjectDataManagement::L22_FireHaltCategory::C: // Aufheben Feuer Halt Allgemein
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_C: // Aufheben Feuer Halt Allgemein
for (auto *ifs : qAsConst(effectClusterPartyMap))
{
DEBUG_LOG(m_logger) << "[Aufheben Feuer Halt Allgemein] " << "effectClusterId: " << ifs->data().id;
@@ -766,7 +766,7 @@ void HandlerEffectCluster::onEffectClusterFireHaltRequest(const rti::core::Sampl
ifs->resumePause(req);
}
break;
case ProjectDataManagement::L22_FireHaltCategory::F: // Aufheben Feuer Halt Referenziert
case ProjectDataManagement::L22_FireHaltCategory::L22_FireHaltCategory_F: // Aufheben Feuer Halt Referenziert
{
for (auto *ifs : qAsConst(effectClusterPartyMap))
{