BUILD_RTI=OFF: Fix remaining include and build issues

TrainingAreaBase:
- Add BUILD_RTI guards to dds_handler.cpp (entire file)
- Add BUILD_RTI guards to recv_from_dds_aes.h for tab_db.h include
- Add BUILD_RTI guards to main_handler.h for tab_db.h include
- Remove duplicate m_logger declaration in main_handler.h
- Add stub headers for RTI types (tab_db_stub.hpp, tab_enums_stub.hpp, etc.)

VideoOverlayManagement:
- Fix member initialization order in handler_overlays.h
- Fix member initialization order in avs_interface.h
- Fix member initialization order in main_handler.h
- Change logger.cpp include from NGLLogger.h to INGLLogger.h
- Add BUILD_RTI guard to handler_overlays.cpp for RTI signal connection

Plugins:
- Migrate QDesktopWidget → QScreen in Light/Dark style plugins
- Fix CMakeLists.txt for SituationReplayManagement (BUILD_RTI guards)
- Fix CMakeLists.txt for CombatNetRadio (Qt6::Core linking)
- Remove QDesktopWidget includes in multiple plugin files

Infrastructure:
- Remove duplicate INGLLogger.h include directory
- Add stub headers for ProjectDataManagement (pdm.hpp, etc.)
- Add stub headers for RoutingServiceNG

BUILD_RTI=OFF build now compiles successfully (1112 targets).
This commit is contained in:
torsten committed 2026-08-24 14:37:16 +02:00
1 parent 4969e4ff9b
commit 793c9f8b81
43 files changed
+334 -56

No files matched your search

@@ -49,6 +49,16 @@ NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement
ddscore
ngltools
)
ELSE(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement
Qt6::Core
Qt6::Network
nglsettings
LtsCommandLineParser
NGLLogger
nglcoreapplication
ngltools
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcVideoOverlayManagement)
NGL_INSTALL(AAR SV FILES log4cxx_vom.props DESTINATION bin)
@@ -100,7 +100,6 @@ protected Q_SLOTS:
private: // methode
NGL::INGLLogger &m_logger;
void tryReconnect();
private: // attributes
@@ -118,6 +117,8 @@ private: // attributes
QTcpSocket *m_socket; ///< pointer to tcpsocket object
NGL::INGLLogger &m_logger;
QByteArray m_buffer; ///< data buffer to hold incoming data form tcpsocket
@@ -26,7 +26,11 @@ public:
#if BUILD_RTI
DdsHandler(int domainId, int exerciseId);
#else
DdsHandler(int domainId, int exerciseId) { Q_UNUSED(domainId); Q_UNUSED(exerciseId); }
DdsHandler(int domainId, int exerciseId)
: m_logger(NGL::getMemoryLogger())
{
Q_UNUSED(domainId); Q_UNUSED(exerciseId);
}
#endif
~DdsHandler() = default;
@@ -43,9 +43,11 @@ bool HandlerOverlays::init()
// Get assigned participants to roomId data from Player Management ...
initParticipantsInRoomMap();
#if BUILD_RTI
// Subscribe for external changes
connect(m_handlerParticipantData.get(), &HandlerParticipantData::participantPositionChanged,
this, &HandlerOverlays::onParticipantPositionChanged);
#endif
INFO_LOG(m_logger) << "VOM Handler initialized. ";
@@ -62,8 +62,6 @@ private Q_SLOTS:
void onParticipantsInRoomMapChanged(int roomId, const QSet<int> &participants);
private: // methodes
NGL::INGLLogger &m_logger;
/**
* Initialize 'participantsInRoomMap'
*/
@@ -118,7 +116,7 @@ private: // attributes
std::shared_ptr<HandlerParticipantData> m_handlerParticipantData; ///< Pointer to participant data handler
std::shared_ptr<HandlerInfrastructureData> m_handlerInfrastructureData; ///< Pointer to infrastructure data handler
int m_exerciseId; ///< Exercise id
NGL::INGLLogger &m_logger; ///< Logger instance
QMap<int, QSet<int>> m_participantsInRoomMap; ///< Includes all participants (player) in one room (roomId, Set<participantId>)
};
@@ -11,7 +11,7 @@
#if BUILD_RTI
#include <NGLLogger/NGLLoggerBootstrap.h>
#else
#include <NGLLogger.h>
#include <INGLLogger.h>
#endif
namespace VideoOverlayManagement
@@ -38,7 +38,7 @@ LOGGER_T getLogger(const char *name)
abort();
}
#else
return NGL::getMemoryLogger(loggerName);
return NGL::getMemoryLogger().getNGLLogger(loggerName);
#endif
}
@@ -51,8 +51,6 @@ private Q_SLOTS:
private: // attributes
NGL::INGLLogger &m_logger;
int m_exerciseId; ///< Exercise id
AvsInterface *m_avsIf; ///< Pointer to AVS-Interface
AvsIfConnectionState m_avsConnectionState; ///< AVS connection state
@@ -66,6 +64,7 @@ NGL::INGLLogger &m_logger;
QTimer *m_checkConnectTimer; ///< Wait for AVS connected.
QTimer *m_keepAliveTriggerTimer; ///< Timer for triggering the keep alive request
bool m_bAvsSocketWarnedOnce;
NGL::INGLLogger &m_logger;