Migrates remaining proxies to generated rtiddsgen API

Converts accessor calls to plain member access in bld, cmo, gna, hla, whg and wls.
This commit is contained in:
berrux-dev committed 2026-09-21 02:47:26 +02:00
1 parent 3ec4208139
commit 6a8c31b735
34 files changed
+218 -214

No files matched your search

@@ -13,20 +13,20 @@ namespace GuezNasat
Database::NasatAircraft toDb(const NasatAircraft &dds)
{
Database::NasatAircraft ret;
ret.id = dds.id();
ret.nasatId = dds.nasatId();
ret.simulationActive = dds.simulationActive();
ret.name = QString::fromStdString(dds.name());
ret.id = dds.id;
ret.nasatId = dds.nasatId;
ret.simulationActive = dds.simulationActive;
ret.name = QString::fromStdString(dds.name);
return ret;
}
NasatAircraft fromDb(const Database::NasatAircraft &db)
{
NasatAircraft ret;
ret.id(db.id);
ret.nasatId(db.nasatId);
ret.simulationActive(db.simulationActive);
ret.name(db.name.toStdString());
ret.id = db.id;
ret.nasatId = db.nasatId;
ret.simulationActive = db.simulationActive;
ret.name = db.name.toStdString();
return ret;
}
@@ -42,7 +42,7 @@ HandlerNasatAircraft::HandlerNasatAircraft(Initialization *mainHandler)
HandlerNasatAircraft::~HandlerNasatAircraft()
{
for (const auto &data : std::as_const(m_nasatAircrafts))
m_dts->removeNasatAircraftByKey(data.id());
m_dts->removeNasatAircraftByKey(data.id);
}
bool HandlerNasatAircraft::init()
@@ -50,9 +50,9 @@ bool HandlerNasatAircraft::init()
auto cb = [this](const Database::NasatAircraft & data)
{
auto dds(fromDb(data));
dds.simulationActive(false);
dds.simulationActive = false;
emit activateNasatAircraftSimulation(data.nasatId, false);
m_nasatAircrafts[dds.id()] = dds;
m_nasatAircrafts[dds.id] = dds;
m_dts->publish(dds);
};
m_db->select(cb);
@@ -64,7 +64,7 @@ int HandlerNasatAircraft::nasatIdFromNasatAircraftId(int nasatAircraftId) const
auto it = m_nasatAircrafts.find(nasatAircraftId);
if (it == m_nasatAircrafts.end())
return -1;
return it.value().nasatId();
return it.value().nasatId;
}
void HandlerNasatAircraft::simulationStatusChanged(const NasatSimulationStatus &data)
@@ -76,11 +76,11 @@ void HandlerNasatAircraft::flaFluSimulationChanged(int nasatId, bool bSimulation
{
for (NasatAircraft &na : m_nasatAircrafts)
{
if (na.nasatId() != nasatId)
if (na.nasatId != nasatId)
continue;
if (na.simulationActive() == bSimulationActive)
if (na.simulationActive == bSimulationActive)
return;
na.simulationActive(bSimulationActive);
na.simulationActive = bSimulationActive;
m_dts->publish(na);
return;
}
@@ -91,7 +91,7 @@ void HandlerNasatAircraft::onModifyNasatAircraftRequest(const rti::core::SampleI
const NasatAircraft &request)
{
DEBUG_LOG(m_logger) << "onModifyNasatAircraftRequest: " << request;
auto ret = request.id() > 0 ? modifyNasatAircraftRequest(request) : createNasatAircraftRequest(request);
auto ret = request.id > 0 ? modifyNasatAircraftRequest(request) : createNasatAircraftRequest(request);
if (ret.error())
WARNING_LOG(m_logger) << ret();
m_fts->modifyNasatAircraftReply(cookie, ret);
@@ -104,7 +104,7 @@ Core::FunctionReplyObject HandlerNasatAircraft::createNasatAircraftRequest(const
naDb.id = 0;
if (!m_db->insert(naDb))
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Can not create Aircraft information - error inserting values in database"));
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not create Aircraft information - error inserting values in database"));
emit activateNasatAircraftSimulation(naDb.nasatId, naDb.simulationActive);
@@ -113,48 +113,48 @@ Core::FunctionReplyObject HandlerNasatAircraft::createNasatAircraftRequest(const
m_dts->publish(nasatAircraftData);
m_nasatAircrafts[naDb.id] = nasatAircraftData;
return Core::FunctionReplyObject(request.id());
return Core::FunctionReplyObject(request.id);
}
Core::FunctionReplyObject HandlerNasatAircraft::modifyNasatAircraftRequest(const NasatAircraft &request)
{
auto it = m_nasatAircrafts.find(request.id());
auto it = m_nasatAircrafts.find(request.id);
if (it == m_nasatAircrafts.end())
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Can not modify Aircraft information - id %1 not found")).arg(request.id());
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not modify Aircraft information - id %1 not found")).arg(request.id);
if (request.nasatId() == 0 && request.name().size() == 0)
if (request.nasatId == 0 && request.name.size() == 0)
{
if (!m_db->removeNasatAircraft(request.id()))
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Can not remove Aircraft information - error removing values from database"));
if (!m_db->removeNasatAircraft(request.id))
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not remove Aircraft information - error removing values from database"));
m_nasatAircrafts.erase(it);
m_mainHandler->nasatAircraftParticipant()->aircraftRemoved(request.id());
m_dts->removeNasatAircraftByKey(request.id());
if (it.value().simulationActive())
emit activateNasatAircraftSimulation(request.nasatId(), false);
return Core::FunctionReplyObject(request.id());
m_mainHandler->nasatAircraftParticipant()->aircraftRemoved(request.id);
m_dts->removeNasatAircraftByKey(request.id);
if (it.value().simulationActive)
emit activateNasatAircraftSimulation(request.nasatId, false);
return Core::FunctionReplyObject(request.id);
}
const int oldNasatId = it.value().nasatId();
const int oldNasatId = it.value().nasatId;
Database::NasatAircraft naDb(toDb(request));
if (!m_db->update(naDb))
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Can not modify Aircraft information - error updating values in database"));
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not modify Aircraft information - error updating values in database"));
const bool simulationChanged = it.value().simulationActive() != request.simulationActive();
const bool simulationChanged = it.value().simulationActive != request.simulationActive;
const auto nasatAircraftData(fromDb(naDb));
m_dts->publish(nasatAircraftData);
it.value() = nasatAircraftData;
if (request.nasatId() != oldNasatId)
if (request.nasatId != oldNasatId)
emit nasatIdChanged(oldNasatId, naDb.nasatId);
if (simulationChanged)
emit activateNasatAircraftSimulation(naDb.nasatId, request.simulationActive());
emit activateNasatAircraftSimulation(naDb.nasatId, request.simulationActive);
return Core::FunctionReplyObject(request.id());
return Core::FunctionReplyObject(request.id);
}