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:
104 files changed
+2424
-2430
No files matched your search
+16
-16
@@ -84,7 +84,7 @@ void HandlerPresentation::onPresentationModifyRequest(const rti::core::SampleIde
|
||||
const PresentationModifyRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onPresentationModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? presentationModifyRequest(request) : presentationCreateRequest(request);
|
||||
auto ret = request.id > 0 ? presentationModifyRequest(request) : presentationCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_mainHandler->dds()->fts()->presentationModifyReply(cookie, ret);
|
||||
@@ -112,11 +112,11 @@ Core::FunctionReplyObject HandlerPresentation::presentationCreateRequest(const P
|
||||
//---------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject HandlerPresentation::presentationModifyRequest(const PresentationModifyRequest &request)
|
||||
{
|
||||
PresentationManagement::ObjectPresentation *ifs = m_objectPresentationMap.value(request.id());
|
||||
PresentationManagement::ObjectPresentation *ifs = m_objectPresentationMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Presentation with id %1 not found")).arg(request.id());
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Presentation with id %1 not found")).arg(request.id);
|
||||
|
||||
int oldId = request.id();
|
||||
int oldId = request.id;
|
||||
Core::FunctionReplyObject ret = ifs->updateObject(request);
|
||||
if (ret.error())
|
||||
return ret;
|
||||
@@ -133,7 +133,7 @@ void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIde
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onPresentationRemoveRequest: " << request;
|
||||
Core::FunctionReplyObject ret;
|
||||
int presentationId = request.id();
|
||||
int presentationId = request.id;
|
||||
|
||||
// gest presentation object
|
||||
PresentationManagement::ObjectPresentation *ifs = m_objectPresentationMap.value(presentationId);
|
||||
@@ -146,7 +146,7 @@ void HandlerPresentation::onPresentationRemoveRequest(const rti::core::SampleIde
|
||||
|
||||
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Presentation '%1' is used by another user!")).arg(ifs->getName());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Presentation '%1' is used by another user!")).arg(ifs->getName());
|
||||
m_mainHandler->dds()->fts()->presentationRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -173,26 +173,26 @@ void HandlerPresentation::onGetPresentationContentRequest(const rti::core::Sampl
|
||||
Core::FunctionReplyObject fro;
|
||||
GetPresentationContentReply reply;
|
||||
|
||||
ObjectPresentation *ifs = m_objectPresentationMap.value(request.presentationId());
|
||||
ObjectPresentation *ifs = m_objectPresentationMap.value(request.presentationId);
|
||||
|
||||
if (ifs)
|
||||
{
|
||||
reply.id(ifs->getId());
|
||||
reply.id = ifs->getId();
|
||||
/*
|
||||
if (ifs->getContent().size() <= 0)
|
||||
fro = Core::FunctionReplyObject(request.presentationId(), tr_lts("dds", "No content for presentation "));
|
||||
fro = Core::FunctionReplyObject(request.presentationId, tr_lts("dds", "No content for presentation "));
|
||||
else
|
||||
*/
|
||||
reply.content(ifs->getContent());
|
||||
reply.content = ifs->getContent();
|
||||
}
|
||||
else
|
||||
fro = Core::FunctionReplyObject(request.presentationId(), tr_lts("dds", "No valid presentation id for retrieving presentation content"));
|
||||
fro = Core::FunctionReplyObject(request.presentationId, tr_lts("dds", "No valid presentation id for retrieving presentation content"));
|
||||
|
||||
if (fro.error())
|
||||
{
|
||||
reply.id(fro.id());
|
||||
reply.errorString(fro.str());
|
||||
reply.errorParams(fro.args());
|
||||
reply.id = fro.id();
|
||||
reply.errorString = fro.str();
|
||||
reply.errorParams = fro.args();
|
||||
}
|
||||
|
||||
m_mainHandler->dds()->fts()->getPresentationContentReply(cookie, reply);
|
||||
@@ -202,10 +202,10 @@ void HandlerPresentation::onGetPresentationContentRequest(const rti::core::Sampl
|
||||
void HandlerPresentation::onPresentationChangeStatusRequest(const rti::core::SampleIdentity &cookie,
|
||||
const PresentationChangeStatusRequest &request)
|
||||
{
|
||||
ObjectPresentation *ifs = m_objectPresentationMap.value(request.id());
|
||||
ObjectPresentation *ifs = m_objectPresentationMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Presentation with id %1 not found")).arg(request.id());
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Presentation with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->presentationChangeStatusReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user