Merge feature/Re-implement-XmlPatterns into action/merge-regress-arcgis-symbolo-with-reimplement-xmlpattern

Integrates the XmlPatterns reimplementation branch which:
- Re-implements MSDL/SAAB import without Qt XmlPatterns using Qt6 QDomDocument
- Adds xsdcxx and XercesC dependencies for MSDL plugin
- Adds Schusstafel and KDChart resolution functions
- Enables BUILD_WLS, BUILD_FILTERMANAGEMENT, BUILD_PLUGINS_SERVICEMONITOR,
  BUILD_WEBENGINE_PLUGINS, and BUILD_XMLPATTERNS_PLUGINS options
- Updates GROUP4 to include svcWirelessLocationSystem and wlsJsonClientTest by default
- Fixes Qt6 API changes (QStringRef removal, etc.)

Conflict resolutions:
- visitors.cpp: Kept Qt6-compatible QString code (no QStringView include needed)
- new_docker_build.sh: Merged new build options and resolution functions
This commit is contained in:
torsten committed 2026-11-18 17:12:42 +00:00
commit 131308cebd
53 files changed
+940 -531

No files matched your search

@@ -136,24 +136,24 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
while (i.hasNext())
{
i.next();
SInt32 vulnerabilityState = i.value().vulnerabilityState;
Float64 lat = i.value().pos().lat() * 180 / M_PI;
Float64 lon = i.value().pos().lon() * 180 / M_PI;
SInt32 vulnerabilityState = static_cast<SInt32>(i.value().vulnerabilityState);
Float64 lat = i.value().pos.lat * 180 / M_PI;
Float64 lon = i.value().pos.lon * 180 / M_PI;
DEBUG_LOG(m_logger) << "GeoPairing::calculateAirFire"
<< "\nl_Updater->update : " << i.key()
<< "\n: participantId=" << i.value().participantId()
<< "\n participantTypeId= " << i.value().participantTypeId()
<< "\n: participantId=" << i.value().participantId
<< "\n participantTypeId= " << i.value().participantTypeId
<< "\n pos lat=" << lat
<< "\n lon=" << lon
<< "\n alt=" << i.value().pos().z()
<< "\n posTime=" << i.value().sampleTime()
<< "\n alt=" << i.value().pos.z
<< "\n posTime=" << i.value().sampleTime
<< "\n state=" << i.value().vulnerabilityState
<< "\n state (SInt32)=" << vulnerabilityState;
l_Updater->update(i.value().participantId(),
l_Updater->update(i.value().participantId,
lat,
lon,
i.value().pos().z(),
i.value().sampleTime() / 1000, //s
i.value().pos.z,
i.value().sampleTime / 1000, //s
vulnerabilityState);
}
@@ -225,7 +225,7 @@ void GeoPairing::calculateAirFire(const QByteArray &transparentData,
if (l_TargetFound != l_CachedTrackingState || l_TimeoutPassed)
{
// prepare response for player
m_reportTarget.playerId = i.value().participantId();
m_reportTarget.playerId = i.value().participantId;
m_reportTarget.sendData.clear();
m_reportTarget.sendData.append(0xEB); // Report Target Detection
@@ -843,11 +843,11 @@ bool GeoPairing::geoPairingData(const std::shared_ptr<N_Ballistic::BallisticServ
while (i.hasNext())
{
i.next();
DEBUG_LOG(m_logger) << i.key() << ": participantId=" << i.value().participantId()
<< " participantTypeId= " << i.value().participantTypeId()
<< " pos lat=" << i.value().pos().lat()
<< " pos lon=" << i.value().pos().lon()
<< " z=" << i.value().pos().z();
DEBUG_LOG(m_logger) << i.key() << ": participantId=" << i.value().participantId
<< " participantTypeId= " << i.value().participantTypeId
<< " pos lat=" << i.value().pos.lat
<< " pos lon=" << i.value().pos.lon
<< " z=" << i.value().pos.z;
}