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>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
@@ -31,7 +31,7 @@ TetraIF::TetraIF(const QHostAddress &addr, unsigned short port, unsigned short i
|
||||
, m_timer(nullptr)
|
||||
, m_SendCounter(0)
|
||||
),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_socket, &QTcpSocket::connected, this, &TetraIF::onConnected);
|
||||
connect(m_socket, &QTcpSocket::disconnected, this, &TetraIF::onDisconnected);
|
||||
connect(m_socket, &QTcpSocket::readyRead, this, &TetraIF::onReadyRead);
|
||||
|
||||
@@ -35,7 +35,7 @@ PrtCnvBroadcastMgr::PrtCnvBroadcastMgr() : m_ClaimWindow(0)
|
||||
, m_FinishedBroadcastIndex(0)
|
||||
, m_FirstBroadcastIndexOfBc1(0)
|
||||
, m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ PrtCnvRadioThread::PrtCnvRadioThread(int exerciseId, PrtCnvThreadStarter *a_pare
|
||||
m_bUseScrambling(false),
|
||||
m_loggerStats(getLogger("PrtCnvRadioThread.statistic")),
|
||||
m_exerciseEquipmentAssignmentMutex(QMutex::Recursive),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_Name = QStringLiteral("Radio");
|
||||
for (int i = 0; i < AVERAGE_COUNT; ++i)
|
||||
{
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
TTServer::TTServer(const TTSArgs &ttsArgs) : m_ttsArgs(ttsArgs)
|
||||
.getNGLLogger("TTServer")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(this, &TTServer::newConnection,
|
||||
this, &TTServer::onNewConnection);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user