Qt6 Migration: BUILD_RTI guards und CMake fixes

- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
@@ -13,7 +13,7 @@ namespace Json
 {
 WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
  , m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 WebSocketHandler::~WebSocketHandler()
 {
@@ -15,7 +15,7 @@

 Test::Test() : m_api(new BuildingControlUnit::VWM::Api(this))
  .getNGLLogger("BCU.VWM.Test")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_api, &BuildingControlUnit::VWM::Api::hitResult,
          this, &Test::hitResult);
  QTimer::singleShot(0, this, &Test::test1);
@@ -12,7 +12,7 @@ namespace BuildingControlUnit
 HandleHttpRequest::HandleHttpRequest(bool useQueue, QObject *parent) : QObject(parent)
  , m_nam(new QNetworkAccessManager(this))
  , m_bUseQueue(useQueue),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  INFO_LOG(m_logger) << "Using Queue: " << m_bUseQueue;
  connect(m_nam, &QNetworkAccessManager::finished,
          this, &HandleHttpRequest::onReplyFinished);
@@ -18,7 +18,7 @@ MainHandler::MainHandler() : QObject()
  , m_handelEffectsBsm(nullptr)
  , m_handleHttpRequest(nullptr)
  , m_bsmFlash(BEO_Auto),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -21,7 +21,7 @@ IsmHandler::IsmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
  , m_ftcIsm(nullptr)
  , m_changeTimeoutTimer(new QTimer(this))
  , m_changeTimeoutTimerInit(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_changeTimeoutTimer, &QTimer::timeout,
          this, &IsmHandler::onBuildingsChanged);
  m_changeTimeoutTimer->setInterval(3 * 1000);
@@ -10,7 +10,7 @@
 namespace Buildings
 {
 MainHandler::MainHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -9,7 +9,7 @@ namespace Buildings
 {
 PdmHandler::PdmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
  , m_bPdmInitialized(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 PdmHandler::~PdmHandler()
 {}
@@ -7,7 +7,7 @@
 namespace Buildings
 {
 PpmHandler::PpmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 PpmHandler::~PpmHandler()
 {}
@@ -11,7 +11,7 @@
 using namespace CombatNetRadio::WebSocketInterface::Connection;

 ConnectionHandler::ConnectionHandler() : m_server(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 ConnectionHandler::~ConnectionHandler()
@@ -13,7 +13,7 @@ namespace Messages
 {

 MessageHandler::MessageHandler(ExerciseManager *exerciseManager) : m_exerciseManager(exerciseManager),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  Q_ASSERT(exerciseManager);
 }

@@ -20,7 +20,7 @@ ConfigCnr::ConfigCnr(int exerciseId, AudioVideoManagement::Interface::Dtc *avmDt
  , m_avmDtc(avmDtc)
  , m_ismDtc(ismDtc)
  , m_loggerJson(getLogger("ConfigCnr.Json")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  Q_ASSERT(avmDtc);
  Q_ASSERT(ismDtc);

@@ -16,7 +16,7 @@ namespace ComponentMonitor

 CheckmkHandler::CheckmkHandler() : QObject()
  , m_socket(new QTcpSocket(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
@@ -13,7 +13,7 @@ namespace ComponentMonitor
 {

 ComponentStatusHandler::ComponentStatusHandler() : QObject(),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
@@ -12,7 +12,7 @@ namespace ComponentMonitor
 {

 MainHandler::MainHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
@@ -20,7 +20,7 @@ namespace FeedGeoJson
 FeedGeoJson::FeedGeoJson(QObject *parent) : QObject(parent)
  , m_bTestsSuccessful(true)
  , m_refPos(LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UMD8000090000"))),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 FeedGeoJson::~FeedGeoJson()
 {}
@@ -11,7 +11,7 @@ namespace HighLevelArchitecture

 DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
  , m_exerciseHasHlaConnection(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -15,7 +15,7 @@ namespace HighLevelArchitecture

 MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_exerciseId(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -144,7 +144,7 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_n
  , m_bInitialized(false)
  , m_bCanPublishData(false)
  , m_timer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_timer, &QTimer::timeout,
          this, &NgsConnector::go);
  connect(m_playerCallback, &PlayerCallback::firstTick,
@@ -16,7 +16,7 @@ namespace HighLevelArchitecture

 NgsHandler::NgsHandler(QObject *parent) : QObject(parent)
  , m_ddsHandler(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 NgsHandler::~NgsHandler()
 {
@@ -16,7 +16,7 @@ SocketReader::SocketReader(QObject *parent) : QThread(parent)
  , m_socket(new QTcpSocket(this))
  , m_hlaRequestIdentifier(0)
  .getNGLLogger("SocketReader")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }

 bool SocketReader::init(const QString &host, quint16 port, int hlaRequestIdentifier)
@@ -19,7 +19,7 @@ WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QOb
  , m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
  , m_mainHandler(mainHandler)
  , m_exerciseId(exerciseId),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 WebSocketHandler::~WebSocketHandler()
 {
@@ -11,7 +11,7 @@ namespace HighLevelArchitecture

 DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
  , m_hlaIsActive(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -17,7 +17,7 @@ namespace HighLevelArchitecture

 MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_exerciseId(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -154,7 +154,7 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_n
  , m_bInitialized(false)
  , m_bCanPublishData(false)
  , m_timer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_timer, &QTimer::timeout,
          this, &NgsConnector::go);
  connect(m_playerCallback, &PlayerCallback::firstTick,
@@ -14,7 +14,7 @@ namespace HighLevelArchitecture

 NgsHandler::NgsHandler(QObject *parent) : QObject(parent)
  , m_ddsHandler(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 NgsHandler::~NgsHandler()
 {
@@ -19,7 +19,7 @@ WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QOb
  , m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
  , m_mainHandler(mainHandler)
  , m_exerciseId(exerciseId),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 WebSocketHandler::~WebSocketHandler()
 {
@@ -17,7 +17,7 @@ namespace HighLevelArchitecture

 MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_exerciseId(0),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -150,7 +150,7 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_n
  , m_bInitialized(false)
  , m_bCanPublishData(false)
  , m_timer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_timer, &QTimer::timeout,
          this, &NgsConnector::go);
  connect(m_playerCallback, &PlayerCallback::firstTick,
@@ -18,7 +18,7 @@ namespace HighLevelArchitecture
 {

 NgsHandler::NgsHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 NgsHandler::~NgsHandler()
 {
@@ -23,7 +23,7 @@ WsInterface::WsInterface(std::shared_ptr<NgsHandler> ngsHandler, QObject *parent
  , m_wsServer(new QWebSocketServer(QStringLiteral("GNA"), QWebSocketServer::NonSecureMode, this))
  , m_ngsHandler(ngsHandler)
  .getNGLLogger("HlaTestTool.WsInterface")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
  TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
 }
@@ -21,7 +21,7 @@ JsonHandlerRx::JsonHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab
    , m_bWarnedOnceTx(false)
    , m_aesHandler(aesHandler)
    , m_ppmHandler(ppmHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
 }
 bool JsonHandlerRx::handleTelegram(int wsId, const QJsonObject &telegram, int &errorcode)
 {
@@ -11,7 +11,7 @@ namespace AdlerJson


 PdmHandler::PdmHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool PdmHandler::init(MainDispatcher* mainDispatcher)
 {
@@ -9,7 +9,7 @@ namespace ApHlaJson
 {

 DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -23,7 +23,7 @@ HlaHandlerRx::HlaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab>
  , m_bWarnedOnceTx(false)
  , m_aesHandler(aesHandler)
  , m_ppmHandler(ppmHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
 {
@@ -11,7 +11,7 @@ namespace ApHlaJson


 PdmHandler::PdmHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool PdmHandler::init(MainDispatcher* mainDispatcher)
 {
@@ -12,7 +12,7 @@ namespace ApHlaJson


 PpmHandler::PpmHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool PpmHandler::init(MainDispatcher* mainDispatcher)
 {
@@ -23,7 +23,7 @@ DirectoryCleaner::DirectoryCleaner(const QString &directory, unsigned int maxAge
  , m_cleanerThread(new QThread(this))
  , m_worker(new DirectoryCleanerWorker(directory, maxAgeSec))
  .getNGLLogger("TAB.Plugin.DirectoryCleaner")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  QDir().mkpath(directory);
  doInitialCleanup(directory);
  m_worker->moveToThread(m_cleanerThread);
@@ -14,7 +14,7 @@ HlaHandlerRx::HlaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab>
                           HlaDispatcher *dispatcher) : m_rxHandler(recvFromTabCb)
  , m_dispatcher(dispatcher)
  , m_bWarnedOnce(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool HlaHandlerRx::handleTelegram(const QByteArray &baJson)
 {
@@ -13,7 +13,7 @@ namespace Nmea

 NmeaHandlerRx::NmeaHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab> &rxHandler) : m_rxHandler(rxHandler)
  , m_bWarnedOnce(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {

  

@@ -14,7 +14,7 @@ ConvertFromJson::ConvertFromJson(const std::shared_ptr<TrainingAreaBase::RecvFro
                                 const char *loggerName) : m_rxHandler(rxHandler)
  , m_bWarnedOnce(false)
  .getNGLLogger(loggerName)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter)
 {
@@ -16,7 +16,7 @@ using namespace LtsUtils;
 namespace UAS
 {
 Resolver::Resolver(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(this, &Resolver::resolve, this, &QObject::deleteLater);
  connect(this, &Resolver::reject, this, [this](){deleteLater();});
 }
@@ -24,7 +24,7 @@
 namespace UAS
 {
 TmsIfModuleHandle::TmsIfModuleHandle() : m_handle(ModuleLoader::load(QString(QCoreApplication::applicationDirPath() + QStringLiteral("/../lib/")).toStdString())),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}


 TmsIfModuleHandle::~TmsIfModuleHandle()
@@ -31,7 +31,7 @@ UAVInterfaceAdapterManager::UAVInterfaceAdapterManager(const std::shared_ptr<Tra
  , m_ftcPpm(ParticipantManagement::Interface::Ftc::create(ddsHandler->ddsConnector()))
  , m_tmsIfAdapter(tmsIfAdapter)
  , m_sendToDds(sendToDds),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}


 void UAVInterfaceAdapterManager::init()
@@ -15,7 +15,7 @@ TetraHandlerRx::TetraHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromT
  , m_receiveCounter(0)
  , m_bWarnedOnce(false)
  , m_bWaitForInitialAck(true),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_ackTimer->setInterval(1000);
  m_ackTimer->setSingleShot(false);
  connect(m_ackTimer, &QTimer::timeout,
@@ -18,7 +18,7 @@ WlsHandlerRx::WlsHandlerRx(const std::shared_ptr<TrainingAreaBase::RecvFromTab>
                           WlsDispatcher *dispatcher) : m_rxHandler(recvFromTabCb)
  , m_dispatcher(dispatcher)
  , m_bWarnedOnce(false),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool WlsHandlerRx::handleTelegram(const QByteArray &baJson)
 {
@@ -47,7 +47,7 @@ ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandle


 SendBiteRequest::SendBiteRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 void SendBiteRequest::process()
 {
@@ -15,7 +15,7 @@ namespace TrainingAreaBase
 DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))  
  , m_curMSecSinceEpoch(0)
  , m_exerciseId(exerciseId),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -16,7 +16,7 @@ IsmHandler::IsmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
  , m_dtcIsm(nullptr)
  , m_distanceIpsToGps(Settings::distanceIpsToGps())
  , m_distanceOpsToGps(Settings::distanceOpsToGps()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool IsmHandler::init()
 {
@@ -11,7 +11,7 @@ namespace TrainingAreaBase
 {
 PdmHandler::PdmHandler(MainHandler *mainHandler) : m_initialized(false)
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool PdmHandler::init()
 {
@@ -10,7 +10,7 @@ using namespace TrainingAreaBase;

 PositionHandler::PositionHandler(MainHandler *mainHandler) : QObject()
  , m_mainHandler(mainHandler),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool PositionHandler::init()
 {
@@ -19,7 +19,7 @@ namespace TrainingAreaBase

 AesStateHandler::AesStateHandler(MainHandler *mainHandler) : m_dbInterface(mainHandler->dbHandler()->db())
  , m_exerciseId(mainHandler->exerciseId()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}


 template<>
@@ -17,7 +17,7 @@ TxDdlHandler::TxDdlHandler() : m_state(DdlState::NotStarted)
  , m_segmentToggle(0)
  , m_sentCnt(0)
  , m_responseTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_responseTimer->setInterval(1000);
  m_responseTimer->setSingleShot(true);
  connect(m_responseTimer, &QTimer::timeout, this, &TxDdlHandler::sendAbortOrRestartTimeout);
@@ -12,7 +12,7 @@ namespace TrainingAreaBaseOC

 ConnectionHandlerSerial::ConnectionHandlerSerial() : m_spQuerry(new LtsSerialPortQuerry::LtsSerialPortQuerry(this))
  , m_receiveTimeoutTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open);
  m_spQuerry->restartQuerry();
  m_receiveTimeoutTimer->setInterval(5000);
@@ -11,7 +11,7 @@ namespace TrainingAreaBaseOC
 {

 ConnectionHandlerTcp::ConnectionHandlerTcp() : m_timer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_timer->setInterval(5000);
  connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);
 }
@@ -20,7 +20,7 @@ ConnectionHandlerTcpTtci::ConnectionHandlerTcpTtci() : m_messageDataStart(true)
  , m_segmentToggle(0)
  , m_canDevice(new Device(this))
  , m_canChannel(new Channel(QLatin1Char('@'), true, this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_canChannel, &Channel::dataAvailable, this, &ConnectionHandlerTcpTtci::slotReadCanFrame);
  connect(m_canChannel, &Channel::disconnectedFromEq, this, &ConnectionHandlerTcpTtci::disconnectedFromEq);
 }
@@ -9,7 +9,7 @@ namespace TrainingAreaBaseOC
 {

 DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -19,7 +19,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_rxHandler(nullptr)
  , m_ftsHandler(nullptr)
  , m_websocketHandler(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -14,7 +14,7 @@ SendToDds::SendToDds(MainHandler *mainHandler) : m_dtsTaboc(mainHandler->dds()->
  , m_dtsTab(mainHandler->dds()->dtsTab())
  , m_utmCoord(LtsCoordTrans::UtmCoordinate())
  , m_idToSend(1),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 void SendToDds::rxData(const OcTelegrams::Display &inData)
 {
@@ -14,7 +14,7 @@ Channel::Channel(QChar channel, bool bIsBinary, QObject *parent) : QObject(paren
  , m_bIsBinary(bIsBinary)
  , m_device(nullptr)
  .getNGLLogger("SCTT.Channel")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 void Channel::setDevice(Device *dev)
 {
@@ -17,7 +17,7 @@ Device::Device(QObject *parent, bool tcpMode) : QObject(parent)
  , m_receiveTimeoutTimer(new QTimer(this))
  , m_tcpMode(tcpMode)
  .getNGLLogger("TTCI.Device")),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &Device::open);
  m_spQuerry->restartQuerry();

@@ -16,7 +16,7 @@ WebsocketHandler::WebsocketHandler(QObject *parent, int exerciseId,
  , m_exerciseId(exerciseId)
  , m_dtsTaboc(dtsTabOc)
  , m_dtcTaboc(dtcTabOc),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_tryConnectionTimer = new QTimer(this);
  connect(m_tryConnectionTimer, &QTimer::timeout, this, &WebsocketHandler::onTryConnectionTimerTimeout);
  m_tryConnectionTimer->start(10 * 1000);
@@ -9,7 +9,7 @@ namespace WarehouseManagement
 {

 DdsHandler::DdsHandler(int domainId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, 0)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -10,7 +10,7 @@ namespace WarehouseManagement
 {

 DdsHandlerExercise::DdsHandlerExercise(const dds::domain::DomainParticipant &dp, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(dp, IDL::PartitionType::Exercise, exerciseId)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_ddsConnector->setDomainParticipant(dp);
  DEBUG_LOG(m_logger) << "DdsHandlerExercise for partition: " << m_ddsConnector->getDefaultPartition();
 }
@@ -7,7 +7,7 @@ namespace WarehouseManagement
 {

 MainHandler::MainHandler() : QObject(),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 { 
@@ -9,7 +9,7 @@ namespace WirelessLocationSystem
 {

 DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Global, exerciseId)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
 }

@@ -7,7 +7,7 @@
 namespace WirelessLocationSystem
 {
 IsmHandler::IsmHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 bool IsmHandler::init(MainHandler *mainHandler)
 {
@@ -10,7 +10,7 @@ namespace WirelessLocationSystem

 MainHandler::MainHandler(QObject *parent) : QObject(parent)
  , m_ddsHandler(nullptr),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 MainHandler::~MainHandler()
 {
@@ -24,7 +24,7 @@ const char *exerciseIdProperty = "exerciseId";
 WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
  , m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
  , m_basePoint(LtsCoordTrans::UtmCoordinate::fromMgrs(Settings::wlsMgrsBasePoint())),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}

 WebSocketHandler::~WebSocketHandler()
 {}
@@ -33,7 +33,7 @@ static inline QByteArray escapeData(const QByteArray &bufferData)
 }

 WlsHandler::WlsHandler(QObject *parent) : QObject(parent),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  if (Settings::wlsMgrsBasePoint().size() <= 15)
    WARNING_LOG(m_logger) << "WLS basepoint is not defined precise enough: " << Settings::wlsMgrsBasePoint();
 }
@@ -16,7 +16,7 @@ namespace WirelessLocationSystem
 {
 WlsParticipant::WlsParticipant(QObject *parent) : QObject(parent)
  , m_wlsTeleTimeoutTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  m_wlsTeleTimeoutTimer->setSingleShot(true);
  m_wlsTeleTimeoutTimer->setTimerType(Qt::VeryCoarseTimer);
  m_wlsTeleTimeoutTimer->setInterval(s_dataCommunicationAliveTimeout);
@@ -12,7 +12,7 @@ namespace WirelessLocationSystem
 {
 WlsParticipantHandler::WlsParticipantHandler(QObject *parent) : QObject(parent)
  , m_gpsOnOffTimeoutTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
  connect(m_gpsOnOffTimeoutTimer, &QTimer::timeout, this, &WlsParticipantHandler::onGpsOnOffTimeoutTimer);
  m_gpsOnOffTimeoutTimer->setSingleShot(false);
  m_gpsOnOffTimeoutTimer->start(1000);