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:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+8
-8
@@ -182,7 +182,7 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa
|
||||
<< ", data.pos: " << data.pos;
|
||||
|
||||
//TransportInitiated (mounted on vehicle)
|
||||
if (data.mountedOn.is_set())
|
||||
if (data.mountedOn.has_value())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Mounted on : " << data.mountedOn.get();
|
||||
|
||||
@@ -309,7 +309,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
// Report Unit Power
|
||||
Database::RepUnitPowerData upData;
|
||||
|
||||
if (pData.equipmentNumber.is_set())
|
||||
if (pData.equipmentNumber.has_value())
|
||||
upData.equipmentNumber = pData.equipmentNumber.get();
|
||||
else
|
||||
upData.equipmentNumber = -1;
|
||||
@@ -491,9 +491,9 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
DEBUG_LOG(m_logger) << "Found indirect fire from AES id = " << stateInfo.originatorId << ", charge type = " << stateInfo.originatorChargeTypeId;
|
||||
if (aesItemView.id > 0)
|
||||
{
|
||||
if (aesItemView.partyId.is_set())
|
||||
if (aesItemView.partyId.has_value())
|
||||
airSupData.aesPartyId = aesItemView.partyId.get();
|
||||
if (aesItemView.partyId.is_set() && aesItemView.partyId.get() == pData.partyId && vulnState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
|
||||
if (aesItemView.partyId.has_value() && aesItemView.partyId.get() == pData.partyId && vulnState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady)
|
||||
{
|
||||
fData.hit = 0;
|
||||
fData.hitFriendlyFire = 1;
|
||||
@@ -590,13 +590,13 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic
|
||||
AreaEffectSimulation::AesType aesType = aesItemView.aesTypeId;
|
||||
DEBUG_LOG(m_logger) << "AesType: " << aesType;
|
||||
|
||||
if (aesItemView.partyId.is_set())
|
||||
if (aesItemView.partyId.has_value())
|
||||
mbData.mineAreaPartyId = aesItemView.partyId.get();
|
||||
if (mbData.mineAreaPartyId == mbData.partyId)
|
||||
mbData.hitFriendlyFire = 1;
|
||||
|
||||
// Save only, if vulnerabilityState changed
|
||||
if (checkVulnerabilityStateChange(vulnState, data.participantId)) // TODO: can this check moved out of if (data.stateHistory().at(data.stateHistory().size()-1).originEffectSimulationId().is_set()) ?
|
||||
if (checkVulnerabilityStateChange(vulnState, data.participantId)) // TODO: can this check moved out of if (data.stateHistory().at(data.stateHistory().size()-1).originEffectSimulationId().has_value()) ?
|
||||
{
|
||||
if (aesType == AreaEffectSimulation::AesType::AtMineArea ||
|
||||
aesType == AreaEffectSimulation::AesType::AtMineAreaSingleMines)
|
||||
@@ -1001,7 +1001,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
|
||||
// Report AirSupport
|
||||
Database::RepAirSupportData airSupData;
|
||||
auto aiv = getAesItemView(data.aesId);
|
||||
if (aiv.partyId.is_set())
|
||||
if (aiv.partyId.has_value())
|
||||
airSupData.aesPartyId = aiv.partyId.get();
|
||||
|
||||
airSupData.buildingId = data.structureElementId;
|
||||
@@ -1027,7 +1027,7 @@ void HandlerDynamicParticipantData::onAesEffectsChanged(const AreaEffectSimulati
|
||||
impData.aesId = data.aesItemId;
|
||||
AreaEffectSimulation::AesItemView aiv = getAesItemView(data.aesItemId);
|
||||
impData.chargeTypeId = aiv.chargeStruct.chargeTypeId;
|
||||
if (aiv.partyId.is_set())
|
||||
if (aiv.partyId.has_value())
|
||||
impData.partyId = aiv.partyId.get();
|
||||
//impData.aesName = getAesName(data.aesItemId());
|
||||
|
||||
|
||||
+1
-1
@@ -89,7 +89,7 @@ bool HandlerReportData::generateMaintenanceResult(const CreateModifyReportReques
|
||||
qInsert.bindValue(QStringLiteral(":pTypeId"), vrData.participantTypeId);
|
||||
qInsert.bindValue(QStringLiteral(":participantId"), vrData.participantId);
|
||||
qInsert.bindValue(QStringLiteral(":participantName"), ppmDtc->hierarchyFromParticipant(vrData.participantId));
|
||||
qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.is_set() ?
|
||||
qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.has_value() ?
|
||||
participant.equipmentNumber.get() : 0);
|
||||
|
||||
qInsert.bindValue(QStringLiteral(":time_event"), vrData.time_event);
|
||||
|
||||
+1
-1
@@ -151,7 +151,7 @@ bool HandlerReportData::generateParticipantDistanceResult(const CreateModifyRepo
|
||||
qInsert.bindValue(QStringLiteral(":pTypeId"), typeId);
|
||||
qInsert.bindValue(QStringLiteral(":participantId"), partId);
|
||||
qInsert.bindValue(QStringLiteral(":participantName"), ppmDtc->hierarchyFromParticipant(partId));
|
||||
qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.is_set() ?
|
||||
qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.has_value() ?
|
||||
participant.equipmentNumber.get() : 0);
|
||||
|
||||
// double dist = static_cast<double>(static_cast<int>(itt.value()*100+0.5))/100.0; // round to 2 decimals
|
||||
|
||||
+3
-3
@@ -135,7 +135,7 @@ bool HandlerReportData::generateTreatmentResult(const CreateModifyReportRequest
|
||||
qInsert.bindValue(QStringLiteral(":pTypeId"), tData.participantTypeId);
|
||||
qInsert.bindValue(QStringLiteral(":participantId"), tData.participantId);
|
||||
qInsert.bindValue(QStringLiteral(":participantName"), ppmDtc->hierarchyFromParticipant(tData.participantId));
|
||||
qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.is_set() ?
|
||||
qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.has_value() ?
|
||||
participant.equipmentNumber.get() : 0);
|
||||
qInsert.bindValue(QStringLiteral(":vitality"), tData.vitality);
|
||||
qInsert.bindValue(QStringLiteral(":vulnerability"), tData.vulnerability);
|
||||
@@ -187,9 +187,9 @@ bool HandlerReportData::generateTreatmentResult(const CreateModifyReportRequest
|
||||
DEBUG_LOG(m_logger) << "Initial Time enter area = " << tData.time_enter_area;
|
||||
DEBUG_LOG(m_logger) << "Initial Time 9 liner = " << tData.time_nine_liner;
|
||||
|
||||
//if (tData.time_treatment > 0 && participant.equipmentNumber.is_set())
|
||||
//if (tData.time_treatment > 0 && participant.equipmentNumber.has_value())
|
||||
// get FunctionalArea for participants with vulnerabilityState > 0, too
|
||||
if (participant.equipmentNumber.is_set())
|
||||
if (participant.equipmentNumber.has_value())
|
||||
{
|
||||
// re-calculate time enter in Functional Area
|
||||
QPair<int, qint64> fa = getNextFunctionalAreaEntry(participant.equipmentNumber.get(), tData.time_vulnerability);
|
||||
|
||||
+1
-1
@@ -110,7 +110,7 @@ bool HandlerReportData::generateTreatmentTimelineResult(const CreateModifyReport
|
||||
qInsert.bindValue(QStringLiteral(":pTypeId"), tData.participantTypeId);
|
||||
qInsert.bindValue(QStringLiteral(":participantId"), tData.participantId);
|
||||
qInsert.bindValue(QStringLiteral(":participantName"), ppmDtc->hierarchyFromParticipant(tData.participantId));
|
||||
qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.is_set() ?
|
||||
qInsert.bindValue(QStringLiteral(":participantEqNo"), participant.equipmentNumber.has_value() ?
|
||||
participant.equipmentNumber.get() : 0);
|
||||
qInsert.bindValue(QStringLiteral(":vitality"), tData.vitality);
|
||||
qInsert.bindValue(QStringLiteral(":vulnerability"), tData.vulnerability);
|
||||
|
||||
Reference in new issue
Block a user