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 eb1d949edc
commit 815e16368e
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/OperatorManagement/Gui/OpmComboBox/opm_combobox_gui_plugin.cpp
+15 -15
View File
@@ -43,9 +43,9 @@ bool InterfaceImpl::fillOperatorComboBox(LtsWidgets::LtsComboBox *cbx, CbxOperat
{
auto cbUser = [cbx](const User &user)
{
if (user.isDeleted() || user.id() <= 0)
if (user.isDeleted || user.id <= 0)
return;
cbx->addItem(QString::fromStdString(user.name()), user.id());
cbx->addItem(QString::fromStdString(user.name), user.id);
};
m_dtc->users(cbUser);
}
@@ -54,15 +54,15 @@ bool InterfaceImpl::fillOperatorComboBox(LtsWidgets::LtsComboBox *cbx, CbxOperat
{
auto cbPlayer = [this, cbx] (const ParticipantManagement::Participant &oc)
{
if (oc.isDeleted() || !oc.equipmentNumber().is_set())
if (oc.isDeleted || !oc.equipmentNumber.has_value())
return;
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(oc.typeId()).typeClass();
ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(oc.typeId).typeClass;
if ((typeClass != ParticipantManagement::TypeClass::SupportEntity) ||
(oc.id() <= 0))
(oc.id <= 0))
return;
int participantId = oc.id();
int participantId = oc.id;
QString hierarchy = m_ppmDtc->hierarchyFromParticipant(participantId);
cbx->addItem(hierarchy + QStringLiteral(" - ") + QString::fromStdString(oc.tacticalIdentifier()) + QStringLiteral(" - ")+ QString::number(oc.equipmentNumber().get()), 0 - oc.id());
cbx->addItem(hierarchy + QStringLiteral(" - ") + QString::fromStdString(oc.tacticalIdentifier) + QStringLiteral(" - ")+ QString::number(oc.equipmentNumber.value()), 0 - oc.id);
};
m_ppmDtc->participants(cbPlayer);
}
@@ -79,12 +79,12 @@ bool InterfaceImpl::fillActiveAppOperatorComboBox(LtsWidgets::LtsComboBox *cbx,
{
DEBUG_LOG(m_logger) << "activeApp = " << activeApp
<< ", appId = " << appId;
if ((activeApp.operatorId() <= 0) ||
if ((activeApp.operatorId <= 0) ||
(activeApp.exerciseId() != exerciseId))
(activeApp.exerciseId != exerciseId))
return;
operatorIds += activeApp.operatorId();
operatorIds += activeApp.operatorId;
};
m_dtc->activeApps(cbActiveApp);
@@ -92,7 +92,7 @@ bool InterfaceImpl::fillActiveAppOperatorComboBox(LtsWidgets::LtsComboBox *cbx,
{
const User &user = m_dtc->user(opId);
DEBUG_LOG(m_logger) << "activeApp = addItem: " << user;
cbx->addItem(QString::fromStdString(user.name()), user.id());
cbx->addItem(QString::fromStdString(user.name), user.id);
}
cbx->model()->sort(0);
@@ -114,12 +114,12 @@ bool InterfaceImpl::fillActiveAppScreenComboBox(LtsWidgets::LtsComboBox *cbx, in
auto cbActiveApp = [this, cbx, appId, operatorId, exerciseId](const ActiveApp &activeApp)
{
DEBUG_LOG(m_logger) << " activeApp = " << activeApp;
if ((activeApp.operatorId() == operatorId) &&
if ((activeApp.operatorId == operatorId) &&
(activeApp.exerciseId() == exerciseId))
(activeApp.exerciseId == exerciseId))
{
const int screenId = activeApp.screenId();
const QString &activeAppAsString = LtsSession::LtsSession::appToString(static_cast<LtsAppDescriptor::App>(activeApp.appId()));
const int screenId = activeApp.screenId;
const QString &activeAppAsString = LtsSession::LtsSession::appToString(static_cast<LtsAppDescriptor::App>(activeApp.appId));
cbx->addItem(tr("Screen '%1' ('%2')").arg(screenId).arg(activeAppAsString),
screenId);
}