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:
1718 files changed
+126739
-18495
No files matched your search
+42
-42
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user