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
+2
-2
@@ -22,7 +22,7 @@ namespace dds
|
||||
{
|
||||
namespace core
|
||||
{
|
||||
inline uint qHash(ProjectDataManagement::EventType et)
|
||||
inline uint qHash(ProjectDataManagement::PdmEventType et)
|
||||
{
|
||||
return ::qHash(et.underlying());
|
||||
}
|
||||
@@ -216,7 +216,7 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId,
|
||||
remaining, // remainEffectPercent ( no protection outside Building )
|
||||
pos,
|
||||
effectTime, // effectTime
|
||||
ProjectDataManagement::EventType::Jamming, // EventType
|
||||
ProjectDataManagement::PdmEventType::Jamming, // EventType
|
||||
originatorPartyId, // originPartyId
|
||||
mineId
|
||||
);
|
||||
|
||||
+2
-2
@@ -34,7 +34,7 @@ struct ParticipantDistance
|
||||
|
||||
struct EnterLeaveType
|
||||
{
|
||||
ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::Unknown;
|
||||
ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown;
|
||||
bool isAlreadySupplied = false;
|
||||
};
|
||||
|
||||
@@ -73,7 +73,7 @@ private: // methoden
|
||||
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData);
|
||||
|
||||
|
||||
ProjectDataManagement::EventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
|
||||
ProjectDataManagement::PdmEventType leaveEventTypeForAesType(AreaEffectSimulation::AesType aesTypeId);
|
||||
|
||||
private: // attributes
|
||||
|
||||
|
||||
Reference in new issue
Block a user