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/aes_handler.cpp
+37 -37
View File
@@ -187,7 +187,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
<< "\nboundingBoxBottomLeft: " << ParticipantPosition(data.boundingBoxBottomLeft()).toString()
<< "\nboundingBoxTopRight: " << ParticipantPosition(data.boundingBoxTopRight()).toString()
<< "\neffectStateId: " << toString(data.effectStateId())
<< "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
<< "\neffectStart: " << data.effectStart() << "\n";
}
@@ -212,7 +212,7 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification
else if (data.aesTypeId() == AesType::AtBCContamination)
{
m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId().underlying(), data.form());
m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId(), data.form());
DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector";
}
}
@@ -260,7 +260,7 @@ void AesHandler::onTriggeredImpactsChanged(const TriggeredImpacts &data, DataMod
if (chargeTypeId <= 0)
return;
rpr2::ForceIdentifierEnum8::ET forceId = aesItemView.partyId().is_set() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(aesItemView.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
rpr2::ForceIdentifierEnum8::ET forceId = aesItemView.partyId().has_value() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(aesItemView.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
for (int32_t bitFieldIdx = 0; bitFieldIdx < data.impactCount(); ++bitFieldIdx)
{
@@ -303,8 +303,8 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
if (!exCluster.partyId().is_set() &&
(!exCluster.participantId().is_set() || exCluster.participantId().get() <= 0))
if (!exCluster.partyId().has_value() &&
(!exCluster.participantId().has_value() || exCluster.participantId().get() <= 0))
return;
const int chargeTypeId = exCluster.chargeStruct().chargeTypeId();
@@ -316,7 +316,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType)
const rpr2::ForceIdentifierEnum8::ET forceId = exCluster.partyId().is_set() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(exCluster.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
const rpr2::ForceIdentifierEnum8::ET forceId = exCluster.partyId().has_value() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(exCluster.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
int curSeIndex = -1;
@@ -359,10 +359,10 @@ void AesHandler::onAesExplosionSingleChanged(const ExplosionSingle &data, DataMo
<< "\nsampleTime: " << data.sampleTime()
<< "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
<< "\neffectDuration: " << data.effectDuration()
<< "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStateId: " << toString(data.effectStateId())
<< "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\nimpactPosition: " << ParticipantPosition(data.impactPosition()).toString()
<< "\nfireRequestTime: " << data.fireRequestTime()
<< "\naltitude: " << data.altitude()
@@ -372,13 +372,13 @@ void AesHandler::onAesExplosionSingleChanged(const ExplosionSingle &data, DataMo
return;
if (!data.partyId().is_set() &&
(!data.participantId().is_set() || data.participantId().get() <= 0))
if (!data.partyId().has_value() &&
(!data.participantId().has_value() || data.participantId().get() <= 0))
return;
ParticipantPosition pos(data.impactPosition(), data.effectStart().is_set() ? data.effectStart().get() : data.sampleTime());
rpr2::ForceIdentifierEnum8::ET forceId = data.partyId().is_set() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(data.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
ParticipantPosition pos(data.impactPosition(), data.effectStart().has_value() ? data.effectStart().get() : data.sampleTime());
rpr2::ForceIdentifierEnum8::ET forceId = data.partyId().has_value() ? m_ngsHandler->ppmHandler()->forceIdentifierFromPartyId(data.partyId().get()) : rpr2::ForceIdentifierEnum8::Other;
m_ngsHandler->ngsConnector()->sendMunitionDetonation(pos, data.chargeStruct().chargeTypeId(), forceId);
}
@@ -397,10 +397,10 @@ void AesHandler::onAesMineAreaChanged(const MineArea &data, DataModification mod
<< "\nsampleTime: " << data.sampleTime()
<< "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
<< "\neffectDuration: " << data.effectDuration()
<< "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStateId: " << toString(data.effectStateId())
<< "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\n";
m_ngsHandler->ngsConnector()->guezMineField(data);
@@ -420,10 +420,10 @@ void AesHandler::onAesMineCorridorChanged(const MineCorridor &data, DataModifica
<< "\nsampleTime: " << data.sampleTime()
<< "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
<< "\neffectDuration: " << data.effectDuration()
<< "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStateId: " << toString(data.effectStateId())
<< "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\n";
m_ngsHandler->ngsConnector()->guezMineFieldBreach(data);
@@ -445,10 +445,10 @@ void AesHandler::onAesNContaminationChanged(const NContamination &data, DataModi
<< "\nsampleTime: " << data.sampleTime()
<< "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
<< "\neffectDuration: " << data.effectDuration()
<< "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStateId: " << toString(data.effectStateId())
<< "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\n";
}
@@ -468,10 +468,10 @@ void AesHandler::onAesBCContaminationChanged(const BCContamination &data, DataMo
<< "\nsampleTime: " << data.sampleTime()
<< "\nchargeTypeId: " << data.chargeStruct().chargeTypeId()
<< "\neffectDuration: " << data.effectDuration()
<< "\neffectStart: " << (data.effectStart().is_set() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStart: " << (data.effectStart().has_value() ? QString::number(data.effectStart().get()) : QStringLiteral("not set"))
<< "\neffectStateId: " << toString(data.effectStateId())
<< "\npartyId: " << (data.partyId().is_set() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().is_set() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\npartyId: " << (data.partyId().has_value() ? QString::number(data.partyId().get()) : QStringLiteral("not set"))
<< "\nparticipantId: " << (data.participantId().has_value() ? QString::number(data.participantId().get()) : QStringLiteral("not set"))
<< "\n";
}
@@ -491,7 +491,7 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa
int aesItemId = 0;
AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
switch (type.underlying())
switch (type)
{
case AreaEffectSimulation::AesType::AtBCContamination:
break;
@@ -565,7 +565,7 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt)
DEBUG_LOG(m_logger) << "Remove Item for " << aesItemId << " requested. Type: " << type;
switch (type.underlying())
switch (type)
{
case AreaEffectSimulation::AesType::AtBCContamination:
break;
@@ -627,7 +627,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
if (msecsSinceEpoch < earliest && msecsSinceEpoch > 0)
msecsSinceEpoch = earliest;
switch (type.underlying())
switch (type)
{
case AreaEffectSimulation::AesType::AtBCContamination:
break;
@@ -637,7 +637,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
if (!req)
{
AreaEffectSimulation::MineCorridor item = m_dtcAes->mineCorridor(aesItemId);
if ((item.effectStart().is_set() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
if ((item.effectStart().has_value() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
return;
req = makeMinefieldBreachRequest(item);
addRequestToQueue(aesItemId, req);
@@ -653,7 +653,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi
{
DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea - Request NOT found";
AreaEffectSimulation::MineArea item = m_dtcAes->mineArea(aesItemId);
if ((item.effectStart().is_set() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
if ((item.effectStart().has_value() && item.effectStart().get() == msecsSinceEpoch) || !isModifiable(item))
return;
req = makeMinefieldRequest(item);
addRequestToQueue(aesItemId, req);
@@ -699,7 +699,7 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId)
int aesItemId = 0;
AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
switch (type.underlying())
switch (type)
{
case AreaEffectSimulation::AesType::AtBCContamination:
break;
@@ -782,7 +782,7 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time)
int aesItemId = 0;
AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
switch (type.underlying())
switch (type)
{
case AreaEffectSimulation::AesType::AtBCContamination:
break;
@@ -854,7 +854,7 @@ void AesHandler::onAesChargeChanged(qint64 identifierInt, int chargeTypeId)
int aesItemId = 0;
AesType type = m_dtcAes->aesItemIdFromExternalId(identifierInt, aesItemId);
switch (type.underlying())
switch (type)
{
case AreaEffectSimulation::AesType::AtBCContamination:
break;
@@ -960,7 +960,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector<
DEBUG_LOG(m_logger) << "Points Data changed for Aes Item ID: " << aesItemId << ". Type: " << type;
switch (type.underlying())
switch (type)
{
case AreaEffectSimulation::AesType::AtBCContamination:
break;
@@ -1061,7 +1061,7 @@ void AesHandler::onSendRequest(const MineAreaModifyRequest &item)
bool AesHandler::onNewMinefieldBreach(const MineCorridorModifyRequest &mc)
{
if (!mc.externalId().is_set())
if (!mc.externalId().has_value())
return false;
return m_requestHelper->startSingleRequest([this, mc]()
@@ -1077,7 +1077,7 @@ void AesHandler::onSendRequest(const MineCorridorModifyRequest &item)
void AesHandler::onMunitionDetonation(const ExplosionSingleModifyRequest &es)
{
if (!es.externalId().is_set())
if (!es.externalId().has_value())
return;
m_requestHelper->startSingleRequest([this, es]()
@@ -1089,7 +1089,7 @@ void AesHandler::onMunitionDetonation(const ExplosionSingleModifyRequest &es)
#ifdef SUPPORT_EXPLOSION_CLUSTER_SINGLE_EFFECT
void AesHandler::onMunitionDetonationExplosionClusterSingleEffect(const ExplosionClusterSingleEffectOnlyRequest &es)
{
if (!es.externalId().is_set())
if (!es.externalId().has_value())
return;
m_requestHelper->startSingleRequest([this, es]()