Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
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:
1718 files changed
+126739
-18495
No files matched your search
+7
-7
@@ -93,11 +93,11 @@ Core::FunctionReplyObject HandlerShootbackArea::shootbackAreaModifyRequest(const
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
|
||||
// modify
|
||||
if (request.id() > 0)
|
||||
if (request.id > 0)
|
||||
{
|
||||
ObjectShootbackArea *ifs = m_objectMap.value(request.id());
|
||||
ObjectShootbackArea *ifs = m_objectMap.value(request.id);
|
||||
if (!ifs)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "ShootbackArea with id %1 not found")).arg(request.id());
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "ShootbackArea with id %1 not found")).arg(request.id);
|
||||
return ifs->updateObject(request);
|
||||
}
|
||||
// create
|
||||
@@ -121,11 +121,11 @@ void HandlerShootbackArea::onShootbackAreaRemoveRequest(const rti::core::SampleI
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " request=" << request;
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectShootbackArea *ifs = m_objectMap.value(request.id());
|
||||
ObjectShootbackArea *ifs = m_objectMap.value(request.id);
|
||||
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "ShootbackArea with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "ShootbackArea with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->ftsTgt()->shootbackAreaRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -155,14 +155,14 @@ void HandlerShootbackArea::onShootbackAreaRemoveRequest(const rti::core::SampleI
|
||||
{
|
||||
// delete Object
|
||||
delete ifs;
|
||||
m_objectMap.remove(request.id());
|
||||
m_objectMap.remove(request.id);
|
||||
}
|
||||
|
||||
m_mainHandler->dds()->ftsTgt()->shootbackAreaRemoveReply(cookie, ret);
|
||||
|
||||
// For ShootbackController
|
||||
if (!ret.error())
|
||||
emit objectChanged(request.id(), true);
|
||||
emit objectChanged(request.id, true);
|
||||
|
||||
return;
|
||||
}
|
||||
Reference in new issue
Block a user