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
+2
-2
@@ -113,7 +113,7 @@ bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) con
|
||||
{
|
||||
const ProjectDataManagement::GearClass::type gearClassA = getGearClassType(typeIdA);
|
||||
|
||||
if (gearClassA == ProjectDataManagement::GearClass::Unknown)
|
||||
if (gearClassA == ProjectDataManagement::GearClass::GearClass_Unknown)
|
||||
return false;
|
||||
|
||||
const ProjectDataManagement::GearClass::type gearClassB = getGearClassType(typeIdB);
|
||||
@@ -126,7 +126,7 @@ ProjectDataManagement::GearClass::type FiringUnitValidator::getGearClassType(int
|
||||
const Type type = m_ppmDtc->type(typeId);
|
||||
const QJsonDocument properties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties()));
|
||||
const QJsonObject propertiesObject = properties.object();
|
||||
const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(ProjectDataManagement::GearClass::Unknown);
|
||||
const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(ProjectDataManagement::GearClass::GearClass_Unknown);
|
||||
|
||||
return static_cast<ProjectDataManagement::GearClass::type>(gearClassId);
|
||||
}
|
||||
|
||||
+2
-2
@@ -959,9 +959,9 @@ QString ParticipantConfigModel::buildInternationalModeString(const ProjectDataMa
|
||||
{
|
||||
switch(inMode.underlying())
|
||||
{
|
||||
case ProjectDataManagement::InternationalMode::On:
|
||||
case ProjectDataManagement::InternationalMode::InternationalMode_On:
|
||||
return tr("On");
|
||||
case ProjectDataManagement::InternationalMode::Off:
|
||||
case ProjectDataManagement::InternationalMode::InternationalMode_Off:
|
||||
return tr("Off");
|
||||
default:
|
||||
return tr("No Change");
|
||||
|
||||
+2
-2
@@ -1653,13 +1653,13 @@ void ParticipantInfoDialog::onUasChanged(const UAS &uas)
|
||||
|
||||
switch (uas.uasState().underlying())
|
||||
{
|
||||
case ProjectDataManagement::UasState::Auto:
|
||||
case ProjectDataManagement::UasState::UasState_Auto:
|
||||
{
|
||||
m_ui->lblOperatingMode->setText(textHtml.arg(QStringLiteral("green")).arg(operatingMode));
|
||||
break;
|
||||
}
|
||||
|
||||
case ProjectDataManagement::UasState::Manual:
|
||||
case ProjectDataManagement::UasState::UasState_Manual:
|
||||
{
|
||||
m_ui->lblOperatingMode->setText(textHtml.arg(QStringLiteral("orange")).arg(operatingMode));
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user