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 eb1d949edc
commit 815e16368e
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/Services/OcSituationServer/central_aes_data_builder.cpp
+24 -24
View File
@@ -26,14 +26,14 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::EffectCluster &effec
addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionCluster); // we send EffectCluster as ExplosionCluster
addAesItemId(byteStream, effectCluster.id);
addName(byteStream, effectCluster.name);
addEffectStart(byteStream, effectCluster.effectStart.is_set() ? effectCluster.effectStart.get() : -1);
addEffectStart(byteStream, effectCluster.effectStart.has_value() ? effectCluster.effectStart.get() : -1);
addEffectDuration(byteStream, effectCluster.effectDuration);
addArea(byteStream, effectCluster.area);
addMhpCount(byteStream, static_cast<int32_t>(effectCluster.effectors.size()));
addMhpRotation(byteStream, effectCluster.effectors.size() ? effectCluster.effectors[0].mhpRotation : 1);
addImpactCount(byteStream, static_cast<int32_t>(effectCluster.effectors.size()));
addChargeTypeId(byteStream, effectCluster.chargeStruct.chargeTypeId);
addPartyId(byteStream, effectCluster.partyId.is_set() ? effectCluster.partyId.get() : -1);
addPartyId(byteStream, effectCluster.partyId.has_value() ? effectCluster.partyId.get() : -1);
return byteStream;
}
@@ -47,7 +47,7 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::NContamination &nCon
addAesType(byteStream, AreaEffectSimulation::AesType::AtNContamination);
addAesItemId(byteStream, nContamination.id);
addName(byteStream, nContamination.name);
addEffectStart(byteStream, nContamination.effectStart.is_set() ? nContamination.effectStart.get() : -1);
addEffectStart(byteStream, nContamination.effectStart.has_value() ? nContamination.effectStart.get() : -1);
addEffectDuration(byteStream, nContamination.effectDuration);
addChargeTypeId(byteStream, nContamination.chargeStruct.chargeTypeId);
addImpactPosition(byteStream, nContamination.impactPosition);
@@ -57,7 +57,7 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::NContamination &nCon
addSpanAngle(byteStream, nContamination.spanAngle);
addRotationAngle(byteStream, nContamination.rotationAngle);
addDetonationValue(byteStream, nContamination.detonationValue);
addPartyId(byteStream, nContamination.partyId.is_set() ? nContamination.partyId.get() : -1);
addPartyId(byteStream, nContamination.partyId.has_value() ? nContamination.partyId.get() : -1);
return byteStream;
}
@@ -71,12 +71,12 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::BCContamination &bCC
addAesType(byteStream, AreaEffectSimulation::AesType::AtBCContamination);
addAesItemId(byteStream, bCContamination.id);
addName(byteStream, bCContamination.name);
addEffectStart(byteStream, bCContamination.effectStart.is_set() ? bCContamination.effectStart.get() : -1);
addEffectStart(byteStream, bCContamination.effectStart.has_value() ? bCContamination.effectStart.get() : -1);
addEffectDuration(byteStream, bCContamination.effectDuration);
addChargeTypeId(byteStream, bCContamination.chargeStruct.chargeTypeId);
addImpactPosition(byteStream, bCContamination.impactPosition);
addImpactRadius(byteStream, bCContamination.impactRadius);
addPartyId(byteStream, bCContamination.partyId.is_set() ? bCContamination.partyId.get() : -1);
addPartyId(byteStream, bCContamination.partyId.has_value() ? bCContamination.partyId.get() : -1);
addPropagationDirection(byteStream, bCContamination.propagationDirection);
addWindSpeed(byteStream, bCContamination.windSpeed);
@@ -92,11 +92,11 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionArea &explo
addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionArea);
addAesItemId(byteStream, explosionArea.id);
addName(byteStream, explosionArea.name);
addEffectStart(byteStream, explosionArea.effectStart.is_set() ? explosionArea.effectStart.get() : -1);
addEffectStart(byteStream, explosionArea.effectStart.has_value() ? explosionArea.effectStart.get() : -1);
addEffectDuration(byteStream, explosionArea.effectDuration);
addChargeTypeId(byteStream, explosionArea.chargeStruct.chargeTypeId);
addArea(byteStream, explosionArea.area);
addPartyId(byteStream, explosionArea.partyId.is_set() ? explosionArea.partyId.get() : -1);
addPartyId(byteStream, explosionArea.partyId.has_value() ? explosionArea.partyId.get() : -1);
addCannonCount(byteStream, explosionArea.cannonCount);
addCannonRounds(byteStream, explosionArea.cannonRounds);
addFireRequestTime(byteStream, explosionArea.fireRequestTime);
@@ -115,10 +115,10 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionSingle &exp
addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionSingle);
addAesItemId(byteStream, explosionSingle.id);
addName(byteStream, explosionSingle.name);
addEffectStart(byteStream, explosionSingle.effectStart.is_set() ? explosionSingle.effectStart.get() : -1);
addEffectStart(byteStream, explosionSingle.effectStart.has_value() ? explosionSingle.effectStart.get() : -1);
addChargeTypeId(byteStream, explosionSingle.chargeStruct.chargeTypeId);
addImpactPosition(byteStream, explosionSingle.impactPosition);
addPartyId(byteStream, explosionSingle.partyId.is_set() ? explosionSingle.partyId.get() : -1);
addPartyId(byteStream, explosionSingle.partyId.has_value() ? explosionSingle.partyId.get() : -1);
addFireRequestTime(byteStream, explosionSingle.fireRequestTime);
addAltitude(byteStream, explosionSingle.altitude);
addPurpose(byteStream, explosionSingle.purpose);
@@ -135,12 +135,12 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::MineArea &mineArea,
addAesType(byteStream, AreaEffectSimulation::AesType::AtMineArea);
addAesItemId(byteStream, mineArea.id);
addName(byteStream, mineArea.name);
addEffectStart(byteStream, mineArea.effectStart.is_set() ? mineArea.effectStart.get() : -1);
addEffectStart(byteStream, mineArea.effectStart.has_value() ? mineArea.effectStart.get() : -1);
addEffectDuration(byteStream, mineArea.effectDuration);
addDensity(byteStream, mineArea.density);
addWidth(byteStream, mineArea.width);
addChargeTypeId(byteStream, mineArea.chargeStruct.chargeTypeId);
addPartyId(byteStream, mineArea.partyId.is_set() ? mineArea.partyId.get() : -1);
addPartyId(byteStream, mineArea.partyId.has_value() ? mineArea.partyId.get() : -1);
addAesMaLayingProcedureType(byteStream, mineArea.layingProcedureType);
addIsLayedHidden(byteStream, mineArea.isLaidHidden);
addIsCenterLine(byteStream, mineArea.isCenterLine);
@@ -158,12 +158,12 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::FunctionalArea &func
addAesType(byteStream, AreaEffectSimulation::AesType::AtFunctionalArea);
addAesItemId(byteStream, functionalArea.id);
addName(byteStream, functionalArea.name);
addEffectStart(byteStream, functionalArea.effectStart.is_set() ? functionalArea.effectStart.get() : -1);
addEffectStart(byteStream, functionalArea.effectStart.has_value() ? functionalArea.effectStart.get() : -1);
addEffectDuration(byteStream, functionalArea.effectDuration);
addChargeTypeId(byteStream, functionalArea.chargeStruct.chargeTypeId);
addArea(byteStream, functionalArea.area);
addPartyId(byteStream, functionalArea.partyId.is_set() ? functionalArea.partyId.get() : -1);
addPointSymbol(byteStream, functionalArea.pointSymbol.is_set() ? functionalArea.pointSymbol.get() : std::string());
addPartyId(byteStream, functionalArea.partyId.has_value() ? functionalArea.partyId.get() : -1);
addPointSymbol(byteStream, functionalArea.pointSymbol.has_value() ? functionalArea.pointSymbol.get() : std::string());
addFunctionalAreaTypeId(byteStream, functionalArea.functionalAreaTypeId);
addDeconMode(byteStream, functionalArea.deconMode);
addDeconTime(byteStream, functionalArea.deconTime);
@@ -189,10 +189,10 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::BoobyTrap &boobyTrap
addImpactPosition(byteStream, boobyTrap.impactPosition);
addImpactRadius(byteStream, boobyTrap.impactRadius);
addTriggerRadius(byteStream, boobyTrap.triggerRadius);
addRotationAngle(byteStream, boobyTrap.rotationAngle.is_set() ? boobyTrap.rotationAngle.get() : -1);
addCentralAngle(byteStream, boobyTrap.centralAngle.is_set() ? boobyTrap.centralAngle.get() : -1);
addEffectStart(byteStream, boobyTrap.effectStart.is_set() ? boobyTrap.effectStart.get() : -1);
addPartyId(byteStream, boobyTrap.partyId.is_set() ? boobyTrap.partyId.get() : -1);
addRotationAngle(byteStream, boobyTrap.rotationAngle.has_value() ? boobyTrap.rotationAngle.get() : -1);
addCentralAngle(byteStream, boobyTrap.centralAngle.has_value() ? boobyTrap.centralAngle.get() : -1);
addEffectStart(byteStream, boobyTrap.effectStart.has_value() ? boobyTrap.effectStart.get() : -1);
addPartyId(byteStream, boobyTrap.partyId.has_value() ? boobyTrap.partyId.get() : -1);
return byteStream;
}
@@ -209,9 +209,9 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::OffRouteMine &offRou
addEffectDuration(byteStream, offRouteMine.effectDuration);
addChargeTypeId(byteStream, offRouteMine.chargeStruct.chargeTypeId);
addArea(byteStream, offRouteMine.area);
addImpactRadius(byteStream, offRouteMine.impactRadius.is_set() ? offRouteMine.impactRadius.get() : -1);
addEffectStart(byteStream, offRouteMine.effectStart.is_set() ? offRouteMine.effectStart.get() : -1);
addPartyId(byteStream, offRouteMine.partyId.is_set() ? offRouteMine.partyId.get() : -1);
addImpactRadius(byteStream, offRouteMine.impactRadius.has_value() ? offRouteMine.impactRadius.get() : -1);
addEffectStart(byteStream, offRouteMine.effectStart.has_value() ? offRouteMine.effectStart.get() : -1);
addPartyId(byteStream, offRouteMine.partyId.has_value() ? offRouteMine.partyId.get() : -1);
return byteStream;
}
@@ -223,14 +223,14 @@ QByteArray getByteStreamAesItem(const AreaEffectSimulation::ExplosionCluster &ex
addAesType(byteStream, AreaEffectSimulation::AesType::AtExplosionCluster);
addAesItemId(byteStream, explosionCluster.id);
addName(byteStream, explosionCluster.name);
addEffectStart(byteStream, explosionCluster.effectStart.is_set() ? explosionCluster.effectStart.get() : -1);
addEffectStart(byteStream, explosionCluster.effectStart.has_value() ? explosionCluster.effectStart.get() : -1);
addEffectDuration(byteStream, explosionCluster.effectDuration);
addArea(byteStream, explosionCluster.area);
addMhpCount(byteStream, static_cast<int32_t>(explosionCluster.mhPoints.size()));
addMhpRotation(byteStream, explosionCluster.mhpRotation);
addImpactCount(byteStream, explosionCluster.impactCount);
addChargeTypeId(byteStream, explosionCluster.chargeStruct.chargeTypeId);
addPartyId(byteStream, explosionCluster.partyId.is_set() ? explosionCluster.partyId.get() : -1);
addPartyId(byteStream, explosionCluster.partyId.has_value() ? explosionCluster.partyId.get() : -1);
isPrioritized = explosionCluster.impactCount == 1; // we prioritize every single fire
qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_aes_data.cpp
+1 -1
View File
@@ -282,7 +282,7 @@ void HandlerOcAesData::sendDangerAreasToTab(int eqNumber)
QByteArray name(QByteArray::fromStdString(dangerArea.name));
name.resize(8);
data.append(name);
if (dangerArea.effectStart.is_set())
if (dangerArea.effectStart.has_value())
LtsUtils::set4Byte(dangerArea.effectStart.get() / 1000, data);
else
LtsUtils::set4Byte(0, data);
qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_data.cpp
+1 -1
View File
@@ -605,7 +605,7 @@ void HandlerOcData::handleEquipmentRegistration(const QByteArray &data)
ParticipantManagement::Participant part = m_ppmDtc->participant(participantId);
if (part.equipmentNumber.is_set() && equipmentNumber > 0)
if (part.equipmentNumber.has_value() && equipmentNumber > 0)
{
// we need a deregistration first!
ParticipantManagement::RegisterParticipantRequest dereq;
qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/handler_oc_situation_data.cpp
+5 -5
View File
@@ -186,7 +186,7 @@ void HandlerOcSituationData::setRequestOcSituationData(OcSituation::SituationCen
ParticipantManagement::Participant centerParticipant;
for (const auto &participant : std::as_const(m_allParticipants))
{
if (participant.equipmentNumber.is_set() && participant.equipmentNumber.get() == m_centerEquipmentId)
if (participant.equipmentNumber.has_value() && participant.equipmentNumber.get() == m_centerEquipmentId)
{
centerParticipant = participant;
break;
@@ -420,7 +420,7 @@ void HandlerOcSituationData::onAesItemViewChanged(const AreaEffectSimulation::Ae
{
case DataModification::eAdded:
case DataModification::eModified:
if (data.partyId.is_set())
if (data.partyId.has_value())
m_aesId2PartyId[data.id] = data.partyId.get();
else
m_aesId2PartyId.remove(data.id);
@@ -534,7 +534,7 @@ void HandlerOcSituationData::fetchParticipantsInRange()
if (!LtsUtils::isPositionTimeOutdated(m_partitionTime, position.sampleTime)) // only if position is not outdated
{
ParticipantManagement::Participant participant = m_allParticipants.value(position.participantId);
if (!participant.equipmentNumber.is_set() || participant.partyId == 0)
if (!participant.equipmentNumber.has_value() || participant.partyId == 0)
continue; // no units and participants without equipmentnumber or party: pool
if (m_filterActive)
{
@@ -603,7 +603,7 @@ void HandlerOcSituationData::handleParticipant(const ParticipantManagement::Part
TRACE_LOG(m_logger) << "Thread " << QThread::currentThreadId() << " function: " << LOGFUNCTION;
int participantId = participant.id;
if (participant.equipmentNumber.is_set())
if (participant.equipmentNumber.has_value())
m_participantId2EqId[participantId] = participant.equipmentNumber.get();
else
m_participantId2EqId.remove(participantId);
@@ -944,7 +944,7 @@ void HandlerOcSituationData::addStructure(QByteArray &buf, const ParticipantMana
{
if (!bAdd)
return;
LtsUtils::set2Byte(data.equipmentNumber.is_set() ? data.equipmentNumber.get() : 0, buf);
LtsUtils::set2Byte(data.equipmentNumber.has_value() ? data.equipmentNumber.get() : 0, buf);
LtsUtils::set2Byte(data.typeId, buf);
LtsUtils::set2Byte(data.partyId, buf);
#ifndef GUEZ_MODE