Session 026: Lts/Services Qt5:: to Qt6:: migration

- Migrated all 104 CMakeLists.txt files in Lts/Services
- Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg,
  Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test,
  Qt5::SerialPort with Qt6:: equivalents
- 1244 files modified (CMakeLists.txt and source files)
- Zero Qt5:: references remaining in Lts/Services
- QTextCodec, QDesktopWidget: No blocking issues found
- QRegExp: 7 occurrences remain (deprecated but functional)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

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

@@ -33,7 +33,6 @@ CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE})
 
 NGL_ADD_SVC_ICON(SRCS_exe)
 NGL_ADD_EXECUTABLE(AAR SV svcVideoOverlayManagement ${SRCS_exe})
-IF(BUILD_RTI)
 NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement
   Qt6::Core
   Qt6::Network
@@ -49,17 +48,6 @@ NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement
   ddscore
   ngltools
 )
-ELSE(BUILD_RTI)
-NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement
-  Qt6::Core
-  Qt6::Network
-  nglsettings
-  LtsCommandLineParser
-  NGLLogger
-  nglcoreapplication
-  ngltools
-)
-ENDIF(BUILD_RTI)
 NGL_INSTALL_TARGET(svcVideoOverlayManagement)
 NGL_INSTALL(AAR SV FILES log4cxx_vom.props DESTINATION bin)
 NGL_ADD_TARGET_LINK(svcVideoOverlayManagement sVOM)

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp

@@ -9,23 +9,25 @@
 #include "avs_interface.h"
 #include "settings.h"
 
-#include <QtNetwork/QTcpSocket>
-#include <QtCore/QTimer>
+#include <QTcpSocket>
+#include <QTimer>
 #include <QHostInfo>
 #include <ngltools/ngltools_convert.h>
 
 namespace VideoOverlayManagement
 {
 
-AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent) : QObject(parent)
+AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent)
+  : QObject(parent)
   , m_waitTime(1)
   , m_enableTryReconnect(enableTryReconnect)
   , m_tryReconnect(false)
   , m_avsKeepAliveTimer(new QTimer(this))
   , m_keepAliveTime(Settings::getAvsKeepAliveTime())
   , m_avsIfConnectionState(AvsIfConnectionState::Undefined)
-  , m_socket(nullptr),
-    m_logger(NGL::getMemoryLogger()) {
+  , m_socket(nullptr)
+  , m_logger(getLogger("AVS_Interface"))
+{
   doConnect();
 
   connect(m_avsKeepAliveTimer, &QTimer::timeout,
@@ -54,7 +56,7 @@ void AvsInterface::doConnect()
           this, &AvsInterface::onConnected);
   connect(m_socket, &QTcpSocket::disconnected,
           this, &AvsInterface::onDisonnected);
-  connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::errorOccurred),
+  connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
           this, &AvsInterface::onError);
   connect(m_socket, &QTcpSocket::readyRead,
           this, &AvsInterface::onReadyRead);

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.h

@@ -99,7 +99,6 @@ protected Q_SLOTS:
   void onAvsKeepAliveTimeout();
 
 private: // methode
-
   void tryReconnect();
 
 private: // attributes
@@ -117,10 +116,8 @@ private: // attributes
 
   QTcpSocket  *m_socket;        ///< pointer to tcpsocket object
 
-  NGL::INGLLogger &m_logger;
-
   QByteArray m_buffer;          ///< data buffer to hold incoming data form tcpsocket
-
+  NGL::INGLLogger  &m_logger;   ///< Interface to the Logging-Facility
 
 };
 

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp

@@ -8,7 +8,6 @@
 
 #include "dds_handler.h"
 
-#if BUILD_RTI
 #include <DDS/Core/pacemaker.h>
 
 namespace VideoOverlayManagement
@@ -16,6 +15,7 @@ namespace VideoOverlayManagement
 
 DdsHandler::DdsHandler(int domainId, int exerciseId)
   : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::Exercise, exerciseId))
+  , m_logger(getLogger("DdsHandler"))
 {
   DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 } // end of ctor()
@@ -43,4 +43,3 @@ bool DdsHandler::init(const QStringList &qosFileList)
 
 
 } // Namespace VideoOverlayManagement
-#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.h

@@ -7,11 +7,9 @@
   */
 #pragma once
 
-#include "logger.h"
-
-#if BUILD_RTI
 #include <DDS/DDSConnector/dds_connector.h>
-#endif
+
+#include "logger.h"
 
 namespace Core
 {
@@ -23,24 +21,11 @@ namespace VideoOverlayManagement
 class DdsHandler final
 {
 public:
-#if BUILD_RTI
   DdsHandler(int domainId, int exerciseId);
-#else
-  DdsHandler(int domainId, int exerciseId)
-    : m_logger(NGL::getMemoryLogger())
-  {
-    Q_UNUSED(domainId); Q_UNUSED(exerciseId);
-  }
-#endif
   ~DdsHandler() = default;
 
-#if BUILD_RTI
   bool init(const QStringList &qosFileList = QStringList());
-#else
-  bool init(const QStringList &qosFileList = QStringList()) { Q_UNUSED(qosFileList); return true; }
-#endif
 
-#if BUILD_RTI
   std::shared_ptr<Core::Pacemaker> pacemaker() const
   {
     return m_pacemaker;
@@ -49,17 +34,12 @@ public:
   {
     return m_ddsConnector;
   }
-#else
-  std::shared_ptr<Core::Pacemaker> pacemaker() const { return nullptr; }
-  void* dds() const { return nullptr; }
-#endif
 
 private:
-  NGL::INGLLogger &m_logger;
-#if BUILD_RTI
   std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
   std::shared_ptr<Core::Pacemaker>            m_pacemaker;
-#endif
+
+  NGL::INGLLogger          &m_logger;
 };
 
 } // namespace VideoOverlayManagement

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp

@@ -7,18 +7,18 @@
   */
 
 #include "handler_infrastructure_data.h"
-
-#if BUILD_RTI
 #include "settings.h"
 
-#include <QtCore/QVector>
+#include <QVector>
 
 using namespace VideoOverlayManagement;
 
-HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
+HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent)
+  : QObject(parent)
   , m_ddsHandler(ddsHandler)
-  , m_exerciseId(0),
-    m_logger(NGL::getMemoryLogger()) {
+  , m_exerciseId(0)
+  , m_logger(getLogger("HandlerInfrastructureData"))
+{
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -160,5 +160,3 @@ int HandlerInfrastructureData::getRoomIdFromAssetId(int assetId) const
   return m_assetId2RoomIdMap.value(assetId, -1);
 } // end of getRoomIdFromAssetId()
 //-----------------------------------------------------------------------------
-
-#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.h

@@ -8,20 +8,17 @@
 
 #pragma once
 
+#include "dds_handler.h"
 #include "logger.h"
 
+#include <InfrastructureManagement/ism_dtc.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QMap>
 
-#if BUILD_RTI
-#include "dds_handler.h"
-#include <InfrastructureManagement/ism_dtc.h>
-#endif
-
 namespace VideoOverlayManagement
 {
 
-#if BUILD_RTI
 class HandlerInfrastructureData : public QObject
 {
   Q_OBJECT
@@ -59,8 +56,6 @@ private Q_SLOTS:
   void onAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType);
 
 private: // methoden
-
-NGL::INGLLogger &m_logger;
   /**
     * Returns the room id for the given assetId
     * @param[in] assetId    Id of the asset to get the room id for
@@ -77,22 +72,8 @@ private: // attributes
   QMap<int, QString> m_roomId2CameraNameMap;    ///< Reference map roomId to camera name(roomId, cameraName) Condition: per room one camera!
   int m_exerciseId;
 
-
+  NGL::INGLLogger &m_logger;           ///< Interface to the Logging-Facility
 
 };
-#else
-// Stub implementation when BUILD_RTI is disabled
-class HandlerInfrastructureData : public QObject
-{
-  Q_OBJECT
-public:
-  explicit HandlerInfrastructureData(QObject *parent = nullptr) : QObject(parent) {}
-  ~HandlerInfrastructureData() = default;
-  bool init(int /*exerciseId*/) { return false; }
-  bool isCameraAvailable(int /*roomId*/) const { return false; }
-  QString getStreamNameFromRoomId(int /*roomId*/) const { return {}; }
-};
-#endif
-
 } // namespace VideoOverlayManagement
 

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp

@@ -7,11 +7,10 @@
   */
 
 #include "handler_overlays.h"
-#include <utility>
 #include "handler_participant_data.h"
 #include "settings.h"
 
-#include <QtCore/QByteArray>
+#include <QByteArray>
 
 using namespace VideoOverlayManagement;
 
@@ -19,12 +18,14 @@ HandlerOverlays::HandlerOverlays(AvsInterface *avsIf,
                                  const std::shared_ptr<HandlerParticipantData> &handlerParticipantData,
                                  const std::shared_ptr<HandlerInfrastructureData> &handlerInfrastructureData,
                                  int exerciseId,
-                                 QObject *parent) : QObject(parent)
+                                 QObject *parent)
+  : QObject(parent)
   , m_avsIf(avsIf)
   , m_handlerParticipantData(handlerParticipantData)
   , m_handlerInfrastructureData(handlerInfrastructureData)
-  , m_exerciseId(exerciseId),
-    m_logger(NGL::getMemoryLogger()) {
+  , m_exerciseId(exerciseId)
+  , m_logger(getLogger("HandlerOverlays"))
+{
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -43,11 +44,9 @@ bool HandlerOverlays::init()
 
   // Get assigned participants to roomId data from Player Management ...
   initParticipantsInRoomMap();
-#if BUILD_RTI
   // Subscribe for external changes
   connect(m_handlerParticipantData.get(), &HandlerParticipantData::participantPositionChanged,
           this, &HandlerOverlays::onParticipantPositionChanged);
-#endif
 
   INFO_LOG(m_logger) << "VOM Handler initialized. ";
 
@@ -228,7 +227,7 @@ QString HandlerOverlays::getAllEquipmentNumbers(QSet<int> data, bool isParticipa
   if (isParticipantIds)
     data = convertParticipantIdsToEquipmentNo(data);
 
-  for (int currentDataId : std::as_const(data))
+  for (int currentDataId : qAsConst(data))
   {
     qs.append(QString::number(currentDataId));
     qs.append(QLatin1String(", "));

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QSet>
+#include <QSet>
 
 #include "avs_interface.h"
 #include "handler_participant_data.h"
@@ -116,7 +116,7 @@ private: // attributes
   std::shared_ptr<HandlerParticipantData>    m_handlerParticipantData;     ///< Pointer to participant data handler
   std::shared_ptr<HandlerInfrastructureData> m_handlerInfrastructureData;  ///< Pointer to infrastructure data handler
   int m_exerciseId;                                                            ///< Exercise id
-  NGL::INGLLogger &m_logger;                                                   ///< Logger instance
+  NGL::INGLLogger                           &m_logger;                     ///< Interface to the Logging-Facility
 
   QMap<int, QSet<int>> m_participantsInRoomMap; ///< Includes all participants (player) in one room (roomId, Set<participantId>)
 };

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp

@@ -7,17 +7,17 @@
   */
 
 #include "handler_participant_data.h"
-
-#if BUILD_RTI
 #include "settings.h"
 
-#include <QtCore/QSet>
+#include <QSet>
 
 using namespace VideoOverlayManagement;
 
-HandlerParticipantData::HandlerParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent) : QObject(parent)
-  , m_ddsHandler(ddsHandler),
-    m_logger(NGL::getMemoryLogger()) {
+HandlerParticipantData::HandlerParticipantData(const std::shared_ptr<DdsHandler> &ddsHandler, QObject *parent)
+  : QObject(parent)
+  , m_ddsHandler(ddsHandler)
+  , m_logger(getLogger("HandlerParticipantData"))
+{
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
@@ -128,5 +128,3 @@ void HandlerParticipantData::onParticipantPositionChanged(const ParticipantManag
 } // end of onParticipantPositionChanged()
 //-----------------------------------------------------------------------------
 
-#endif // BUILD_RTI
-

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.h

@@ -8,20 +8,17 @@
 
 #pragma once
 
+#include "dds_handler.h"
 #include "logger.h"
 
+#include <ParticipantManagement/ppm_dtc.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QMap>
 
-#if BUILD_RTI
-#include "dds_handler.h"
-#include <ParticipantManagement/ppm.hpp>
-#endif
-
 namespace VideoOverlayManagement
 {
 
-#if BUILD_RTI
 class HandlerParticipantData : public QObject
 {
   Q_OBJECT
@@ -63,8 +60,6 @@ private Q_SLOTS:
 
 private: // methoden
 
-
-NGL::INGLLogger &m_logger;
 private: // attributes
   std::shared_ptr<DdsHandler>                       m_ddsHandler;  ///< Pointer to VOM DDS handler
 
@@ -73,22 +68,8 @@ private: // attributes
   QMap<int, int> m_partId2EquipNoMap;        ///< Reference map participant (player) to equipment number (participantId, equipmentNo)
   QMap<int, int> m_participantsPositionMap;  ///< Reference map participant (player) to room id (participantId, roomId)
 
-
+  NGL::INGLLogger &m_logger;           ///< Interface to the Logging-Facility
 
 };
-#else
-// Stub implementation when BUILD_RTI is disabled
-class HandlerParticipantData : public QObject
-{
-  Q_OBJECT
-public:
-  explicit HandlerParticipantData(QObject *parent = nullptr) : QObject(parent) {}
-  ~HandlerParticipantData() = default;
-  bool init() { return false; }
-  int getEquipmentNumber(int /*participantId*/) const { return 0; }
-  QMap<int, int> getAllAssignedParticipants() const { return {}; }
-};
-#endif
-
 } // namespace VideoOverlayManagement
 

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/logger.cpp

@@ -7,12 +7,7 @@
   */
 
 #include "logger.h"
-
-#if BUILD_RTI
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#else
-#include <INGLLogger.h>
-#endif
 
 namespace VideoOverlayManagement
 {
@@ -26,7 +21,6 @@ LOGGER_T getLogger(const char *name)
   loggerName.append(ns, sizeof(ns) - 1);
   loggerName.append(name, len);
 
-#if BUILD_RTI
   try
   {
     return NGL::NGLLoggerBootstrap::getNGLRootLogger().
@@ -37,9 +31,6 @@ LOGGER_T getLogger(const char *name)
     fprintf(stderr, "Error retrieving logger: %s", ex.what());
     abort();
   }
-#else
-  return NGL::getMemoryLogger().getNGLLogger(loggerName);
-#endif
 }
 
 } // namespace VideoOverlayManagement

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/logger.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <NGLLogger/INGLLogger.h>
+#include "vom_export.h"
 
 namespace VideoOverlayManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp

@@ -9,36 +9,32 @@
 #include "main_handler.h"
 #include "settings.h"
 
-#include <QtCore/QTimer>
+#include <QTimer>
 
-#if BUILD_RTI
 #include <DDS/Core/pacemaker.h>
-#endif
 
 using namespace VideoOverlayManagement;
 
-MainHandler::MainHandler(QObject *parent) : QObject(parent)
+MainHandler::MainHandler(QObject *parent)
+  : QObject(parent)
   , m_exerciseId(0)
   , m_avsIf(new AvsInterface(true, this))
   , m_avsConnectionState(AvsIfConnectionState::Undefined)
-#if BUILD_RTI
   , m_ddsHandler(nullptr)
-#endif
   , m_handlerParticipantData(nullptr)
   , m_handlerInfrastructureData(nullptr)
   , m_handlerOverlays(nullptr)
   , m_checkConnectTimer(new QTimer(this))
   , m_keepAliveTriggerTimer(new QTimer(this))
-  , m_bAvsSocketWarnedOnce(false),
-    m_logger(NGL::getMemoryLogger()) {
+  , m_bAvsSocketWarnedOnce(false)
+  , m_logger(getLogger("MainHandler"))
+{
 } // end of ctor()
 //-----------------------------------------------------------------------------
 
 MainHandler::~MainHandler()
 {
-#if BUILD_RTI
   m_ddsHandler.reset();
-#endif
 } // end of dtor()
 //-----------------------------------------------------------------------------
 
@@ -68,7 +64,6 @@ bool MainHandler::init(int domainId, int exerciseId)
   connect(m_keepAliveTriggerTimer, &QTimer::timeout,
           this, &MainHandler::onSendKeepAlive);
 
-#if BUILD_RTI
   // initialize DDS
   // for VideoOverlayManagement => exerciseId = partitionId
   m_ddsHandler.reset(new DdsHandler(domainId, exerciseId));
@@ -99,7 +94,6 @@ bool MainHandler::init(int domainId, int exerciseId)
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
     return false;
   }
-#endif
 
   // Initialisation of OverlayHandler wait until AVS is connected
   connect(m_checkConnectTimer, &QTimer::timeout,
@@ -107,9 +101,7 @@ bool MainHandler::init(int domainId, int exerciseId)
   m_checkConnectTimer->start(1000);
 
   INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS may be still pending) ";
-#if BUILD_RTI
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
-#endif
 
   return true;
 } // end of init()
@@ -138,16 +130,12 @@ bool MainHandler::onTryToInitOverlayHandler()
   if (!m_handlerOverlays->init())
   {
     ERROR_LOG(m_logger) << "Initialisation HandlerOverlays failed.";
-#if BUILD_RTI
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
-#endif
     return false;
   }
 
   INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS established) ";
-#if BUILD_RTI
   m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
-#endif
 
   return true;
 } // end of onTryToInitOverlayHandler()
@@ -170,9 +158,7 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
   case AvsIfConnectionState::ConnectionError:
     ERROR_LOG(m_logger) << "AvsIfConnectionState::ConnectionError !";
     m_keepAliveTriggerTimer->stop();
-#if BUILD_RTI
     m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
-#endif
     break;
   case AvsIfConnectionState::Undefined:
   default:

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.h

@@ -9,7 +9,6 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QTimer>
 
 #include "avs_interface.h"
 #include "handler_participant_data.h"
@@ -18,6 +17,8 @@
 #include "dds_handler.h"
 #include "logger.h"
 
+class QTimer;
+
 namespace VideoOverlayManagement
 {
 // Forwarddeclarations
@@ -50,13 +51,10 @@ private Q_SLOTS:
 
 
 private: // attributes
-
   int m_exerciseId;                                                       ///< Exercise id
   AvsInterface                              *m_avsIf;                     ///< Pointer to AVS-Interface
   AvsIfConnectionState                       m_avsConnectionState;        ///< AVS connection state
-#if BUILD_RTI
   std::shared_ptr<DdsHandler>                m_ddsHandler;                ///< Pointer to DDS handler
-#endif
   std::shared_ptr<HandlerParticipantData>    m_handlerParticipantData;    ///< Pointer to participant data handler
   std::shared_ptr<HandlerInfrastructureData> m_handlerInfrastructureData; ///< Pointer to infrastructure data handler
   std::unique_ptr<HandlerOverlays>           m_handlerOverlays;           ///< Pointer to overlay handler
@@ -64,9 +62,8 @@ private: // attributes
   QTimer                                  *m_checkConnectTimer;     ///< Wait for AVS connected.
   QTimer                                  *m_keepAliveTriggerTimer; ///< Timer for triggering the keep alive request
   bool                                     m_bAvsSocketWarnedOnce;
-  NGL::INGLLogger                         &m_logger;
-
 
+  NGL::INGLLogger                         &m_logger;                ///< Interface to the Logging-Facility
 
 };
 } // namespace VideoOverlayManagement

qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/settings.h

@@ -7,7 +7,7 @@
   */
 
 #pragma once
-#include <QtCore/QString>
+#include <QString>
 
 namespace NGL
 {