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

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

No files matched your search

@@ -117,7 +117,7 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie
return;
DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId();
switch (data.effectStateId().underlying())
switch (data.effectStateId())
{
case AreaEffectSimulation::AesEffectState::EsUnknown:
case AreaEffectSimulation::AesEffectState::EsError:
@@ -381,7 +381,7 @@ void HandlerAesData::onSendCesHitInformationReply(const Core::FunctionReplyObjec
void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpacts &data, const Footprint &footprint)
{
// check for correct AES type artillery only
switch (data.aesTypeId().underlying())
switch (data.aesTypeId())
{
case AreaEffectSimulation::AesType::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -26,7 +26,7 @@ namespace core
{
inline uint qHash(ProjectDataManagement::PdmEventType et)
{
return ::qHash(et.underlying());
return ::qHash(et);
}
}
}
@@ -280,7 +280,7 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae
const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId();
const double impactRadius = m_ddsHandler->chargeTypeRadius(data.chargeTypeId());
DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius;
switch (effectState.underlying())
switch (effectState)
{
case AreaEffectSimulation::AesEffectState::EsPrepared:
{
@@ -291,7 +291,7 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae
{
const auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], impactRadius));
switch (data.aesTypeId().underlying())
switch (data.aesTypeId())
{
case AreaEffectSimulation::AesType::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -353,7 +353,7 @@ void HandlerParticipantArea::onDusSingleMineChanged(const AreaEffectSimulation::
break;
case DataModification::eAdded:
case DataModification::eModified:
switch (data.effectStateId().underlying())
switch (data.effectStateId())
{
case AreaEffectSimulation::AesEffectState::EsActivated:
{
@@ -361,7 +361,7 @@ void HandlerParticipantArea::onDusSingleMineChanged(const AreaEffectSimulation::
CentralEffectSimulation::AesItemViewUtm itemView;
itemView.aesItemId = data.id();
itemView.chargeTypeId = data.chargeTypeId();
itemView.partyId = data.partyId.is_set() ? data.partyId.get() : -1;
itemView.partyId = data.partyId.has_value() ? data.partyId.get() : -1;
itemView.aesTypeId = AreaEffectSimulation::AesType::AtDusSingleMine;
itemView.effectStart = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch();
itemView.formMines.push_back(CentralEffectSimulation::geographic2Utm(data.position(), &itemView.zone));
@@ -394,7 +394,7 @@ void HandlerParticipantArea::onBCContaminationChanged(const AreaEffectSimulation
break;
case DataModification::eAdded:
case DataModification::eModified:
switch (data.effectStateId().underlying())
switch (data.effectStateId())
{
case AreaEffectSimulation::AesEffectState::EsReceived:
case AreaEffectSimulation::AesEffectState::EsCreated:
@@ -426,7 +426,7 @@ void HandlerParticipantArea::onNContaminationChanged(const AreaEffectSimulation:
break;
case DataModification::eAdded:
case DataModification::eModified:
switch (data.effectStateId().underlying())
switch (data.effectStateId())
{
case AreaEffectSimulation::AesEffectState::EsReceived:
case AreaEffectSimulation::AesEffectState::EsCreated:
@@ -502,7 +502,7 @@ void HandlerParticipantArea::calculateAesParticipant(const CentralEffectSimulati
for (const CentralEffectSimulation::AesItemViewUtm &itemView : std::as_const(m_aesItemViews))
{
DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId;
switch (itemView.aesTypeId.underlying())
switch (itemView.aesTypeId)
{
case AreaEffectSimulation::AesType::AtMineArea:
if (inFormCheck(itemView, participantPos))
@@ -625,7 +625,7 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
{
DEBUG_LOG(m_logger) << "inside AES form, paricipantId: " << participantPosition.participantId()
<< ", aesItemId: " << itemView.aesItemId;
switch (itemView.aesTypeId.underlying())
switch (itemView.aesTypeId)
{
case AreaEffectSimulation::AesType::AtBCContamination:
sendEffectTypeEvent(itemView, participantPosition, effectTypeForBCContaminationArea(itemView, participantPosUtmPoint), -1, -1);
@@ -654,7 +654,7 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV
} // if inside
// outside
switch (itemView.aesTypeId.underlying())
switch (itemView.aesTypeId)
{
case AreaEffectSimulation::AesType::AtBCContamination:
sendEffectTypeEvent(itemView, participantPosition, EffectType::BCContaminationLeave, -1, -1);
@@ -698,7 +698,7 @@ void HandlerParticipantArea::onTriggeredImpactsChanged(const AreaEffectSimulatio
return;
DEBUG_LOG(m_logger) << "Got TriggeredImpacts: " << data;
switch (data.aesTypeId().underlying())
switch (data.aesTypeId())
{
case AreaEffectSimulation::AesType::AtExplosionArea:
case AreaEffectSimulation::AesType::AtExplosionSingle:
@@ -725,7 +725,7 @@ void HandlerParticipantArea::onExplosionAreaChanged(const AreaEffectSimulation::
return;
DEBUG_LOG(m_logger) << "Got ExplosionArea, m_aesItemId2partIdMap.insert " << data.id() << " / " << data.participantId();
if (data.participantId.is_set())
if (data.participantId.has_value())
m_aesItemId2partIdMap.insert(data.id(), data.participantId.get());
else
m_aesItemId2partIdMap.remove(data.id());
@@ -916,7 +916,7 @@ void HandlerParticipantArea::calculateImpacts(const AreaEffectSimulation::Trigge
const auto participantPositions = m_handlerParticipant->positions();
for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : participantPositions)
{
if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
continue;
if (pPos.insideBuilding())
continue;
@@ -992,7 +992,7 @@ void HandlerParticipantArea::sendCesHitRequest(const CentralEffectSimulation::Ae
return;
}
if (participantPosition.participantId() != 0 &&
participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
{
DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
return;
@@ -1059,7 +1059,7 @@ void HandlerParticipantArea::sendCesHitRequest(const AreaEffectSimulation::AesIt
} // if
if (participantPosition.participantId() != 0 &&
participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
{
DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)";
return;
@@ -1158,14 +1158,14 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation:
CentralEffectSimulation::ParticipantEvent pe;
pe.id(m_ddsHandler->getParticipantEventId());
pe.eventTypeId(eventType.underlying());
pe.eventTypeId(eventType);
pe.participantId(participantPosition.participantId());
pe.eventTime(participantPosition.sampleTime());
pe.aesItemId(itemView.aesItemId);
pe.partyId(participantPosition.partyId());
//pe.aesName(m_handlerAesData->aesName(itemView.aesItemId));
pe.equipmentNumber(equipmentNumber);
pe.vulnerability(participantPosition.vulnerabilityState.underlying());
pe.vulnerability(participantPosition.vulnerabilityState);
pe.position(participantPosition.pos());
// Criterion for friendly Fire:
@@ -1267,7 +1267,7 @@ bool HandlerParticipantArea::eventMustBeSend(int aesItemId,
activeEvents.insert(eventType);
// - remove opposite events (e.g remove Enter event when we leave the area)
switch (eventType.underlying())
switch (eventType)
{
case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea:
activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea);
@@ -1423,7 +1423,7 @@ bool HandlerParticipantArea::inCircle(const QPointF &centerUtm, const double rad
ProjectDataManagement::PdmEventType HandlerParticipantArea::leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
{
switch (aesTypeId.underlying())
switch (aesTypeId)
{
case AreaEffectSimulation::AesType::AtDangerArea:
return ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea;
@@ -1441,7 +1441,7 @@ ProjectDataManagement::PdmEventType HandlerParticipantArea::leaveEventTypeForAes
EffectType HandlerParticipantArea::leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId)
{
switch (aesTypeId.underlying())
switch (aesTypeId)
{
case AreaEffectSimulation::AesType::AtBCContamination:
return EffectType::BCContaminationLeave;