diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp index 235e2f9c5..920afd306 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/avs_interface.cpp @@ -25,7 +25,7 @@ AvsInterface::AvsInterface(bool enableTryReconnect, QObject *parent) : QObject(p , m_keepAliveTime(Settings::getAvsKeepAliveTime()) , m_avsIfConnectionState(AvsIfConnectionState::Undefined) , m_socket(nullptr), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + m_logger(NGL::getMemoryLogger()) { doConnect(); connect(m_avsKeepAliveTimer, &QTimer::timeout, @@ -54,7 +54,7 @@ void AvsInterface::doConnect() this, &AvsInterface::onConnected); connect(m_socket, &QTcpSocket::disconnected, this, &AvsInterface::onDisonnected); - connect(m_socket, QOverload::of(&QTcpSocket::error), + connect(m_socket, QOverload::of(&QTcpSocket::errorOccurred), this, &AvsInterface::onError); connect(m_socket, &QTcpSocket::readyRead, this, &AvsInterface::onReadyRead); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp index e0d4dea81..1bedda5a9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_infrastructure_data.cpp @@ -18,7 +18,7 @@ using namespace VideoOverlayManagement; HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr &ddsHandler, QObject *parent) : QObject(parent) , m_ddsHandler(ddsHandler) , m_exerciseId(0), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + m_logger(NGL::getMemoryLogger()) { } // end of ctor() //----------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp index 0450c4155..f20f1a986 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_overlays.cpp @@ -24,7 +24,7 @@ HandlerOverlays::HandlerOverlays(AvsInterface *avsIf, , m_handlerParticipantData(handlerParticipantData) , m_handlerInfrastructureData(handlerInfrastructureData) , m_exerciseId(exerciseId), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + m_logger(NGL::getMemoryLogger()) { } // end of ctor() //----------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp index 0e6eec30a..4418fd8a0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/handler_participant_data.cpp @@ -17,7 +17,7 @@ using namespace VideoOverlayManagement; HandlerParticipantData::HandlerParticipantData(const std::shared_ptr &ddsHandler, QObject *parent) : QObject(parent) , m_ddsHandler(ddsHandler), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + m_logger(NGL::getMemoryLogger()) { } // end of ctor() //----------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/logger.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/logger.cpp index 2cfd05e99..2404721fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/logger.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/logger.cpp @@ -7,7 +7,12 @@ */ #include "logger.h" + +#if BUILD_RTI #include +#else +#include +#endif namespace VideoOverlayManagement { @@ -21,6 +26,7 @@ LOGGER_T getLogger(const char *name) loggerName.append(ns, sizeof(ns) - 1); loggerName.append(name, len); +#if BUILD_RTI try { return NGL::NGLLoggerBootstrap::getNGLRootLogger(). @@ -31,6 +37,9 @@ LOGGER_T getLogger(const char *name) fprintf(stderr, "Error retrieving logger: %s", ex.what()); abort(); } +#else + return NGL::getMemoryLogger(loggerName); +#endif } } // namespace VideoOverlayManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp index 3059878e2..a1863b628 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp @@ -30,7 +30,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent) , m_checkConnectTimer(new QTimer(this)) , m_keepAliveTriggerTimer(new QTimer(this)) , m_bAvsSocketWarnedOnce(false), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { + m_logger(NGL::getMemoryLogger()) { } // end of ctor() //-----------------------------------------------------------------------------