Migrates remaining services and plugins to generated rtiddsgen API

Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:48 +02:00
1 parent 6a8c31b735
commit c3eda18234
104 files changed
+2424 -2430

No files matched your search

@@ -84,12 +84,12 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
const EvlCriteriumModifyRequest &request)
{
Database::EvlCriterium data;
data.name = QString::fromStdString(request.name());
data.description = QString::fromStdString(request.description());
data.operatorId = request.operatorId();
data.name = QString::fromStdString(request.name);
data.description = QString::fromStdString(request.description);
data.operatorId = request.operatorId;
Core::FunctionReplyObject ret;
if (request.id() <= 0)
if (request.id <= 0)
{
ObjectCriterium *ifs = new ObjectCriterium(m_ddsHandler, m_db);
ret = ifs->createObject(data);
@@ -105,7 +105,7 @@ void HandlerCriterium::onEvlCriteriumModifyRequest(const rti::core::SampleIdenti
}
else
{
data.id = request.id();
data.id = request.id;
ObjectCriterium *ifs = m_criteriumObjMap.value(data.id);
ret = ifs->updateObject(data);
}
@@ -118,11 +118,11 @@ void HandlerCriterium::onEvlCriteriumRemoveRequest(const rti::core::SampleIdenti
{
DEBUG_LOG(m_logger) << "onEvlCriteriumRemoveRequest: " << request;
ObjectCriterium *ifs = m_criteriumObjMap.value(request.id());
ObjectCriterium *ifs = m_criteriumObjMap.value(request.id);
Core::FunctionReplyObject ret;
if (!ifs)
{
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.id);
m_ddsHandler->fts()->evlCriteriumRemoveReply(cookie, ret);
return;
}
@@ -134,31 +134,31 @@ void HandlerCriterium::onEvlCriteriumRemoveRequest(const rti::core::SampleIdenti
void HandlerCriterium::onEvlElementModifyRequest(const rti::core::SampleIdentity &cookie,
const EvlElementModifyRequest &request)
{
ObjectCriterium *ifs = m_criteriumObjMap.value(request.criteriumId());
ObjectCriterium *ifs = m_criteriumObjMap.value(request.criteriumId);
Core::FunctionReplyObject ret;
if (!ifs)
{
ret = Core::FunctionReplyObject(request.criteriumId(), tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.criteriumId());
ret = Core::FunctionReplyObject(request.criteriumId, tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.criteriumId);
m_ddsHandler->fts()->evlElementModifyReply(cookie, ret);
return;
}
Database::EvlElement data;
data.criteriumId = request.criteriumId();
data.id = request.id();
data.duration = request.duration();
data.note = QString::fromStdString(request.note());
data.phaseId = request.phaseId();
data.rating = request.rating();
data.time = request.timestamp();
if (request.audioContent().is_set())
data.audioContent = QString::fromStdString(request.audioContent().get());
if (request.videoContent().is_set())
data.videoContent = QString::fromStdString(request.videoContent().get());
if (request.situationContent().is_set())
data.situationContent = QString::fromStdString(request.situationContent().get());
data.criteriumId = request.criteriumId;
data.id = request.id;
data.duration = request.duration;
data.note = QString::fromStdString(request.note);
data.phaseId = request.phaseId;
data.rating = request.rating;
data.time = request.timestamp;
if (request.audioContent.is_set())
data.audioContent = QString::fromStdString(request.audioContent.get());
if (request.videoContent.is_set())
data.videoContent = QString::fromStdString(request.videoContent.get());
if (request.situationContent.is_set())
data.situationContent = QString::fromStdString(request.situationContent.get());
if (data.id <= 0)
{
@@ -189,23 +189,23 @@ void HandlerCriterium::onEvlElementModifyRequest(const rti::core::SampleIdentity
void HandlerCriterium::onEvlElementRemoveRequest(const rti::core::SampleIdentity &cookie,
const EvlElementRemoveRequest &request)
{
ObjectCriterium *ifs = m_criteriumObjMap.value(request.criteriumId());
ObjectCriterium *ifs = m_criteriumObjMap.value(request.criteriumId);
Core::FunctionReplyObject ret;
if (!ifs)
{
ret = Core::FunctionReplyObject(request.criteriumId(), tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.criteriumId());
ret = Core::FunctionReplyObject(request.criteriumId, tr_lts("dds", "No EvlCriterium with id %1 found")).arg(request.criteriumId);
m_ddsHandler->fts()->evlElementModifyReply(cookie, ret);
return;
}
ObjectEvaluationElement *oee = ifs->getElement(request.id());
ObjectEvaluationElement *oee = ifs->getElement(request.id);
if (!oee)
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "No EvaluationElement with id %1 found")).arg(request.id());
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "No EvaluationElement with id %1 found")).arg(request.id);
else
{
ret = oee->removeObject();
ifs->removeElement(request.id());
ifs->removeElement(request.id);
}
m_ddsHandler->fts()->evlElementRemoveReply(cookie, ret);