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
@@ -51,9 +51,9 @@ int ExercisesHandler::findEquipmentNumber(int participantId, int exerciseId)
|
||||
|
||||
bool ExercisesHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipmentMessageRequest &request)
|
||||
{
|
||||
if (request.equipmentNumbers().size() == 0)
|
||||
if (request.equipmentNumbers.size() == 0)
|
||||
return false;
|
||||
const int equipmentNumber = request.equipmentNumbers().at(0);
|
||||
const int equipmentNumber = request.equipmentNumbers.at(0);
|
||||
auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.cend())
|
||||
{
|
||||
@@ -67,9 +67,9 @@ bool ExercisesHandler::sendEquipmentMessage(const TrainingAreaBase::SendEquipmen
|
||||
|
||||
bool ExercisesHandler::sendOcEquipmentMessage(const OcSituationServer::SendEquipmentMessageRequest &request)
|
||||
{
|
||||
if (request.equipmentNumbers().size() == 0)
|
||||
if (request.equipmentNumbers.size() == 0)
|
||||
return false;
|
||||
const int equipmentNumber = request.equipmentNumbers().at(0);
|
||||
const int equipmentNumber = request.equipmentNumbers.at(0);
|
||||
auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.cend())
|
||||
{
|
||||
@@ -104,7 +104,7 @@ void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManage
|
||||
|
||||
for (auto it = m_equipNo2ExerciseId.begin(); it != m_equipNo2ExerciseId.end(); )
|
||||
{
|
||||
if (it.value() != data.exerciseId())
|
||||
if (it.value() != data.exerciseId)
|
||||
++it;
|
||||
else
|
||||
it = m_equipNo2ExerciseId.erase(it);
|
||||
@@ -114,13 +114,13 @@ void ExercisesHandler::onEquipmentExerciseMappingChanged(const ParticipantManage
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
for (const ParticipantManagement::Equipment2ParticipantId &e2p : data.mapping())
|
||||
for (const ParticipantManagement::Equipment2ParticipantId &e2p : data.mapping)
|
||||
{
|
||||
m_equipNo2ExerciseId[e2p.equipmentNumber()] = data.exerciseId();
|
||||
m_equipNo2ExerciseId[e2p.equipmentNumber] = data.exerciseId;
|
||||
QPair<int,int> exePart;
|
||||
exePart.first = data.exerciseId();
|
||||
exePart.second = e2p.participantId();
|
||||
m_participant2EquipNumber[exePart] = e2p.equipmentNumber();
|
||||
exePart.first = data.exerciseId;
|
||||
exePart.second = e2p.participantId;
|
||||
m_participant2EquipNumber[exePart] = e2p.equipmentNumber;
|
||||
}
|
||||
break;
|
||||
case DataModification::eRemoved:
|
||||
@@ -134,7 +134,7 @@ void ExercisesHandler::onEquipmentMessageChanged(const TrainingAreaBase::Equipme
|
||||
if (modType != DataModification::eAdded &&
|
||||
modType != DataModification::eModified)
|
||||
return;
|
||||
const int equipmentNumber = data.equipmentNumber();
|
||||
const int equipmentNumber = data.equipmentNumber;
|
||||
const auto it = m_equipNo2ExerciseId.constFind(equipmentNumber);
|
||||
if (it == m_equipNo2ExerciseId.constEnd())
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user