lifemaps/qt5-legatus-legacy
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: Merge latest Qt5 devel content and apply migration fixes

Browse Source 
- Merged 292 changed files from dlbo snapshot
- Fixed IDL enum collisions (PortType, PdmEventType)
- Fixed Grantlee template for C++11 scoped enums
- Fixed CMake VERSION_GREATER syntax
- Added missing directories (THP, LtsRestClient, etc.)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-09-15 18:20:51 +00:00
1 parent c9e245a211
commit 3028302f7b
310 files changed
+2823 -740
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Lts/Services/AreaEffectSimulation/handler_charge_administration.cpp
+4 -2
View File
@@ -133,9 +133,11 @@ Core::FunctionReplyObject HandlerChargeAdministration::consumeCharge(int chargeT
ParticipantManagement::ConnectState connectState = m_mainHandler->dds()->ppmDtc()->saaConnectedState(partyId);
DEBUG_LOG(m_logger) << "connectState: " << connectState;
if (m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected)
if (m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected
&& m_mainHandler->dds()->pdmDtc()->isAdlerChargeType(chargeTypeId))
effectSource = ProjectDataManagement::EffectSource::ES_ADLER;
else if (!m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected)
else if (!m_mainHandler->dds()->ppmDtc()->isPartyAdlerVerbund(partyId) && connectState == ParticipantManagement::ConnectState::Connected
&& m_mainHandler->dds()->pdmDtc()->isAdlerChargeType(chargeTypeId))
effectSource = ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE;
DEBUG_LOG(m_logger) << "effectSource: " << effectSource;