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
@@ -77,20 +77,20 @@ bool ReportChargeModel::isFiltered(const ProjectDataManagement::ChargeType &data
|
||||
switch (m_reportType.underlying())
|
||||
{
|
||||
case ReportType::ChargeAdministration:
|
||||
return (gc != ProjectDataManagement::GearClass::Artillery &&
|
||||
gc != ProjectDataManagement::GearClass::Mortar &&
|
||||
gc != ProjectDataManagement::GearClass::Rocket);
|
||||
return (gc != ProjectDataManagement::GearClass::GearClass_Artillery &&
|
||||
gc != ProjectDataManagement::GearClass::GearClass_Mortar &&
|
||||
gc != ProjectDataManagement::GearClass::GearClass_Rocket);
|
||||
case ReportType::ChargeResupply:
|
||||
|
||||
|
||||
case ReportType::Firings:
|
||||
|
||||
return (gc != ProjectDataManagement::GearClass::DuelSim ||
|
||||
return (gc != ProjectDataManagement::GearClass::GearClass_DuelSim ||
|
||||
m_pdmDtc->isDryFire(data.id(),0,0) || m_pdmDtc->isIed(data.id(),0,0));
|
||||
|
||||
|
||||
case ReportType::AirSupport:
|
||||
return (gc != ProjectDataManagement::GearClass::AirSupport);
|
||||
return (gc != ProjectDataManagement::GearClass::GearClass_AirSupport);
|
||||
case ReportType::ExplosiveDevice:
|
||||
return !m_pdmDtc->isIed(data.id(),0,0);
|
||||
default:
|
||||
|
||||
Reference in new issue
Block a user