lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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 2b957d1edb
commit 598fc2560e
1718 files changed
+126739 -18495
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/CMakeLists.txt
+9
View File
@@ -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)
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.cpp
+2 -2
View File
@@ -39,9 +39,9 @@ bool ChargeSelector::init(const std::shared_ptr<ProjectDataManagement::Interface
const auto cfgc = dtc->chargesForGearClass(gearClass);
for (const ChargeType &charge : cfgc)
{
if (LtsUtils::JsonObject::fromJson(charge.properties()).valueOr<bool>("suppressVisibility", false))
if (LtsUtils::JsonObject::fromJson(charge.properties).valueOr<bool>("suppressVisibility", false))
continue;
const int chargeId = charge.id();
const int chargeId = charge.id;
QCheckBox *cb = new QCheckBox;
cb->setText(dtc->trChargeTypeShortName(chargeId, true));
cb->setChecked(preselectedCharges.contains(chargeId));
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_charge_selector.h
-1
View File
@@ -9,7 +9,6 @@
#include <QtCore/QSet>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ProjectDataManagement/pdm_gear_class.h>
#endif
#include "ui_pdm_charge_selector.h"
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp
+54 -54
View File
@@ -74,10 +74,10 @@ void fillGearClass(QComboBox *cbx, GearClass gearClass, const std::shared_ptr<In
const auto charges = dtc->chargesForGearClass(gearClass);
for (const ChargeType &charge : charges)
{
QStandardItem *item = new QStandardItem(dtc->trChargeTypeShortName(charge.id(), true));
item->setToolTip(dtc->trChargeTypeName(charge.id(), true));
item->setData(charge.id(), CBUserRoles::Id);
item->setData(QByteArray::fromStdString(charge.properties()), CBUserRoles::Properties);
QStandardItem *item = new QStandardItem(dtc->trChargeTypeShortName(charge.id, true));
item->setToolTip(dtc->trChargeTypeName(charge.id, true));
item->setData(charge.id, CBUserRoles::Id);
item->setData(QByteArray::fromStdString(charge.properties), CBUserRoles::Properties);
itemModel->appendRow(item);
}
}
@@ -93,10 +93,10 @@ void fillIgniterType(QComboBox *cbx, int chargeTypeId, const std::shared_ptr<Int
const auto igniters = dtc->ignitersForChargeType(chargeTypeId);
for (const IgniterType &igniter : igniters)
{
QStandardItem *item = new QStandardItem(dtc->trIgniterTypeShortName(igniter.id()));
item->setToolTip(dtc->trIgniterTypeName(igniter.id()));
item->setData(igniter.id(), CBUserRoles::Id);
item->setData(QByteArray::fromStdString(igniter.properties()), CBUserRoles::Properties);
QStandardItem *item = new QStandardItem(dtc->trIgniterTypeShortName(igniter.id));
item->setToolTip(dtc->trIgniterTypeName(igniter.id));
item->setData(igniter.id, CBUserRoles::Id);
item->setData(QByteArray::fromStdString(igniter.properties), CBUserRoles::Properties);
itemModel->appendRow(item);
}
itemModel->sort(0, Qt::AscendingOrder);
@@ -117,10 +117,10 @@ void fillIgniterFunction(QComboBox *cbx, int chargeTypeId, int igniterTypeId, co
const auto chargeTypeIgTypeIgFunMap = dtc->igniterFunctionsForChargeTypeIgniterType(chargeTypeId, igniterTypeId);
for (const ChargeTypeIgniterTypeIgniterFunction &chargeTypeIgTypeIgFun : chargeTypeIgTypeIgFunMap)
{
QStandardItem *item = new QStandardItem(dtc->trIgniterFunctionShortName(chargeTypeIgTypeIgFun.igniterFunctionId()));
item->setToolTip(dtc->trIgniterFunctionName(chargeTypeIgTypeIgFun.igniterFunctionId()));
item->setData(chargeTypeIgTypeIgFun.igniterFunctionId(), CBUserRoles::Id);
item->setData(QByteArray::fromStdString(chargeTypeIgTypeIgFun.properties()), CBUserRoles::Properties);
QStandardItem *item = new QStandardItem(dtc->trIgniterFunctionShortName(chargeTypeIgTypeIgFun.igniterFunctionId));
item->setToolTip(dtc->trIgniterFunctionName(chargeTypeIgTypeIgFun.igniterFunctionId));
item->setData(chargeTypeIgTypeIgFun.igniterFunctionId, CBUserRoles::Id);
item->setData(QByteArray::fromStdString(chargeTypeIgTypeIgFun.properties), CBUserRoles::Properties);
itemModel->appendRow(item);
}
itemModel->sort(0, Qt::AscendingOrder);
@@ -141,9 +141,9 @@ void fillLoadType(QComboBox *cbx, int chargeTypeId, const std::shared_ptr<Interf
const auto loads = dtc->loadsForChargeType(chargeTypeId);
for (const LoadType &load : loads)
{
QStandardItem *item = new QStandardItem(dtc->trLoadTypeShortName(load.id()));
item->setToolTip(dtc->trLoadTypeName(load.id()));
item->setData(load.id(), CBUserRoles::Id);
QStandardItem *item = new QStandardItem(dtc->trLoadTypeShortName(load.id));
item->setToolTip(dtc->trLoadTypeName(load.id));
item->setData(load.id, CBUserRoles::Id);
itemModel->appendRow(item);
}
itemModel->sort(0, Qt::AscendingOrder);
@@ -164,9 +164,9 @@ void fillTargetType(QComboBox *cbx, const std::shared_ptr<Interface::Dtc> &dtc)
const auto targeTypes = dtc->targetTypes();
for (const TargetType &targetType : targeTypes)
{
QStandardItem *item = new QStandardItem(dtc->trTargetTypeName(targetType.id()));
item->setToolTip(dtc->trTargetTypeName(targetType.id()));
item->setData(targetType.id(), CBUserRoles::Id);
QStandardItem *item = new QStandardItem(dtc->trTargetTypeName(targetType.id));
item->setToolTip(dtc->trTargetTypeName(targetType.id));
item->setData(targetType.id, CBUserRoles::Id);
itemModel->appendRow(item);
}
itemModel->sort(0, Qt::AscendingOrder);
@@ -184,10 +184,10 @@ void fillTargetSubType(QComboBox *cbx, int targetTypeId, const std::shared_ptr<I
for (const TargetSubType &targetSubType : targetSubTypeVec)
{
QStandardItem *item = new QStandardItem(dtc->trTargetSubTypeName(targetSubType.id()));
item->setToolTip(dtc->trTargetSubTypeName(targetSubType.id()));
item->setData(targetSubType.id(), TargetSubTypeRole::Id);
item->setData(QString::fromStdString(targetSubType.abbreviation()), TargetSubTypeRole::Abbreviation);
QStandardItem *item = new QStandardItem(dtc->trTargetSubTypeName(targetSubType.id));
item->setToolTip(dtc->trTargetSubTypeName(targetSubType.id));
item->setData(targetSubType.id, TargetSubTypeRole::Id);
item->setData(QString::fromStdString(targetSubType.abbreviation), TargetSubTypeRole::Abbreviation);
itemModel->appendRow(item);
}
itemModel->sort(0, Qt::AscendingOrder);
@@ -204,10 +204,10 @@ void fillFirePurpose(QComboBox *cbx, const std::shared_ptr<Interface::Dtc> &dtc)
const auto &firePurposes = dtc->firePurposes();
for (const FirePurpose &firePurpose : firePurposes)
{
QStandardItem *item = new QStandardItem(dtc->trFirePurposeName(firePurpose.id()));
item->setToolTip(dtc->trFirePurposeName(firePurpose.id()));
item->setData(firePurpose.id(), CBUserRoles::Id);
item->setData(QByteArray::fromStdString(firePurpose.properties()), CBUserRoles::Properties);
QStandardItem *item = new QStandardItem(dtc->trFirePurposeName(firePurpose.id));
item->setToolTip(dtc->trFirePurposeName(firePurpose.id));
item->setData(firePurpose.id, CBUserRoles::Id);
item->setData(QByteArray::fromStdString(firePurpose.properties), CBUserRoles::Properties);
itemModel->appendRow(item);
}
itemModel->sort(0, Qt::AscendingOrder);
@@ -232,70 +232,70 @@ bool fill(QComboBox *cbx, PdmComboBoxType type)
const QString languages = LtsUtils::ProjectSettings::getInstance()->value(QStringLiteral("pdm"), QStringLiteral("EquipmentLanguages")).toString();
const QStringList slLang = languages.split(QLatin1Char(','));
QSet<int> alreadySeen;
alreadySeen += Language::NoChange;
cbx->addItem(toString(Language::NoChange), Language::NoChange);
alreadySeen += static_cast<int>(LanguageConfiguration::LanguageConfiguration_NoChange);
cbx->addItem(toString(LanguageConfiguration::LanguageConfiguration_NoChange), static_cast<int>(LanguageConfiguration::LanguageConfiguration_NoChange));
for (const QString &r : slLang)
{
const int langId = r.toInt();
if (alreadySeen.contains(langId))
continue;
alreadySeen += langId;
cbx->addItem(toString(static_cast<LanguageConfiguration>(langId)), static_cast<LanguageConfiguration>(langId));
cbx->addItem(toString(static_cast<LanguageConfiguration>(langId)), static_cast<int>(static_cast<LanguageConfiguration>(langId)));
}
break;
}
case PdmComboBoxType::CbOperationMode:
{
cbx->addItem(toString(OperationMode::NoChange), OperationMode::NoChange);
cbx->addItem(toString(OperationMode::Normal), OperationMode::Normal);
cbx->addItem(toString(OperationMode::BeStill), OperationMode::BeStill);
cbx->addItem(toString(OperationMode::OperationMode_NoChange), static_cast<int>(OperationMode::OperationMode_NoChange));
cbx->addItem(toString(OperationMode::OperationMode_Normal), static_cast<int>(OperationMode::OperationMode_Normal));
cbx->addItem(toString(OperationMode::OperationMode_BeStill), static_cast<int>(OperationMode::OperationMode_BeStill));
break;
}
case PdmComboBoxType::CbModeHelmet:
case PdmComboBoxType::CbModeVest:
{
cbx->addItem(toString(WphMode::NoChange), WphMode::NoChange);
cbx->addItem(toString(WphMode::Without), WphMode::Without);
cbx->addItem(toString(WphMode::With), WphMode::With);
cbx->addItem(toString(WphMode::WphMode_NoChange), static_cast<int>(WphMode::WphMode_NoChange));
cbx->addItem(toString(WphMode::WphMode_Without), static_cast<int>(WphMode::WphMode_Without));
cbx->addItem(toString(WphMode::WphMode_With), static_cast<int>(WphMode::WphMode_With));
break;
}
case PdmComboBoxType::CbPersonalProtection:
{
cbx->addItem(toString(PersonalProtection::NoChange), PersonalProtection::NoChange);
cbx->addItem(toString(PersonalProtection::Without), PersonalProtection::Without);
cbx->addItem(toString(PersonalProtection::Suit), PersonalProtection::Suit);
cbx->addItem(toString(PersonalProtection::SuitAndGloves), PersonalProtection::SuitAndGloves);
cbx->addItem(toString(PersonalProtection::PersonalProtection_NoChange), static_cast<int>(PersonalProtection::PersonalProtection_NoChange));
cbx->addItem(toString(PersonalProtection::PersonalProtection_Without), static_cast<int>(PersonalProtection::PersonalProtection_Without));
cbx->addItem(toString(PersonalProtection::PersonalProtection_Suit), static_cast<int>(PersonalProtection::PersonalProtection_Suit));
cbx->addItem(toString(PersonalProtection::PersonalProtection_SuitAndGloves), static_cast<int>(PersonalProtection::PersonalProtection_SuitAndGloves));
break;
}
case PdmComboBoxType::CbProtectionLevel:
{
cbx->addItem(toString(ProtectionLevel::NoChange), ProtectionLevel::NoChange);
cbx->addItem(toString(ProtectionLevel::IdzBs), ProtectionLevel::IdzBs);
cbx->addItem(toString(ProtectionLevel::IdzEs), ProtectionLevel::IdzEs);
cbx->addItem(toString(ProtectionLevel::Ksk), ProtectionLevel::Ksk);
cbx->addItem(toString(ProtectionLevel::SoldierWithBodyArmor), ProtectionLevel::SoldierWithBodyArmor);
cbx->addItem(toString(ProtectionLevel::SoldierActor), ProtectionLevel::SoldierActor);
cbx->addItem(toString(ProtectionLevel::ProtectionLevel_NoChange), static_cast<int>(ProtectionLevel::ProtectionLevel_NoChange));
cbx->addItem(toString(ProtectionLevel::ProtectionLevel_IdzBs), static_cast<int>(ProtectionLevel::ProtectionLevel_IdzBs));
cbx->addItem(toString(ProtectionLevel::ProtectionLevel_IdzEs), static_cast<int>(ProtectionLevel::ProtectionLevel_IdzEs));
cbx->addItem(toString(ProtectionLevel::ProtectionLevel_Ksk), static_cast<int>(ProtectionLevel::ProtectionLevel_Ksk));
cbx->addItem(toString(ProtectionLevel::ProtectionLevel_SoldierWithBodyArmor), static_cast<int>(ProtectionLevel::ProtectionLevel_SoldierWithBodyArmor));
cbx->addItem(toString(ProtectionLevel::ProtectionLevel_SoldierActor), static_cast<int>(ProtectionLevel::ProtectionLevel_SoldierActor));
break;
}
case PdmComboBoxType::CbHandgrenadeSearchMode:
{
cbx->addItem(toString(HandgrenadeSearchMode::NoChange), HandgrenadeSearchMode::NoChange);
cbx->addItem(toString(HandgrenadeSearchMode::On), HandgrenadeSearchMode::On);
cbx->addItem(toString(HandgrenadeSearchMode::Off), HandgrenadeSearchMode::Off);
cbx->addItem(toString(HandgrenadeSearchMode::HandgrenadeSearchMode_NoChange), static_cast<int>(HandgrenadeSearchMode::HandgrenadeSearchMode_NoChange));
cbx->addItem(toString(HandgrenadeSearchMode::HandgrenadeSearchMode_On), static_cast<int>(HandgrenadeSearchMode::HandgrenadeSearchMode_On));
cbx->addItem(toString(HandgrenadeSearchMode::HandgrenadeSearchMode_Off), static_cast<int>(HandgrenadeSearchMode::HandgrenadeSearchMode_Off));
break;
}
case PdmComboBoxType::CbInternationalMode:
{
cbx->addItem(toString(InternationalMode::InternationalMode_NoChange), InternationalMode::InternationalMode_NoChange);
cbx->addItem(toString(InternationalMode::InternationalMode_On), InternationalMode::InternationalMode_On);
cbx->addItem(toString(InternationalMode::InternationalMode_Off), InternationalMode::InternationalMode_Off);
cbx->addItem(toString(InternationalMode::InternationalMode_NoChange), static_cast<int>(InternationalMode::InternationalMode_NoChange));
cbx->addItem(toString(InternationalMode::InternationalMode_On), static_cast<int>(InternationalMode::InternationalMode_On));
cbx->addItem(toString(InternationalMode::InternationalMode_Off), static_cast<int>(InternationalMode::InternationalMode_Off));
break;
}
case PdmComboBoxType::CbABCProtectionMode:
{
cbx->addItem(toString(ABCProtectionMode::NoChange), ABCProtectionMode::NoChange);
cbx->addItem(toString(ABCProtectionMode::On), ABCProtectionMode::On);
cbx->addItem(toString(ABCProtectionMode::Off), ABCProtectionMode::Off);
cbx->addItem(toString(ABCProtectionMode::ABCProtectionMode_NoChange), static_cast<int>(ABCProtectionMode::ABCProtectionMode_NoChange));
cbx->addItem(toString(ABCProtectionMode::ABCProtectionMode_On), static_cast<int>(ABCProtectionMode::ABCProtectionMode_On));
cbx->addItem(toString(ABCProtectionMode::ABCProtectionMode_Off), static_cast<int>(ABCProtectionMode::ABCProtectionMode_Off));
break;
}
#endif // BUILD_WITH_EXTERNAL_DDS
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.h
+3 -3
View File
@@ -38,9 +38,9 @@ enum class InternationalMode;
enum class ABCProtectionMode;
enum class PersonalProtection;
enum class ProtectionLevel;
enum class Language; // from training_area_telegrams.h
enum class OperationMode; // from training_area_telegrams.h
enum class WphMode; // from training_area_telegrams.h
enum class LanguageConfiguration; // RTI enum in ProjectDataManagement (pdm_enums.hpp); legacy used LanguageConfiguration
enum class OperationMode;
enum class WphMode;
#endif
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ bool ForeignGuiInterfaceImpl::fillBoobyTrapComboBox(QComboBox *cbx)
bool ForeignGuiInterfaceImpl::fillOffRouteMineComboBox(QComboBox *cbx)
{
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::OffRouteMine, m_dtc);
return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::GearClass_OffRouteMine, m_dtc);
}
bool ForeignGuiInterfaceImpl::fillFunctionalAreaComboBox(QComboBox *cbx)
qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.h
-1
View File
@@ -7,7 +7,6 @@
#include <ProjectDataManagement/pdm_dtc.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <ProjectDataManagement/pdm_gear_class.h>
#endif
namespace ProjectDataManagement