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

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_dialog.cpp

@@ -16,7 +16,8 @@ namespace AudioVideoManagement
 {
 
 MvsDialog::MvsDialog(const QString& menuGroup, LtsSession::LtsSession* session, QWidget* parent)
-    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_session(session),
+    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_logger(getLogger("MvsDialog")),
+      m_session(session),
       m_ui(new Ui::MvsDialog), m_menuGroup(menuGroup), m_model(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this)), m_avmDtc(nullptr), m_avmFtc(nullptr)
 {
@@ -105,7 +106,7 @@ void MvsDialog::onEditClicked()
         return;
 
     AudioVideoManagement::VideoTeam config = m_model->getRowData(currentIndex.row());
-    EditVideoTeamDialog* dialog = new EditVideoTeamDialog(config.id(), m_avmDtc, m_session->exerciseId(), config, this);
+    EditVideoTeamDialog* dialog = new EditVideoTeamDialog(config.id, m_avmDtc, m_session->exerciseId(), config, this);
 
     connect(dialog, &EditVideoTeamDialog::modifyRequest, this,
             [this](const AudioVideoManagement::VideoTeamModifyRequest& request) {
@@ -113,7 +114,7 @@ void MvsDialog::onEditClicked()
                     [this, request]() { return m_avmFtc->videoTeamModifyRequest(request, this); });
             });
 
-    addDialog(dialog, m_menuGroup, QStringLiteral("EditVideoTeam%1").arg(config.id()),
+    addDialog(dialog, m_menuGroup, QStringLiteral("EditVideoTeam%1").arg(config.id),
               LtsWidgets::LayoutArea::eDialogTab);
 }
 
@@ -126,12 +127,12 @@ void MvsDialog::onRemoveClicked()
 
     AudioVideoManagement::VideoTeamModifyRequest request;
     const VideoTeam team = m_model->getRowData(currentIndex.row());
-    request.id(team.id());
-    request.name(team.name());
-    request.ssrc(team.ssrc());
-    request.streamName(team.streamName());
-    request.vtPort(team.vtPort());
-    request.exerciseId(0);
+    request.id = team.id;
+    request.name = team.name;
+    request.ssrc = team.ssrc;
+    request.streamName = team.streamName;
+    request.vtPort = team.vtPort;
+    request.exerciseId = 0;
 
     m_requestHelper->startSingleRequest([this, request]() { return m_avmFtc->videoTeamModifyRequest(request, this); });
     m_model->removeRow(currentIndex.row());

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_edit_dialog.cpp

@@ -23,7 +23,7 @@ EditVideoTeamDialog::EditVideoTeamDialog(int32_t id, const std::shared_ptr<Audio
   : EditVideoTeamDialog(id, avmDtc, exerciseId, parent)
 {
   m_videoTeam = team;
-  QString name = QString::fromStdString(m_videoTeam.name());
+  QString name = QString::fromStdString(m_videoTeam.name);
   if (!m_teamsToIndex.contains(name))
   {
     m_teamsToIndex.insert(name, m_ui->cbIdentifier->count());
@@ -33,11 +33,12 @@ EditVideoTeamDialog::EditVideoTeamDialog(int32_t id, const std::shared_ptr<Audio
   m_ui->cbIdentifier->setCurrentIndex(m_teamsToIndex.value(name, 0));
   m_uiRequirements->addRequirement({m_ui->lblStreamName, [this]() { return (m_ui->leStreamName->text().size() > 0); }});
 
-  m_ui->leStreamName->setText(QString::fromStdString((m_videoTeam.streamName())));
+  m_ui->leStreamName->setText(QString::fromStdString((m_videoTeam.streamName)));
 }
 
 EditVideoTeamDialog::EditVideoTeamDialog(int32_t id, const std::shared_ptr<AudioVideoManagement::Interface::Dtc> &avmDtc, int32_t exerciseId, QWidget *parent)
   : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
+  , m_logger(getLogger("EditVideoTeamDialog"))
   , m_ui(new Ui::EditVideoTeamDialog)
   , m_exerciseId(exerciseId)
   , m_id(id)
@@ -62,13 +63,13 @@ void EditVideoTeamDialog::retranslate()
 bool EditVideoTeamDialog::apply()
 {
   AudioVideoManagement::VideoTeamModifyRequest request;
-  m_id = m_videoTeam.id();
-  request.id(m_videoTeam.id());
-  request.name(m_videoTeam.name());
-  request.ssrc(m_videoTeam.ssrc());
-  request.vtPort(m_videoTeam.vtPort());
-  request.streamName() = m_ui->leStreamName->text().toStdString();
-  request.exerciseId(m_exerciseId);
+  m_id = m_videoTeam.id;
+  request.id = m_videoTeam.id;
+  request.name = m_videoTeam.name;
+  request.ssrc = m_videoTeam.ssrc;
+  request.vtPort = m_videoTeam.vtPort;
+  request.streamName = m_ui->leStreamName->text().toStdString();
+  request.exerciseId = m_exerciseId;
   emit modifyRequest(request);
   return true;
 }
@@ -76,7 +77,7 @@ bool EditVideoTeamDialog::apply()
 void EditVideoTeamDialog::init()
 {
   onCheckTakenTeams();
-  if (m_videoTeam.id() > 0)
+  if (m_videoTeam.id > 0)
     m_ui->cbIdentifier->setEnabled(false);
 
   connect(m_avmDtc.get(),  &AudioVideoManagement::Interface::Dtc::videoTeamChanged, this, &EditVideoTeamDialog::onCheckTakenTeams);
@@ -100,7 +101,7 @@ void EditVideoTeamDialog::onCheckTakenTeams()
 
   for (auto it = teams.constBegin(); it != teams.constEnd(); ++it)
   {
-    QString team = QString::fromStdString(it.value().name());
+    QString team = QString::fromStdString(it.value().name);
 
     if (m_avmDtc->isFreeVideoTeam(m_exerciseId, it.key()))
     {
@@ -108,7 +109,7 @@ void EditVideoTeamDialog::onCheckTakenTeams()
         index = m_ui->cbIdentifier->count();
 
       m_teamsToIndex.insert(team, m_ui->cbIdentifier->count());
-      m_ui->cbIdentifier->addItem(team, QVariant::fromValue(it.value().id()));
+      m_ui->cbIdentifier->addItem(team, QVariant::fromValue(it.value().id));
     }
     else
       m_takenTeams.insert(team, it.key());

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_model.cpp

@@ -12,6 +12,7 @@ namespace AudioVideoManagement
 
 MvsModel::MvsModel(QObject* parent)
     : LtsAbstractTableModel<AudioVideoManagement::VideoTeam>({tr("Video Team Name"), tr("Stream Name")}, parent),
+      m_logger(getLogger("MvsModel")),
       m_exerciseId(-1)
 {
 }
@@ -26,9 +27,9 @@ QVariant MvsModel::data(const QModelIndex& index, int role) const
     switch (index.column())
     {
         case CHANNEL:
-            return QString::fromStdString(m_videoTeams.value(config.id()).name());
+            return QString::fromStdString(m_videoTeams.value(config.id).name);
         case STREAM_NAME:
-            return QString::fromStdString(config.streamName());
+            return QString::fromStdString(config.streamName);
     }
 
     return QVariant();
@@ -45,7 +46,7 @@ bool MvsModel::init(int32_t exerciseId, const std::shared_ptr<AudioVideoManageme
             [this](const AudioVideoManagement::VideoTeam& data, DataModification modType) {
                 Q_UNUSED(modType);
 
-                if (data.exerciseId() == m_exerciseId)
+                if (data.exerciseId == m_exerciseId)
                     onDataChanged(data, DataModification::eAdded);
                 else
                     onDataChanged(data, DataModification::eRemoved);
@@ -55,7 +56,7 @@ bool MvsModel::init(int32_t exerciseId, const std::shared_ptr<AudioVideoManageme
     const QMap<int, AudioVideoManagement::VideoTeam> configMap = m_avmDtc->videoTeams();
     for (auto it = configMap.begin(); it != configMap.end(); ++it)
     {
-        if (it.value().exerciseId() == m_exerciseId)
+        if (it.value().exerciseId == m_exerciseId)
             configs.append(it.value());
     }
     setData(configs);
@@ -74,10 +75,10 @@ QByteArray MvsModel::modelToJson()
         DEBUG_LOG(m_logger) << "row =" << ": " << row;
         QJsonObject inner;
         const VideoTeam& config = m_vecData.at(row);
-        inner[QStringLiteral("id")] = config.id();
-        inner[QStringLiteral("exerciseId")] = config.exerciseId();
-        inner[QStringLiteral("name")] = QString::fromStdString(config.name());
-        inner[QStringLiteral("streamName")] = QString::fromStdString(config.streamName());
+        inner[QStringLiteral("id")] = config.id;
+        inner[QStringLiteral("exerciseId")] = config.exerciseId;
+        inner[QStringLiteral("name")] = QString::fromStdString(config.name);
+        inner[QStringLiteral("streamName")] = QString::fromStdString(config.streamName);
         arr += inner;
     }
 
@@ -105,14 +106,14 @@ QVector<VideoTeamModifyRequest> MvsModel::jsonToVideoTeamVector(const QByteArray
             continue;
 
         VideoTeamModifyRequest config;
-        config.id(id);
-        config.name(team.name());
-        config.ssrc(team.ssrc());
-        config.vtPort(team.vtPort());
-        config.exerciseId(m_exerciseId);
-        config.streamName(obj[QStringLiteral("streamName")].toString().toStdString());
+        config.id = id;
+        config.name = team.name;
+        config.ssrc = team.ssrc;
+        config.vtPort = team.vtPort;
+        config.exerciseId = m_exerciseId;
+        config.streamName = obj[QStringLiteral("streamName")].toString().toStdString();
 
-        INFO_LOG(m_logger) << "insertRow: " << config.name() << " VideoTeamId=" << config.id();
+        INFO_LOG(m_logger) << "insertRow: " << config.name << " VideoTeamId=" << config.id;
         result.append(std::move(config));
     }
     return result;
@@ -122,7 +123,7 @@ bool MvsModel::isFiltered(const VideoTeam& data, DataModification modType) const
 {
 
     Q_UNUSED(modType)
-    if (data.exerciseId() != m_exerciseId)
+    if (data.exerciseId != m_exerciseId)
         return true;
     return false;
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/avm_mvs_video_team_dialog.cpp

@@ -14,7 +14,8 @@ namespace AudioVideoManagement
 {
 
 MvsVideoTeamDialog::MvsVideoTeamDialog(QWidget* parent)
-    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_ui(new Ui::MvsVideoTeamDialog),
+    : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_logger(getLogger("MvsVideoTeamDialog")),
+      m_ui(new Ui::MvsVideoTeamDialog),
       m_session(nullptr), m_dtc(nullptr), m_ftc(nullptr), m_flmGui(nullptr),
       m_requestHelper(new LtsUtils::RequestHelper(this))
 {
@@ -64,11 +65,11 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
 
     QMap<std::string, VideoTeam> teamMap;
     auto cbVt = [this, &row, &teamMap](const AudioVideoManagement::VideoTeam& vt) {
-        if (vt.exerciseId() != m_session->exerciseId())
+        if (vt.exerciseId != m_session->exerciseId())
             return;
 
-        m_teamToRow.insert(vt.programId() == 3 ? 2 : 1, vt.programId() == 3 ? 2 : 1);
-        teamMap.insert(vt.name(), vt);
+        m_teamToRow.insert(vt.programId == 3 ? 2 : 1, vt.programId == 3 ? 2 : 1);
+        teamMap.insert(vt.name, vt);
     };
     m_dtc->videoTeams(cbVt);
 
@@ -76,8 +77,8 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
     QSet<int> teamId;
     for (auto rec : vts)
     {
-        if (teamMap.value(rec.streamName()).id() > 0)
-            teamId.insert(rec.teamId());
+        if (teamMap.value(rec.streamName).id > 0)
+            teamId.insert(rec.teamId);
     }
     for (auto team : teamId)
     {
@@ -86,14 +87,14 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
     }
 
     auto cbMs = [this, &column](const InfrastructureManagement::MainStructureElement& mse) {
-        if (mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::RadioStation &&
-            !mse.isDeleted() && mse.id() > 0)
+        if (mse.structureElementTypeId == InfrastructureManagement::StructureElementType::RadioStation &&
+            !mse.isDeleted && mse.id > 0)
         {
-            m_stationToColumn.insert(mse.id(), column);
-            QLabel* lblStation = new QLabel(QString::fromStdString(mse.name()), this);
+            m_stationToColumn.insert(mse.id, column);
+            QLabel* lblStation = new QLabel(QString::fromStdString(mse.name), this);
             lblStation->setProperty("RadioStation", true);
             lblStation->setProperty("column", column);
-            lblStation->setProperty("name", QString::fromStdString(mse.name()));
+            lblStation->setProperty("name", QString::fromStdString(mse.name));
             m_ui->glMvs->addWidget(lblStation, 0, column++);
             lblStation->hide();
         }
@@ -101,17 +102,17 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
     m_ismDtc->mainStructureElements(cbMs);
 
     auto cbRec = [this, teamMap](const AudioVideoManagement::VideoReceiver& rec) {
-        if (m_teamToRow.value(rec.teamId()) <= 0)
+        if (m_teamToRow.value(rec.teamId) <= 0)
             return;
-        if (!teamMap.contains(rec.streamName()))
+        if (!teamMap.contains(rec.streamName))
             return;
-        m_receiverMap.insert(rec.id(), rec);
-        if (m_stationToColumn.value(rec.mainStructureElementId()) > 0 && m_teamToRow.value(rec.teamId()) > 0)
+        m_receiverMap.insert(rec.id, rec);
+        if (m_stationToColumn.value(rec.mainStructureElementId) > 0 && m_teamToRow.value(rec.teamId) > 0)
         {
             ReceiverElement* btn = createReceiverElement(rec);
 
-            int row = m_teamToRow.value(rec.teamId());
-            int column = m_stationToColumn.value(rec.mainStructureElementId());
+            int row = m_teamToRow.value(rec.teamId);
+            int column = m_stationToColumn.value(rec.mainStructureElementId);
             if (!m_videoTeamButtonGroup.contains(row))
             {
                 QRadioButton* none = new QRadioButton(tr("None"), this);
@@ -121,10 +122,10 @@ bool MvsVideoTeamDialog::init(LtsSession::LtsSession* session,
                 m_videoTeamButtonGroup.insert(row, new QButtonGroup(this));
                 m_videoTeamButtonGroup[row]->addButton(none, 0);
             }
-            m_videoTeamButtonGroup[row]->addButton(btn->radioButton(), rec.mainStructureElementId());
-            m_videoTeamButtonGroup[row]->setProperty("teamId", rec.teamId());
-            m_receiverIds.insert(QPair<int, int>(rec.mainStructureElementId(), rec.teamId()), rec.id());
-            bool isActive = rec.isActive();
+            m_videoTeamButtonGroup[row]->addButton(btn->radioButton(), rec.mainStructureElementId);
+            m_videoTeamButtonGroup[row]->setProperty("teamId", rec.teamId);
+            m_receiverIds.insert(QPair<int, int>(rec.mainStructureElementId, rec.teamId), rec.id);
+            bool isActive = rec.isActive;
             btn->setButtonChecked(isActive);
             btn->radioButton()->setChecked(isActive);
             m_ui->glMvs->addWidget(btn, row, column);
@@ -167,32 +168,32 @@ bool MvsVideoTeamDialog::apply()
 
         if (itBg.value()->checkedId() == 0)
         {
-            req.isActive(false);
-            req.id(0);
+            req.isActive = false;
+            req.id = 0;
             QMapIterator<qint32, AudioVideoManagement::VideoReceiver> i(m_receiverMap);
             while (i.hasNext())
             {
                 i.next();
-                if ((i.value().isActive()) && i.value().teamId() == teamId)
-                    req.id(i.value().id());
+                if ((i.value().isActive) && i.value().teamId == teamId)
+                    req.id = i.value().id;
             }
         }
         else
         {
-            req.isActive(true);
-            req.id(m_receiverIds.value(QPair<int, int>(mainStructureElementId, teamId)));
+            req.isActive = true;
+            req.id = m_receiverIds.value(QPair<int, int>(mainStructureElementId, teamId));
         }
         DEBUG_LOG(m_logger) << "itBg.key=" << itBg.key() << " mainStructureElementId=" << mainStructureElementId
-                            << " teamId=" << teamId << " id=" << req.id() << " isActive=" << req.isActive();
+                            << " teamId=" << teamId << " id=" << req.id << " isActive=" << req.isActive;
 
-        if ((m_receiverMap.value(req.id()).isActive() != req.isActive()) && req.id() > 0)
+        if ((m_receiverMap.value(req.id).isActive != req.isActive) && req.id > 0)
         {
 
             if (oldActiveId > 0)
             {
                 VideoReceiverModifyActiveRequest reqInactive;
-                reqInactive.id(oldActiveId);
-                reqInactive.isActive(false);
+                reqInactive.id = oldActiveId;
+                reqInactive.isActive = false;
                 m_requestHelper->addRequest(
                     [this, reqInactive]() { return m_ftc->videoReceiverModifyActiveRequest(reqInactive, this); });
             }
@@ -207,30 +208,30 @@ ReceiverElement* MvsVideoTeamDialog::createReceiverElement(const VideoReceiver&
 {
     ReceiverElement* re = new ReceiverElement(this);
     re->init(rec);
-    if (rec.isActive())
-        m_oldActiveTeamToRec.insert(rec.teamId(), rec.id());
-    m_elementList.insert(rec.teamId(), re);
+    if (rec.isActive)
+        m_oldActiveTeamToRec.insert(rec.teamId, rec.id);
+    m_elementList.insert(rec.teamId, re);
     return re;
 }
 
 void MvsVideoTeamDialog::updateReceiverButton(const AudioVideoManagement::VideoReceiver& rec, DataModification modType)
 {
     Q_UNUSED(modType);
-    m_receiverMap.insert(rec.id(), rec);
-    for (auto it = m_elementList.lowerBound(rec.teamId()); it != m_elementList.end(); ++it)
+    m_receiverMap.insert(rec.id, rec);
+    for (auto it = m_elementList.lowerBound(rec.teamId); it != m_elementList.end(); ++it)
     {
-        if (it.key() != rec.teamId())
+        if (it.key() != rec.teamId)
             break;
         auto* receiverElement = it.value();
-        if (receiverElement->property("recId").toInt() != rec.id())
+        if (receiverElement->property("recId").toInt() != rec.id)
             continue;
 
-        receiverElement->setButtonChecked(rec.isActive());
-        receiverElement->setSnr(rec.snr());
-        receiverElement->setDbm(rec.dbm());
-        receiverElement->setStreamName(QString::fromStdString(rec.streamName()));
-        receiverElement->setFrequency(rec.frequency());
-        receiverElement->setIsLocked(rec.isLocked());
+        receiverElement->setButtonChecked(rec.isActive);
+        receiverElement->setSnr(rec.snr);
+        receiverElement->setDbm(rec.dbm);
+        receiverElement->setStreamName(QString::fromStdString(rec.streamName));
+        receiverElement->setFrequency(rec.frequency);
+        receiverElement->setIsLocked(rec.isLocked);
     }
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/receiverelement.cpp

@@ -36,12 +36,12 @@ QRadioButton *ReceiverElement::radioButton()
 
 bool ReceiverElement::init(const AudioVideoManagement::VideoReceiver &rec)
 {
-  setProperty("teamId", rec.teamId());
-  setProperty("recId", rec.id());
+  setProperty("teamId", rec.teamId);
+  setProperty("recId", rec.id);
 
-  setSnr(rec.snr());
-  setDbm(rec.dbm());
-  setButtonChecked(rec.isActive());
+  setSnr(rec.snr);
+  setDbm(rec.dbm);
+  setButtonChecked(rec.isActive);
 
   return true;
 }