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
+1
-1
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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()
|
||||
{
|
||||
|
||||
+1
-1
@@ -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,
|
||||
|
||||
+1
-1
@@ -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()
|
||||
{
|
||||
|
||||
+1
-1
@@ -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()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user