Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1718 files changed
+126739
-18495
No files matched your search
+13
-13
@@ -79,20 +79,20 @@ void ExerciseParticipantHandler::registerParticipant(qint32 participantId,
|
||||
ParticipantManagement::RegisterParticipantRequest req;
|
||||
req.assignState = assignState;
|
||||
|
||||
if (equipNo.is_set())
|
||||
if (equipNo.has_value())
|
||||
req.equipmentNumber = equipNo.get();
|
||||
if (identification.is_set())
|
||||
if (identification.has_value())
|
||||
req.identification = identification.get().toStdString();
|
||||
if (info.is_set())
|
||||
if (info.has_value())
|
||||
req.info = info.get().toStdString();
|
||||
if (!equipNo.is_set() || !info.is_set() || !identification.is_set())
|
||||
if (!equipNo.has_value() || !info.has_value() || !identification.has_value())
|
||||
{
|
||||
const auto participant = m_ddsHandlerExercise->ppmDtc()->participant(participantId);
|
||||
if (!equipNo.is_set() && participant.equipmentNumber.is_set())
|
||||
if (!equipNo.has_value() && participant.equipmentNumber.has_value())
|
||||
req.equipmentNumber = participant.equipmentNumber.get();
|
||||
if (!info.is_set())
|
||||
if (!info.has_value())
|
||||
req.info = participant.info;
|
||||
if (!identification.is_set())
|
||||
if (!identification.has_value())
|
||||
req.identification = participant.identification;
|
||||
}
|
||||
req.participantId = participantId;
|
||||
@@ -125,7 +125,7 @@ void ExerciseParticipantHandler::onRegisterParticipantReply(const ParticipantMan
|
||||
void ExerciseParticipantHandler::participantAdded(const ParticipantManagement::Participant &participant)
|
||||
{
|
||||
|
||||
if (!participant.equipmentNumber.is_set() || participant.equipmentNumber.get() == 0)
|
||||
if (!participant.equipmentNumber.has_value() || participant.equipmentNumber.get() == 0)
|
||||
{
|
||||
|
||||
INFO_LOG(m_logger) << "New participant but no equipment number - ignoring";
|
||||
@@ -150,7 +150,7 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement
|
||||
{
|
||||
|
||||
|
||||
if (!participant.equipmentNumber.is_set() || participant.equipmentNumber.get() == 0)
|
||||
if (!participant.equipmentNumber.has_value() || participant.equipmentNumber.get() == 0)
|
||||
{
|
||||
|
||||
return;
|
||||
@@ -161,18 +161,18 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement
|
||||
}
|
||||
|
||||
|
||||
if (participant.equipmentNumber.is_set() && itEquipNumber.value() == participant.equipmentNumber.get())
|
||||
if (participant.equipmentNumber.has_value() && itEquipNumber.value() == participant.equipmentNumber.get())
|
||||
{
|
||||
|
||||
return;
|
||||
}
|
||||
if (participant.equipmentNumber.is_set())
|
||||
if (participant.equipmentNumber.has_value())
|
||||
{
|
||||
INFO_LOG(m_logger) << "Participant with id " << participant.id << " changed its equipment number from "
|
||||
<< itEquipNumber.value() << " to " << participant.equipmentNumber.get();
|
||||
}
|
||||
|
||||
if (participant.equipmentNumber.is_set() && participant.equipmentNumber.get() == 0)
|
||||
if (participant.equipmentNumber.has_value() && participant.equipmentNumber.get() == 0)
|
||||
{
|
||||
|
||||
removeParticipant(participant.id, participant.equipmentNumber.get());
|
||||
@@ -181,7 +181,7 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement
|
||||
|
||||
|
||||
removeParticipant(itEquipNumber.key(), itEquipNumber.value());
|
||||
if (participant.equipmentNumber.is_set())
|
||||
if (participant.equipmentNumber.has_value())
|
||||
addParticipant(participant.id, participant.equipmentNumber.get());
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user