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

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

No files matched your search

@@ -110,7 +110,7 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
}
case EventType:
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::EventType>(alarmConfig.eventTypeId()));
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(alarmConfig.eventTypeId()));
case MessageWindow:
return alarmConfig.messageWindow() ? tr("Yes") : tr("No");
case SetMarker:
@@ -84,7 +84,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
if (role == Qt::BackgroundRole)
{
if (notificationEx.eventType() == ProjectDataManagement::EventType::Alarm)
if (notificationEx.eventType() == ProjectDataManagement::PdmEventType::Alarm)
return QColor(Qt::red);
return QVariant();
}
@@ -100,7 +100,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
return notificationEx.equipmentNumber;
break;
case Incident:
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::EventType>(notificationEx.eventTypeId));
return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(notificationEx.eventTypeId));
case Hierarchie:
return m_ppmDtc->hierarchyFromParticipant(notificationEx.participantId);
case ParticipantId:
@@ -142,7 +142,7 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
notification.equipmentNumber = data.equipmentNumber();
if (data.participantId().has_value())
notification.participantId = data.participantId().value();
notification.eventTypeId = static_cast<ProjectDataManagement::EventType>(data.eventType());
notification.eventTypeId = static_cast<ProjectDataManagement::PdmEventType>(data.eventType());
if (data.aesId().has_value())
notification.aesId = data.aesId().value();
const int global = propertieJsonObj[QStringLiteral("Global")].toInt();
@@ -21,7 +21,7 @@ struct NotificationEx : public AlarmManagement::Notification
int equipmentNumber = 0;
int participantId = 0;
int aesId = 0;
ProjectDataManagement::EventType eventTypeId = ProjectDataManagement::EventType::Unknown;
ProjectDataManagement::PdmEventType eventTypeId = ProjectDataManagement::PdmEventType::Unknown;
NotificationEx() = default;