Migrates residual Lts sources to generated rtiddsgen API

Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
berrux-dev committed 2026-09-23 12:05:37 +02:00
1 parent 5485a90385
commit 881d44f4dd
512 files changed
+6887 -6426

No files matched your search

@@ -18,7 +18,7 @@ namespace ParticipantManagement
static int s_lastTypeClassUsed = ParticipantManagement::TypeClass_def::Human;
static int s_lastTypeClassUsed = ParticipantManagement::TypeClass::Human;
static int s_lastTypeUsed = -1;
ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportService,
@@ -140,7 +140,7 @@ void ParticipantEditItemWidgetBase::onFillTypeCb()
{
QSignalBlocker blocker(m_ui->cbType);
TypeClass currentClass(static_cast<TypeClass_def::type>(m_ui->cbTypeClass->currentData().toInt()));
TypeClass currentClass(static_cast<TypeClass>(m_ui->cbTypeClass->currentData().toInt()));
m_ppmGuiCbxIfc->fillTypeComboBox(m_ui->cbType, currentClass);
if (!m_disabledTypeIds.isEmpty())
@@ -101,7 +101,7 @@ static ParticipantData qVariantToParticipant(const QVariant &data)
pd.designator(designator.toStdString());
pd.tacticalIdentifier(tacticalIdentifier.toStdString());
pd.info(info.toStdString());
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState::inner_enum>(assignState));
pd.assignState(static_cast<ParticipantManagement::ParticipantAssignState>(assignState));
pd.isSimulated(isSimulated);
pd.isDeleted(isDeleted);
pd.modId(modId);
@@ -376,7 +376,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data,
qDeleteAll(tiSources);
TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId());
bool isDataTypeClassSupport = dataTypeClass == TypeClass::inner_enum::SupportEntity || dataTypeClass == TypeClass::inner_enum::SupportUnit;
bool isDataTypeClassSupport = dataTypeClass == TypeClass::SupportEntity || dataTypeClass == TypeClass::SupportUnit;
bool isOwnTypeClassSupport = m_partyId == 1;
if (isOwnTypeClassSupport != isDataTypeClassSupport)
@@ -76,7 +76,7 @@ void FiringUnitValidator::fetchArtilleryTypes()
if (!isArtilleryType(type))
return;
if (type.typeClass() == ParticipantManagement::TypeClass::inner_enum::Unit)
if (type.typeClass() == ParticipantManagement::TypeClass::Unit)
m_firingUnitTypeIds.insert(type.id());
else
m_artilleryParticipantTypeIds.insert(type.id());
@@ -111,24 +111,24 @@ bool FiringUnitValidator::isArtilleryWeaponSystem(int typeId) const
bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) const
{
const ProjectDataManagement::GearClass::type gearClassA = getGearClassType(typeIdA);
const ProjectDataManagement::GearClass gearClassA = getGearClassType(typeIdA);
if (gearClassA == ProjectDataManagement::GearClass::GearClass_Unknown)
return false;
const ProjectDataManagement::GearClass::type gearClassB = getGearClassType(typeIdB);
const ProjectDataManagement::GearClass gearClassB = getGearClassType(typeIdB);
return gearClassA == gearClassB;
}
ProjectDataManagement::GearClass::type FiringUnitValidator::getGearClassType(int typeId) const
ProjectDataManagement::GearClass FiringUnitValidator::getGearClassType(int typeId) const
{
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::GearClass_Unknown);
return static_cast<ProjectDataManagement::GearClass::type>(gearClassId);
return static_cast<ProjectDataManagement::GearClass>(gearClassId);
}
}
@@ -43,7 +43,7 @@ public:
return !restrictions.testFlag(IS_AT_MAX_CAPACITY);
}
template<typename T>
ProjectDataManagement::GearClass::type getGearClassType(const T *model, const QModelIndex &participantIndex) const
ProjectDataManagement::GearClass getGearClassType(const T *model, const QModelIndex &participantIndex) const
{
if (!model)
return {};
@@ -127,7 +127,7 @@ public:
bool isArtilleryWeaponSystem(int typeId) const;
bool isSameGearClassArtillery(int typeIdA, int typeIdB) const;
ProjectDataManagement::GearClass::type getGearClassType(int typeId) const;
ProjectDataManagement::GearClass getGearClassType(int typeId) const;
private:
int getTypeId(const ParticipantEditModel *model, const QModelIndex &index) const;
@@ -58,9 +58,9 @@ bool ParticipantTreeEditHandler::isContainer() const
return false;
if (m_asSupportService)
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::SupportUnit;
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit;
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::Unit;
return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit;
}
QVector<int> ParticipantTreeEditHandler::usedEquipmentNumbers() const
@@ -15,21 +15,21 @@ static ProjectDataManagement::VulnerabilityClass vulnerabilityClassFromTypeClass
switch (tc.underlying())
{
case TypeClass::Human:
return ProjectDataManagement::VulnerabilityClass::SoldierInjuries;
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries;
case TypeClass::GroundVehicle:
case TypeClass::Vessel:
case TypeClass::VehicleWithGear:
case TypeClass::WeaponSystem:
return ProjectDataManagement::VulnerabilityClass::VehicleDamages;
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
case TypeClass::SupportEntity:
case TypeClass::SupportUnit:
case TypeClass::Unit:
case TypeClass::Unknown:
case TypeClass::Aircraft:
return ProjectDataManagement::VulnerabilityClass::Unknown;
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_Unknown;
}
Q_ASSERT(false);
return ProjectDataManagement::VulnerabilityClass::Unknown;
return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_Unknown;
}
@@ -60,20 +60,20 @@ QVector<ProjectDataManagement::VulnerabilityState> vulnerabilityStatesForTypeCla
{
QVector<ProjectDataManagement::VulnerabilityState> ret;
ret += VulnerabilityState::CombatReady;
ret += VulnerabilityState::VulnerabilityState_CombatReady;
if (hasVulnerabilityStateLightDamage)
ret += VulnerabilityState::LightDamage;
ret += VulnerabilityState::VulnerabilityState_LightDamage;
if (hasVulnerabilityStateMediumDamage)
ret += VulnerabilityState::MediumDamage;
ret += VulnerabilityState::VulnerabilityState_MediumDamage;
if (hasVulnerabilityStateHeavyDamage)
ret += VulnerabilityState::HeavyDamage;
ret += VulnerabilityState::VulnerabilityState_HeavyDamage;
if (hasVulnerabilityStateWeaponSystemDamage)
ret += VulnerabilityState::WeaponSystemDamage;
ret += VulnerabilityState::VulnerabilityState_WeaponSystemDamage;
if (hasVulnerabilityStateVisibleWeaponSystemDamage)
ret += VulnerabilityState::VisibleWeaponSystemDamage;
ret += VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage;
if (hasVulnerabilityStateTemporarySeverance)
ret += VulnerabilityState::TemporarySeverance;
ret += VulnerabilityState::CatastrophicKill;
ret += VulnerabilityState::VulnerabilityState_TemporarySeverance;
ret += VulnerabilityState::VulnerabilityState_CatastrophicKill;
return ret;
}
case TypeClass::GroundVehicle:
@@ -84,24 +84,24 @@ QVector<ProjectDataManagement::VulnerabilityState> vulnerabilityStatesForTypeCla
QVector<ProjectDataManagement::VulnerabilityState> ret;
ret += VulnerabilityState::CombatReady;
ret += VulnerabilityState::VulnerabilityState_CombatReady;
if (hasVulnerabilityStateLightDamage)
ret += VulnerabilityState::LightDamage;
ret += VulnerabilityState::VulnerabilityState_LightDamage;
if (hasVulnerabilityStateMediumDamage)
ret += VulnerabilityState::MediumDamage;
ret += VulnerabilityState::VulnerabilityState_MediumDamage;
if (hasVulnerabilityStateHeavyDamage)
ret += VulnerabilityState::HeavyDamage;
ret += VulnerabilityState::VulnerabilityState_HeavyDamage;
if (hasVulnerabilityStateMobilityKill)
ret += VulnerabilityState::MobilityKill;
ret += VulnerabilityState::VulnerabilityState_MobilityKill;
if (hasVulnerabilityStateVisibleMobilityKill)
ret += VulnerabilityState::VisibleMobilityKill;
ret += VulnerabilityState::VulnerabilityState_VisibleMobilityKill;
if (hasVulnerabilityStateWeaponSystemDamage)
ret += VulnerabilityState::WeaponSystemDamage;
ret += VulnerabilityState::VulnerabilityState_WeaponSystemDamage;
if (hasVulnerabilityStateVisibleWeaponSystemDamage)
ret += VulnerabilityState::VisibleWeaponSystemDamage;
ret += VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage;
if (hasVulnerabilityStateTemporarySeverance)
ret += VulnerabilityState::TemporarySeverance;
ret += VulnerabilityState::CatastrophicKill;
ret += VulnerabilityState::VulnerabilityState_TemporarySeverance;
ret += VulnerabilityState::VulnerabilityState_CatastrophicKill;
return ret;
}
case TypeClass::SupportEntity:
@@ -110,7 +110,7 @@ QVector<ProjectDataManagement::VulnerabilityState> vulnerabilityStatesForTypeCla
return {};
case TypeClass::Unknown:
case TypeClass::Aircraft:
return { VulnerabilityState::CombatReady, VulnerabilityState::CatastrophicKill };
return { VulnerabilityState::VulnerabilityState_CombatReady, VulnerabilityState::VulnerabilityState_CatastrophicKill };
}
Q_ASSERT(false);
return {};