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/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp
+41 -41
View File
@@ -477,25 +477,17 @@ void JsonDispatcher::onSAASQWS(const int wsId, const Waffensystemdaten &exSQWS)
const bool isVerbund = true;
auto saa = getSAAByWs(wsId);
int partyId = saa->getPartyId();
QStringList args;
const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQWS.einheit.verein, partyId, isVerbund);
QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://ParticipantInfo/%1'>Show Participant Info</a><br /><B>Unit:</B> %2/%3/%4"));
args.append(QString::number(part.id()));
args.append(ortsIdMap.key(exSQWS.einheit.oi));
args.append(QString::number(exSQWS.einheit.r));
args.append(exSQWS.einheit.verein);
DEBUG_LOG(m_logger) << "Stellungsmeldung Waffensystem content=" << content;
createNotificationRequest(wsId,
QString::fromUtf8(tr_lts("Notification","Weapon System Position Report")),
NotificationManagement::MessageType_def::Info,
NotificationManagement::NotificationType::AdlerNotification,
content,
args);
// Parse in party SAA
m_ppmHandler->parseSQWS(exSQWS, wsId);
if (part.id() > 0)
{
sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQWS.einheit);
return;
}
QTimer::singleShot(5000, this, [this, wsId, partyId, isVerbund, exSQWS]() {
sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQWS.einheit);
});
}
void JsonDispatcher::onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS)
@@ -504,25 +496,17 @@ void JsonDispatcher::onSAASQFS(const int wsId, const Feuerstellungsdaten &exSQFS
auto saa = getSAAByWs(wsId);
int partyId = saa->getPartyId();
const bool isVerbund = true;
QStringList args;
const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQFS.feuereinheit.verein, partyId, isVerbund);
QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://ParticipantInfo/%1'>Show Participant Info</a><br /><B>Unit:</B> %2/%3/%4"));
args.append(QString::number(part.id()));
args.append(ortsIdMap.key(exSQFS.feuereinheit.oi));
args.append(QString::number(exSQFS.feuereinheit.r));
args.append(exSQFS.feuereinheit.verein);
DEBUG_LOG(m_logger) << "Stellungsmeldung Feuerstellung content=" << content;
createNotificationRequest(wsId,
QString::fromUtf8(tr_lts("Notification","Position Report: Firing Unit")),
NotificationManagement::MessageType_def::Info,
NotificationManagement::NotificationType::AdlerNotification,
content,
args);
// Parse in party SAA
m_ppmHandler->parseSQFS(exSQFS, wsId);
const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQFS.feuereinheit.verein, partyId, isVerbund);
if (part.id() > 0)
{
sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQFS.feuereinheit);
return;
}
QTimer::singleShot(5000, this, [this, wsId, partyId, isVerbund, exSQFS]() {
sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQFS.feuereinheit);
});
}
void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
@@ -531,17 +515,35 @@ void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
auto saa = getSAAByWs(wsId);
int partyId = saa->getPartyId();
const bool isVerbund = true;
QStringList args;
const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(exSQLP.einheit.verein, partyId, isVerbund);
DEBUG_LOG(m_logger) << "ParticipantId=" << part.id();
m_ppmHandler->parseSQLP(exSQLP, wsId);
if (part.id() > 0)
{
sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQLP.einheit);
return;
}
QTimer::singleShot(5000, this, [this, wsId, partyId, exSQLP]() {
sendParticipantInfoNotification(wsId, partyId, isVerbund, exSQLP.einheit);
});
}
void JsonDispatcher::sendParticipantInfoNotification(const int wsId, const int partyId, const bool isVerbund, const Einheit &einheit)
{
DEBUG_LOG(m_logger) << "sendParticipantInfoNotification";
QStringList args;
const ParticipantManagement::Participant &part = m_ppmHandler->findParticipantByInternalName(einheit.verein, partyId, isVerbund);
DEBUG_LOG(m_logger) << "sendParticipantInfoNotification ParticipantId=" << part.id();
QString content = QString::fromUtf8(tr_lts("Notification","<a href='lts://ParticipantInfo/%1'>Show Participant Info</a><br /><B>Unit:</B> %2/%3/%4"));
args.append(QString::number(part.id()));
args.append(ortsIdMap.key(exSQLP.einheit.oi));
args.append(QString::number(exSQLP.einheit.r));
args.append(exSQLP.einheit.verein);
args.append(ortsIdMap.key(einheit.oi));
args.append(QString::number(einheit.r));
args.append(einheit.verein);
createNotificationRequest(wsId,
QString::fromUtf8(tr_lts("Notification","Loading Point Position Report")),
@@ -549,9 +551,7 @@ void JsonDispatcher::onSAASQLP(const int wsId, const Ladeplatzdaten &exSQLP)
NotificationManagement::NotificationType::AdlerNotification,
content,
args);
DEBUG_LOG(m_logger) << "Stellungsmeldung Ladeplatz content=" << content;
// Parse in party SAA
m_ppmHandler->parseSQLP(exSQLP, wsId);
DEBUG_LOG(m_logger) << "Stellungsmeldung content=" << content;
}
void JsonDispatcher::onSAATrajectoryData(const int wsId, const Flugbahndaten &exFlugbahndaten, const QString referenceUuid)