Adds immediate migration results

2026-08-18 22:12:24 +02:00
1 parent ba4121728b
commit 6a2a0667ab
@@ -22,7 +22,7 @@ ADD_SUBDIRECTORY(Shared)
 ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface
  ${CMAKE_CURRENT_SOURCE_DIR}/avm_menu_edit_gui_plugin_interface.h
  ${CMAKE_CURRENT_SOURCE_DIR}/..
-  GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt5::Core AvmShared Boost::boost
+  GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt6::Core AvmShared Boost::boost
 )

 #
@@ -31,7 +31,7 @@ ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface
 ADD_INTERFACE_LIBRARY(AvmCombatNetRadioGuiPluginInterface
  ${CMAKE_CURRENT_SOURCE_DIR}/avm_combat_net_radio_gui_plugin_interface.h
  ${CMAKE_CURRENT_SOURCE_DIR}/..
-  GuiPluginInterface Qt5::Core
+  GuiPluginInterface Qt6::Core
 )

 #
@@ -59,5 +59,5 @@ ADD_INTERFACE_LIBRARY(AvmMvsVideoTeamGuiPluginInterface
 ADD_INTERFACE_LIBRARY(AvmDataPluginInterface
  ${CMAKE_CURRENT_SOURCE_DIR}/avm_data_plugin_interface.h
  ${CMAKE_CURRENT_SOURCE_DIR}/..
-  DataPluginInterface svcAvmCommon Qt5::Core IsmDataPluginInterface
+  DataPluginInterface svcAvmCommon Qt6::Core IsmDataPluginInterface
 )
@@ -36,7 +36,7 @@ NGL_TARGET_LINK_LIBRARIES(AvmDataPlugin
  svcExmClient
  svcIsmClient
  IsmDataPluginInterface
-  Qt5::Core
+  Qt6::Core
  LtsUtilsGuiStyleManager
  LtsUtilsGuiConnectDialog
  LtsUtilsSettings
@@ -2,6 +2,7 @@


 #include "audio_settings_dialog.h"
+#include <utility>
 #include "ui_audio_settings_dialog.h"
 #include "audio_settings_avail_streams_model.h"
 #include "audio_settings_used_streams_model.h"
@@ -187,7 +188,7 @@ void AudioSettingsDialog::fillOperatorList()
 {
  QVector<StreamData> newStreamData;

-  for (const auto &rc : qAsConst(m_cnrTvcProfileMap))
+  for (const auto &rc : std::as_const(m_cnrTvcProfileMap))
  {
    if ((rc.exerciseId() != m_session->exerciseId())
        || (rc.operatorId() != m_ui->operatorComboBox->currentData().toInt()))
@@ -283,7 +284,7 @@ bool AudioSettingsDialog::applyRemove()
  RemoveCnrTvcProfileRequest    removeRequest;
  DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyRemove";

-  for (const auto &profile : qAsConst(m_cnrTvcProfileMap))
+  for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
  {
    if (profile.operatorId() != m_operatorId)
      continue;
@@ -306,7 +307,7 @@ bool AudioSettingsDialog::applyModify()
  ModifyCnrTvcProfileRequest modifyRequest;
  DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyModify";

-  for (const auto &profile : qAsConst(m_cnrTvcProfileMap))
+  for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
  {
    if (profile.operatorId() != m_operatorId)
      continue;
@@ -78,7 +78,7 @@ NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
  ngltools
  nglwidgets
  OpmDataPluginInterface
-  Qt5::Widgets
+  Qt6::Widgets
  TopicEditorBase
  Boost::boost
 )
@@ -2,6 +2,7 @@


 #include "avm_sequence_model.h"
+#include <utility>

 #include <QJsonObject>
 #include <QColor>
@@ -209,13 +210,13 @@ void AvmSequenceModel::setHighlightedRow(int highlighted, bool reset)
  changedRows.reserve(oldSelected.size() + m_highlightedRows.size());

  if (m_highlightedRows.isEmpty() || reset)
-    for (int row : qAsConst(oldSelected))
+    for (int row : std::as_const(oldSelected))
      changedRows += row;

-  for (int row : qAsConst(m_highlightedRows))
+  for (int row : std::as_const(m_highlightedRows))
    changedRows += row;

-  for (int row : qAsConst(changedRows))
+  for (int row : std::as_const(changedRows))
    emit dataChanged(index(row, 0), index(row, Description), { Qt::BackgroundRole });
 }

@@ -2,6 +2,7 @@


 #include "topic_editor.h"
+#include <utility>
 #include "ui_topic_editor.h"

 #include <AudioVideoManagement/av_helper.h>
@@ -620,7 +621,7 @@ void TopicEditor::onDeleteSequences()
  if (rows.count() == 1)
    curEditedRow = rows.first();

-  for (int row : qAsConst(rowIds))
+  for (int row : std::as_const(rowIds))
  {
    m_model->removeRow(row);
    if (curEditedRow == row)
@@ -2,6 +2,7 @@


 #include "avm_used_streams_model.h"
+#include <utility>
 #include "avm_available_streams_model.h"
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <nglwidgets/ngltreeitem.h>
@@ -474,7 +475,7 @@ QSet<int> UsedStreamsModel::fillTakenCameras(NGLTreeItem *getItem) const
 {
  QSet<int> ret;
  const QVector<NGLTreeItem *> &children = getItem->children();
-  for (const auto &item : qAsConst(children))
+  for (const auto &item : std::as_const(children))
  {
    if (item->childCount())
      ret +=  fillTakenCameras(item);
@@ -91,7 +91,7 @@ NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
  svcAvmCommon
  AvmShared
  svcExmClient
-  Qt5::Widgets
+  Qt6::Widgets
  LtsWidgets
  LtsDataView
  LtsUtilsGuiDds
@@ -2,6 +2,7 @@


 #include "avm_cnr_json_helper.h"
+#include <utility>

 #include <AudioVideoManagement/avm_dtc.h>

@@ -19,7 +20,7 @@ QByteArray cnrConfigVectorToJson(const QVector<CnrConfig> &configVector, int32_t
  QJsonObject obj;
  QJsonArray arr;

-  for (const CnrConfig &config : qAsConst(configVector))
+  for (const CnrConfig &config : std::as_const(configVector))
  {
    if((isGlobal && config.exerciseId().is_set())
       || (!isGlobal && !config.exerciseId().is_set()))
@@ -2,6 +2,7 @@


 #include "avm_combat_net_radio_dialog_model.h"
+#include <utility>
 #include <ParticipantManagement/ppm_translation.h>
 #include <LtsSession/lts_session_data.h>
 #include <AudioVideoManagement/avm_ftc.h>
@@ -110,7 +111,7 @@ bool CombatNetRadioDialogModel::init(const std::shared_ptr<Interface::Dtc> &avmD
 }
 bool CombatNetRadioDialogModel::onlyGlobals()
 {
-  for(const CnrConfig &config : qAsConst(m_vecData))
+  for(const CnrConfig &config : std::as_const(m_vecData))
  {
    if(config.exerciseId().is_set() && config.exerciseId().get() == m_exerciseId)
      return false;
@@ -2,6 +2,7 @@


 #include "avm_edit_combat_net_radio_dialog.h"
+#include <utility>
 #include "ui_avm_edit_combat_net_radio_dialog.h"
 #include <AudioVideoManagement/av_helper.h>
 #include <AudioVideoManagement/Shared/project_settings.h>
@@ -191,7 +192,7 @@ void EditCombatNetRadioDialog::init(LtsSession::LtsSession *session)
  if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
    ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";

-  for (const ParticipantManagement::Party &party : qAsConst(parties))
+  for (const ParticipantManagement::Party &party : std::as_const(parties))
    m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name()), party.id());

  connect(m_ui->cbParty, QOverload<int>::of(&LtsWidgets::LtsComboBox::currentIndexChanged), this, &EditCombatNetRadioDialog::onPartyIndexChanged);
@@ -481,7 +482,7 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index)

  int32_t partyId = m_ui->cbParty->itemData(index).toInt();

-  for (const ParticipantManagement::Participant &unit : qAsConst(m_units))
+  for (const ParticipantManagement::Participant &unit : std::as_const(m_units))
  {
    QString unitStr;
    if (unit.partyId() == partyId)
@@ -2,6 +2,7 @@


 #include "avm_edit_frequency_planning_dialog.h"
+#include <utility>
 #include "ui_avm_edit_frequency_planning_dialog.h"
 #include "avm_edit_frequency_planning_frequency_data_model.h"

@@ -330,7 +331,7 @@ QVector<int> EditFrequencyPlanningDialog::otherActiveExercises() const
  allExercises.erase(newEnd, allExercises.end());

  QVector<int>   toBeConsidered;
-  for (const auto &exercise : qAsConst(allExercises))
+  for (const auto &exercise : std::as_const(allExercises))
  {
    if (exercise.id() == m_exerciseId)
      continue;
@@ -2,6 +2,7 @@


 #include "avm_edit_frequency_planning_frequency_data_model.h"
+#include <utility>

 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 #include <FileManagement/flm_translation.h>
@@ -78,7 +79,7 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
      QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
      if (circuits.size() > 1)
      {
-        for (RadioCircuit *circuit : qAsConst(circuits))
+        for (RadioCircuit *circuit : std::as_const(circuits))
        {
          itemData.radioCircuit = circuit;
          ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(itemData));
@@ -109,7 +110,7 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
    }
  }
  
-  for (const FrequencyPlanningData &item : qAsConst(fpdMap))
+  for (const FrequencyPlanningData &item : std::as_const(fpdMap))
  {
    setFrequencyPlanningData(item);
  }
@@ -202,7 +203,7 @@ void EditFrequencyPlanningFrequencyDataModel::setCnrConfigs(const QVector<CnrCon
      {
        ConfigTreeItem *configItem = new ConfigTreeItem(QVariant::fromValue(id));
        insertRow(m_rootItem->childCount(), indexFromItem(m_rootItem), configItem);
-        for (RadioCircuit *circuit : qAsConst(circuits))
+        for (RadioCircuit *circuit : std::as_const(circuits))
        {
          id.radioCircuit = circuit;
          ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(id));
@@ -721,7 +722,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencyPlanningData(const Fre
    {
      ConfigTreeItem *configItem = new ConfigTreeItem(QVariant::fromValue(data));
      insertRow(m_rootItem->childCount(), indexFromItem(m_rootItem), configItem);
-      for (RadioCircuit *circuit : qAsConst(circuits))
+      for (RadioCircuit *circuit : std::as_const(circuits))
      {
        data.radioCircuit = circuit;
        ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(data));
@@ -752,7 +753,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencyPlanningData(const Fre
  if (circuits.size() <= 1)
    return;

-  for (RadioCircuit *circuit : qAsConst(circuits))
+  for (RadioCircuit *circuit : std::as_const(circuits))
  {
    data.radioCircuit = circuit;
    ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(data));
@@ -777,9 +778,9 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
    {
      const FrequencyPlanningData &pI= startSearchIt.value();
      QSet<int> fsdIdsInner = frequencySetDataIds(pI.properties());
-      for (int inner : qAsConst(fsdIdsInner))
+      for (int inner : std::as_const(fsdIdsInner))
      {
-        for (int outer : qAsConst(fsdIdsOuter))
+        for (int outer : std::as_const(fsdIdsOuter))
        {
          if (inner != outer)
          {
@@ -803,7 +804,7 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
  }
 #ifdef LTS_DEBUG
  QString qs;
-  for (int id : qAsConst(m_multipleAssignedCnrIds))
+  for (int id : std::as_const(m_multipleAssignedCnrIds))
  {
    qs.append(QString::number(id));
    qs.append(QStringLiteral(", "));
@@ -881,7 +882,7 @@ EditFrequencyPlanningFrequencyDataModel::ConfigTreeItem* EditFrequencyPlanningFr
 QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanningSetIds()
 {
  QSet<int> result;
-  for (const auto &fpd : qAsConst(m_frequencyPlanningData))
+  for (const auto &fpd : std::as_const(m_frequencyPlanningData))
  {
    result += AudioVideoManagement::frequencySetDataIds(fpd.properties());
  }
@@ -889,7 +890,7 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
  if(m_exerciseId == 0)
  {
    QMap<qint32,AudioVideoManagement::FrequencyPlanning> frequencyPlannings =  m_avmDtc->frequencyPlannings();
-    for(const auto &frequencyPlanning : qAsConst(frequencyPlannings))
+    for(const auto &frequencyPlanning : std::as_const(frequencyPlannings))
    {
      if(!frequencyPlanning.exerciseId().is_set())
        continue;
@@ -2,6 +2,7 @@


 #include "avm_edit_frequency_planning_frequency_data_model.h"
+#include <utility>
 #include "avm_edit_frequency_planning_resource_dialog.h"
 #include "ui_avm_edit_frequency_planning_resource_dialog.h"
 #include "avm_frequency_planning_widget.h"
@@ -75,7 +76,7 @@ bool EditFrequencyPlanningResourceDialog::init(LtsSession::LtsSession *session,

  QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(planningData.properties());
  bool readOnly = isReadOnly(planningData.properties());
-  for (RadioCircuit *circuit : qAsConst(circuits))
+  for (RadioCircuit *circuit : std::as_const(circuits))
  {
    addMemberWidget(circuit, readOnly);
  }
@@ -2,6 +2,7 @@


 #include "avm_load_frequency_planning_dialog_model.h"
+#include <utility>

 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 #include <FileManagement/flm_translation.h>
@@ -87,7 +88,7 @@ void LoadFrequencyPlanningDialogModel::onFrequencyPlanningChanged(const Frequenc
  
  
  QMap<qint32,AudioVideoManagement::FrequencyPlanning> frequencyPlannings =  m_avmDtc->frequencyPlannings();
-  for(const auto &frequencyPlanning : qAsConst(frequencyPlannings))
+  for(const auto &frequencyPlanning : std::as_const(frequencyPlannings))
  {
    
    
@@ -213,7 +214,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray &data)
        ConfigTreeItem *configItem = new ConfigTreeItem(QVariant::fromValue(id));
        m_checkStates.insert(m_rootItem->childCount(), Qt::Unchecked);
        insertRow(m_rootItem->childCount(), indexFromItem(m_rootItem), configItem);
-        for (RadioCircuit *circuit : qAsConst(circuits))
+        for (RadioCircuit *circuit : std::as_const(circuits))
        {
          id.radioCircuit = circuit;
          ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(id));
@@ -629,7 +630,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts()
    itemsInRow.append(item);
    itemsInRow += item->children();

-    for (NGLTreeItem *treeItem : qAsConst(itemsInRow))
+    for (NGLTreeItem *treeItem : std::as_const(itemsInRow))
    {
      ItemData itemData = treeItem->data().value<ItemData>();

@@ -809,7 +810,7 @@ void LoadFrequencyPlanningDialogModel::setFrequencyPlanningData(const FrequencyP
  if (circuits.size() <= 1)
    return;

-  for (RadioCircuit *circuit : qAsConst(circuits))
+  for (RadioCircuit *circuit : std::as_const(circuits))
  {
    data.radioCircuit = circuit;
    ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(data));
@@ -3,6 +3,7 @@


 #include "avm_radio_specifica_hf_widget.h"
+#include <utility>
 #include "ui_avm_radio_specifica_hf_widget.h"
 #include <AudioVideoManagement/avm_translation.h>

@@ -106,7 +107,7 @@ QJsonObject RadioSpecificaHfWidget::toJson() const

 bool RadioSpecificaHfWidget::isFreqValid() const
 {
-  for (const auto &range : qAsConst(m_ranges))
+  for (const auto &range : std::as_const(m_ranges))
    if(m_ui->sbFrequency->value() >= range.first && m_ui->sbFrequency->value() <= range.second)
      return true;
  return false;
@@ -3,6 +3,7 @@


 #include "avm_radio_specifica_uhf_widget.h"
+#include <utility>
 #include "ui_avm_radio_specifica_uhf_widget.h"
 #include <AudioVideoManagement/avm_translation.h>

@@ -164,7 +165,7 @@ QJsonObject RadioSpecificaUhfWidget::toJson() const

 bool RadioSpecificaUhfWidget::isFreqValid() const
 {
-  for (const auto &range : qAsConst(m_ranges))
+  for (const auto &range : std::as_const(m_ranges))
    if(m_ui->sbFrequency->value() >= range.first && m_ui->sbFrequency->value() <= range.second)
      return true;
  return false;
@@ -2,6 +2,7 @@


 #include <Plugins/ParticipantManagement/ppm_data_plugin_interface.h>
+#include <utility>
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 #include "avm_combat_net_radio_gui_plugin.h"
 #include "CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h"
@@ -124,7 +125,7 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowFrequencyPlanningDialog(QWidget *par
  {
   QMap<qint32,AudioVideoManagement::FrequencyPlanning> plannings = m_avmDataIfc->getDtc()->frequencyPlannings();

-   for(const FrequencyPlanning &planning : qAsConst(plannings))
+   for(const FrequencyPlanning &planning : std::as_const(plannings))
   {
     if(planning.exerciseId().is_set())
       continue;
@@ -31,7 +31,7 @@ NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
  AvmDataPluginInterface
  PpmDataPluginInterface
  svcAvmCommon
-  Qt5::Widgets
+  Qt6::Widgets
  LtsWidgets
  LtsDataView
  LtsUtilsGuiDds
@@ -2,6 +2,7 @@


 #include "avm_eloka_dialog.h"
+#include <utility>
 #include "ui_avm_eloka_dialog.h"

 #include <avm_eloka_edit_dialog.h>
@@ -278,7 +279,7 @@ bool ElokaDialog::isAnnouncement(ElokaData& data)
 {
  QMap<qint32, Stream> announcements;
  QMap<qint32, Stream> streams = m_avmDtc->streams();
-  for (const Stream &stream : qAsConst(streams))
+  for (const Stream &stream : std::as_const(streams))
  {
    if ((stream.type() == StreamType_def::AudioOut) ||
        (stream.type() == StreamType_def::AudioInOut))
@@ -2,6 +2,7 @@


 #include <LtsSession/lts_session_data.h>
+#include <utility>

 #include "avm_eloka_edit_dialog.h"
 #include "ui_avm_eloka_edit_dialog.h"
@@ -474,7 +475,7 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
  {
  case ElokaCircuitType::Cnr:
  {
-    for (const CnrConfig &cnr : qAsConst(m_cnrConfigMap))
+    for (const CnrConfig &cnr : std::as_const(m_cnrConfigMap))
    {
      if (!m_userProfile.contains(cnr.id(), ElokaCircuitType::Cnr))
        continue;
@@ -487,7 +488,7 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
  }
  case ElokaCircuitType::Tvc:
  {
-    for (const TvcConfig &tvc : qAsConst(m_tvcConfigMap))
+    for (const TvcConfig &tvc : std::as_const(m_tvcConfigMap))
    {
      if (!m_userProfile.contains(tvc.id(), ElokaCircuitType::Tvc))
        continue;
@@ -500,7 +501,7 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
  }
  case ElokaCircuitType::Announcement:
  {
-    for (const Stream &stream : qAsConst(m_announcementMap))
+    for (const Stream &stream : std::as_const(m_announcementMap))
    {
      QString    internalName = QString::fromStdString(stream.name());
      QString    displayName = m_streamNameMapping->displayName(internalName);
@@ -33,7 +33,7 @@ QT5_WRAP_UI(mvs_gui_SRCS
 NGL_ADD_LIBRARY(WS MvsVideoTeamGuiPlugin MODULE ${mvs_gui_SRCS})
 NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
 #  LtsPrinting
-  Qt5::Widgets
+  Qt6::Widgets
  LtsWidgets
  LtsDataView
  LtsPrinting
@@ -34,7 +34,7 @@ NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
  svcAvmCommon
  AvmShared
  svcExmClient
-  Qt5::Widgets
+  Qt6::Widgets
  LtsWidgets
  LtsDataView
  LtsUtilsGuiDds
@@ -2,6 +2,7 @@


 #include "avm_edit_training_voice_communication_dialog.h"
+#include <utility>
 #include "ui_avm_edit_training_voice_communication_dialog.h"
 #include <AudioVideoManagement/avm_dtc.h>
 #include <AudioVideoManagement/av_helper.h>
@@ -197,7 +198,7 @@ QVector<int> EditTrainingVoiceCommunicationDialog::exercisesToConsider() const
  allExercises.erase(newEnd, allExercises.end());

  QVector<int>   toBeConsidered;
-  for (const auto &exercise : qAsConst(allExercises))
+  for (const auto &exercise : std::as_const(allExercises))
  {
    if (::isActive(exercise.state()))
      toBeConsidered.append(exercise.id());
@@ -27,13 +27,13 @@ set(SRCS
 NGL_ADD_LIBRARY2(WS AvmShared SHARED ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(AvmShared
  PUBLIC
-    Qt5::Core
+    Qt6::Core
    svcAvmCommon
    Boost::boost
  PRIVATE
    LtsMultiMonitor
    LtsUtilsSettings
-    Qt5::Gui
+    Qt6::Gui
    nglsettings
    ngltools
 )