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/TargetManagement/handler_target_area_assignment.cpp
+9 -9
View File
@@ -69,7 +69,7 @@ bool HandlerTargetAreaAssignment::init()
bool HandlerTargetAreaAssignment::isAreaIdUsedInAny(int areaId)
{
for (const ObjectTargetAreaAssignment *sample : std::as_const(m_objectMap))
if (sample && (sample->getData().areaId() == areaId))
if (sample && (sample->getData().areaId == areaId))
return true;
return false;
}
@@ -77,7 +77,7 @@ bool HandlerTargetAreaAssignment::isAreaIdUsedInAny(int areaId)
bool HandlerTargetAreaAssignment::isTargetDataIdUsedInAny(int targetDataId)
{
for (const ObjectTargetAreaAssignment *sample : std::as_const(m_objectMap))
if (sample && (sample->getData().targetParticipantId() == targetDataId))
if (sample && (sample->getData().targetParticipantId == targetDataId))
return true;
return false;
}
@@ -100,11 +100,11 @@ Core::FunctionReplyObject HandlerTargetAreaAssignment::TargetAreaAssignmentModif
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
// modify
if (request.id() > 0)
if (request.id > 0)
{
ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id());
ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id);
if (!ifs)
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "TargetAreaAssignment with id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "TargetAreaAssignment with id %1 not found")).arg(request.id);
return ifs->updateObject(request);
}
// create
@@ -128,11 +128,11 @@ void HandlerTargetAreaAssignment::onTargetAreaAssignmentRemoveRequest(const rti:
TRACE_LOG(m_logger) << LOGFUNCTION << " request=" << request;
Core::FunctionReplyObject ret;
ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id());
ObjectTargetAreaAssignment *ifs = m_objectMap.value(request.id);
if (ifs == nullptr)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "TargetAreaAssignment with id %1 not found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "TargetAreaAssignment with id %1 not found")).arg(request.id);
m_mainHandler->dds()->ftsTgt()->targetAreaAssignmentRemoveReply(cookie, ret);
return;
}
@@ -152,14 +152,14 @@ void HandlerTargetAreaAssignment::onTargetAreaAssignmentRemoveRequest(const rti:
{
// delete Object
delete ifs;
m_objectMap.remove(request.id());
m_objectMap.remove(request.id);
}
m_mainHandler->dds()->ftsTgt()->targetAreaAssignmentRemoveReply(cookie, ret);
// For ShootbackController
if (!ret.error())
emit objectChanged(request.id(), true);
emit objectChanged(request.id, true);
return;
}