Removes .IDL warnings: multiple enum definitons and builtin-type collisions
This commit is contained in:
135 files changed
+1122
-1122
No files matched your search
+5
-5
@@ -111,12 +111,12 @@ void AlmTests::tryConfigureAlarms()
|
||||
alarms[0].setMarker(true);
|
||||
alarms[0].messageWindow(true);
|
||||
alarms[0].vulnerabilityState(-1);
|
||||
alarms[0].eventTypeId(ProjectDataManagement::EventType_def::Hit);
|
||||
alarms[0].eventTypeId(ProjectDataManagement::PdmEventType_def::Hit);
|
||||
|
||||
alarms[1].setMarker(true);
|
||||
alarms[1].messageWindow(true);
|
||||
alarms[1].vulnerabilityState(0);
|
||||
alarms[1].eventTypeId(ProjectDataManagement::EventType_def::EnterNuclear);
|
||||
alarms[1].eventTypeId(ProjectDataManagement::PdmEventType_def::EnterNuclear);
|
||||
|
||||
std::vector<int32_t> participantIds;
|
||||
participantIds.push_back(0);
|
||||
@@ -173,13 +173,13 @@ void AlmTests::tryConfigureAlarmsList()
|
||||
|
||||
alarms[0].setMarker(true);
|
||||
alarms[0].messageWindow(true);
|
||||
alarms[0].eventTypeId(ProjectDataManagement::EventType_def::Hit);
|
||||
alarms[0].eventTypeId(ProjectDataManagement::PdmEventType_def::Hit);
|
||||
alarms[0].vulnerabilityState(-1);
|
||||
|
||||
alarms[1].setMarker(true);
|
||||
alarms[1].messageWindow(true);
|
||||
alarms[1].vulnerabilityState(-1);
|
||||
alarms[1].eventTypeId(ProjectDataManagement::EventType_def::WeaponAssignment);
|
||||
alarms[1].eventTypeId(ProjectDataManagement::PdmEventType_def::WeaponAssignment);
|
||||
|
||||
std::vector<int32_t> participantIds;
|
||||
participantIds.push_back(1);
|
||||
@@ -204,7 +204,7 @@ void AlmTests::trySendEvent()
|
||||
// publish new Event data here
|
||||
pe.id(100);
|
||||
//pe.aesItemId(5);
|
||||
pe.eventTypeId(ProjectDataManagement::EventType_def::Hit); // same as eventTypeId in ConfigureAlarms
|
||||
pe.eventTypeId(ProjectDataManagement::PdmEventType_def::Hit); // same as eventTypeId in ConfigureAlarms
|
||||
pe.participantId(2);
|
||||
pe.equipmentNumber(55);
|
||||
pe.sampleTime(QDateTime::currentMSecsSinceEpoch());
|
||||
|
||||
Reference in new issue
Block a user