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/Tools/VulnerabilityStateGenerator/main_handler.cpp
+17 -15
View File
@@ -5,6 +5,7 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QDateTime>
#include <QtCore/QElapsedTimer>
#include <QtCore/QRandomGenerator>
#include "proxy_emulator.h"
#include <QtCore/QTimer>
@@ -90,10 +91,11 @@ void VulnerabilityStateGenerator::MainHandler::quit()
ProjectDataManagement::VulnerabilityState VulnerabilityStateGenerator::MainHandler::randomVulnerabilityState()
{
qsrand(QDateTime::currentMSecsSinceEpoch());
// (legacy: qsrand(QDateTime::currentMSecsSinceEpoch()); re-seeded per call) — Qt6's QRandomGenerator::global()
// is auto-seeded; ->seed() on the global/system generator aborts in Qt 6.10.
unsigned int index = 0;
if (m_vsMap.size() > 0)
index = qrand() % m_vsMap.size();
index = QRandomGenerator::global()->bounded(m_vsMap.size());
return m_vsMap.value(index);
@@ -104,23 +106,23 @@ void VulnerabilityStateGenerator::MainHandler::setNewState()
{
for (auto it = m_partMap.begin(); it != m_partMap.end(); ++it)
{
if (it.value().m_equipmentNumber().is_set() && it.value().m_equipmentNumber().get() > 0)
if (it.value().equipmentNumber.has_value() && it.value().equipmentNumber.value() > 0)
m_proxyEmulator->publishNewState(randomVulnerabilityState(), it.value());
}
}
void VulnerabilityStateGenerator::MainHandler::fillMapFromEnum()
{
m_vsMap.insert(0, ProjectDataManagement::VulnerabilityState::CombatReady);
m_vsMap.insert(1, ProjectDataManagement::VulnerabilityState::LightDamage);
m_vsMap.insert(2, ProjectDataManagement::VulnerabilityState::MediumDamage);
m_vsMap.insert(3, ProjectDataManagement::VulnerabilityState::HeavyDamage);
m_vsMap.insert(4, ProjectDataManagement::VulnerabilityState::MobilityKill);
m_vsMap.insert(5, ProjectDataManagement::VulnerabilityState::VisibleMobilityKill);
m_vsMap.insert(6, ProjectDataManagement::VulnerabilityState::WeaponSystemDamage);
m_vsMap.insert(7, ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage);
m_vsMap.insert(8, ProjectDataManagement::VulnerabilityState::CatastrophicKill);
m_vsMap.insert(9, ProjectDataManagement::VulnerabilityState::TemporarySeverance);
m_vsMap.insert(10, ProjectDataManagement::VulnerabilityState::NearMiss);
m_vsMap.insert(11, ProjectDataManagement::VulnerabilityState::HitWithNoEffect);
m_vsMap.insert(0, ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady);
m_vsMap.insert(1, ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage);
m_vsMap.insert(2, ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage);
m_vsMap.insert(3, ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage);
m_vsMap.insert(4, ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill);
m_vsMap.insert(5, ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill);
m_vsMap.insert(6, ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage);
m_vsMap.insert(7, ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage);
m_vsMap.insert(8, ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill);
m_vsMap.insert(9, ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance);
m_vsMap.insert(10, ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss);
m_vsMap.insert(11, ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect);
}
qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp
+8 -8
View File
@@ -46,14 +46,14 @@ void VulnerabilityStateGenerator::ProxyEmulator::giveInitState(const QMap<qint32
{
const ParticipantManagement::Participant &currentParticipant = it.value();
if (currentParticipant.m_equipmentNumber().is_set())
if (currentParticipant.equipmentNumber.has_value())
{
++participantsWithEquipmentNumber;
TrainingAreaBase::EquipmentState state;
state.m_equipmentNumber(currentParticipant.m_equipmentNumber().get());
state.sampleTime(QDateTime::currentMSecsSinceEpoch());
state.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady);
state.equipmentNumber = currentParticipant.equipmentNumber.value();
state.sampleTime = QDateTime::currentMSecsSinceEpoch();
state.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
m_tabDts->publish(state);
}
@@ -76,11 +76,11 @@ void VulnerabilityStateGenerator::ProxyEmulator::publishNewState(ProjectDataMana
{
TrainingAreaBase::EquipmentState state;
state.m_equipmentNumber(participant.m_equipmentNumber().get());
state.sampleTime(QDateTime::currentMSecsSinceEpoch());
state.vulnerabilityState(newState);
state.equipmentNumber = participant.equipmentNumber.value();
state.sampleTime = QDateTime::currentMSecsSinceEpoch();
state.vulnerabilityState = newState;
DEBUG_LOG(m_logger) << "participantId: " << participant.m_id() << ", state: " << newState << ", equipNo: " << participant.m_equipmentNumber().get();
DEBUG_LOG(m_logger) << "participantId: " << participant.id << ", state: " << newState << ", equipNo: " << participant.equipmentNumber.value();
m_tabDts->publish(state);
}