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_area.cpp
+34 -34
View File
@@ -26,20 +26,20 @@ ObjectShootbackArea::~ObjectShootbackArea()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
if (isValid())
m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id());
m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id);
TRACE_LOG(m_logger) << LOGFUNCTION << " END";
}
//------------------------------------------------------------------------------
bool ObjectShootbackArea::isValid() const
{
return m_data.id() > 0;
return m_data.id > 0;
}
//------------------------------------------------------------------------------
bool ObjectShootbackArea::isUsed() const
{
return m_data.isUsed();
return m_data.isUsed;
}
//------------------------------------------------------------------------------
@@ -48,24 +48,24 @@ Core::FunctionReplyObject ObjectShootbackArea::createObject(const ShootbackArea
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::TgtShootbackArea dbData(toDbData(data));
if (!m_mainHandler->db()->insert(dbData))
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting ShootbackArea-data into database"));
m_data.id(dbData.id);
DEBUG_LOG(m_logger) << "New TgtShootbackArea: " << m_data.id();
m_data.id = dbData.id;
DEBUG_LOG(m_logger) << "New TgtShootbackArea: " << 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);
}
//------------------------------------------------------------------------------
@@ -73,36 +73,36 @@ Core::FunctionReplyObject ObjectShootbackArea::updateObject(const ShootbackArea
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
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::TgtShootbackArea dbData;
dbData = toDbData(data);
if (!m_mainHandler->db()->update(dbData))
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating ShootbackArea-data into database"));
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating ShootbackArea-data into database"));
m_data = data;
DEBUG_LOG(m_logger) << "Data changed for ShootbackAreaId: " << m_data.id();
DEBUG_LOG(m_logger) << "Data changed for ShootbackAreaId: " << 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 ObjectShootbackArea::setUsed(bool isUsed)
{
if (!isValid())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed ShootbackArea object"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed ShootbackArea 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);
}
//------------------------------------------------------------------------------
@@ -110,22 +110,22 @@ Core::FunctionReplyObject ObjectShootbackArea::removeObject()
{
TRACE_LOG(m_logger) << LOGFUNCTION << " START";
if (isUsed())
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea still in use"));
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackArea still in use"));
if (!m_mainHandler->db()->removeTgtShootbackArea(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea with id %1 can not be removed from DB")).arg(m_data.id());
if (!m_mainHandler->db()->removeTgtShootbackArea(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackArea with id %1 can not be removed from DB")).arg(m_data.id);
if (!m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id()))
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "ShootbackArea with id %1 can not be removed from DDS")).arg(m_data.id());
if (!m_mainHandler->dds()->dtsTgt()->removeShootbackAreaByKey(m_data.id))
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "ShootbackArea 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 ObjectShootbackArea::onPublishData()
{
TRACE_LOG(m_logger) << "Publish ShootbackArea-data to dds (" << m_data.id() << ") ...";
TRACE_LOG(m_logger) << "Publish ShootbackArea-data to dds (" << m_data.id << ") ...";
if (!m_mainHandler->dds()->dtsTgt()->publish(m_data))
ERROR_LOG(m_logger) << "Error publishing ShootbackArea-data to dds";
@@ -140,11 +140,11 @@ Database::TgtShootbackArea ObjectShootbackArea::toDbData(const ShootbackArea &dd
{
Database::TgtShootbackArea dbData;
dbData.id = ddsData.id();
dbData.name = QString::fromStdString(ddsData.name());
dbData.position = QPointF(ddsData.position().lon(), ddsData.position().lat());
dbData.width = ddsData.width();
dbData.height = ddsData.height();
dbData.id = ddsData.id;
dbData.name = QString::fromStdString(ddsData.name);
dbData.position = QPointF(ddsData.position.lon, ddsData.position.lat);
dbData.width = ddsData.width;
dbData.height = ddsData.height;
return dbData;
}
@@ -155,15 +155,15 @@ ShootbackArea ObjectShootbackArea::toDdsData(const Database::TgtShootbackArea &d
{
ShootbackArea ddsData;
ddsData.id(dbData.id);
ddsData.name(dbData.name.toStdString());
ddsData.position(Core::GeoPosition2D(dbData.position.x(), dbData.position.y()));
ddsData.width(dbData.width);
ddsData.height(dbData.height);
ddsData.id = dbData.id;
ddsData.name = dbData.name.toStdString();
ddsData.position = Core::GeoPosition2D(dbData.position.x(), dbData.position.y());
ddsData.width = dbData.width;
ddsData.height = dbData.height;
// init data not in db
ddsData.isDeleted(false);
ddsData.isUsed(false);
ddsData.isDeleted = false;
ddsData.isUsed = false;
return ddsData;
}