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
@@ -30,7 +30,7 @@
|
||||
namespace ExerciseEventManagement
|
||||
{
|
||||
EemTests::EemTests(QObject *parent) : QObject(parent),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
//-----------------------------------------------------------------------------------------------------------------------
|
||||
bool EemTests::init(int domainId, int exerciseId, int testId)
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ namespace ExerciseEventManagement
|
||||
WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
|
||||
, m_webSocketServer(new QWebSocketServer(QStringLiteral("AVS-Server"), QWebSocketServer::NonSecureMode, this))
|
||||
, m_timer(new QTimer()),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_timer, &QTimer::timeout,
|
||||
this, &WebSocketHandler::onSendMessage);
|
||||
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ HandlerDynamicParticipantData::HandlerDynamicParticipantData(MainHandler *mainHa
|
||||
, m_dbHandler(db)
|
||||
, m_eventServer(eventServer)
|
||||
, m_mainHandler(mainHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
} // end of ctor()
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ HandlerEquipmentErrorRegistration::HandlerEquipmentErrorRegistration(MainHandler
|
||||
, m_dbHandler(db)
|
||||
, m_eventServer(eventServer)
|
||||
, m_ossDtc(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ HandlerParticipantEvent::HandlerParticipantEvent(MainHandler *mainHandler,
|
||||
, m_dbHandler(db)
|
||||
, m_eventServer(eventServer)
|
||||
, m_mainHandler(mainHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
} // end of ctor()
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ MainHandler::MainHandler() : m_almService(nullptr)
|
||||
, m_mrkService(nullptr)
|
||||
, m_evlService(nullptr)
|
||||
, m_removeTimer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_removeTimer, &QTimer::timeout, this, &MainHandler::onRemoveKeys);
|
||||
m_removeTimer->setInterval(5000);
|
||||
m_removeTimer->setSingleShot(false);
|
||||
|
||||
+1
-1
@@ -66,7 +66,7 @@ WebSocketAvs::WebSocketAvs(MainHandler *mainHandler,
|
||||
, m_exerciseId(exerciseId)
|
||||
, m_lastUpdate(0)
|
||||
, m_bWebSocketDisconnectedWarnedOnce(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_wsReconnectTimer, &QTimer::timeout,
|
||||
this, &WebSocketAvs::openWebSocket);
|
||||
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ WebSocketEventServer::WebSocketEventServer(const QSqlDatabase &db, QObject *pare
|
||||
, m_wsServer(nullptr)
|
||||
, m_cleanupTimer(new QTimer(this))
|
||||
, m_db(db),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_cleanupTimer->setInterval(10000); // clear every 10s
|
||||
connect(m_cleanupTimer, &QTimer::timeout, this, &WebSocketEventServer::onCleanupLiveHistory);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user