lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

Browse Source 
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp
+14 -14
View File
@@ -150,7 +150,7 @@ int PpmHandler::getEquipmentNo(int participantId) const
return 0;
const ParticipantManagement::Participant &p = m_partData[participantId];
if (!p.equipmentNumber().is_set())
if (!p.equipmentNumber().has_value())
return 0;
return p.equipmentNumber().get();
@@ -192,7 +192,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
if (oldStateInfo != newStateInfo)
{
m_dynPartData[data.participantId()] = data;
if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
{
conn->setParticipantHit(equipmentNo,
@@ -202,7 +202,7 @@ void PpmHandler::onDynamicParticipantDataChanged(const ParticipantManagement::Dy
newStateInfo.originatorType(),
newStateInfo.originatorId());
}
else if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::Participant)
else if (newStateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant)
{
conn->setParticipantHit(equipmentNo,
@@ -262,15 +262,15 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
}
int oldEqNo = m_partData[data.id()].equipmentNumber().is_set() ? m_partData[data.id()].equipmentNumber().get() : 0;
int newEqNo = data.equipmentNumber().is_set() ? data.equipmentNumber().get() : 0;
int oldEqNo = m_partData[data.id()].equipmentNumber().has_value() ? m_partData[data.id()].equipmentNumber().get() : 0;
int newEqNo = data.equipmentNumber().has_value() ? data.equipmentNumber().get() : 0;
if (oldEqNo != newEqNo)
{
removeParticipant(m_partData[data.id()]);
createParticipant(data);
}
if (m_partData[data.id()].designator() != data.designator() && data.equipmentNumber().is_set())
if (m_partData[data.id()].designator() != data.designator() && data.equipmentNumber().has_value())
m_ngsHandler->ngsConnector()->setParticipantName(data.equipmentNumber().get(), QString::fromStdString(data.designator()));
m_partData[data.id()] = data;
@@ -286,7 +286,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
if (it == m_externalEquipmentNumbers.end())
{
if (modType == DataModification::eRemoved || !data.equipmentNumber().is_set() || data.externalId() <= 0)
if (modType == DataModification::eRemoved || !data.equipmentNumber().has_value() || data.externalId() <= 0)
return;
int equipNo = data.equipmentNumber().get();
m_externalEquipmentNumbers.insert(data.id(), equipNo);
@@ -296,7 +296,7 @@ void PpmHandler::onParticipantChanged(const ParticipantManagement::Participant &
{
int oldEquipNo = it.value();
if (modType == DataModification::eRemoved || !data.equipmentNumber().is_set() || data.externalId() <= 0)
if (modType == DataModification::eRemoved || !data.equipmentNumber().has_value() || data.externalId() <= 0)
{
m_externalEquipmentNumbers.erase(it);
emit externalEquipmentNumberRemoved(oldEquipNo);
@@ -512,7 +512,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
const ParticipantManagement::Type partType = getParticipantType(participant.typeId());
bool bCreated;
switch (partType.typeClass().underlying())
switch (partType.typeClass())
{
case ParticipantManagement::TypeClass::Human:
bCreated = createHuman(participant);
@@ -544,7 +544,7 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par
bool PpmHandler::removeParticipant(const ParticipantManagement::Participant &participant)
{
if (!participant.equipmentNumber().is_set() || participant.equipmentNumber().get() == 0)
if (!participant.equipmentNumber().has_value() || participant.equipmentNumber().get() == 0)
return false;
return m_ngsHandler->ngsConnector()->removeBaseEntity(participant.equipmentNumber().get());
@@ -617,7 +617,7 @@ ProjectDataManagement::VulnerabilityState PpmHandler::currentVulnerabilityState(
return ts;
}
}
ts = ProjectDataManagement::VulnerabilityState::TemporarySeverance;
ts = ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance;
return ts;
}
@@ -728,7 +728,7 @@ int PpmHandler::gearTypeIdFromChargeTypeId(int chargeTypeId)
rpr2::ForceIdentifierEnum8::ET PpmHandler::getRprForceIdentifierFromPpmForceIdentifier(const ParticipantManagement::HlaForceIdentifierEnum& ppmForceIdentifier) const
{
rpr2::ForceIdentifierEnum8::ET eqfi = rpr2::ForceIdentifierEnum8::Other;
switch (ppmForceIdentifier.underlying()) {
switch (ppmForceIdentifier) {
case ParticipantManagement::HlaForceIdentifierEnum::Friendly_1:
eqfi = rpr2::ForceIdentifierEnum8::Friendly;
break;
@@ -899,7 +899,7 @@ void PpmHandler::onParticipantHit(const GuezHitStruct &hitStruct)
TrainingAreaBase::EquipmentState es;
es.equipmentNumber(hitStruct.targetId);
es.originatorChargeTypeId(ct.id());
if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
if (hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
{
int aesItemId = 0;
if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType::AtUnknown)
@@ -971,7 +971,7 @@ void PpmHandler::onEquipmentState(const TrainingAreaBase::EquipmentState &event)
bool PpmHandler::onExconEngagement(int eqNo, const ProjectDataManagement::VulnerabilityState &state)
{
if (state != ProjectDataManagement::VulnerabilityState::CombatReady)
if (state != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
{
TrainingAreaBase::DemandVulnerabilityStateChangeRequest req;
req.equipmentNumbers().push_back(eqNo);