Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
1200 files changed
+20421
-18259
No files matched your search
+3
-3
@@ -105,7 +105,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::Init &data)
|
||||
msg.originatorType = TrainingAreaBase::TetraIcd::OriginatorType::ExerciseControl;
|
||||
msg.tasVitality = 100;
|
||||
msg.vulnerabilityBits = 0;
|
||||
msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CombatReady;
|
||||
msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CombatReady;
|
||||
|
||||
m_sendToDds->rxData(msg);
|
||||
return true;
|
||||
@@ -193,7 +193,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data)
|
||||
msg.chargeTypeId = data.chargeTasCodeDirect;
|
||||
msg.header.equipmentNumber = eqId;
|
||||
msg.header.timeStamp = data.header.timeStamp;
|
||||
msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CatastrophicKill;
|
||||
msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CatastrophicKill;
|
||||
msg.originatorId = data.originatorEquipmentNumber;
|
||||
|
||||
DEBUG_LOG(m_logger) << "sending state change direct (kill) with jamming for eqId " << msg.header.equipmentNumber;
|
||||
@@ -213,7 +213,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateC
|
||||
const auto &pData = m_dtcPpm->dynamicParticipantData(p);
|
||||
for (const auto &dyn : pData.stateHistory())
|
||||
{
|
||||
if (dyn.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CatastrophicKill)
|
||||
if (dyn.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
+1
-1
@@ -235,7 +235,7 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA
|
||||
msg.originatorType = TrainingAreaBase::TetraIcd::OriginatorType::Initialisation;
|
||||
msg.tasVitality = 100;
|
||||
msg.vulnerabilityBits = 0;
|
||||
msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CombatReady;
|
||||
msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CombatReady;
|
||||
|
||||
m_sendToDds->rxData(msg);
|
||||
|
||||
|
||||
Reference in new issue
Block a user