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

@@ -72,8 +72,8 @@ void CrossBorderlineFilter::updateFilterString()
}
m_filterString = QStringLiteral(" WHEN event_type_id = %1 OR event_type_id = %2")
.arg(int(ProjectDataManagement::EventType_def::CrossLocalBorderline))
.arg(int(ProjectDataManagement::EventType_def::CrossGlobalBorderline));
.arg(int(ProjectDataManagement::PdmEventType_def::CrossLocalBorderline))
.arg(int(ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline));
if (m_attributes[CrossBorderlineEventFactory::s_global].isEmpty() &&
m_attributes[CrossBorderlineEventFactory::s_sampleTime].isEmpty())
@@ -477,7 +477,7 @@ void TimelineDialog::onDebugCreateFakeEvent()
}
m_model->onLiveEvent(ExerciseEventManagement::Event(uniqueId, start,
ProjectDataManagement::EventType(static_cast<ProjectDataManagement::EventType::inner_enum>(typeId)),
ProjectDataManagement::PdmEventType(static_cast<ProjectDataManagement::PdmEventType::inner_enum>(typeId)),
participantId, partyId, eqId, te->toPlainText().toStdString(), {}));
});
@@ -608,9 +608,9 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
auto updateItem = [this, &properties, &eemEvent](Item &i, Track &t)
{
int type = (int)eemEvent.eventTypeId().underlying();
if (type == ProjectDataManagement::EventType_def::CameraVideo
|| type == ProjectDataManagement::EventType_def::RadioTvc
|| type == ProjectDataManagement::EventType_def::RadioCnr)
if (type == ProjectDataManagement::PdmEventType_def::CameraVideo
|| type == ProjectDataManagement::PdmEventType_def::RadioTvc
|| type == ProjectDataManagement::PdmEventType_def::RadioCnr)
{
int duration = properties[QStringLiteral("duration")].toInt(0);
@@ -722,8 +722,8 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent)
EventType eventType = static_cast<EventType>(static_cast<int>(eemEvent.eventTypeId().underlying()));
if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::EventType_def::CrossGlobalBorderline ||
eemEvent.eventTypeId().underlying() == ProjectDataManagement::EventType_def::CrossLocalBorderline)
if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline ||
eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType_def::CrossLocalBorderline)
eventType = EventType::CrossBorderline;
EventItemPtr eventItem;
@@ -13,115 +13,115 @@ QString eventTypeString(EventType eventType)
switch (eventType)
{
case EventType::Hit:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Hit);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Hit);
case EventType::WeaponAssignment:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::WeaponAssignment);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::WeaponAssignment);
case EventType::BiteMessage:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::BiteMessage);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::BiteMessage);
case EventType::FireEvent:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::FireEvent);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FireEvent);
case EventType::HitBuilding:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitBuilding);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitBuilding);
case EventType::Manipulation:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Manipulation);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Manipulation);
case EventType::CameraVideo:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::CameraVideo);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::CameraVideo);
case EventType::RadioCnr:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::RadioCnr);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::RadioCnr);
case EventType::RadioTvc:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::RadioTvc);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::RadioTvc);
case EventType::HitEffectSimulation:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitEffectSimulation);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitEffectSimulation);
case EventType::HitMine:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitMine);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitMine);
case EventType::HitN:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitN);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitN);
case EventType::HitC:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitC);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitC);
case EventType::EnterDangerArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EnterDangerArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterDangerArea);
case EventType::LeaveDangerArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::LeaveDangerArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveDangerArea);
case EventType::EnterMineArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EnterMineArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterMineArea);
case EventType::LeaveMineArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::LeaveMineArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveMineArea);
case EventType::CrossBorderline:
return QCoreApplication::translate("EventType", "CrossBorderline");
case EventType::EnterFunctionalArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EnterFunctionalArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterFunctionalArea);
case EventType::LeaveFunctionalArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::LeaveFunctionalArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea);
case EventType::EnterNuclear:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EnterNuclear);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterNuclear);
case EventType::LeaveNuclear:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::LeaveNuclear);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveNuclear);
case EventType::HitB:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitB);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitB);
case EventType::FriendlyFire:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::FriendlyFire);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FriendlyFire);
case EventType::HitGasPipe:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::HitGasPipe);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitGasPipe);
case EventType::MineArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::MineArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::MineArea);
case EventType::NContamination:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::NContamination);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::NContamination);
case EventType::BCContamination:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::BCContamination);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::BCContamination);
case EventType::DangerArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::DangerArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::DangerArea);
case EventType::FunctionalArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::FunctionalArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FunctionalArea);
case EventType::MineCorridor:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::MineCorridor);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::MineCorridor);
case EventType::Borderline:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Borderline);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Borderline);
case EventType::TechnicalArea:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::TechnicalArea);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::TechnicalArea);
case EventType::GasPipe:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::GasPipe);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::GasPipe);
case EventType::Sanitation:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Sanitation);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Sanitation);
case EventType::EquipmentErrorReport:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EquipmentErrorReport);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EquipmentErrorReport);
case EventType::EmergencyCall:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::EmergencyCall);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EmergencyCall);
case EventType::Marker:
return QCoreApplication::translate("EventType", "Marker");
@@ -131,7 +131,7 @@ QString eventTypeString(EventType eventType)
case EventType::Unknown:
default:
return ProjectDataManagement::toString(ProjectDataManagement::EventType_def::Unknown);
return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Unknown);
}
Q_UNREACHABLE();
}
@@ -191,8 +191,8 @@ EventType toEventType(int eventType)
case EventType::LeaveMineArea:
return EventType::LeaveMineArea;
case ProjectDataManagement::EventType_def::CrossLocalBorderline:
case ProjectDataManagement::EventType_def::CrossGlobalBorderline:
case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline:
case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline:
return EventType::CrossBorderline;
case EventType::EnterFunctionalArea:
@@ -10,46 +10,46 @@ namespace Timeline
enum EventType
{
Unknown = ProjectDataManagement::EventType_def::Unknown,
Hit = ProjectDataManagement::EventType_def::Hit,
WeaponAssignment = ProjectDataManagement::EventType_def::WeaponAssignment,
BiteMessage = ProjectDataManagement::EventType_def::BiteMessage,
FireEvent = ProjectDataManagement::EventType_def::FireEvent,
HitBuilding = ProjectDataManagement::EventType_def::HitBuilding,
Manipulation = ProjectDataManagement::EventType_def::Manipulation,
CameraVideo = ProjectDataManagement::EventType_def::CameraVideo,
RadioCnr = ProjectDataManagement::EventType_def::RadioCnr,
RadioTvc = ProjectDataManagement::EventType_def::RadioTvc,
HitEffectSimulation = ProjectDataManagement::EventType_def::HitEffectSimulation,
HitMine = ProjectDataManagement::EventType_def::HitMine,
HitN = ProjectDataManagement::EventType_def::HitN,
HitC = ProjectDataManagement::EventType_def::HitC,
EnterDangerArea = ProjectDataManagement::EventType_def::EnterDangerArea,
LeaveDangerArea = ProjectDataManagement::EventType_def::LeaveDangerArea,
EnterMineArea = ProjectDataManagement::EventType_def::EnterMineArea,
LeaveMineArea = ProjectDataManagement::EventType_def::LeaveMineArea,
CrossBorderline = ProjectDataManagement::EventType_def::CrossLocalBorderline,
Unknown = ProjectDataManagement::PdmEventType_def::Unknown,
Hit = ProjectDataManagement::PdmEventType_def::Hit,
WeaponAssignment = ProjectDataManagement::PdmEventType_def::WeaponAssignment,
BiteMessage = ProjectDataManagement::PdmEventType_def::BiteMessage,
FireEvent = ProjectDataManagement::PdmEventType_def::FireEvent,
HitBuilding = ProjectDataManagement::PdmEventType_def::HitBuilding,
Manipulation = ProjectDataManagement::PdmEventType_def::Manipulation,
CameraVideo = ProjectDataManagement::PdmEventType_def::CameraVideo,
RadioCnr = ProjectDataManagement::PdmEventType_def::RadioCnr,
RadioTvc = ProjectDataManagement::PdmEventType_def::RadioTvc,
HitEffectSimulation = ProjectDataManagement::PdmEventType_def::HitEffectSimulation,
HitMine = ProjectDataManagement::PdmEventType_def::HitMine,
HitN = ProjectDataManagement::PdmEventType_def::HitN,
HitC = ProjectDataManagement::PdmEventType_def::HitC,
EnterDangerArea = ProjectDataManagement::PdmEventType_def::EnterDangerArea,
LeaveDangerArea = ProjectDataManagement::PdmEventType_def::LeaveDangerArea,
EnterMineArea = ProjectDataManagement::PdmEventType_def::EnterMineArea,
LeaveMineArea = ProjectDataManagement::PdmEventType_def::LeaveMineArea,
CrossBorderline = ProjectDataManagement::PdmEventType_def::CrossLocalBorderline,
EnterFunctionalArea = ProjectDataManagement::EventType_def::EnterFunctionalArea,
LeaveFunctionalArea = ProjectDataManagement::EventType_def::LeaveFunctionalArea,
EnterNuclear = ProjectDataManagement::EventType_def::EnterNuclear,
LeaveNuclear = ProjectDataManagement::EventType_def::LeaveNuclear,
EnterFunctionalArea = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea,
LeaveFunctionalArea = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea,
EnterNuclear = ProjectDataManagement::PdmEventType_def::EnterNuclear,
LeaveNuclear = ProjectDataManagement::PdmEventType_def::LeaveNuclear,
HitB = ProjectDataManagement::EventType_def::HitB,
FriendlyFire = ProjectDataManagement::EventType_def::FriendlyFire,
HitGasPipe = ProjectDataManagement::EventType_def::HitGasPipe,
MineArea = ProjectDataManagement::EventType_def::MineArea,
NContamination = ProjectDataManagement::EventType_def::NContamination,
BCContamination = ProjectDataManagement::EventType_def::BCContamination,
DangerArea = ProjectDataManagement::EventType_def::DangerArea,
FunctionalArea = ProjectDataManagement::EventType_def::FunctionalArea,
MineCorridor = ProjectDataManagement::EventType_def::MineCorridor,
Borderline = ProjectDataManagement::EventType_def::Borderline,
TechnicalArea = ProjectDataManagement::EventType_def::TechnicalArea,
GasPipe = ProjectDataManagement::EventType_def::GasPipe,
Sanitation = ProjectDataManagement::EventType_def::Sanitation,
EquipmentErrorReport = ProjectDataManagement::EventType_def::EquipmentErrorReport,
EmergencyCall = ProjectDataManagement::EventType_def::EmergencyCall,
HitB = ProjectDataManagement::PdmEventType_def::HitB,
FriendlyFire = ProjectDataManagement::PdmEventType_def::FriendlyFire,
HitGasPipe = ProjectDataManagement::PdmEventType_def::HitGasPipe,
MineArea = ProjectDataManagement::PdmEventType_def::MineArea,
NContamination = ProjectDataManagement::PdmEventType_def::NContamination,
BCContamination = ProjectDataManagement::PdmEventType_def::BCContamination,
DangerArea = ProjectDataManagement::PdmEventType_def::DangerArea,
FunctionalArea = ProjectDataManagement::PdmEventType_def::FunctionalArea,
MineCorridor = ProjectDataManagement::PdmEventType_def::MineCorridor,
Borderline = ProjectDataManagement::PdmEventType_def::Borderline,
TechnicalArea = ProjectDataManagement::PdmEventType_def::TechnicalArea,
GasPipe = ProjectDataManagement::PdmEventType_def::GasPipe,
Sanitation = ProjectDataManagement::PdmEventType_def::Sanitation,
EquipmentErrorReport = ProjectDataManagement::PdmEventType_def::EquipmentErrorReport,
EmergencyCall = ProjectDataManagement::PdmEventType_def::EmergencyCall,
Marker = 666,
Block = 999,
};