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
@@ -85,22 +85,22 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
|
||||
const SanNineLinerModifyRequest &request)
|
||||
{
|
||||
Database::SanNineLiner data;
|
||||
data.id = request.id();
|
||||
data.lastModified = request.lastModified();
|
||||
data.position = QPointF(request.line1_position().lon(), request.line1_position().lat());
|
||||
data.id = request.id;
|
||||
data.lastModified = request.lastModified;
|
||||
data.position = QPointF(request.line1_position.lon, request.line1_position.lat);
|
||||
|
||||
LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(request.line1_position().lon(),
|
||||
request.line1_position().lat()));
|
||||
LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(request.line1_position.lon,
|
||||
request.line1_position.lat));
|
||||
data.positionXM = coord.x;
|
||||
data.positionYM = coord.y;
|
||||
|
||||
data.radioFrequencySuffixCallsign = QString::fromStdString(request.line2_radioFrequencyCallSignSuffix());
|
||||
data.radioFrequencySuffixCallsign = QString::fromStdString(request.line2_radioFrequencyCallSignSuffix);
|
||||
|
||||
INFO_LOG(m_logger) << "lines: " << request.lines();
|
||||
INFO_LOG(m_logger) << "lines: " << request.lines;
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectSanNineLiner *ifs = nullptr;
|
||||
if (request.id() <= 0)
|
||||
if (request.id <= 0)
|
||||
{
|
||||
ifs = new ObjectSanNineLiner(m_ddsHandler, m_db);
|
||||
ret = ifs->createObject(data);
|
||||
@@ -119,7 +119,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
|
||||
}
|
||||
else
|
||||
{
|
||||
data.id = request.id();
|
||||
data.id = request.id;
|
||||
ifs = m_mapObjectSanNineLiner.value(data.id);
|
||||
ret = ifs->updateObject(data);
|
||||
}
|
||||
@@ -139,7 +139,7 @@ void HandlerSanNineLiner::onSanNineLinerModifyRequest(const rti::core::SampleIde
|
||||
// line3 - line9 in object_san_category_line
|
||||
INFO_LOG(m_logger) << "data.id: " << data.id;
|
||||
|
||||
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines(), data.id);
|
||||
QVector<Database::SanCategoryLine> linesCategory = SanCategoryLine::fromJson(request.lines, data.id);
|
||||
INFO_LOG(m_logger) << "LinesCategory count: " << linesCategory.count();
|
||||
|
||||
for (Database::SanCategoryLine cl : qAsConst(linesCategory))
|
||||
@@ -165,22 +165,22 @@ void HandlerSanNineLiner::onSanNineLinerRemoveRequest(const rti::core::SampleIde
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
|
||||
ObjectSanNineLiner *ifs = m_mapObjectSanNineLiner.value(request.id());
|
||||
ObjectSanNineLiner *ifs = m_mapObjectSanNineLiner.value(request.id);
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
if (!ifs)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "SanNineLiner with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "SanNineLiner with id %1 not found")).arg(request.id);
|
||||
m_ddsHandler->fts()->sanNineLinerRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!m_db->removeCategoryLinesPerNineLiner(request.id()))
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "SanCategoryLine with id %1 not found")).arg(request.id());
|
||||
if (!m_db->removeCategoryLinesPerNineLiner(request.id))
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "SanCategoryLine with id %1 not found")).arg(request.id);
|
||||
else
|
||||
{
|
||||
ifs->removeObject();
|
||||
m_mapObjectSanNineLiner.remove(request.id());
|
||||
m_mapObjectSanNineLiner.remove(request.id);
|
||||
}
|
||||
|
||||
m_ddsHandler->fts()->sanNineLinerRemoveReply(cookie, ret);
|
||||
|
||||
Reference in new issue
Block a user