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/object_shootback_target.cpp
+54 -54
View File
@@ -26,20 +26,20 @@ ObjectShootbackTarget::~ObjectShootbackTarget()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
if (isValid())
m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id());
m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
}
//------------------------------------------------------------------------------
bool ObjectShootbackTarget::isValid() const
{
return m_data.id() > 0;
return m_data.id > 0;
}
//------------------------------------------------------------------------------
bool ObjectShootbackTarget::isUsed() const
{
return m_data.isUsed();
return m_data.isUsed;
}
//------------------------------------------------------------------------------
@@ -48,33 +48,33 @@ Core::FunctionReplyObject ObjectShootbackTarget::createObject(const ShootbackTar
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
m_data = data;
if (m_data.id() <= 0)
if (m_data.id <= 0)
{
m_data.isUsed(false);
m_data.isUsed = false;
Database::TgtShootbackTarget dbData(toDbData(data));
if (!m_mainHandler->db()->insert(dbData))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting ShootbackTarget-data into database"));
m_data.id(dbData.id);
DEBUG_LOG(m_logger) << "New TgtShootbackTarget: " << m_data.id();
m_data.id = dbData.id;
DEBUG_LOG(m_logger) << "New TgtShootbackTarget: " << m_data.id;
}
// Publish Data via DTS
onPublishData();
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectShootbackTarget::updateObject(const ShootbackTarget &data)
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id=" << data.id()
<< " size =" << data.visibleParticipants().size();
TRACE_LOG(m_logger) << LOGFUNCTION << " START, id=" << data.id
<< " size =" << data.visibleParticipants.size();
if (!isValid())
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
Database::TgtShootbackTarget dbData;
dbData = toDbData(data);
@@ -82,32 +82,32 @@ Core::FunctionReplyObject ObjectShootbackTarget::updateObject(const ShootbackTar
if (isDifferent(dbData))
{
if (!m_mainHandler->db()->update(dbData))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating ShootbackTarget-data into database"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating ShootbackTarget-data into database"));
}
m_data = data;
DEBUG_LOG(m_logger) << "Data changed for ShootbackTargetId: " << m_data.id();
DEBUG_LOG(m_logger) << "Data changed for ShootbackTargetId: " << m_data.id;
// Publish Data via DTS
onPublishData();
TRACE_LOG(m_logger) << LOGFUNCTION << " END, id=" << data.id()
<< " size =" << data.visibleParticipants().size();
return Core::FunctionReplyObject(m_data.id());
TRACE_LOG(m_logger) << LOGFUNCTION << " END, id=" << data.id
<< " size =" << data.visibleParticipants.size();
return Core::FunctionReplyObject(m_data.id);
}
//------------------------------------------------------------------------------
Core::FunctionReplyObject ObjectShootbackTarget::setUsed(bool isUsed)
{
if (!isValid())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed ShootbackTarget object"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed ShootbackTarget object"));
m_data.isUsed(isUsed);
m_data.isUsed = isUsed;
// Publish Data via DTS
onPublishData();
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
//------------------------------------------------------------------------------
@@ -115,21 +115,21 @@ Core::FunctionReplyObject ObjectShootbackTarget::removeObject()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
if (isUsed())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackTarget still in use"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackTarget still in use"));
if (!m_mainHandler->db()->removeTgtShootbackTarget(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackTarget with id %1 can not be removed from DB")).arg(m_data.id());
if (!m_mainHandler->db()->removeTgtShootbackTarget(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackTarget with id %1 can not be removed from DB")).arg(m_data.id);
if (!m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackTarget with id %1 can not be removed from DDS")).arg(m_data.id());
if (!m_mainHandler->dds()->dtsTgt()->removeShootbackTargetByKey(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackTarget with id %1 can not be removed from DDS")).arg(m_data.id);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
return Core::FunctionReplyObject(m_data.id());
return Core::FunctionReplyObject(m_data.id);
}
void ObjectShootbackTarget::updateVolatileData(const std::vector<int32_t> &visibleParticipant)
{
m_data.visibleParticipants(visibleParticipant);
m_data.visibleParticipants = visibleParticipant;
// Publish Data via DTS
onPublishData();
@@ -137,7 +137,7 @@ void ObjectShootbackTarget::updateVolatileData(const std::vector<int32_t> &visib
void ObjectShootbackTarget::updateVolatileData(const Core::GeoPosition &position)
{
m_data.position(position);
m_data.position = position;
// Publish Data via DTS
onPublishData();
@@ -146,7 +146,7 @@ void ObjectShootbackTarget::updateVolatileData(const Core::GeoPosition &position
//------------------------------------------------------------------------------
void ObjectShootbackTarget::onPublishData()
{
TRACE_LOG(m_logger) << "Publish ShootbackTarget-data to dds (" << m_data.id() << ") ...";
TRACE_LOG(m_logger) << "Publish ShootbackTarget-data to dds (" << m_data.id << ") ...";
if (!m_mainHandler->dds()->dtsTgt()->publish(m_data))
ERROR_LOG(m_logger) << "Error publishing ShootbackTarget-data to dds";
@@ -161,15 +161,15 @@ Database::TgtShootbackTarget ObjectShootbackTarget::toDbData(const ShootbackTarg
{
Database::TgtShootbackTarget dbData;
dbData.id = ddsData.id();
dbData.targetParticipantId = ddsData.targetParticipantId();
dbData.name = QString::fromStdString(ddsData.name());
dbData.id = ddsData.id;
dbData.targetParticipantId = ddsData.targetParticipantId;
dbData.name = QString::fromStdString(ddsData.name);
dbData.activateLaserDesignation = ddsData.activateLaserDesignation();
dbData.activateLights = ddsData.activateLights();
dbData.activatePopupAutomatic = ddsData.activatePopupAutomatic();
dbData.hitsToKill = ddsData.hitsToKill();
dbData.permanentInstalledTarget = ddsData.permanentInstalledTarget();
dbData.activateLaserDesignation = ddsData.activateLaserDesignation;
dbData.activateLights = ddsData.activateLights;
dbData.activatePopupAutomatic = ddsData.activatePopupAutomatic;
dbData.hitsToKill = ddsData.hitsToKill;
dbData.permanentInstalledTarget = ddsData.permanentInstalledTarget;
return dbData;
}
@@ -180,19 +180,19 @@ ShootbackTarget ObjectShootbackTarget::toDdsData(const Database::TgtShootbackTar
{
ShootbackTarget ddsData;
ddsData.id(dbData.id);
ddsData.targetParticipantId(dbData.targetParticipantId);
ddsData.name(dbData.name.toStdString());
ddsData.id = dbData.id;
ddsData.targetParticipantId = dbData.targetParticipantId;
ddsData.name = dbData.name.toStdString();
ddsData.activateLaserDesignation(dbData.activateLaserDesignation);
ddsData.activateLights(dbData.activateLights);
ddsData.activatePopupAutomatic(dbData.activatePopupAutomatic);
ddsData.hitsToKill(dbData.hitsToKill);
ddsData.permanentInstalledTarget(dbData.permanentInstalledTarget);
ddsData.activateLaserDesignation = dbData.activateLaserDesignation;
ddsData.activateLights = dbData.activateLights;
ddsData.activatePopupAutomatic = dbData.activatePopupAutomatic;
ddsData.hitsToKill = dbData.hitsToKill;
ddsData.permanentInstalledTarget = dbData.permanentInstalledTarget;
// init data not in db
ddsData.isDeleted(false);
ddsData.isUsed(false);
ddsData.isDeleted = false;
ddsData.isUsed = false;
return ddsData;
}
@@ -200,15 +200,15 @@ ShootbackTarget ObjectShootbackTarget::toDdsData(const Database::TgtShootbackTar
bool ObjectShootbackTarget::isDifferent(const Database::TgtShootbackTarget &dbData)
{
return (
dbData.id != m_data.id() ||
dbData.targetParticipantId != m_data.targetParticipantId() ||
dbData.name.toStdString() != m_data.name() ||
dbData.id != m_data.id ||
dbData.targetParticipantId != m_data.targetParticipantId ||
dbData.name.toStdString() != m_data.name ||
dbData.activateLaserDesignation != m_data.activateLaserDesignation() ||
dbData.activateLights != m_data.activateLights() ||
dbData.activatePopupAutomatic != m_data.activatePopupAutomatic() ||
dbData.hitsToKill != m_data.hitsToKill() ||
dbData.permanentInstalledTarget != m_data.permanentInstalledTarget()
dbData.activateLaserDesignation != m_data.activateLaserDesignation ||
dbData.activateLights != m_data.activateLights ||
dbData.activatePopupAutomatic != m_data.activatePopupAutomatic ||
dbData.hitsToKill != m_data.hitsToKill ||
dbData.permanentInstalledTarget != m_data.permanentInstalledTarget
);
}