Adds immediate migration results

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/CMakeLists.txt

@@ -141,8 +141,8 @@ NGL_TARGET_LINK_LIBRARIES(svcAvmCommon
     RTI::nddscpp2
     ngltools
   PUBLIC
-    Qt5::Core
-    Qt5::Network
+    Qt6::Core
+    Qt6::Network
     NGLLogger
     LtsUtilsCore
     svcIsmClient
@@ -280,8 +280,8 @@ NGL_ADD_SVC_ICON(SRCS_exe)
 NGL_ADD_EXECUTABLE(AAR SV svcAudioVideoManagement ${SRCS_exe})
 NGL_TARGET_LINK_LIBRARIES(svcAudioVideoManagement
   PUBLIC
-    Qt5::Core
-    Qt5::Network
+    Qt6::Core
+    Qt6::Network
     svcAvmCommon
     svcAvmServer
     svcCoreClient

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/CMakeLists.txt

@@ -31,8 +31,8 @@ IF(BUILD_TESTING)
 
     ADD_EXECUTABLE(avmFtTests ${SRCS_FT_TEST} ${HDRS_FT_TEST})
     TARGET_LINK_LIBRARIES(avmFtTests
-      Qt5::Core
-      Qt5::Test
+      Qt6::Core
+      Qt6::Test
       RTI::nddscpp2
       svcAvmClient
       LtsCommandLineParser
@@ -42,8 +42,8 @@ IF(BUILD_TESTING)
 
     ADD_EXECUTABLE(avmVcaTests ${SRCS_VCA_TEST} ${HDRS_VCA_TEST})
     TARGET_LINK_LIBRARIES(avmVcaTests
-      Qt5::Core
-      Qt5::Test
+      Qt6::Core
+      Qt6::Test
       RTI::nddscpp2
       svcAvmClient
       svcCoreClient
@@ -54,8 +54,8 @@ IF(BUILD_TESTING)
 
     ADD_EXECUTABLE(mvsTests ${SRCS_MVS_TEST} ${HDRS_MVS_TEST})
     TARGET_LINK_LIBRARIES(mvsTests
-      Qt5::Core
-      Qt5::Test
+      Qt6::Core
+      Qt6::Test
       RTI::nddscpp2
       svcAvmClient
       LtsCommandLineParser

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ModuleTests/avm_vca_tests.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "avm_vca_tests.h"
+#include <utility>
 #include <AudioVideoManagement/avm_dtc.h>
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
@@ -193,14 +194,14 @@ void AvmVcaTests::createCnrConfig()
 
 void AvmVcaTests::removeTvcConfig()
 {
-  for (auto id: qAsConst(m_tvcConfigIds))
+  for (auto id: std::as_const(m_tvcConfigIds))
     m_ftc->removeTvcConfigRequest(RemoveTvcConfigRequest{id}, this);
   QTRY_VERIFY(m_tvcConfigIds.isEmpty());
 }
 
 void AvmVcaTests::removeCnrConfig()
 {
-  for (auto id: qAsConst(m_cnrConfigIds))
+  for (auto id: std::as_const(m_cnrConfigIds))
     m_ftc->removeCnrConfigRequest(RemoveCnrConfigRequest{id}, this);
   QTRY_VERIFY(m_cnrConfigIds.isEmpty());
 }

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/CMakeLists.txt

@@ -18,8 +18,8 @@ SET(SRCS_static
 NGL_ADD_LIBRARY(WS AAR SV avaTestServer_static STATIC ${SRCS_static})
 NGL_TARGET_LINK_LIBRARIES(avaTestServer_static
   PUBLIC
-    Qt5::Core
-    Qt5::Network
+    Qt6::Core
+    Qt6::Network
 )
 
 SET(SRCS
@@ -29,7 +29,7 @@ SET(SRCS
 NGL_ADD_EXECUTABLE(WS AAR SV NO_TRANSLATION avaTestServer ${SRCS})
 NGL_TARGET_LINK_LIBRARIES(avaTestServer
   avaTestServer_static
-  Qt5::Core
+  Qt6::Core
 )
 
 IF(BUILD_TESTING)
@@ -63,9 +63,9 @@ IF(BUILD_TESTING)
   IF(TARGET svcAvmCommon)
     ADD_EXECUTABLE(avmTests ${SRCS})
     TARGET_LINK_LIBRARIES(avmTests
-      Qt5::Core
-      Qt5::Network
-      Qt5::Test
+      Qt6::Core
+      Qt6::Network
+      Qt6::Test
       svcAvmCommon
       svcIsmCommon
       avaTestServer_static

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp

@@ -8,6 +8,7 @@
   */
 
 #include <QtNetwork/QHostAddress>
+#include <utility>
 #include <QtCore/QStringList>
 #include <QtCore/QRegExp>
 #include <QString>
@@ -325,7 +326,7 @@ AvaTestServer::AvaTestServer()
 
 AvaTestServer::~AvaTestServer()
 {
-  for (QTcpSocket *conn : qAsConst(m_Conns))
+  for (QTcpSocket *conn : std::as_const(m_Conns))
   {
     // disconnect before we delete as otherwise closedConnection() would be called wich would
     // also delete the socket.

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/ava_state.cpp

@@ -8,6 +8,7 @@
   */
 
 #include "ava_state.h"
+#include <utility>
 #include "ava_session.h"
 #include "ava_control.h"
 #include "av_helper.h"
@@ -40,7 +41,7 @@ AvaState::AvaState(AvaSession *session)
 QStringList AvaState::currentLiveVideoStreams() const
 {
   QStringList   streams;
-  for (const QMap<QString, AvaStreamState> &map : qAsConst(m_videoState))
+  for (const QMap<QString, AvaStreamState> &map : std::as_const(m_videoState))
   {
     const QList<QString>   streamNames = map.keys();
     for (const QString &streamName : streamNames)

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp

@@ -8,6 +8,7 @@
   */
 
 #include "cnr_handler.h"
+#include <utility>
 #include "avm_dts.h"
 #include "dds_handler.h"
 #include "exercise_context.h"
@@ -235,7 +236,7 @@ bool CnrHandler::init()
     return false;
   }
 
-  for (const AvmCnrChannel &currentChannel : qAsConst(m_channels))
+  for (const AvmCnrChannel &currentChannel : std::as_const(m_channels))
     m_dts->publish(::AudioVideoManagement::toDds(currentChannel));
 
   // Don't use select with callback here as addConfig() uses the DB, too.
@@ -246,7 +247,7 @@ bool CnrHandler::init()
     return false;
   }
 
-  for (const AvmCnrConfig &currentConfig : qAsConst(cnrConfigs))
+  for (const AvmCnrConfig &currentConfig : std::as_const(cnrConfigs))
   {
     auto   reply = createCnrConfig(toRequest(currentConfig, 0), currentConfig.id);
     if (reply.error())
@@ -399,7 +400,7 @@ void CnrHandler::updateDeviceConfig()
 {
   DBTransaction trans(m_db->database());
 
-  for (const auto &config : qAsConst(m_cache))
+  for (const auto &config : std::as_const(m_cache))
     if (config.isActive())
       m_deviceConfig->update(config);
 
@@ -481,7 +482,7 @@ Core::FunctionReplyObject CnrHandler::validateRequest(const ModifyCnrConfigReque
  */
 bool CnrHandler::checkConstraint(const std::function<bool (const CnrConfig &)> &constraint, const boost::optional<int> &exerciseId, const boost::optional<int32_t> &excludeId) const
 {
-  for (const CnrConfig &config : qAsConst(m_cache))
+  for (const CnrConfig &config : std::as_const(m_cache))
   {
     if (excludeId == config.id())
       continue;
@@ -707,7 +708,7 @@ QString CnrHandler::exerciseList(const CnrConfig &config) const
 
   // Global - all active exercises, no matter if they have active plannings or not
   QStringList exerciseList;
-  for (const auto &context : qAsConst(m_activeExercises->allContexts()))
+  for (const auto &context : std::as_const(m_activeExercises->allContexts()))
     exerciseList.append(context.toString());
   return exerciseList.join(QLatin1Char(','));
 }
@@ -744,7 +745,7 @@ int CnrHandler::normalizedAddacChannel(int addacChannel) const
 
 Database::AvmCnrChannel CnrHandler::channelById(int32_t id) const
 {
-  for (const Database::AvmCnrChannel &channel : qAsConst(m_channels))
+  for (const Database::AvmCnrChannel &channel : std::as_const(m_channels))
     if (channel.id == id)
       return channel;
 

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp

@@ -8,6 +8,7 @@
   */
 
 #include "cnr_tvc_profile_handler.h"
+#include <utility>
 #include "cnr_handler.h"
 #include "tvc_handler.h"
 #include <AudioVideoManagement/avm_dts.h>
@@ -49,7 +50,7 @@ CnrTvcProfile toDds(const Database::AvmCnrTvcProfile &circuitContainerDb, T circ
 
   CnrTvcProfile   circuitContainerDds(circuitContainerDb.id, circuitContainerDb.operatorId, circuitContainerDb.exerciseId, {});
   circuitContainerDds.data().reserve(circuitsDb.size());
-  for (const auto &currentCircuitDb : qAsConst(circuitsDb))
+  for (const auto &currentCircuitDb : std::as_const(circuitsDb))
     circuitContainerDds.data().push_back(toDds(currentCircuitDb));
   return circuitContainerDds;
 }
@@ -148,7 +149,7 @@ bool CnrTvcProfileHandler::init()
     return false;
   }
 
-  for (const auto &currentCircuitContainer: qAsConst(circuitContainersDb))
+  for (const auto &currentCircuitContainer: std::as_const(circuitContainersDb))
     status &= collectAndPublish(currentCircuitContainer);
 
   return status;
@@ -570,7 +571,7 @@ void CnrTvcProfileHandler::onConfigChanged(int32_t configId, RadioSystem type)
 
   // Find all CnrTvcProfiles where this config is referenced and reload those.
   // Hint: reloading might modify m_cache. Thus the reloading is done in a separate loop.
-  for (const auto &profile : qAsConst(m_cache))
+  for (const auto &profile : std::as_const(m_cache))
     for (const auto &data : profile.data())
       if (data.radioSystemId() == type && data.radioCircuitId() == configId)
       {
@@ -578,7 +579,7 @@ void CnrTvcProfileHandler::onConfigChanged(int32_t configId, RadioSystem type)
         break;
       }
 
-  for (const auto &profile : qAsConst(toBeReloaded))
+  for (const auto &profile : std::as_const(toBeReloaded))
   {
     Database::AvmCnrTvcProfile   profileDb = toDb(profile);
     const bool   isReload = true;

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "exercises_handler.h"
+#include <utility>
 #include "dds_handler.h"
 #include "dds_handler_exercise.h"
 #include "main_handler.h"
@@ -80,7 +81,7 @@ bool ExercisesHandler::init()
     return false;
 
   DBTransaction trans(db()->database());
-  for (const Database::AvmDeviceConfig &dc : qAsConst(avmDeviceConfig))
+  for (const Database::AvmDeviceConfig &dc : std::as_const(avmDeviceConfig))
   {
     // nur hinzufuegen, wenn es record/replay session ist
     // alle anderen -> aus DB loeschen

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "frequency_planning_handler.h"
+#include <utility>
 
 #include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
 #include "frequency_set_handler.h"
@@ -160,7 +161,7 @@ bool FrequencyPlanningHandler::init()
     return false;
   }
 
-  for (const Database::AvmFrequencyPlanning &planContainerDb : qAsConst(frequencyPlannings))
+  for (const Database::AvmFrequencyPlanning &planContainerDb : std::as_const(frequencyPlannings))
     collectAndPublish(planContainerDb);
 
   auto cbAfp = [this] (const Database::AvmActiveFrequencyPlanning &currentDbData)
@@ -360,7 +361,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Modify
   for (const FrequencyPlanningData &entry : request.data())
   {
     QSet<int> frequencySetEntries = AudioVideoManagement::frequencySetDataIds(entry.properties());
-    for(const int &setEntry : qAsConst(frequencySetEntries))
+    for(const int &setEntry : std::as_const(frequencySetEntries))
     {
       if (setEntry != 0 && !m_frequencySetHandler->isValid(request.frequencySetId(), setEntry))
         return reply.setStr(tr_lts("dds", "FrequencySetData %1 does not belong to FrequencySet %2")).arg(setEntry).arg(request.frequencySetId());
@@ -556,7 +557,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::testActivation(const std::ve
   for (const FrequencyPlanningData &fpdEntry : entries)
   {
      QSet<int> frequencySetEntries = AudioVideoManagement::frequencySetDataIds(fpdEntry.properties());
-     for(const int &setEntry : qAsConst(frequencySetEntries))
+     for(const int &setEntry : std::as_const(frequencySetEntries))
      {
        if(takenSetEntries.contains(setEntry))
        {

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp

@@ -8,6 +8,7 @@
   */
 
 #include "frequency_set_handler.h"
+#include <utility>
 #include "dds_handler.h"
 #include "main_handler.h"
 #include <AudioVideoManagement/avm_dts.h>
@@ -37,7 +38,7 @@ bool FrequencySetHandler::init()
   }
   DEBUG_LOG(m_logger) << "Found " << frequencySets.size() << " Frequency Sets";
 
-  for (const Database::AvmFrequencySet &currentfrequencySet : qAsConst(frequencySets))
+  for (const Database::AvmFrequencySet &currentfrequencySet : std::as_const(frequencySets))
     addFrequencySet(toDdsFrequencySet(currentfrequencySet));
 
   return true;

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "handler_frequency_planning_status.h"
+#include <utility>
 #include "object_frequency_planning_status.h"
 
 #include "avm_db.h"
@@ -81,7 +82,7 @@ bool HandlerFrequencyPlanningStatus::init()
   }
 
   // create objects
-  for (const Database::AvmFrequencyPlanningStatus &data : qAsConst(dataVec))
+  for (const Database::AvmFrequencyPlanningStatus &data : std::as_const(dataVec))
   {
     FrequencyPlanningStatus ddsData = ObjectFrequencyPlanningStatus::toDdsData(data);
     ObjectFrequencyPlanningStatus *ifs(new ObjectFrequencyPlanningStatus(m_dts, m_db));
@@ -112,7 +113,7 @@ void HandlerFrequencyPlanningStatus::onClearFrequencyPlanningStatusRequest(const
 {
   Q_UNUSED(request);
   Core::FunctionReplyObject ret;
-  for (ObjectFrequencyPlanningStatus *ifs : qAsConst(m_data))
+  for (ObjectFrequencyPlanningStatus *ifs : std::as_const(m_data))
   {
     ret = ifs->clearValues();
     if (ret.error())
@@ -125,7 +126,7 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ
 {
   Core::FunctionReplyObject ret;
   QVector<int> clients;
-  for (ObjectFrequencyPlanningStatus *ifs : qAsConst(m_data))
+  for (ObjectFrequencyPlanningStatus *ifs : std::as_const(m_data))
   {
     if (request.client() == 0 || ifs->getData().client() == request.client())
     {
@@ -137,7 +138,7 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ
         clients << client;
     }
   }
-  for (int client : qAsConst(clients))
+  for (int client : std::as_const(clients))
   {
     // delete ObjectVideoReceiver
     delete m_data[client];

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "handler_video_receiver.h"
+#include <utility>
 #include "object_video_receiver.h"
 
 #include <QNetworkReply>
@@ -68,7 +69,7 @@ bool HandlerVideoReceiver::init()
   }
 
   // create objects
-  for (const Database::AvmVideoReceiver &data : qAsConst(dataVec))
+  for (const Database::AvmVideoReceiver &data : std::as_const(dataVec))
   {
     AudioVideoManagement::VideoReceiver ddsData = ObjectVideoReceiver::toDdsData(data);
     ObjectVideoReceiver *ifs(new ObjectVideoReceiver(m_dts, m_db));

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "handler_video_team.h"
+#include <utility>
 #include "object_video_team.h"
 #include "default_av_menus.h"
 
@@ -143,7 +144,7 @@ bool HandlerVideoTeam::init()
   }
 
   // create objects
-  for (const Database::AvmVideoTeam &data : qAsConst(dataVec))
+  for (const Database::AvmVideoTeam &data : std::as_const(dataVec))
   {
     VideoTeam ddsData = ObjectVideoTeam::toDdsData(data);
     ObjectVideoTeam *ifs(new ObjectVideoTeam(m_dts, m_db));
@@ -168,7 +169,7 @@ bool HandlerVideoTeam::init()
 QMap<int, VideoTeam> HandlerVideoTeam::videoTeams() const
 {
   QMap<int, VideoTeam> ret;
-  for (const auto &videoTeam : qAsConst(m_videoTeamObjMap))
+  for (const auto &videoTeam : std::as_const(m_videoTeamObjMap))
     ret.insert(videoTeam->getId(), videoTeam->getData());
   return ret;
 }
@@ -193,7 +194,7 @@ bool HandlerVideoTeam::needDeviceConfig(const VideoTeam &videoTeam) const
 
 void HandlerVideoTeam::onContextActivated(const ExerciseContext &context)
 {
-  for (const auto *ifs : qAsConst(m_videoTeamObjMap))
+  for (const auto *ifs : std::as_const(m_videoTeamObjMap))
   {
     VideoTeam   ddsData = ifs->getData();
     if (ddsData.exerciseId() == context.id())
@@ -203,7 +204,7 @@ void HandlerVideoTeam::onContextActivated(const ExerciseContext &context)
 
 void HandlerVideoTeam::onContextDeactivated(const ExerciseContext &context)
 {
-  for (ObjectVideoTeam *ifs : qAsConst(m_videoTeamObjMap))
+  for (ObjectVideoTeam *ifs : std::as_const(m_videoTeamObjMap))
   {
     if (ifs->exerciseId() == context.id())
     {

qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp

@@ -8,6 +8,7 @@
   */
 
 #include "tvc_handler.h"
+#include <utility>
 #include "dds_handler.h"
 #include "exercise_context.h"
 #include "active_exercises.h"
@@ -201,7 +202,7 @@ bool TvcHandler::init()
     return false;
   }
 
-  for (const AvmTvcChannel &currentChannel : qAsConst(m_channels))
+  for (const AvmTvcChannel &currentChannel : std::as_const(m_channels))
     m_dts->publish(toDds(currentChannel));
 
   QVector<AvmTvcConfig> tvcConfigs;
@@ -212,7 +213,7 @@ bool TvcHandler::init()
     return false;
   }
 
-  for (const AvmTvcConfig &currentConfig : qAsConst(tvcConfigs))
+  for (const AvmTvcConfig &currentConfig : std::as_const(tvcConfigs))
     createTvcConfig(toRequest(currentConfig, 0), currentConfig.id);
 
   return true;
@@ -412,7 +413,7 @@ Database::AvmDeviceConfig TvcHandler::toDeviceConfig(const TvcConfig &tvcConfig)
 
 Database::AvmTvcChannel TvcHandler::channelById(int32_t id) const
 {
-  for (const Database::AvmTvcChannel &channel : qAsConst(m_channels))
+  for (const Database::AvmTvcChannel &channel : std::as_const(m_channels))
     if (channel.id == id)
       return channel;
 
@@ -424,7 +425,7 @@ void TvcHandler::onContextActivated(const ExerciseContext &context)
 {
   bool   isFirstActiveExercise = m_activeExercises->count() == 1;
 
-  for (const TvcConfig &tvcConfig : qAsConst(m_cache))
+  for (const TvcConfig &tvcConfig : std::as_const(m_cache))
   {
     bool   isLocal = tvcConfig.exerciseId().is_set();
     if (isLocal)
@@ -446,7 +447,7 @@ void TvcHandler::onContextDeactivated(const ExerciseContext &context)
 {
   bool   haveActiveExercise = m_activeExercises->count() > 0;
 
-  for (const TvcConfig &tvcConfig : qAsConst(m_cache))
+  for (const TvcConfig &tvcConfig : std::as_const(m_cache))
   {
     bool   isLocal = tvcConfig.exerciseId().is_set();
 
@@ -526,7 +527,7 @@ Core::FunctionReplyObject TvcHandler::validateRequest(const ModifyTvcConfigReque
  */
 bool TvcHandler::checkConstraint(const std::function<bool (const TvcConfig &)> &constraint, const boost::optional<int> &exerciseId, const boost::optional<int32_t> &excludeId) const
 {
-  for (const TvcConfig &config : qAsConst(m_cache))
+  for (const TvcConfig &config : std::as_const(m_cache))
   {
     if (excludeId == config.id())
       continue;