Adds immediate migration results

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

@@ -45,7 +45,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEemCommon
   PRIVATE
     RTI::nddscpp2
   PUBLIC
-    Qt5::Core
+    Qt6::Core
     ddscore
     LtsCommandLineParser
     NGLLogger
@@ -142,7 +142,7 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
 NGL_ADD_SVC_ICON(SRCS_exe)
 NGL_ADD_EXECUTABLE(AAR SV svcExerciseEventManagement ${SRCS_exe})
 NGL_TARGET_LINK_LIBRARIES(svcExerciseEventManagement
-  Qt5::Core
+  Qt6::Core
   svcAlmServer
   svcFltServer
   svcMrkServer
@@ -169,7 +169,7 @@ NGL_TARGET_LINK_LIBRARIES(svcExerciseEventManagement
   NGLLogger
   nglcoreapplication
   ngltools
-  Qt5::WebSockets
+  Qt6::WebSockets
 )
 NGL_INSTALL_TARGET(svcExerciseEventManagement)
 NGL_INSTALL(AAR SV FILES log4cxx_eem.props DESTINATION bin)

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

@@ -23,8 +23,8 @@ IF(BUILD_TESTING AND BUILD_SV)
    # Testing FunctionTopic Functionality (FTC)
    ADD_EXECUTABLE(eemTests ${SRCS_TEST_EEM} ${HDRS_TEST_EEM})
    TARGET_LINK_LIBRARIES(eemTests
-     Qt5::Core
-     Qt5::Test
+     Qt6::Core
+     Qt6::Test
      RTI::nddscpp2
      svcEemClient
      svcTabServer

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/CMakeLists.txt

@@ -12,9 +12,9 @@ SET(websocket_SRCS
 
 NGL_ADD_EXECUTABLE(AAR SV webSocketServer ${websocket_SRCS})
 NGL_TARGET_LINK_LIBRARIES(webSocketServer
-    Qt5::WebSockets
-    Qt5::Core
-    Qt5::Network
+    Qt6::WebSockets
+    Qt6::Core
+    Qt6::Network
     NGLLogger
     nglcoreapplication
     svcEemCommon

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "web_socket_handler.h"
+#include <utility>
 #include <QWebSocket>
 #include <iostream>
 
@@ -32,7 +33,7 @@ WebSocketHandler::WebSocketHandler(QObject *parent)
 
 WebSocketHandler::~WebSocketHandler()
 {
-  for (auto s : qAsConst(m_webSockets))
+  for (auto s : std::as_const(m_webSockets))
   {
     s->disconnect(this);
     s->close();
@@ -64,7 +65,7 @@ bool WebSocketHandler::sendTelegram(const QString &jsonStr)
   ERROR_LOG(m_logger) << "jsonStr" << jsonStr;
 
   bool bOk = false;
-  for (QWebSocket *ws : qAsConst(m_webSockets))
+  for (QWebSocket *ws : std::as_const(m_webSockets))
   {
     if (ws->sendTextMessage(jsonStr))
       bOk = true;

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp

@@ -7,6 +7,7 @@
   */
 
 #include "handler_dynamic_participant_data.h"
+#include <utility>
 #include <ExerciseEventManagement/eem_db.h>
 
 #include <ParticipantManagement/ppm.hpp>
@@ -528,7 +529,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil
   for (const auto &cs: data.contaminationStates())
   {
     QJsonArray roomArr;
-    for (const auto &roomId : qAsConst(cs.rooms()))
+    for (const auto &roomId : std::as_const(cs.rooms()))
       roomArr.append(QJsonValue(roomId));
 
     contaminationArr.append(QJsonObject({{QStringLiteral("aesId") , cs.aesId()},

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp

@@ -8,6 +8,7 @@
 
 
 #include "web_socket_avs.h"
+#include <utility>
 #include "web_socket_server.h"
 #include "main_handler.h"
 #include "settings.h"
@@ -564,7 +565,7 @@ void WebSocketAvs::onCleanUpDbInternal()
 
     }
 
-    for (const AvsData &oldEntry : qAsConst(ntpRangeSortLocal))
+    for (const AvsData &oldEntry : std::as_const(ntpRangeSortLocal))
     {
       const auto &item = collection.value(oldEntry.eventTime);
 
@@ -680,7 +681,7 @@ QMap<QString, QVector<AvsData>> WebSocketAvs::getAllInternalDbData()
   //qCritical() << "END select reading internal db ";
   DEBUG_LOG(m_logger) << "START Sync read local DB at " << QDateTime::fromMSecsSinceEpoch(m_lastUpdate).toString();
   int j = 0;
-  for (const auto &dataI : qAsConst(dataVec))
+  for (const auto &dataI : std::as_const(dataVec))
   {
     if (m_lastUpdate > 0 && dataI.sampleTime < m_lastUpdate)
       continue;

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp

@@ -8,6 +8,7 @@
 
 
 #include "web_socket_server.h"
+#include <utility>
 
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -34,7 +35,7 @@ WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *pare
 
 WebSocketEventServer::~WebSocketEventServer()
 {
-  for (auto s : qAsConst(m_liveSockets))
+  for (auto s : std::as_const(m_liveSockets))
   {
     s->disconnect(this);
     s->close();
@@ -83,7 +84,7 @@ void WebSocketEventServer::sendEvent(const QJsonObject &obj)
 {
   const QJsonDocument doc(obj);
   const QString msg = QString::fromUtf8(doc.toJson(QJsonDocument::Compact));
-  for (QWebSocket *ws : qAsConst(m_liveSockets))
+  for (QWebSocket *ws : std::as_const(m_liveSockets))
     ws->sendTextMessage(msg);
   m_liveHistory[time(nullptr)].push_back(msg);
 }
@@ -104,7 +105,7 @@ void WebSocketEventServer::onNewConnection()
   {
     connect(ws, &QWebSocket::disconnected,
             this, &WebSocketEventServer::onSocketDisconnected);
-    for (const auto &historyVec : qAsConst(m_liveHistory))
+    for (const auto &historyVec : std::as_const(m_liveHistory))
     {
       for (const auto &msg : historyVec)
         ws->sendTextMessage(msg);