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