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/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp
+7 -7
View File
@@ -373,9 +373,9 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantSecondary(const C
if (result)
{
DEBUG_LOG(m_logger) << "sendParticipantEvent";
sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine);
DEBUG_LOG(m_logger) << "sendParticipantHit";
sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine);
}
} // calculateBoobyTrapParticipantSecondary
@@ -472,9 +472,9 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff
DEBUG_LOG(m_logger) << "sendFtcBoobyTrapTrigger id=" << aesItemView.aesItemId;
sendFtcBoobyTrapTrigger(aesItemView.aesItemId);
DEBUG_LOG(m_logger) << "sendParticipantEvent";
sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine);
DEBUG_LOG(m_logger) << "sendParticipantHit";
sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine);
//calculateBoobyTrapParticipantsSecondary(aesItemView.aesItemId, participantPos.participantId() );
}
return true;
@@ -519,7 +519,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe
const bool result = enteredOrCrossedArea(boobyTrap.form, posStepPoly);
DEBUG_LOG(m_logger) << "result BoobyTrap Explosion = " << result;
if (result)
sendParticipantEvent(boobyTrap, partPos, ProjectDataManagement::EventType_def::HitMine);
sendParticipantEvent(boobyTrap, partPos, ProjectDataManagement::PdmEventType_def::HitMine);
}
} // end of onParticipantPositionChanged()
//-----------------------------------------------------------------------------
@@ -533,7 +533,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe
void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &boobyTrapItem,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
DEBUG_LOG(m_logger) << "sendParticipantEvent aesItemId=" << boobyTrapItem.aesItemId
<< " participantId=" << participantPosition.participantId();
@@ -599,7 +599,7 @@ void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimula
void HandlerParticipantBoobyTrap::sendParticipantHit(const CentralEffectSimulation::AesItemViewUtm &boobyTrap,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
// Q_UNUSED(eventType); // not used - no alarm for this
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.h
+2 -2
View File
@@ -69,10 +69,10 @@ private Q_SLOTS:
private: // methoden
void sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &boobyTrapItem,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
void sendParticipantHit(const CentralEffectSimulation::AesItemViewUtm &boobyTrap,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
bool insideSecondaryArea(const QPolygonF &polygonf, const QPointF &participantPos) const;
bool enteredOrCrossedArea(const QPolygonF &polygonf, const QPolygonF &participantStep) const;
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp
+7 -7
View File
@@ -271,9 +271,9 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipantSecondary(c
if (result)
{
DEBUG_LOG(m_logger) << "sendParticipantEvent";
sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine); //69
sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); //69
DEBUG_LOG(m_logger) << "sendParticipantHit";
sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine); // 49
sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); // 49
}
} // calculateOffRouteMineParticipantSecondary
@@ -306,9 +306,9 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipant(const Cent
DEBUG_LOG(m_logger) << "sendFtcOffRouteMineTrigger id=" << aesItemView.aesItemId;
sendFtcOffRouteMineTrigger(aesItemView.aesItemId);
DEBUG_LOG(m_logger) << "sendParticipantEvent";
sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine);
DEBUG_LOG(m_logger) << "sendParticipantHit";
sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::EventType_def::HitMine);
sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine);
calculateOffRouteMineParticipantsSecondary(aesItemView.aesItemId);
}
} // calculateOffRouteMineParticipant
@@ -377,7 +377,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
const bool result = enteredOrCrossedArea(offRouteMine.form, posStepPoly);
DEBUG_LOG(m_logger) << "result offRouteMine Explosion = " << result;
if (result)
sendParticipantEvent(offRouteMine, partPos, ProjectDataManagement::EventType_def::HitMine);
sendParticipantEvent(offRouteMine, partPos, ProjectDataManagement::PdmEventType_def::HitMine);
}
} // end of onParticipantPositionChanged()
//-----------------------------------------------------------------------------
@@ -391,7 +391,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE
void HandlerParticipantOffRouteMine::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &offRouteItem,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId());
@@ -445,7 +445,7 @@ void HandlerParticipantOffRouteMine::sendParticipantEvent(const CentralEffectSim
void HandlerParticipantOffRouteMine::sendParticipantHit(const CentralEffectSimulation::AesItemViewUtm &offRouteMine,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType)
const ProjectDataManagement::PdmEventType eventType)
{
const int equipNo = m_ddsHandler->participantId2EquipNo(participantPosition.participantId());
qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.h
+2 -2
View File
@@ -67,10 +67,10 @@ private Q_SLOTS:
private: // methoden
void sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &offRouteItem,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
void sendParticipantHit(const CentralEffectSimulation::AesItemViewUtm &offRouteMine,
const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition,
const ProjectDataManagement::EventType eventType);
const ProjectDataManagement::PdmEventType eventType);
bool insideSecondaryArea(const QPolygonF &polygonf, const QPointF &participantPos) const;
bool enteredOrCrossedArea(const QPolygonF &polygonf, const QPolygonF &participantStep) const;