Adds succesfull lts/proxies migration & testsuite

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/CMakeLists.txt

@@ -45,6 +45,7 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlBsm
     Qt6::Core
     Qt6::Network
     BuildingControlCommon
+    svcTabCommon
 )
 
 NGL_ADD_EXECUTABLE(AAR SV BuildingControlTestBsm bsm_test_main.cpp)
@@ -52,3 +53,4 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlTestBsm
   BuildingControlBsm
   nglcoreapplication
 )
+add_test(NAME bld_bsm_test COMMAND $<TARGET_FILE:BuildingControlTestBsm>)

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_api.cpp

@@ -11,7 +11,7 @@ namespace BSM
 Api::Api(QObject *parent)
   : QObject(parent)
   , m_socketHandler(new SocketHandler(this))
-  , m_logger(BuildingControlUnit::getLogger("BSM.Api"))
+  , m_logger(TrainingAreaBase::getLogger("BSM.Api"))
 {
   connect(m_socketHandler, &SocketHandler::opticalShot,
           this, &Api::opticalShot);

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket.cpp

@@ -18,7 +18,7 @@ Socket::Socket(const Bsm &cfg, QObject *parent)
   , m_tcpSocket(new QTcpSocket(this))
   , m_reconnectTimer(nullptr)
   , m_aliveTimer(new QTimer(this))
-  , m_logger(BuildingControlUnit::getLogger("BSM.Socket"))
+  , m_logger(TrainingAreaBase::getLogger("BSM.Socket"))
 {
   m_aliveTimer->setTimerType(Qt::VeryCoarseTimer);
   m_aliveTimer->setSingleShot(true);
@@ -29,7 +29,7 @@ Socket::Socket(const Bsm &cfg, QObject *parent)
           this, &Socket::onConnected);
   connect(m_tcpSocket, &QTcpSocket::disconnected,
           this, &Socket::onDisconnected);
-  connect(m_tcpSocket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::error),
+  connect(m_tcpSocket, &QTcpSocket::errorOccurred,
           this, &Socket::onError);
   connect(m_tcpSocket, &QTcpSocket::readyRead,
           this, &Socket::onReadyRead);

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_socket_handler.cpp

@@ -23,7 +23,7 @@ static const qint64 s_opticalTimeSlot = 100;
 
 SocketHandler::SocketHandler(QObject *parent)
   : QObject(parent)
-  , m_logger(BuildingControlUnit::getLogger("BSM.SocketHandler"))
+  , m_logger(TrainingAreaBase::getLogger("BSM.SocketHandler"))
 {
   connect(&m_cleanupQueueTimer, &QTimer::timeout,
           this, &SocketHandler::onCleanupQueue);

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_base.cpp

@@ -99,7 +99,7 @@ QByteArray Telegram::toBytestream() const
 
 Telegram *Telegram::telegramFromBytestream(const QByteArray &data_)
 {
-  NGL::INGLLogger &logger = BuildingControlUnit::getLogger("BSM.Telegrams");
+  NGL::INGLLogger &logger = TrainingAreaBase::getLogger("BSM.Telegrams");
   QByteArray data = desubstituteData(data_);
   if (data.size() < 2)
     return nullptr;

qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/BSM/bsm_telegrams_direct_fire.cpp

@@ -35,7 +35,7 @@ QByteArray PanDirectFire::payload() const
 
 Telegram *PanDirectFire::fromBytestream(const QByteArray &data)
 {
-  NGL::INGLLogger &logger = getLogger("PanDirectFire");
+  NGL::INGLLogger &logger = TrainingAreaBase::getLogger("PanDirectFire");
   DEBUG_LOG(logger) << "data.length=" << data.length();
   if (data.length() < 9)
     return nullptr;