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
+3
-3
@@ -220,10 +220,10 @@ void AesChargeEffectItemInfo::onShowDetails()
|
||||
const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct().chargeTypeId());
|
||||
|
||||
for (auto gc :
|
||||
{ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar,
|
||||
ProjectDataManagement::GearClass::AirSupport})
|
||||
{ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar,
|
||||
ProjectDataManagement::GearClass::GearClass_AirSupport})
|
||||
{
|
||||
if (gc == ProjectDataManagement::GearClass::AirSupport && !isExplosionSingle)
|
||||
if (gc == ProjectDataManagement::GearClass::GearClass_AirSupport && !isExplosionSingle)
|
||||
continue;
|
||||
|
||||
if (gearClass == gc)
|
||||
|
||||
+4
-4
@@ -975,8 +975,8 @@ void AesInfoDialog::onShowDetails()
|
||||
std::shared_ptr<AesExplosion::ForeignGuiInterface> ifc;
|
||||
if (m_session->getForeignGuiInterface<AesExplosion::ForeignGuiInterface>(ifc))
|
||||
{
|
||||
const auto gcs = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar,
|
||||
ProjectDataManagement::GearClass::AirSupport};
|
||||
const auto gcs = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar,
|
||||
ProjectDataManagement::GearClass::GearClass_AirSupport};
|
||||
const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(m_singleExpChargeTypeId);
|
||||
for (auto gc : gcs)
|
||||
{
|
||||
@@ -1001,8 +1001,8 @@ void AesInfoDialog::onShowDetails()
|
||||
std::shared_ptr<AesExplosion::ForeignGuiInterface> ifc;
|
||||
if (m_session->getForeignGuiInterface<AesExplosion::ForeignGuiInterface>(ifc))
|
||||
{
|
||||
const auto gcs = {ProjectDataManagement::GearClass::Artillery,
|
||||
ProjectDataManagement::GearClass::Mortar};
|
||||
const auto gcs = {ProjectDataManagement::GearClass::GearClass_Artillery,
|
||||
ProjectDataManagement::GearClass::GearClass_Mortar};
|
||||
const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(m_areaExpChargeTypeId);
|
||||
for (auto gc : gcs)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user