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/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
+3 -3
View File
@@ -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
+10 -10
View File
@@ -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)