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/Guez/ppm_handler.cpp
+26 -26
View File
@@ -154,7 +154,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();
@@ -196,7 +196,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,
@@ -206,7 +206,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,
@@ -282,18 +282,18 @@ 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()));
if (m_partData[data.id()].partyId() != data.partyId() && data.equipmentNumber().is_set())
if (m_partData[data.id()].partyId() != data.partyId() && data.equipmentNumber().has_value())
m_ngsHandler->ngsConnector()->setParticipantForce(data.equipmentNumber().get(), forceIdentifierFromPartyId(data.partyId()));
m_partData[data.id()] = data;
@@ -309,7 +309,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);
@@ -319,7 +319,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);
@@ -349,7 +349,7 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti
if (eqNo == 0)
return;
ParticipantPosition pos(data.pos(), data.sampleTime());
int mountedOnEqNo = data.mountedOn().is_set() ? getEquipmentNo(data.mountedOn().get()) : 0;
int mountedOnEqNo = data.mountedOn().has_value() ? getEquipmentNo(data.mountedOn().get()) : 0;
m_ngsHandler->ngsConnector()->setWorldLocation(eqNo, pos, mountedOnEqNo);
}
m_partPosData[data.participantId()] = data;
@@ -381,8 +381,8 @@ void PpmHandler::onParticipantReceivedInit(int eqId, qint64 simTimeMSecs)
init.equipmentNumber(eqId);
init.sampleTime(simTimeMSecs);
init.vulnerabilityBits(1);
init.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady);
init.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl);
init.vulnerabilityState(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
init.originatorType(ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl);
m_dtsTab->publish(init);
}
@@ -474,7 +474,7 @@ void PpmHandler::participantBiteRequest(const TrainingAreaBase::TetraIcd::Demand
void PpmHandler::createParticipant(const ParticipantManagement::Participant &participant)
{
if (participant.externalId() > 0 || !participant.equipmentNumber().is_set() || participant.isDeleted() || participant.equipmentNumber().get() == 0)
if (participant.externalId() > 0 || !participant.equipmentNumber().has_value() || participant.isDeleted() || participant.equipmentNumber().get() == 0)
return;
if (!m_ngsHandler->ngsConnector()->canPublishData())
@@ -488,7 +488,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);
@@ -513,7 +513,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());
@@ -578,7 +578,7 @@ rpr2::TacticalStatusStruct PpmHandler::currentTacticalStatus(int participantId)
if (sh.at(idxCurrent).stateTime() < sh.at(i).stateTime())
idxCurrent = i;
}
ts.TacticalStatus = static_cast<rpr2::TacticalStatusEnum8::ET>(sh.at(idxCurrent).vulnerabilityState().underlying());
ts.TacticalStatus = static_cast<rpr2::TacticalStatusEnum8::ET>(sh.at(idxCurrent).vulnerabilityState());
ts.VulnerabilityKind = sh.at(idxCurrent).vulnerabilityKindId();
ts.TotalStatus = static_cast<rpr2::TotalStatusEnum32::ET>(sh.at(idxCurrent).vulnerabilityBits());
return ts;
@@ -660,7 +660,7 @@ ProjectDataManagement::ChargeType PpmHandler::chargeTypeFromDisEntity(const std:
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;
@@ -831,7 +831,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)
@@ -906,7 +906,7 @@ void PpmHandler::onIsPartOfChanged(int eqNo, int eqNoHost, qint64 simTimeMSecs)
TrainingAreaBase::EquipmentPosition &newHost = m_observerPositions[eqNoHost];
auto mountedParticipants = newHost.mountedParticipants().is_set() ? newHost.mountedParticipants().get() : std::vector<int32_t>();
auto mountedParticipants = newHost.mountedParticipants().has_value() ? newHost.mountedParticipants().get() : std::vector<int32_t>();
mountedParticipants.push_back(eqNo);
@@ -925,7 +925,7 @@ void PpmHandler::onIsPartOfChanged(int eqNo, int eqNoHost, qint64 simTimeMSecs)
TrainingAreaBase::EquipmentPosition &oldHost = m_observerPositions[eqNoOldHost];
if (!oldHost.mountedParticipants().is_set())
if (!oldHost.mountedParticipants().has_value())
return;
@@ -968,16 +968,16 @@ bool PpmHandler::onExconInit(int eqNo, rpr2::ResetPlayerEnum8::ET rp, rpr2::Acti
bool bNoChange = false;
switch (aho) {
case rpr2::ActivateHelmetObservationEnum8::WithoutHelmetWithoutVest:
helmet = ProjectDataManagement::WphMode::Without;
vest = ProjectDataManagement::WphMode::Without;
helmet = ProjectDataManagement::WphMode::WphMode_Without;
vest = ProjectDataManagement::WphMode::WphMode_Without;
break;
case rpr2::ActivateHelmetObservationEnum8::HelmetWithoutVest:
helmet = ProjectDataManagement::WphMode::With;
vest = ProjectDataManagement::WphMode::Without;
helmet = ProjectDataManagement::WphMode::WphMode_With;
vest = ProjectDataManagement::WphMode::WphMode_Without;
break;
case rpr2::ActivateHelmetObservationEnum8::HelmetAndVest:
helmet = ProjectDataManagement::WphMode::With;
vest = ProjectDataManagement::WphMode::With;
helmet = ProjectDataManagement::WphMode::WphMode_With;
vest = ProjectDataManagement::WphMode::WphMode_With;
break;
case rpr2::ActivateHelmetObservationEnum8::NoChange:
helmet = ProjectDataManagement::WphMode::NoChange;