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(ppm_combobox_gui_SRCS
ppm_combobox_foreign_gui_interface_impl.cpp
ppm_combobox_foreign_gui_interface_impl.h
@@ -23,61 +23,61 @@ bool PpmComboBox::fill(QComboBox *cbx, ComboBoxType type,
const QMap<qint32, EquipmentType> eqTypes = dtc->equipmentTypes();
for (const EquipmentType &eqType : eqTypes)
{
if (eqType.id() <= 0)
if (eqType.id <= 0)
continue;
if (eqType.deletedInWms())
cbx->addItem(QString::fromStdString(eqType.name()) + QObject::tr("(deleted)"), eqType.id());
if (eqType.deletedInWms)
cbx->addItem(QString::fromStdString(eqType.name) + QObject::tr("(deleted)"), eqType.id);
else
cbx->addItem(QString::fromStdString(eqType.name()), eqType.id());
cbx->addItem(QString::fromStdString(eqType.name), eqType.id);
}
break;
}
case ComboBoxType::Role:
{
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Unknown), ParticipantManagement::Role::Unknown);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Friend), ParticipantManagement::Role::Friend);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Neutral), ParticipantManagement::Role::Neutral);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Enemy), ParticipantManagement::Role::Enemy);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Pending), ParticipantManagement::Role::Pending);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::AssumedFriend), ParticipantManagement::Role::AssumedFriend);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Suspect), ParticipantManagement::Role::Suspect);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Unknown), static_cast<int>(ParticipantManagement::Role::Unknown));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Friend), static_cast<int>(ParticipantManagement::Role::Friend));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Neutral), static_cast<int>(ParticipantManagement::Role::Neutral));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Enemy), static_cast<int>(ParticipantManagement::Role::Enemy));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Pending), static_cast<int>(ParticipantManagement::Role::Pending));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::AssumedFriend), static_cast<int>(ParticipantManagement::Role::AssumedFriend));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::Role::Suspect), static_cast<int>(ParticipantManagement::Role::Suspect));
break;
}
case ComboBoxType::HlaForceIdentifier:
{
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Other), ParticipantManagement::HlaForceIdentifierEnum::Other);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_1), ParticipantManagement::HlaForceIdentifierEnum::Friendly_1);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_1), ParticipantManagement::HlaForceIdentifierEnum::Opposing_1);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_1), ParticipantManagement::HlaForceIdentifierEnum::Neutral_1);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_2), ParticipantManagement::HlaForceIdentifierEnum::Friendly_2);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_2), ParticipantManagement::HlaForceIdentifierEnum::Opposing_2);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_2), ParticipantManagement::HlaForceIdentifierEnum::Neutral_2);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_3), ParticipantManagement::HlaForceIdentifierEnum::Friendly_3);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_3), ParticipantManagement::HlaForceIdentifierEnum::Opposing_3);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_3), ParticipantManagement::HlaForceIdentifierEnum::Neutral_3);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_4), ParticipantManagement::HlaForceIdentifierEnum::Friendly_4);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_4), ParticipantManagement::HlaForceIdentifierEnum::Opposing_4);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_4), ParticipantManagement::HlaForceIdentifierEnum::Neutral_4);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_5), ParticipantManagement::HlaForceIdentifierEnum::Friendly_5);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_5), ParticipantManagement::HlaForceIdentifierEnum::Opposing_5);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_5), ParticipantManagement::HlaForceIdentifierEnum::Neutral_5);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_6), ParticipantManagement::HlaForceIdentifierEnum::Friendly_6);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_6), ParticipantManagement::HlaForceIdentifierEnum::Opposing_6);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_6), ParticipantManagement::HlaForceIdentifierEnum::Neutral_6);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_7), ParticipantManagement::HlaForceIdentifierEnum::Friendly_7);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_7), ParticipantManagement::HlaForceIdentifierEnum::Opposing_7);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_7), ParticipantManagement::HlaForceIdentifierEnum::Neutral_7);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_8), ParticipantManagement::HlaForceIdentifierEnum::Friendly_8);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_8), ParticipantManagement::HlaForceIdentifierEnum::Opposing_8);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_8), ParticipantManagement::HlaForceIdentifierEnum::Neutral_8);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_9), ParticipantManagement::HlaForceIdentifierEnum::Friendly_9);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_9), ParticipantManagement::HlaForceIdentifierEnum::Opposing_9);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_9), ParticipantManagement::HlaForceIdentifierEnum::Neutral_9);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_10), ParticipantManagement::HlaForceIdentifierEnum::Friendly_10);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_10), ParticipantManagement::HlaForceIdentifierEnum::Opposing_10);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_10), ParticipantManagement::HlaForceIdentifierEnum::Neutral_10);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Other), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Other));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_1), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_1));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_1), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_1));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_1), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_1));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_2), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_2));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_2), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_2));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_2), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_2));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_3), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_3));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_3), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_3));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_3), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_3));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_4), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_4));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_4), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_4));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_4), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_4));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_5), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_5));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_5), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_5));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_5), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_5));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_6), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_6));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_6), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_6));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_6), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_6));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_7), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_7));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_7), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_7));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_7), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_7));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_8), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_8));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_8), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_8));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_8), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_8));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_9), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_9));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_9), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_9));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_9), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_9));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Friendly_10), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Friendly_10));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Opposing_10), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Opposing_10));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::HlaForceIdentifierEnum::Neutral_10), static_cast<int>(ParticipantManagement::HlaForceIdentifierEnum::Neutral_10));
break;
}
}
@@ -4,7 +4,8 @@
#pragma once
#include <ParticipantManagement/ppm.hpp>
//DDS
#include <ParticipantManagement/ppm_dtc.h>
class QComboBox;
@@ -67,17 +67,17 @@ bool ForeignGuiComboboxInterfaceImpl::fillPartyComboBox(QComboBox *cbx, CbxParty
for (const Party &party : std::as_const(parties))
{
if (party.id() < 0)
if (party.id < 0)
continue;
if (party.id() == 0 && isBitSet(filter, CbxPartyFilter::Pool))
cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color()))),
ParticipantManagement::trPartyName(party.name()), party.id());
else if (party.id() == 1 && isBitSet(filter, CbxPartyFilter::Oc))
cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color()))),
ParticipantManagement::trPartyName(party.name()), party.id());
else if (party.id() > 1 && isBitSet(filter, CbxPartyFilter::Normal))
cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color()))),
ParticipantManagement::trPartyName(party.name()), party.id());
if (party.id == 0 && isBitSet(filter, CbxPartyFilter::Pool))
cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color))),
ParticipantManagement::trPartyName(party.name), party.id);
else if (party.id == 1 && isBitSet(filter, CbxPartyFilter::Oc))
cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color))),
ParticipantManagement::trPartyName(party.name), party.id);
else if (party.id > 1 && isBitSet(filter, CbxPartyFilter::Normal))
cbx->addItem(pixmapFromParty(QColor::fromRgb(QRgb(party.color))),
ParticipantManagement::trPartyName(party.name), party.id);
}
if (curData.isValid() && (cbx->findData(curData) != -1))
@@ -112,12 +112,12 @@ bool ForeignGuiComboboxInterfaceImpl::fillTypeComboBox(QComboBox *cbx, TypeClass
cbx->clear();
const auto cb = [this, cbx, typeClass](const Type &type)
{
if (type.typeClass() == typeClass && !type.isDeleted())
if (type.typeClass == typeClass && !type.isDeleted)
{
if (!m_dtc->isEditable(type.id()))
if (!m_dtc->isEditable(type.id))
return;
cbx->addItem(ParticipantManagement::trTypeName(type.name()), type.id());
cbx->addItem(ParticipantManagement::trTypeName(type.name), type.id);
}
};
m_dtc->types(cb);
@@ -200,23 +200,23 @@ bool ForeignGuiComboboxInterfaceImpl::fillTypeClassPpmComboBox(QComboBox *cbx, i
if ((filter & eParticipants) == eParticipants)
{
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Human), ParticipantManagement::TypeClass::Human);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::VehicleWithGear), ParticipantManagement::TypeClass::VehicleWithGear);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::GroundVehicle), ParticipantManagement::TypeClass::GroundVehicle);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::WeaponSystem), ParticipantManagement::TypeClass::WeaponSystem);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Human), static_cast<int>(ParticipantManagement::TypeClass::Human));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::VehicleWithGear), static_cast<int>(ParticipantManagement::TypeClass::VehicleWithGear));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::GroundVehicle), static_cast<int>(ParticipantManagement::TypeClass::GroundVehicle));
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::WeaponSystem), static_cast<int>(ParticipantManagement::TypeClass::WeaponSystem));
if ((filter & eParticipantsWithCtaEquipment) != eParticipantsWithCtaEquipment)
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Aircraft), ParticipantManagement::TypeClass::Aircraft);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Aircraft), static_cast<int>(ParticipantManagement::TypeClass::Aircraft));
}
if ((filter & eUnits) == eUnits)
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Unit), ParticipantManagement::TypeClass::Unit);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::Unit), static_cast<int>(ParticipantManagement::TypeClass::Unit));
if ((filter & eOcUnits) == eOcUnits)
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::SupportUnit), ParticipantManagement::TypeClass::SupportUnit);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::SupportUnit), static_cast<int>(ParticipantManagement::TypeClass::SupportUnit));
if ((filter & eOc) == eOc)
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::SupportEntity), ParticipantManagement::TypeClass::SupportEntity);
cbx->addItem(ParticipantManagement::toString(ParticipantManagement::TypeClass::SupportEntity), static_cast<int>(ParticipantManagement::TypeClass::SupportEntity));
cbx->model()->sort(0);
@@ -3,7 +3,7 @@
#pragma once
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
namespace ParticipantManagement
@@ -38,9 +38,9 @@ bool PartySelector::init(const std::shared_ptr<ParticipantManagement::Interface:
{
QCheckBox *cb = new QCheckBox;
cb->setText(ParticipantManagement::trPartyName(party.name()));
cb->setChecked(preselectedParties.contains(party.id()));
const int partyId = party.id();
cb->setText(ParticipantManagement::trPartyName(party.name));
cb->setChecked(preselectedParties.contains(party.id));
const int partyId = party.id;
connect(cb, &QCheckBox::clicked,
cb, [this, partyId](bool checked) {partyCheckBoxChanged(partyId, checked);});
m_ui.layParties->addWidget(cb);
@@ -4,7 +4,7 @@
#pragma once
#include <LtsWidgets/lts_frameless_dialog.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <QtCore/QSet>
#include "ui_ppm_party_selector.h"