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

@@ -78,21 +78,21 @@ void TimelineLegendDialog::setActiveEventTypeIds(const QSet<int> &activeEventTyp
setUnchangeable(false);
}
QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
QVector<ProjectDataManagement::PdmEventType> TimelineLegendDialog::possibleEvents()
{
QVector<ProjectDataManagement::EventType> ret
QVector<ProjectDataManagement::PdmEventType> ret
({
ProjectDataManagement::EventType::Hit,
ProjectDataManagement::EventType::WeaponAssignment,
ProjectDataManagement::EventType::BiteMessage,
ProjectDataManagement::EventType::FireEvent,
ProjectDataManagement::EventType::HitBuilding,
ProjectDataManagement::EventType::Manipulation,
ProjectDataManagement::EventType::CameraVideo,
ProjectDataManagement::EventType::RadioCnr,
ProjectDataManagement::EventType::RadioTvc,
ProjectDataManagement::EventType::HitEffectSimulation,
ProjectDataManagement::PdmEventType::Hit,
ProjectDataManagement::PdmEventType::WeaponAssignment,
ProjectDataManagement::PdmEventType::BiteMessage,
ProjectDataManagement::PdmEventType::FireEvent,
ProjectDataManagement::PdmEventType::HitBuilding,
ProjectDataManagement::PdmEventType::Manipulation,
ProjectDataManagement::PdmEventType::CameraVideo,
ProjectDataManagement::PdmEventType::RadioCnr,
ProjectDataManagement::PdmEventType::RadioTvc,
ProjectDataManagement::PdmEventType::HitEffectSimulation,
@@ -100,12 +100,12 @@ QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
ProjectDataManagement::EventType::CrossLocalBorderline,
ProjectDataManagement::PdmEventType::CrossLocalBorderline,
ProjectDataManagement::EventType::CrossGlobalBorderline,
ProjectDataManagement::PdmEventType::CrossGlobalBorderline,
@@ -127,37 +127,37 @@ QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
if (ps->value(QStringLiteral("tln"),
QStringLiteral("showEffectSimulationEvents")).toBool())
{
ret += ProjectDataManagement::EventType::MineArea;
ret += ProjectDataManagement::EventType::DangerArea;
ret += ProjectDataManagement::EventType::FunctionalArea;
ret += ProjectDataManagement::EventType::MineCorridor;
ret += ProjectDataManagement::EventType::Borderline;
ret += ProjectDataManagement::PdmEventType::MineArea;
ret += ProjectDataManagement::PdmEventType::DangerArea;
ret += ProjectDataManagement::PdmEventType::FunctionalArea;
ret += ProjectDataManagement::PdmEventType::MineCorridor;
ret += ProjectDataManagement::PdmEventType::Borderline;
if (ps->value(QStringLiteral("aes"),
QStringLiteral("enableNuclearContaminations")).toBool())
ret += ProjectDataManagement::EventType::NContamination;
ret += ProjectDataManagement::PdmEventType::NContamination;
if (ps->value(QStringLiteral("aes"),
QStringLiteral("enableNuclearContaminations")).toBool() ||
ps->value(QStringLiteral("aes"),
QStringLiteral("enableNuclearContaminations")).toBool())
ret += ProjectDataManagement::EventType::BCContamination;
ret += ProjectDataManagement::PdmEventType::BCContamination;
}
if (ps->value(QStringLiteral("tln"),
QStringLiteral("showEnterLeaveEvents")).toBool())
{
ret += ProjectDataManagement::EventType::EnterDangerArea;
ret += ProjectDataManagement::EventType::LeaveDangerArea;
ret += ProjectDataManagement::EventType::EnterMineArea;
ret += ProjectDataManagement::EventType::LeaveMineArea;
ret += ProjectDataManagement::EventType::EnterFunctionalArea;
ret += ProjectDataManagement::EventType::LeaveFunctionalArea;
ret += ProjectDataManagement::PdmEventType::EnterDangerArea;
ret += ProjectDataManagement::PdmEventType::LeaveDangerArea;
ret += ProjectDataManagement::PdmEventType::EnterMineArea;
ret += ProjectDataManagement::PdmEventType::LeaveMineArea;
ret += ProjectDataManagement::PdmEventType::EnterFunctionalArea;
ret += ProjectDataManagement::PdmEventType::LeaveFunctionalArea;
if (ps->value(QStringLiteral("aes"),
QStringLiteral("enableNuclearContaminations")).toBool())
{
ret += ProjectDataManagement::EventType::EnterNuclear;
ret += ProjectDataManagement::EventType::LeaveNuclear;
ret += ProjectDataManagement::PdmEventType::EnterNuclear;
ret += ProjectDataManagement::PdmEventType::LeaveNuclear;
}
}
@@ -165,68 +165,68 @@ QVector<ProjectDataManagement::EventType> TimelineLegendDialog::possibleEvents()
if (ps->value(QStringLiteral("aes"),
QStringLiteral("enableGasPipes")).toBool())
{
ret += ProjectDataManagement::EventType::GasPipe;
ret += ProjectDataManagement::PdmEventType::GasPipe;
}
const bool showPvSan = LtsUtils::ProjectSettings::isFunctionEnabled(QStringLiteral("ParticipantInformation"),
QStringLiteral("HasPvSan"));
if (showPvSan)
ret += ProjectDataManagement::EventType::Sanitation;
ret += ProjectDataManagement::PdmEventType::Sanitation;
return ret;
}
static int categoryFromEventType(ProjectDataManagement::EventType et)
static int categoryFromEventType(ProjectDataManagement::PdmEventType et)
{
switch (et.underlying())
{
case ProjectDataManagement::EventType::Unknown:
case ProjectDataManagement::PdmEventType::Unknown:
return 0;
case ProjectDataManagement::EventType::Hit:
case ProjectDataManagement::EventType::WeaponAssignment:
case ProjectDataManagement::EventType::BiteMessage:
case ProjectDataManagement::EventType::FireEvent:
case ProjectDataManagement::EventType::FriendlyFire:
case ProjectDataManagement::EventType::Manipulation:
case ProjectDataManagement::PdmEventType::Hit:
case ProjectDataManagement::PdmEventType::WeaponAssignment:
case ProjectDataManagement::PdmEventType::BiteMessage:
case ProjectDataManagement::PdmEventType::FireEvent:
case ProjectDataManagement::PdmEventType::FriendlyFire:
case ProjectDataManagement::PdmEventType::Manipulation:
return 1;
case ProjectDataManagement::EventType::CameraVideo:
case ProjectDataManagement::EventType::RadioCnr:
case ProjectDataManagement::EventType::RadioTvc:
case ProjectDataManagement::PdmEventType::CameraVideo:
case ProjectDataManagement::PdmEventType::RadioCnr:
case ProjectDataManagement::PdmEventType::RadioTvc:
return 5;
case ProjectDataManagement::EventType::HitBuilding:
case ProjectDataManagement::EventType::HitEffectSimulation:
case ProjectDataManagement::EventType::HitMine:
case ProjectDataManagement::EventType::HitN:
case ProjectDataManagement::EventType::HitB:
case ProjectDataManagement::EventType::HitC:
case ProjectDataManagement::EventType::HitGasPipe:
case ProjectDataManagement::PdmEventType::HitBuilding:
case ProjectDataManagement::PdmEventType::HitEffectSimulation:
case ProjectDataManagement::PdmEventType::HitMine:
case ProjectDataManagement::PdmEventType::HitN:
case ProjectDataManagement::PdmEventType::HitB:
case ProjectDataManagement::PdmEventType::HitC:
case ProjectDataManagement::PdmEventType::HitGasPipe:
return 2;
case ProjectDataManagement::EventType::EnterDangerArea:
case ProjectDataManagement::EventType::LeaveDangerArea:
case ProjectDataManagement::EventType::EnterMineArea:
case ProjectDataManagement::EventType::LeaveMineArea:
case ProjectDataManagement::EventType::CrossLocalBorderline:
case ProjectDataManagement::EventType::EnterFunctionalArea:
case ProjectDataManagement::EventType::LeaveFunctionalArea:
case ProjectDataManagement::EventType::EnterNuclear:
case ProjectDataManagement::EventType::LeaveNuclear:
case ProjectDataManagement::EventType::CrossGlobalBorderline:
case ProjectDataManagement::EventType::Sanitation:
case ProjectDataManagement::PdmEventType::EnterDangerArea:
case ProjectDataManagement::PdmEventType::LeaveDangerArea:
case ProjectDataManagement::PdmEventType::EnterMineArea:
case ProjectDataManagement::PdmEventType::LeaveMineArea:
case ProjectDataManagement::PdmEventType::CrossLocalBorderline:
case ProjectDataManagement::PdmEventType::EnterFunctionalArea:
case ProjectDataManagement::PdmEventType::LeaveFunctionalArea:
case ProjectDataManagement::PdmEventType::EnterNuclear:
case ProjectDataManagement::PdmEventType::LeaveNuclear:
case ProjectDataManagement::PdmEventType::CrossGlobalBorderline:
case ProjectDataManagement::PdmEventType::Sanitation:
return 3;
case ProjectDataManagement::EventType::MineArea:
case ProjectDataManagement::EventType::NContamination:
case ProjectDataManagement::EventType::BCContamination:
case ProjectDataManagement::EventType::DangerArea:
case ProjectDataManagement::EventType::FunctionalArea:
case ProjectDataManagement::EventType::MineCorridor:
case ProjectDataManagement::EventType::Borderline:
case ProjectDataManagement::EventType::GasPipe:
case ProjectDataManagement::PdmEventType::MineArea:
case ProjectDataManagement::PdmEventType::NContamination:
case ProjectDataManagement::PdmEventType::BCContamination:
case ProjectDataManagement::PdmEventType::DangerArea:
case ProjectDataManagement::PdmEventType::FunctionalArea:
case ProjectDataManagement::PdmEventType::MineCorridor:
case ProjectDataManagement::PdmEventType::Borderline:
case ProjectDataManagement::PdmEventType::GasPipe:
return 6;
case ProjectDataManagement::EventType::TechnicalArea:
case ProjectDataManagement::EventType::EquipmentErrorReport:
case ProjectDataManagement::EventType::EmergencyCall:
case ProjectDataManagement::PdmEventType::TechnicalArea:
case ProjectDataManagement::PdmEventType::EquipmentErrorReport:
case ProjectDataManagement::PdmEventType::EmergencyCall:
return 0;
}
Q_ASSERT(false);
@@ -239,7 +239,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
{
QLabel *lbl = nullptr;
QCheckBox *cbx = nullptr;
ProjectDataManagement::EventType et = ProjectDataManagement::EventType::Unknown;
ProjectDataManagement::PdmEventType et = ProjectDataManagement::PdmEventType::Unknown;
};
QImage p(16, 24, QImage::Format_ARGB32);
QColor c;
@@ -249,7 +249,7 @@ bool TimelineLegendDialog::init(DDSTimelineModel *model, const QSet<int> &active
const auto events = possibleEvents();
std::vector<WidgetSortHelper> helperCont;
helperCont.reserve(events.size());
for (const ProjectDataManagement::EventType eventType : events)
for (const ProjectDataManagement::PdmEventType eventType : events)
{
model->setColorPaintFun(paintFunc, c, eventType.underlying());
@@ -305,7 +305,7 @@ bool TimelineLegendDialog::apply()
{
QSet<int> activeEventTypeIds;
const auto events = possibleEvents();
for (const ProjectDataManagement::EventType eventType : events)
for (const ProjectDataManagement::PdmEventType eventType : events)
{
if (checkBox(eventType)->isChecked())
activeEventTypeIds.insert(eventType.underlying());