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
@@ -781,8 +781,8 @@ GearClass DtcImplCustom::gearClassFromChargeTypeId(int chargeTypeId)
|
||||
if (chargeTypeId <= 0)
|
||||
{
|
||||
// update cache:
|
||||
s_gearClassChargeTypeCache[requestedCTID] = ProjectDataManagement::GearClass::Unknown;
|
||||
return ProjectDataManagement::GearClass::Unknown;
|
||||
s_gearClassChargeTypeCache[requestedCTID] = ProjectDataManagement::GearClass::GearClass_Unknown;
|
||||
return ProjectDataManagement::GearClass::GearClass_Unknown;
|
||||
}
|
||||
|
||||
const auto &gear2ChargeMap = gearTypeChargeTypes();
|
||||
@@ -802,9 +802,9 @@ GearClass DtcImplCustom::gearClassFromChargeTypeId(int chargeTypeId)
|
||||
}
|
||||
|
||||
// update cache:
|
||||
s_gearClassChargeTypeCache[requestedCTID] = ProjectDataManagement::GearClass::Unknown;
|
||||
s_gearClassChargeTypeCache[requestedCTID] = ProjectDataManagement::GearClass::GearClass_Unknown;
|
||||
|
||||
return ProjectDataManagement::GearClass::Unknown;
|
||||
return ProjectDataManagement::GearClass::GearClass_Unknown;
|
||||
}
|
||||
|
||||
QVector<SanitationProcedure> DtcImplCustom::getSanitationProcedures(qint64 procedures)
|
||||
@@ -991,7 +991,7 @@ bool DtcImplCustom::isRocket(int chargeTypeId)
|
||||
{
|
||||
const GearClass gearClass = gearClassFromChargeTypeId(chargeTypeId);
|
||||
|
||||
return gearClass.underlying() == GearClass::Rocket;
|
||||
return gearClass.underlying() == GearClass::GearClass_Rocket;
|
||||
}
|
||||
|
||||
ChargeTypeIgniterTypeIgniterFunction DtcImplCustom::getChargeTypeIgniterTypeIgniterFunction(int chargeTypeId, int igniterTypeId, int igniterFunctionId)
|
||||
|
||||
Reference in new issue
Block a user