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:
34 files changed
+218
-214
No files matched your search
+42
-42
@@ -15,20 +15,20 @@ namespace GuezNasat
|
||||
Database::NasatAircraftParticipant toDb(const NasatAircraftParticipant &dds)
|
||||
{
|
||||
Database::NasatAircraftParticipant ret;
|
||||
ret.id = dds.id();
|
||||
ret.nasatAircraftId = dds.nasatAircraftId();
|
||||
ret.exerciseId = dds.exerciseId();
|
||||
ret.participantId = dds.participantId();
|
||||
ret.id = dds.id;
|
||||
ret.nasatAircraftId = dds.nasatAircraftId;
|
||||
ret.exerciseId = dds.exerciseId;
|
||||
ret.participantId = dds.participantId;
|
||||
return ret;
|
||||
}
|
||||
|
||||
NasatAircraftParticipant fromDb(const Database::NasatAircraftParticipant &db)
|
||||
{
|
||||
NasatAircraftParticipant ret;
|
||||
ret.id(db.id);
|
||||
ret.nasatAircraftId(db.nasatAircraftId);
|
||||
ret.exerciseId(db.exerciseId);
|
||||
ret.participantId(db.participantId);
|
||||
ret.id = db.id;
|
||||
ret.nasatAircraftId = db.nasatAircraftId;
|
||||
ret.exerciseId = db.exerciseId;
|
||||
ret.participantId = db.participantId;
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ HandlerNasatAircraftParticipant::~HandlerNasatAircraftParticipant()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
for (const auto &data : std::as_const(m_nasatAircraftParticipants))
|
||||
m_dts->removeNasatAircraftByKey(data.id());
|
||||
m_dts->removeNasatAircraftByKey(data.id);
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
}
|
||||
|
||||
@@ -59,8 +59,8 @@ bool HandlerNasatAircraftParticipant::init()
|
||||
auto cb = [this](const Database::NasatAircraftParticipant & data)
|
||||
{
|
||||
const auto dds(fromDb(data));
|
||||
DEBUG_LOG(m_logger) << "m_nasatAircraftParticipants.insert(" << dds.id() << ")";
|
||||
m_nasatAircraftParticipants.insert(dds.id(), dds);
|
||||
DEBUG_LOG(m_logger) << "m_nasatAircraftParticipants.insert(" << dds.id << ")";
|
||||
m_nasatAircraftParticipants.insert(dds.id, dds);
|
||||
m_dts->publish(dds);
|
||||
m_mainHandler->handlerParticipant()->onNasatAircraftParticipantCreated(dds);
|
||||
};
|
||||
@@ -133,7 +133,7 @@ void HandlerNasatAircraftParticipant::aircraftRemoved(int nasatAircraftId)
|
||||
while (it != m_nasatAircraftParticipants.end())
|
||||
{
|
||||
const auto &val = it.value();
|
||||
if (val.nasatAircraftId() == nasatAircraftId)
|
||||
if (val.nasatAircraftId == nasatAircraftId)
|
||||
{
|
||||
removeNasatAircraftParticipant(val);
|
||||
it = m_nasatAircraftParticipants.erase(it);
|
||||
@@ -150,8 +150,8 @@ void HandlerNasatAircraftParticipant::participantRemoved(int exerciseId, int par
|
||||
while (it != m_nasatAircraftParticipants.end())
|
||||
{
|
||||
const auto &val = it.value();
|
||||
if (val.participantId() == participantId &&
|
||||
val.exerciseId() == exerciseId)
|
||||
if (val.participantId == participantId &&
|
||||
val.exerciseId == exerciseId)
|
||||
{
|
||||
removeNasatAircraftParticipant(val);
|
||||
it = m_nasatAircraftParticipants.erase(it);
|
||||
@@ -161,7 +161,7 @@ void HandlerNasatAircraftParticipant::participantRemoved(int exerciseId, int par
|
||||
}
|
||||
}
|
||||
|
||||
bool isExerciseStateValid(ExerciseManagement::ExerciseState_def::type state)
|
||||
bool isExerciseStateValid(ExerciseManagement::ExerciseState::type state)
|
||||
{
|
||||
switch (state)
|
||||
{
|
||||
@@ -181,17 +181,17 @@ void HandlerNasatAircraftParticipant::onExerciseChanged(const ExerciseManagement
|
||||
{
|
||||
INFO_LOG(m_logger) << Q_FUNC_INFO << " START" << " , exercise" << exercise << " , modType" << modType;
|
||||
|
||||
const int exId = exercise.id();
|
||||
const int exId = exercise.id;
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
{
|
||||
m_exercises[exId] = exercise;
|
||||
const bool valid = isExerciseStateValid(exercise.state().underlying());
|
||||
const bool valid = isExerciseStateValid(exercise.state);
|
||||
if (!valid)
|
||||
{
|
||||
INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE of exId=" << exId
|
||||
<< " , state=" << exercise.state();
|
||||
<< " , state=" << exercise.state;
|
||||
int cnt = removeNapsOfExercise(exId);
|
||||
INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE of exId=" << exId << " not valid : counter of removed naps=" << cnt;
|
||||
}
|
||||
@@ -200,14 +200,14 @@ void HandlerNasatAircraftParticipant::onExerciseChanged(const ExerciseManagement
|
||||
case DataModification::eModified:
|
||||
{
|
||||
const ExerciseManagement::Exercise &exerciseRef = m_exercises[exId];
|
||||
if (exerciseRef.state() != exercise.state())
|
||||
if (exerciseRef.state != exercise.state)
|
||||
{
|
||||
const bool valid = isExerciseStateValid(exercise.state().underlying());
|
||||
const bool valid = isExerciseStateValid(exercise.state);
|
||||
if (!valid)
|
||||
{
|
||||
INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE change of exId=" << exId
|
||||
<< " , old state=" << exerciseRef.state()
|
||||
<< " , new state=" << exercise.state();
|
||||
<< " , old state=" << exerciseRef.state
|
||||
<< " , new state=" << exercise.state;
|
||||
int cnt = removeNapsOfExercise(exId);
|
||||
INFO_LOG(m_logger) << Q_FUNC_INFO << " STATE change of exId=" << exId << " : counter of removed naps=" << cnt;
|
||||
}
|
||||
@@ -231,15 +231,15 @@ void HandlerNasatAircraftParticipant::removeNasatAircraftParticipant(const Nasat
|
||||
{
|
||||
m_mainHandler->handlerParticipant()->onNasatAircraftParticipantRemoved(val);
|
||||
|
||||
m_db->removeNasatAircraftParticipant(val.id());
|
||||
m_dts->removeNasatAircraftParticipantByKey(val.id());
|
||||
m_db->removeNasatAircraftParticipant(val.id);
|
||||
m_dts->removeNasatAircraftParticipantByKey(val.id);
|
||||
}
|
||||
|
||||
void HandlerNasatAircraftParticipant::onModifyNasatAircraftParticipantRequest(const rti::core::SampleIdentity &cookie,
|
||||
const NasatAircraftParticipant &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onModifyNasatAircraftParticipantRequest: " << request;
|
||||
auto ret = request.id() <= 0 ? createNasatAircraftParticipantRequest(request) : modifyNasatAircraftParticipantRequest(request);
|
||||
auto ret = request.id <= 0 ? createNasatAircraftParticipantRequest(request) : modifyNasatAircraftParticipantRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_fts->modifyNasatAircraftParticipantReply(cookie, ret);
|
||||
@@ -251,50 +251,50 @@ Core::FunctionReplyObject HandlerNasatAircraftParticipant::createNasatAircraftPa
|
||||
Database::NasatAircraftParticipant napDb(toDb(request));
|
||||
napDb.id = 0;
|
||||
if (!m_db->insert(napDb))
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Can not create Aircraft Participant connection - error inserting values in database"));
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not create Aircraft Participant connection - error inserting values in database"));
|
||||
|
||||
|
||||
const auto dds(fromDb(napDb));
|
||||
m_dts->publish(dds);
|
||||
m_nasatAircraftParticipants.insert(dds.id(), dds);
|
||||
m_nasatAircraftParticipants.insert(dds.id, dds);
|
||||
m_mainHandler->handlerParticipant()->onNasatAircraftParticipantCreated(request);
|
||||
|
||||
return Core::FunctionReplyObject(request.id());
|
||||
return Core::FunctionReplyObject(request.id);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject HandlerNasatAircraftParticipant::modifyNasatAircraftParticipantRequest(const NasatAircraftParticipant &request)
|
||||
{
|
||||
auto it = m_nasatAircraftParticipants.find(request.id());
|
||||
auto it = m_nasatAircraftParticipants.find(request.id);
|
||||
if (it == m_nasatAircraftParticipants.end())
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Can not modify Aircraft Participant connection - id %1 not found")).arg(request.id());
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not modify Aircraft Participant connection - id %1 not found")).arg(request.id);
|
||||
|
||||
if (request == *it)
|
||||
return Core::FunctionReplyObject(request.id());
|
||||
return Core::FunctionReplyObject(request.id);
|
||||
|
||||
if ((request.exerciseId() == 0 && request.participantId() == 0) ||
|
||||
request.nasatAircraftId() == 0)
|
||||
if ((request.exerciseId == 0 && request.participantId == 0) ||
|
||||
request.nasatAircraftId == 0)
|
||||
{
|
||||
removeNasatAircraftParticipant(it.value());
|
||||
m_nasatAircraftParticipants.erase(it);
|
||||
return Core::FunctionReplyObject(request.id());
|
||||
return Core::FunctionReplyObject(request.id);
|
||||
}
|
||||
|
||||
Database::NasatAircraftParticipant napDb(toDb(request));
|
||||
if (!m_db->update(napDb))
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Can not modify Aircraft Participant connection - error updating values in database"));
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not modify Aircraft Participant connection - error updating values in database"));
|
||||
|
||||
|
||||
m_mainHandler->handlerParticipant()->onNasatAircraftParticipantRemoved(*it);
|
||||
const auto dds(fromDb(napDb));
|
||||
m_dts->publish(dds);
|
||||
m_nasatAircraftParticipants.insert(dds.id(), dds);
|
||||
m_nasatAircraftParticipants.insert(dds.id, dds);
|
||||
|
||||
|
||||
m_dts->publish(fromDb(napDb));
|
||||
|
||||
|
||||
m_mainHandler->handlerParticipant()->onNasatAircraftParticipantCreated(request);
|
||||
return Core::FunctionReplyObject(request.id());
|
||||
return Core::FunctionReplyObject(request.id);
|
||||
}
|
||||
|
||||
int HandlerNasatAircraftParticipant::removeNapsOfExercise(int exerciseId)
|
||||
@@ -306,15 +306,15 @@ int HandlerNasatAircraftParticipant::removeNapsOfExercise(int exerciseId)
|
||||
|
||||
for (const NasatAircraftParticipant &nap : std::as_const(napsCopy))
|
||||
{
|
||||
if (nap.exerciseId() == exerciseId)
|
||||
if (nap.exerciseId == exerciseId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " nap has to be removed: nap=" << nap;
|
||||
|
||||
NasatAircraftParticipant napToTriggerRemoving;
|
||||
napToTriggerRemoving.id(nap.id());
|
||||
napToTriggerRemoving.exerciseId(0);
|
||||
napToTriggerRemoving.participantId(0);
|
||||
napToTriggerRemoving.nasatAircraftId(0);
|
||||
napToTriggerRemoving.id = nap.id;
|
||||
napToTriggerRemoving.exerciseId = 0;
|
||||
napToTriggerRemoving.participantId = 0;
|
||||
napToTriggerRemoving.nasatAircraftId = 0;
|
||||
modifyNasatAircraftParticipantRequest(napToTriggerRemoving);
|
||||
++count;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user