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

@@ -83,11 +83,11 @@ void OperatorChangePassword::onOkay()
}
OperatorManagement::OperatorChangePasswordRequest req;
req.id(m_operatorId);
req.oldPassword(m_ui->leOldPassword->text().toStdString());
req.password(m_ui->leNewPassword->text().toStdString());
req.forceSet(m_ui->leOldPassword->isHidden());
req.id = m_operatorId;
req.oldPassword = m_ui->leOldPassword->text().toStdString();
req.password = m_ui->leNewPassword->text().toStdString();
req.forceSet = m_ui->leOldPassword->isHidden();
m_requestHelper->addRequest([this,req]()
{
return m_ftc->operatorChangePasswordRequest(req, this);
@@ -10,7 +10,7 @@
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_translation.h>
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <LtsUtils/dds_vector_to_pixmap.h>
#include <LtsUtils/LtsUtilsCore/dds_vector_to_pixmap.h>
#include <QtGui/QIcon>
@@ -34,6 +34,7 @@ OperatorManagementDialogModel::OperatorManagementDialogModel(QObject *parent, in
tr("Exercises"),
tr("Preset Role")},
parent)
, m_logger(getLogger("OpeartorManagementDialogModel"))
, m_dtc(nullptr)
, m_ppmDtc(nullptr)
#ifdef BUILD_RTI
@@ -92,8 +93,8 @@ bool OperatorManagementDialogModel::initModel(LtsSession::LtsSession *session, c
{
auto cb = [this](const Group &group)
{
if (group.type() == GroupType::PresetGroup)
m_roles[group.id()] = QString::fromStdString(group.name());
if (group.type == GroupType::PresetGroup)
m_roles[group.id] = QString::fromStdString(group.name);
};
dtc->groups(cb);
}
@@ -104,9 +105,9 @@ bool OperatorManagementDialogModel::initModel(LtsSession::LtsSession *session, c
void OperatorManagementDialogModel::onPartyChanged(const ParticipantManagement::Party &data, DataModification modType)
{
if (modType == DataModification::eRemoved)
m_parties.remove(data.id());
m_parties.remove(data.id);
else
m_parties[data.id()] = ParticipantManagement::trPartyName(data.name());
m_parties[data.id] = ParticipantManagement::trPartyName(data.name);
for (int row = 0; row < m_vecData.size(); ++row)
{
const QModelIndex idx(index(row, VisibleParties));
@@ -118,9 +119,9 @@ void OperatorManagementDialogModel::onPartyChanged(const ParticipantManagement::
void OperatorManagementDialogModel::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType)
{
if (modType == DataModification::eRemoved)
m_exercises.remove(data.id());
m_exercises.remove(data.id);
else
m_exercises[data.id()] = QString::fromStdString(data.name());
m_exercises[data.id] = QString::fromStdString(data.name);
for (int row = 0; row < m_vecData.size(); ++row)
{
const QModelIndex idx(index(row, Exercises));
@@ -143,33 +144,33 @@ QVariant OperatorManagementDialogModel::data(const QModelIndex &index, int role)
if (role == Qt::DisplayRole)
{
const UserType &op = m_vecData.at(index.row());
std::vector<OperatorManagement::PartiesByExercise> pbe = op.visiblePartiesByExercise();
std::vector<OperatorManagement::PartiesByExercise> pbe = op.visiblePartiesByExercise;
switch (index.column())
{
case Name:
return QString::fromStdString(op.name());
return QString::fromStdString(op.name);
case Description:
return QString::fromStdString(op.description());
return QString::fromStdString(op.description);
case VisibleParties:
return hasVisibleParties(pbe);
case RolePreset:
return rolePreset(op.rolePresetId());
return rolePreset(op.rolePresetId);
case Id:
return QString::number(op.id());
return QString::number(op.id);
case EffectiveAcls:
return effectiveAcls(op.effectiveAcls());
return effectiveAcls(op.effectiveAcls);
case PrimaryGroupId:
return QString::number(op.primaryGroupId());
return QString::number(op.primaryGroupId);
case ProjectionPriority:
return priority(op.projectionPriority());
return priority(op.projectionPriority);
case AudioChannelPriority:
return priority(op.audioChannelPriority());
return priority(op.audioChannelPriority);
case Image:
return LtsUtils::getPixmap(op.image());
return LtsUtils::getPixmap(op.image);
case Workstation:
return workstation(op.workstationId(), op.workstationIp());
return workstation(op.workstationId, op.workstationIp);
case Exercises:
return exercises(op.exerciseIds());
return exercises(op.exerciseIds);
}
}
return QVariant();
@@ -191,12 +192,12 @@ QString OperatorManagementDialogModel::workstation(int wsId, int wsIp) const
}
QString OperatorManagementDialogModel::rolePreset(const dds::core::optional<int32_t> &rolePresetId) const
QString OperatorManagementDialogModel::rolePreset(const omg::types::optional<int32_t> &rolePresetId) const
{
if (!rolePresetId.is_set())
if (!rolePresetId.has_value())
return tr("---");
int32_t id = rolePresetId.get();
int32_t id = rolePresetId.value();
if (id <= 0)
return tr("---");
@@ -212,17 +213,17 @@ QString OperatorManagementDialogModel::hasVisibleParties(const std::vector<Opera
for (const auto &pbe : vpbe)
{
if (pbe.exerciseId() != exerciseId)
if (pbe.exerciseId != exerciseId)
continue;
std::vector<int32_t> hiddenParties = {};
if (pbe.hiddenParties().is_set())
hiddenParties = pbe.hiddenParties().get();
if (pbe.hiddenParties.has_value())
hiddenParties = pbe.hiddenParties.value();
if(!pbe.visibleParties().is_set())
if(!pbe.visibleParties.has_value())
return {};
for (const auto &partyId : pbe.visibleParties().get())
for (const auto &partyId : pbe.visibleParties.value())
{
bool isHidden = false;
for (const int &hiddenId : hiddenParties)
@@ -284,7 +285,7 @@ bool OperatorManagementDialogModel::isFiltered(const UserType &data, DataModific
if (m_exerciseId == 0)
return false;
for (auto exId : data.exerciseIds())
for (auto exId : data.exerciseIds)
if (exId == m_exerciseId)
return false;
@@ -6,7 +6,7 @@
#ifdef BUILD_RTI
#include <OperatorManagement/opm_dtc.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_dtc.h>
#include <ExerciseManagement/exm_dtc.h>
#include <OperatorManagement/logger.h>
#include <LtsSession/lts_session.h>
@@ -57,7 +57,7 @@ NGL::INGLLogger &m_logger;
QString effectiveAcls(std::vector<int32_t> acls) const;
QString priority(int16_t prio) const;
QString exercises(const std::vector<int32_t> &exercises) const;
QString rolePreset(const dds::core::optional<int32_t> &rolePresetId) const;
QString rolePreset(const omg::types::optional<int32_t> &rolePresetId) const;
QString workstation(int wsId, int wsIp) const;
private Q_SLOTS: