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/handler_booby_trap.cpp
+9 -9
View File
@@ -78,18 +78,18 @@ static void fillData(const BoobyTrapModifyRequest &src, Database::AesBoobyTrap &
dst.id = src.id;
dst.name = QString::fromStdString(src.name);
dst.effectStart = src.effectStart.is_set() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
dst.effectStart = src.effectStart.has_value() && src.effectStart.get() > 0 ? QDateTime::fromMSecsSinceEpoch(src.effectStart.get()) : QDateTime();
dst.effectDuration = src.effectDuration;
dst.impactPosition.rx() = src.impactPosition.lon;
dst.impactPosition.ry() = src.impactPosition.lat;
dst.impactRadius = src.impactRadius;
dst.partyId = src.partyId.is_set() ? src.partyId.get() : 0;
dst.partyId = src.partyId.has_value() ? src.partyId.get() : 0;
dst.chargeTypeId = src.chargeTypeId;
//dst.participantId = src.participantId.is_set() ? src.participantId.get() : 0;
//dst.externalId = src.externalId.is_set() ? src.externalId.get() : 0;
//dst.participantId = src.participantId.has_value() ? src.participantId.get() : 0;
//dst.externalId = src.externalId.has_value() ? src.externalId.get() : 0;
dst.triggerRadius = src.triggerRadius;
dst.rotationAngle = src.rotationAngle.is_set() ? src.rotationAngle.get() : 0;
dst.centralAngle = src.centralAngle.is_set() ? src.centralAngle.get() : 0;
dst.rotationAngle = src.rotationAngle.has_value() ? src.rotationAngle.get() : 0;
dst.centralAngle = src.centralAngle.has_value() ? src.centralAngle.get() : 0;
dst.isCentral = true;
dst.triggered = false;
}
@@ -106,7 +106,7 @@ void HandlerBoobyTrap::onBoobyTrapModifyRequest(const rti::core::SampleIdentity
Core::FunctionReplyObject HandlerBoobyTrap::boobyTrapCreateRequest(const BoobyTrapModifyRequest &request)
{
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBoobyTrap)]) && request.effectStart.is_set())
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBoobyTrap)]) && request.effectStart.has_value())
return Core::FunctionReplyObject(1, tr_lts("dds", "Too many active booby traps."));
Database::AesBoobyTrap newData;
@@ -153,13 +153,13 @@ Core::FunctionReplyObject HandlerBoobyTrap::boobyTrapModifyRequest(const BoobyTr
if (!ifs)
return ret;
if (request.effectStart.is_set() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
if (request.effectStart.has_value() && (request.effectStart.get() + request.effectDuration < m_mainHandler->dds()->currentPartitionTime().toMSecsSinceEpoch()))
return removeObject(ifs);
// Anzahl aktiver Areas ist erreicht, der Wirkbeginn ist (soll) gesetzt sein, aber die Area war
// vorher noch ohne Wirkbeginn
if (totalAreasCentral() >= (s_maxActiveAreasCentral[static_cast<int>(AesType::AtBoobyTrap)])
&& request.effectStart.is_set()
&& request.effectStart.has_value()
&& !ifs->isActivationTimeSet()
/* && !ifs->isObjectModifiable()*/)
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Too many active booby traps."));