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/ParticipantManagement/UasHandling/uas_handler.cpp
+25 -25
View File
@@ -83,7 +83,7 @@ bool UasHandler::init()
//------------------------------------------------------------------------------------------
void UasHandler::onCreateModifyUasRequest(const rti::core::SampleIdentity &cookie, const CreateModifyUasRequest &request)
{
Core::FunctionReplyObject reply = request.id() == 0 ? createUas(request) : modifyUas(request);
Core::FunctionReplyObject reply = request.id == 0 ? createUas(request) : modifyUas(request);
m_mainHandler->exAnyFts()->createModifyUasReply(cookie, reply);
}
@@ -101,18 +101,18 @@ Core::FunctionReplyObject UasHandler::removeUas(const RemoveUasRequest &request)
{
DEBUG_LOG(m_logger) << "onRemoveUasRequest " << request;
if (request.id() < 0)
if (request.id < 0)
return Core::FunctionReplyObject(tr_lts("dds", "Got request to delete an UAS, but no valid UAS id to delete"));
UasHandling::Uas *uasToDelete = m_uass.value(request.id());
UasHandling::Uas *uasToDelete = m_uass.value(request.id);
if (!uasToDelete)
return Core::FunctionReplyObject(tr_lts("dds", "Could not delete UAS with id %1, because no UAS with that id exists"))
.arg(request.id());
.arg(request.id);
if (uasToDelete->participantId() > 0)
return Core::FunctionReplyObject(tr_lts("dds", "Not possible to delete a UAS in use"));
DEBUG_LOG(m_logger) << "Removing UAS with ID " << request.id();
DEBUG_LOG(m_logger) << "Removing UAS with ID " << request.id;
return removeUas(uasToDelete);
}
@@ -153,13 +153,13 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
Database::PpmUas dbUas;
dbUas.deviceIdentifier = QString::fromStdString(request.deviceIdentifier());
dbUas.uasStateId = ProjectDataManagement::UasState::UasState_Undefined;
dbUas.participantId = request.participantId();
dbUas.exerciseId = request.exerciseId();
dbUas.hostname = QString::fromStdString(request.hostname());
dbUas.hostport = request.hostport();
dbUas.useTcp = request.useTcp();
dbUas.deviceIdentifier = QString::fromStdString(request.deviceIdentifier);
dbUas.uasStateId = static_cast<int>(ProjectDataManagement::UasState::UasState_Undefined);
dbUas.participantId = request.participantId;
dbUas.exerciseId = request.exerciseId;
dbUas.hostname = QString::fromStdString(request.hostname);
dbUas.hostport = request.hostport;
dbUas.useTcp = request.useTcp;
if (hostNameHostPortExists(dbUas.hostname, dbUas.hostport, -1))
return Core::FunctionReplyObject(tr_lts("dds", "Hostname with Port %1:%2 already exists"))
@@ -185,21 +185,21 @@ Core::FunctionReplyObject UasHandler::createUas(const CreateModifyUasRequest &re
//------------------------------------------------------------------------------------------
Core::FunctionReplyObject UasHandler::modifyUas(const CreateModifyUasRequest &request)
{
if (!m_uass.contains(request.id()))
if (!m_uass.contains(request.id))
{
QString error = QStringLiteral("Uas topic with id %1 not present. Not possible to modify it.").arg(request.id());
QString error = QStringLiteral("Uas topic with id %1 not present. Not possible to modify it.").arg(request.id);
ERROR_LOG(m_logger) << error;
return Core::FunctionReplyObject(error.toStdString().c_str());
}
Uas *uas = m_uass.value(request.id());
Uas *uas = m_uass.value(request.id);
// Check if Hostname and Hostport already existing
if (hostNameHostPortExists(QString::fromStdString(request.hostname()), request.hostport(), uas->id()))
if (hostNameHostPortExists(QString::fromStdString(request.hostname), request.hostport, uas->id()))
return Core::FunctionReplyObject(tr_lts("dds", "Hostname with Port %1:%2 already exists"))
.arg(request.hostname()).arg(request.hostport());
.arg(request.hostname).arg(request.hostport);
if (!uas->hasChanges(request))
{
@@ -248,16 +248,16 @@ void UasHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat
{
Q_UNUSED(mod)
if (data.state() != ExerciseManagement::ExerciseState::Stopped &&
data.state() != ExerciseManagement::ExerciseState::Terminated &&
data.state() != ExerciseManagement::ExerciseState::Unknown )
if (data.state != ExerciseManagement::ExerciseState::Stopped &&
data.state != ExerciseManagement::ExerciseState::Terminated &&
data.state != ExerciseManagement::ExerciseState::Unknown )
return;
//Unlink
for (auto uas : m_uass)
{
auto uasData = uas->toDdsUas();
if (uasData.exerciseId() != data.id())
if (uasData.exerciseId != data.id)
continue;
uas->unlinkUas();
@@ -268,16 +268,16 @@ void UasHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat
void UasHandler::onUASRadioLinkConnectionStatusChanged(const UASRadioLinkConnectionStatus &data, DataModification mod)
{
if (data.id() <= 0)
if (data.id <= 0)
return;
if (!m_uass.contains(data.id()))
if (!m_uass.contains(data.id))
return;
auto uas = m_uass.value(data.id());
auto uas = m_uass.value(data.id);
if (mod == DataModification::eRemoved)
uas->setState(ProjectDataManagement::UasState::UasState_Undefined);
else
uas->setState(data.uasState());
uas->setState(data.uasState);
m_mainHandler->exAnyDts()->publish(uas->toDdsUas());
m_mainHandler->db()->update(uas->toDbUas());
}