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/Proxies/TrainingAreaBase/send_to_dds.cpp
+19 -19
View File
@@ -254,8 +254,8 @@ void SendToDds::rxData(const TetraIcd::StateChangeDirect &inData)
if (gearClass == ProjectDataManagement::GearClass::MineSingle ||
gearClass == ProjectDataManagement::GearClass::MineArea)
if (gearClass == ProjectDataManagement::GearClass::GearClass_MineSingle ||
gearClass == ProjectDataManagement::GearClass::GearClass_MineArea)
{
TetraIcd::MineTriggered mt;
mt.header.timeStamp = inData.header.timeStamp;
@@ -935,22 +935,22 @@ void SendToDds::rxData(const TetraIcd::UAVRadioLinkConnectionStatus &inData)
switch (inData.uavConnectionState)
{
case TetraIcd::UAVRadioLinkConnectionStatusType::Connected:
outData.connectionStatus(ProjectDataManagement::UasState::On);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_On);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Disconnected:
outData.connectionStatus(ProjectDataManagement::UasState::Off);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Off);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Connecting:
outData.connectionStatus(ProjectDataManagement::UasState::Init);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Init);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Diconnecting:
outData.connectionStatus(ProjectDataManagement::UasState::Shutdown);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Shutdown);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Error:
outData.connectionStatus(ProjectDataManagement::UasState::Undefined);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Undefined);
break;
case TetraIcd::UAVRadioLinkConnectionStatusType::Undefined:
outData.connectionStatus(ProjectDataManagement::UasState::Undefined);
outData.connectionStatus(ProjectDataManagement::UasState::UasState_Undefined);
break;
}
@@ -988,37 +988,37 @@ void SendToDds::rxData(const TetraIcd::UAVStatus &inData)
switch (inData.uavState)
{
case TetraIcd::UAVState::On:
outData.uasState(ProjectDataManagement::UasState::On);
outData.uasState(ProjectDataManagement::UasState::UasState_On);
break;
case TetraIcd::UAVState::Off:
outData.uasState(ProjectDataManagement::UasState::Off);
outData.uasState(ProjectDataManagement::UasState::UasState_Off);
break;
case TetraIcd::UAVState::Init:
outData.uasState(ProjectDataManagement::UasState::Init);
outData.uasState(ProjectDataManagement::UasState::UasState_Init);
break;
case TetraIcd::UAVState::Shutdown:
outData.uasState(ProjectDataManagement::UasState::Shutdown);
outData.uasState(ProjectDataManagement::UasState::UasState_Shutdown);
break;
case TetraIcd::UAVState::Calibrating:
outData.uasState(ProjectDataManagement::UasState::Calibrating);
outData.uasState(ProjectDataManagement::UasState::UasState_Calibrating);
break;
case TetraIcd::UAVState::Manual:
outData.uasState(ProjectDataManagement::UasState::Manual);
outData.uasState(ProjectDataManagement::UasState::UasState_Manual);
break;
case TetraIcd::UAVState::Maintenance:
outData.uasState(ProjectDataManagement::UasState::Maintenance);
outData.uasState(ProjectDataManagement::UasState::UasState_Maintenance);
break;
case TetraIcd::UAVState::Standby:
outData.uasState(ProjectDataManagement::UasState::Standby);
outData.uasState(ProjectDataManagement::UasState::UasState_Standby);
break;
case TetraIcd::UAVState::Normal:
outData.uasState(ProjectDataManagement::UasState::Normal);
outData.uasState(ProjectDataManagement::UasState::UasState_Normal);
break;
case TetraIcd::UAVState::Auto:
outData.uasState(ProjectDataManagement::UasState::Auto);
outData.uasState(ProjectDataManagement::UasState::UasState_Auto);
break;
case TetraIcd::UAVState::Undefined:
outData.uasState(ProjectDataManagement::UasState::Undefined);
outData.uasState(ProjectDataManagement::UasState::UasState_Undefined);
break;
}