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/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp
+23 -23
View File
@@ -185,7 +185,7 @@ void ModuleTestExplosionCluster::onExplosionClusterChanged(const ExplosionCluste
m_data = data;
qint64 startTimeMsec = -1;
if (m_data.effectStart.is_set())
if (m_data.effectStart.has_value())
startTimeMsec = m_data.effectStart.get();
DEBUG_LOG(m_logger) << " got changed - m_data: " << m_data.id << ", state=" << m_data.effectStateId
@@ -210,7 +210,7 @@ void ModuleTestExplosionCluster::onAesItemViewChanged(const AesItemView &aesItem
if (modType == DataModification::eRemoved)
return;
AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(aesItemView.aesTypeId());
AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(aesItemView.aesTypeId);
DEBUG_LOG(m_logger) << " got onAesItemViewChanged - m_data: " << m_data.id << ", aesType=" << aesType;
switch (aesType) {
@@ -233,7 +233,7 @@ void ModuleTestExplosionCluster::onEffectsChanged(const Effects &effects, DataMo
{
if (modType == DataModification::eRemoved)
return;
AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(effects.aesTypeId());
AreaEffectSimulation::AesType aesType = static_cast<AreaEffectSimulation::AesType>(effects.aesTypeId);
DEBUG_LOG(m_logger) << " got onEffectsChanged - m_data: " << m_data.id << ", aesType=" << aesType;
++m_counterDds.cntExplosionClusterEffects;
@@ -442,10 +442,10 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor1104(const QString &eaName)
eaData.partyId = 2;
eaData.participantId = 5;
eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0),
eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0)});
Core::GeoPosition2D(0.0, 0.0)};
eaData.impactCount = 4;
// SubStruct FlightCurve
@@ -492,10 +492,10 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor1106(const QString &eaName)
eaData.partyId = 2;
eaData.participantId = 6;
eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0),
eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0)});
Core::GeoPosition2D(0.0, 0.0)};
eaData.impactCount = 4;
// SubStruct FlightCurve
@@ -547,10 +547,10 @@ ExplosionCluster ModuleTestExplosionCluster::getEcForUBAHN(const QString &eaName
eaData.partyId = 2;
eaData.participantId = 5;
eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0),
eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0)});
Core::GeoPosition2D(0.0, 0.0)};
eaData.impactCount = 4;
// SubStruct FlightCurve
@@ -600,10 +600,10 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor3101(const QString &eaName)
eaData.partyId = 2;
eaData.participantId = 89;
eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0),
eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0),
Core::GeoPosition2D(0.0, 0.0)});
Core::GeoPosition2D(0.0, 0.0)};
eaData.impactCount = 4;
// SubStruct FlightCurve
@@ -636,13 +636,13 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor3101(const QString &eaName)
int ModuleTestExplosionCluster::doExplosionClusterModifyRequest(const ExplosionCluster &eaData)
{
if (eaData.effectStart.is_set())
if (eaData.effectStart.has_value())
INFO_LOG(m_logger) << " explosionClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(eaData.effectStart.get()).toString();
else
INFO_LOG(m_logger) << " explosionClusterModifyRequest with effectStart: not set ";
FlightCurve fc;
if (eaData.flightCurve.is_set())
if (eaData.flightCurve.has_value())
fc = eaData.flightCurve.get();
const std::string properties = "{}";
@@ -686,7 +686,7 @@ int ModuleTestExplosionCluster::doExplosionClusterModifyRequest(const ExplosionC
int ModuleTestExplosionCluster::doExplosionClusterSingleEffectOnlyModifyRequest(const ExplosionClusterSingleEffectOnlyRequest &request)
{
if (request.effectStart.is_set())
if (request.effectStart.has_value())
INFO_LOG(m_logger) << " explosionClusterModifyRequest with effectStart: " << QDateTime::fromMSecsSinceEpoch(request.effectStart.get()).toString();
else
INFO_LOG(m_logger) << " explosionClusterModifyRequest with effectStart: not set ";
@@ -2071,7 +2071,7 @@ void ModuleTestExplosionCluster::test_point_geometry_bldg_1104()
eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
eaData.chargeStruct.chargeTypeId = 371; // radius == 25, diameter == 50m
QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
eaData.flightCurve.get().requestedRelativePeakHeight = 500;
eaData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint;
@@ -2127,10 +2127,10 @@ void ModuleTestExplosionCluster::test_point_geometry_bldg_1104_SMArt_Proximity()
eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
eaData.chargeStruct.chargeTypeId = 374; // 374: isSMArt=true ; radius == 25, diameter == 50m
NOTICE_LOG(m_logger) << LOGFUNCTION << "Vor eaData.flightCurve.is_set()";
NOTICE_LOG(m_logger) << LOGFUNCTION << "Vor eaData.flightCurve.has_value()";
QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
NOTICE_LOG(m_logger) << LOGFUNCTION << "Nach eaData.flightCurve.is_set()";
QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
NOTICE_LOG(m_logger) << LOGFUNCTION << "Nach eaData.flightCurve.has_value()";
eaData.flightCurve.get().requestedRelativePeakHeight = 500;
@@ -2407,7 +2407,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104()
eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
eaData.chargeStruct.chargeTypeId = s_ChargeTypeIdVulcano; // s_ChargeTypeIdVulcano == 376
QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
eaData.flightCurve.get().requestedRelativePeakHeight = 11100; // == 53deg bei 500 m/s -> apo: x: 12211 y/z= 8190
eaData.flightCurve.get().launchVelocity = 500;
eaData.flightCurve.get().launchAngle = 0; // calculated ; parameter is prepared for ADLER
@@ -2464,7 +2464,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify()
eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
eaData.chargeStruct.chargeTypeId = s_ChargeTypeIdVulcano; // s_ChargeTypeIdVulcano == 376
QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
eaData.flightCurve.get().requestedRelativePeakHeight = 11100; // == 53deg bei 500 m/s -> apo: x: 12211 y/z= 8190
eaData.flightCurve.get().launchVelocity = 500;
eaData.flightCurve.get().launchAngle = 0; // calculated ; parameter is prepared for ADLER
@@ -2489,7 +2489,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify()
QTimer::singleShot(2000, this, [this] () { // local static is captured implicit by gcc and for MSVS
qint64 startTimeMsec = -1;
if (m_data.effectStart.is_set())
if (m_data.effectStart.has_value())
startTimeMsec = m_data.effectStart.get();
const qint64 nowMsec = QDateTime::currentMSecsSinceEpoch();
@@ -2568,7 +2568,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify2()
eaData.chargeStruct.igniterTypeId = s_IgniterTypeImpact;
eaData.chargeStruct.chargeTypeId = s_ChargeTypeIdVulcano; // s_ChargeTypeIdVulcano == 376
QVERIFY2(eaData.flightCurve.is_set(), "ERROR, flightCurve() not set !!");
QVERIFY2(eaData.flightCurve.has_value(), "ERROR, flightCurve() not set !!");
eaData.flightCurve.get().requestedRelativePeakHeight = 11100; // == 53deg bei 500 m/s -> apo: x: 12211 y/z= 8190
eaData.flightCurve.get().launchVelocity = 500;
eaData.flightCurve.get().launchAngle = 0; // calculated ; parameter is prepared for ADLER
@@ -2596,7 +2596,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify2()
QTimer::singleShot(2000, this, [this] () { // local static is captured implicit by gcc and for MSVS
qint64 startTimeMsec = -1;
if (m_data.effectStart.is_set())
if (m_data.effectStart.has_value())
startTimeMsec = m_data.effectStart.get();
const qint64 nowMsec = QDateTime::currentMSecsSinceEpoch();