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
+10
-10
@@ -57,7 +57,7 @@ bool HandlerParticipantData::init()
|
||||
// Position in ParticipantsPositionMap eintragen
|
||||
auto cbParticipantPos = [this](const ParticipantManagement::ParticipantPosition &participantPos)
|
||||
{
|
||||
m_participantsPositionMap.insert(participantPos.participantId(), participantPos.roomId());
|
||||
m_participantsPositionMap.insert(participantPos.participantId, participantPos.roomId);
|
||||
};
|
||||
m_dtc->participantPositions(cbParticipantPos);
|
||||
|
||||
@@ -88,12 +88,12 @@ QMap<int, int> HandlerParticipantData::getAllAssignedParticipants() const
|
||||
|
||||
void HandlerParticipantData::onParticipantChanged(const ParticipantManagement::Participant &data, DataModification modType)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onParticipantChanged() participantId:" << data.id();
|
||||
INFO_LOG(m_logger) << "onParticipantChanged() participantId:" << data.id;
|
||||
|
||||
if (modType != DataModification::eRemoved && data.equipmentNumber().is_set())
|
||||
m_partId2EquipNoMap.insert(data.id(), data.equipmentNumber().get());
|
||||
if (modType != DataModification::eRemoved && data.equipmentNumber.is_set())
|
||||
m_partId2EquipNoMap.insert(data.id, data.equipmentNumber.get());
|
||||
else
|
||||
m_partId2EquipNoMap.remove(data.id());
|
||||
m_partId2EquipNoMap.remove(data.id);
|
||||
|
||||
if (m_logger.isDebugEnabled())
|
||||
{
|
||||
@@ -107,23 +107,23 @@ void HandlerParticipantData::onParticipantChanged(const ParticipantManagement::P
|
||||
|
||||
void HandlerParticipantData::onParticipantPositionChanged(const ParticipantManagement::ParticipantPosition &data, DataModification modType)
|
||||
{
|
||||
const int newRoomId = data.roomId();
|
||||
const int newRoomId = data.roomId;
|
||||
// get reference to room (will be created if not exist)
|
||||
int &roomId = m_participantsPositionMap[data.participantId()];
|
||||
int &roomId = m_participantsPositionMap[data.participantId];
|
||||
// remember old room
|
||||
const int oldRoomId = roomId;
|
||||
// assing new room
|
||||
roomId = modType == DataModification::eRemoved ? 0 : newRoomId;
|
||||
if (newRoomId != oldRoomId)
|
||||
emit participantPositionChanged(oldRoomId, newRoomId, data.participantId());
|
||||
emit participantPositionChanged(oldRoomId, newRoomId, data.participantId);
|
||||
|
||||
INFO_LOG(m_logger) << "onParticipantPositionChanged()"
|
||||
<< " oldRoomId: " << oldRoomId
|
||||
<< " newRoomId: " << newRoomId
|
||||
<< " participantId: " << data.participantId();
|
||||
<< " participantId: " << data.participantId;
|
||||
|
||||
if (modType == DataModification::eRemoved)
|
||||
m_participantsPositionMap.remove(data.participantId());
|
||||
m_participantsPositionMap.remove(data.participantId);
|
||||
|
||||
} // end of onParticipantPositionChanged()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user