Migrates Participant and OperatorManagement to generated rtiddsgen API
Converts accessor calls to plain member access in ppm and opm services and plugins.
This commit is contained in:
36 files changed
+513
-529
No files matched your search
+12
-12
@@ -53,10 +53,10 @@ void HandlerActiveApps::cleanupOperator(int operatorId)
|
||||
while (it != m_activeApps.end())
|
||||
{
|
||||
const ActiveApp &item = it.value();
|
||||
if (item.operatorId() == operatorId)
|
||||
if (item.operatorId == operatorId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "cleanupOperator operatorId: " << operatorId << " ActiveApp=" << item;
|
||||
dtsPtr->removeActiveAppByKey(item.id());
|
||||
dtsPtr->removeActiveAppByKey(item.id);
|
||||
it = m_activeApps.erase(it);
|
||||
}
|
||||
else
|
||||
@@ -70,7 +70,7 @@ void HandlerActiveApps::cleanup()
|
||||
{
|
||||
auto dtsPtr = dts();
|
||||
for (const ActiveApp &item : qAsConst(m_activeApps))
|
||||
dtsPtr->removeActiveAppByKey(item.id());
|
||||
dtsPtr->removeActiveAppByKey(item.id);
|
||||
m_activeApps.clear();
|
||||
}
|
||||
|
||||
@@ -79,10 +79,10 @@ void HandlerActiveApps::removeZombieEntry(const ActiveApp &request)
|
||||
for (auto it = m_activeApps.begin(); it != m_activeApps.end(); ++it)
|
||||
{
|
||||
const ActiveApp &item = it.value();
|
||||
if ((item.operatorId() == request.operatorId()) &&
|
||||
(item.screenId() == request.screenId()))
|
||||
if ((item.operatorId == request.operatorId) &&
|
||||
(item.screenId == request.screenId))
|
||||
{
|
||||
dts()->removeActiveAppByKey(item.id());
|
||||
dts()->removeActiveAppByKey(item.id);
|
||||
m_activeApps.erase(it);
|
||||
break;
|
||||
}
|
||||
@@ -102,13 +102,13 @@ void HandlerActiveApps::onActiveAppUpdateRequest(const rti::core::SampleIdentity
|
||||
|
||||
Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const ActiveApp &request)
|
||||
{
|
||||
const int reqId = request.id();
|
||||
const int reqId = request.id;
|
||||
|
||||
// handle 'remove' :
|
||||
if (request.appId() < 0) // LtsSession::App::Login is -1 but ok
|
||||
if (request.appId < 0) // LtsSession::App::Login is -1 but ok
|
||||
{
|
||||
Core::RemoveElementRequest removeRequest;
|
||||
removeRequest.id(reqId);
|
||||
removeRequest.id = reqId;
|
||||
return activeAppRemoveRequest(removeRequest);
|
||||
}
|
||||
// : handle 'remove'
|
||||
@@ -122,7 +122,7 @@ Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const Active
|
||||
removeZombieEntry(request);
|
||||
|
||||
it = m_activeApps.insert(++s_idCounter, request);
|
||||
it.value().id(s_idCounter);
|
||||
it.value().id = s_idCounter;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -137,7 +137,7 @@ Core::FunctionReplyObject HandlerActiveApps::activeAppUpdateRequest(const Active
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "onActiveAppUpdateRequest - publish new data: " << it.value();
|
||||
dts()->publish(it.value());
|
||||
return Core::FunctionReplyObject(it.value().id());
|
||||
return Core::FunctionReplyObject(it.value().id);
|
||||
}
|
||||
|
||||
void HandlerActiveApps::onActiveAppRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
@@ -152,7 +152,7 @@ void HandlerActiveApps::onActiveAppRemoveRequest(const rti::core::SampleIdentity
|
||||
|
||||
Core::FunctionReplyObject HandlerActiveApps::activeAppRemoveRequest(const Core::RemoveElementRequest &request)
|
||||
{
|
||||
const int reqId = request.id();
|
||||
const int reqId = request.id;
|
||||
if (m_activeApps.remove(reqId) <= 0)
|
||||
return Core::FunctionReplyObject(reqId, tr_lts("dds", "ActiveApp with id %1 not found")).arg(reqId);
|
||||
|
||||
|
||||
Reference in new issue
Block a user