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/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