Removes .IDL warnings: multiple enum definitons and builtin-type collisions
This commit is contained in:
135 files changed
+1122
-1122
No files matched your search
+5
-5
@@ -52,7 +52,7 @@ bool HandlerExplosionCluster::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);
|
||||
|
||||
if(!ifs->data().isCentral)
|
||||
@@ -369,7 +369,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
|
||||
|
||||
// Context NASAT: check via chargeTypeId:
|
||||
const ProjectDataManagement::GearClass gc = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(request.chargeStruct().chargeTypeId());
|
||||
const bool bChargeIsAirSupport = gc == ProjectDataManagement::GearClass::AirSupport;
|
||||
const bool bChargeIsAirSupport = gc == ProjectDataManagement::GearClass::GearClass_AirSupport;
|
||||
ifs->setAirSupportSource(bChargeIsAirSupport);
|
||||
|
||||
const Core::FunctionReplyObject ret = ifs->createObject(newData);
|
||||
@@ -385,7 +385,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterCreateRequest
|
||||
if (ifs->data().isCentral)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "New cen ExplosionCluster";
|
||||
if(gearClass == ProjectDataManagement::GearClass::AirSupport)
|
||||
if(gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport)
|
||||
{
|
||||
if (s_currentAirSupportCount >= s_maxAirSupportCount)
|
||||
{
|
||||
@@ -471,7 +471,7 @@ Core::FunctionReplyObject HandlerExplosionCluster::explosionClusterModifyRequest
|
||||
|
||||
// Context NASAT: check via chargeTypeId:
|
||||
const ProjectDataManagement::GearClass gc = m_mainHandler->dds()->pdmDtc()->gearClassFromChargeTypeId(request.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:
|
||||
@@ -615,7 +615,7 @@ void HandlerExplosionCluster::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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user