Migrates OcSituation and ServiceManagement to generated rtiddsgen API
Converts accessor calls to plain member access in osc, oss and obd services.
This commit is contained in:
30 files changed
+1000
-1007
No files matched your search
@@ -64,9 +64,9 @@ bool LicenceHandler::isServiceLicensed(const QString &licenceName) const
|
||||
void LicenceHandler::onGetLicenceRequest(const rti::core::SampleIdentity &cookie,
|
||||
const LicenceRequest &request)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Try to getLicence (from DDS) for '" << request.name() << "' ...";
|
||||
INFO_LOG(m_logger) << "Try to getLicence (from DDS) for '" << request.name << "' ...";
|
||||
|
||||
Core::FunctionReplyObject ret = getLicenceInternal(QString::fromStdString(request.name()));
|
||||
Core::FunctionReplyObject ret = getLicenceInternal(QString::fromStdString(request.name));
|
||||
m_ddsHandler->fts()->getLicenceReply(cookie, ret);
|
||||
|
||||
return;
|
||||
@@ -76,9 +76,9 @@ void LicenceHandler::onGetLicenceRequest(const rti::core::SampleIdentity &cookie
|
||||
void LicenceHandler::onFreeLicenceRequest(const rti::core::SampleIdentity &cookie,
|
||||
const LicenceRequest &request)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Try to freeLicence (from DDS) for '" << request.name() << "' ...";
|
||||
INFO_LOG(m_logger) << "Try to freeLicence (from DDS) for '" << request.name << "' ...";
|
||||
|
||||
Core::FunctionReplyObject ret = freeLicenceInternal(QString::fromStdString(request.name()));
|
||||
Core::FunctionReplyObject ret = freeLicenceInternal(QString::fromStdString(request.name));
|
||||
m_ddsHandler->fts()->freeLicenceReply(cookie, ret);
|
||||
|
||||
return;
|
||||
@@ -327,12 +327,12 @@ ServiceManagement::LicenceInformation LicenceHandler::toDdsData(const LtsLicence
|
||||
{
|
||||
ServiceManagement::LicenceInformation ddsData;
|
||||
|
||||
ddsData.name(data.name.toStdString());
|
||||
ddsData.ignoreMaxCount(data.ignoreMaxCount);
|
||||
ddsData.maxCount(data.maxCount);
|
||||
ddsData.ignoreExpiration(data.ignoreExpiration);
|
||||
ddsData.expiration(data.expiration.toMSecsSinceEpoch());
|
||||
ddsData.refCount(data.licenceRefCount);
|
||||
ddsData.name = data.name.toStdString();
|
||||
ddsData.ignoreMaxCount = data.ignoreMaxCount;
|
||||
ddsData.maxCount = data.maxCount;
|
||||
ddsData.ignoreExpiration = data.ignoreExpiration;
|
||||
ddsData.expiration = data.expiration.toMSecsSinceEpoch();
|
||||
ddsData.refCount = data.licenceRefCount;
|
||||
|
||||
return ddsData;
|
||||
} // end of toDdsData()
|
||||
|
||||
Reference in new issue
Block a user