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
+7
-7
@@ -63,7 +63,7 @@ void HandlerCodificationData::onCodificationDataModifyRequest(const rti::core::S
|
||||
const CodificationData &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataModifyRequest: " << request;
|
||||
auto ret = request.id() > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
|
||||
auto ret = request.id > 0 ? codificationDataModifyRequest(request) : codificationDataCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->codificationDataModifyReply(cookie, ret);
|
||||
@@ -85,9 +85,9 @@ Core::FunctionReplyObject HandlerCodificationData::codificationDataCreateRequest
|
||||
|
||||
Core::FunctionReplyObject HandlerCodificationData::codificationDataModifyRequest(const CodificationData &request)
|
||||
{
|
||||
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
|
||||
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Codification table with id %1 not found")).arg(request.id);
|
||||
|
||||
return ifs->updateObject(request);
|
||||
} // end of onCodificationDataModifyRequest()
|
||||
@@ -99,10 +99,10 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
|
||||
DEBUG_LOG(m_logger) << "onCodificationDataRemoveRequest: " << request;
|
||||
|
||||
|
||||
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id());
|
||||
ObjectCodificationData *ifs = m_codificationdataObjMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification table with id %1 not found")).arg(request.id());
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Codification table with id %1 not found")).arg(request.id);
|
||||
ERROR_LOG(m_logger) << ret();
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
return;
|
||||
@@ -110,7 +110,7 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
|
||||
|
||||
if (m_ddsHandler->topicLockMaster()->isLocked(ifs->getData(), m_ddsHandler->exerciseId()))
|
||||
{
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Codification '%1' is used by another user!")).arg(ifs->getData().identifier());
|
||||
Core::FunctionReplyObject ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Codification '%1' is used by another user!")).arg(ifs->getData().identifier);
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -122,7 +122,7 @@ void HandlerCodificationData::onCodificationDataRemoveRequest(const rti::core::S
|
||||
{
|
||||
// delete codification object
|
||||
delete ifs;
|
||||
m_codificationdataObjMap.remove(request.id());
|
||||
m_codificationdataObjMap.remove(request.id);
|
||||
}
|
||||
|
||||
m_ddsHandler->fts()->codificationDataRemoveReply(cookie, ret);
|
||||
|
||||
Reference in new issue
Block a user