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

qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table.h

@@ -59,7 +59,7 @@ public:
   explicit ChargeTableDialog(QWidget *parent = nullptr, bool organiser = false);
   ~ChargeTableDialog();
 
-  bool init(LtsSession::LtsSession *session, bool showDetails = false, const QSet<GearClass> &gearClasses = {GearClass::DuelSim});
+  bool init(LtsSession::LtsSession *session, bool showDetails = false, const QSet<GearClass> &gearClasses = {GearClass::GearClass_DuelSim});
   bool apply() override;
 
 public slots:

qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmChargeTable/charge_table_model.h

@@ -79,7 +79,7 @@ public:
   explicit ChargeTableDialogModel(bool isOrganiser, QObject *parent = nullptr);
   ~ChargeTableDialogModel();
 
-  bool initModel(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtc, const QSet<GearClass> &gearClasses = {GearClass::DuelSim});
+  bool initModel(const std::shared_ptr<ProjectDataManagement::Interface::Dtc> &dtc, const QSet<GearClass> &gearClasses = {GearClass::GearClass_DuelSim});
 
   QVariant data(const QModelIndex &, int) const override final;
   bool setData(const QModelIndex &idx, const QVariant &value, int role = Qt::EditRole) override final;

qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp

@@ -286,9 +286,9 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
     }
     case PdmComboBoxType::CbInternationalMode:
     {
-      cbx->addItem(toString(InternationalMode::NoChange), InternationalMode::NoChange);
-      cbx->addItem(toString(InternationalMode::On), InternationalMode::On);
-      cbx->addItem(toString(InternationalMode::Off), InternationalMode::Off);
+      cbx->addItem(toString(InternationalMode::InternationalMode_NoChange), InternationalMode::InternationalMode_NoChange);
+      cbx->addItem(toString(InternationalMode::InternationalMode_On), InternationalMode::InternationalMode_On);
+      cbx->addItem(toString(InternationalMode::InternationalMode_Off), InternationalMode::InternationalMode_Off);
       break;
     }
     case PdmComboBoxType::CbABCProtectionMode:

qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp

@@ -28,42 +28,42 @@ void ForeignGuiInterfaceImpl::uninit()
 
 bool ForeignGuiInterfaceImpl::fillBComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Biological, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Biological, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillCComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Chemical, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Chemical, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillNComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Nuclear, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Nuclear, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillArtilleryComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Artillery, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Artillery, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillMortarComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::Mortar, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_Mortar, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillSingleMineComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::MineSingle, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_MineSingle, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillMineFieldComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::MineArea, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_MineArea, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillBoobyTrapComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::BoobyTrap, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_BoobyTrap, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillOffRouteMineComboBox(QComboBox *cbx)
@@ -73,12 +73,12 @@ bool ForeignGuiInterfaceImpl::fillOffRouteMineComboBox(QComboBox *cbx)
 
 bool ForeignGuiInterfaceImpl::fillFunctionalAreaComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::FunctionalArea, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_FunctionalArea, m_dtc);
 }
 
 bool ForeignGuiInterfaceImpl::fillAirSupportComboBox(QComboBox *cbx)
 {
-  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::AirSupport, m_dtc);
+  return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_AirSupport, m_dtc);
 }
 
 void ForeignGuiInterfaceImpl::fillIgniterComboBox(QComboBox *cbx, int chargeTypeId)