lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes .IDL warnings: multiple enum definitons and builtin-type collisions

Browse Source
This commit is contained in:
torsten committed 2026-09-14 15:45:58 +00:00
1 parent eb02c1f001
commit be912de9d6
135 files changed
+1122 -1122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/handler_configure_alarms.cpp
+6 -6
View File
@@ -103,7 +103,7 @@ void HandlerConfigureAlarms::removeAlarmConfig(int operatorId,
<< " eventTypeId=" << i.value().eventTypeId.underlying();
if ((operatorId == i.value().operatorId)
&& (participantId == i.value().participantId)
&& (eventTypeId == ProjectDataManagement::EventType_def::Unknown || eventTypeId == i.value().eventTypeId.underlying()))
&& (eventTypeId == ProjectDataManagement::PdmEventType_def::Unknown || eventTypeId == i.value().eventTypeId.underlying()))
{
const int key = i.key();
DEBUG_LOG(m_logger) << "found alarm to remove: " << key << ", eventTypeId: " << eventTypeId;
@@ -256,10 +256,10 @@ void HandlerConfigureAlarms::onEventChanged(const ExerciseEventManagement::Event
<< " friendyFire =" << friendlyFireBool;*/
if ((alarm.eventTypeId == eventDatalocal.eventTypeId().underlying()) ||
(alarm.eventTypeId == ProjectDataManagement::EventType_def::FriendlyFire && friendlyFireBool))
(alarm.eventTypeId == ProjectDataManagement::PdmEventType_def::FriendlyFire && friendlyFireBool))
{
if (friendlyFireBool && eventDatalocal.eventTypeId() == ProjectDataManagement::EventType_def::FireEvent)
eventDatalocal.eventTypeId(ProjectDataManagement::EventType_def::FriendlyFire);
if (friendlyFireBool && eventDatalocal.eventTypeId() == ProjectDataManagement::PdmEventType_def::FireEvent)
eventDatalocal.eventTypeId(ProjectDataManagement::PdmEventType_def::FriendlyFire);
participants.clear();
if (alarm.participantId.isValid())
@@ -316,8 +316,8 @@ void HandlerConfigureAlarms::sendWindow(const ExerciseEventManagement::Event &ev
wi.time(eventData.sampleTime());
wi.eventId(eventData.id());
if (eventData.eventTypeId() == ProjectDataManagement::EventType_def::CrossGlobalBorderline
|| eventData.eventTypeId() == ProjectDataManagement::EventType_def::CrossLocalBorderline)
if (eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline
|| eventData.eventTypeId() == ProjectDataManagement::PdmEventType_def::CrossLocalBorderline)
{
if (eventObject.contains(QStringLiteral("Global")))
obj[QStringLiteral("Global")] = eventObject.value(QStringLiteral("Global"));