Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set

new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
berrux-dev committed 2026-10-20 09:36:57 +02:00
1 parent eb1d949edc
commit 815e16368e
1718 files changed
+126739 -18495

No files matched your search

@@ -5,6 +5,15 @@
# Created by Mike Wille, SLSE, 2016-05-05
#
# Build this target as separate translation units (NOT a unity build). It links the
# ddsftc INTERFACE target, which propagates generic_ftc.cpp /
# generic_ftc_threading.cpp as INTERFACE sources (legacy design: consumers compile
# the generic FTC implementation themselves, one TU per file, hidden visibility).
# A unity build concatenates those .cpp's into this target's single TU, and LTO
# (USE_IPO) then reports "multiple definition of Threading::..." from the same
# object. Separate TUs restore the legacy per-file structure (behavior-neutral).
set(CMAKE_UNITY_BUILD FALSE)
SET(esm_combobox_gui_SRCS
esm_combobox_foreign_gui_interface_impl.cpp
esm_combobox_foreign_gui_interface_impl.h
@@ -76,12 +76,12 @@ QString ForeignGuiComboboxInterfaceImpl::getAssignedAesField (const int particip
for (const auto &explosionCluster : m_aesDtc->explosionClusters())
{
if (explosionCluster.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired)
if (explosionCluster.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired)
continue;
for ( const auto &esmParticipant : explosionCluster.esmParticipantIds())
for ( const auto &esmParticipant : explosionCluster.esmParticipantIds)
{
if ( esmParticipant == participantId)
result.append(tr(" | Assigned: %1").arg(QString::fromStdString(explosionCluster.name())));
result.append(tr(" | Assigned: %1").arg(QString::fromStdString(explosionCluster.name)));
}
}
@@ -95,7 +95,7 @@ void ForeignGuiComboboxInterfaceImpl::initEffectShowActors()
QVector<int> participants;
QMap<double, int> sortedParticipants;
QMap<int,EffectShowManagement::EffectShowVehicleStatus> effectShowVehicleStatuss;
if (qFuzzyCompare(m_coord.lon(), 0) && qFuzzyCompare(m_coord.lat(), 0))
if (qFuzzyCompare(m_coord.lon, 0) && qFuzzyCompare(m_coord.lat, 0))
{
@@ -104,17 +104,17 @@ void ForeignGuiComboboxInterfaceImpl::initEffectShowActors()
for (const auto &state : m_dtc->effectShowVehicleStatuss())
{
participants.append(state.esmParticipantId());
effectShowVehicleStatuss.insert(state.esmParticipantId(), state);
participants.append(state.esmParticipantId);
effectShowVehicleStatuss.insert(state.esmParticipantId, state);
}
sortedParticipants = m_ppmDtc->sortByDistance(m_coord.lon(), m_coord.lat(), participants);
sortedParticipants = m_ppmDtc->sortByDistance(m_coord.lon, m_coord.lat, participants);
for ( auto it = sortedParticipants.cbegin(); it!= sortedParticipants.cend(); ++it)
{
ParticipantManagement::Participant participant = m_ppmDtc->participant(it.value());
EffectShowManagement::EffectShowVehicleStatus effectShowVehicleStatus = effectShowVehicleStatuss.value(it.value());
int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(effectShowVehicleStatus.esmParticipantId());
bool isSmokeVehicle = effectShowVehicleStatus.feature() == Feature_e::Smoke;
int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(effectShowVehicleStatus.esmParticipantId);
bool isSmokeVehicle = effectShowVehicleStatus.feature == Feature_e::Smoke;
@@ -135,12 +135,12 @@ void ForeignGuiComboboxInterfaceImpl::initEffectShowActors()
continue;
}
QString newString = QStringLiteral("%1 - %2 (%3)").arg(QString::fromStdString(participant.designator())).arg(QString::fromStdString(participant.tacticalIdentifier())).arg(equipmentNumber);
QString newString = QStringLiteral("%1 - %2 (%3)").arg(QString::fromStdString(participant.designator)).arg(QString::fromStdString(participant.tacticalIdentifier)).arg(equipmentNumber);
newString.append(QStringLiteral(" "));
if (!m_isSmoke)
newString.append(tr("Mag: %1 | Avail: %2").arg(effectShowVehicleStatus.ammunitionMagazine()).arg(effectShowVehicleStatus.ammunitionAvailable()));
newString.append(tr("Mag: %1 | Avail: %2").arg(effectShowVehicleStatus.ammunitionMagazine).arg(effectShowVehicleStatus.ammunitionAvailable));
else
newString.append(tr("Avail: %1").arg(effectShowVehicleStatus.ammunitionAvailable()));
newString.append(tr("Avail: %1").arg(effectShowVehicleStatus.ammunitionAvailable));
newString.append(tr(" | Dist: %1[m]").arg(QString::number(int(it.key()))));
newString.append(getAssignedAesField(it.value()));
@@ -157,14 +157,14 @@ bool ForeignGuiComboboxInterfaceImpl::isMatchedByFilter(const EffectShowVehicleS
enum eFeature
{
NotSpecified = Feature_e::NotSpecified,
Smoke = Feature_e::Smoke,
Explosion24 = Feature_e::Explosion24,
Explosion48 = Feature_e::Explosion48,
NotSpecified = static_cast<int>(Feature_e::NotSpecified),
Smoke = static_cast<int>(Feature_e::Smoke),
Explosion24 = static_cast<int>(Feature_e::Explosion24),
Explosion48 = static_cast<int>(Feature_e::Explosion48),
SmokeAndExplosion48 = Explosion48 + 1
};
int feature = static_cast<int>(vehicleStatus.feature().underlying());
int feature = static_cast<int>(vehicleStatus.feature);
switch (featureFilter)
{
@@ -9,6 +9,7 @@
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <AreaEffectSimulation/aes_dtc.h>
#endif