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
@@ -13,7 +13,7 @@ namespace Json
|
||||
{
|
||||
WebSocketHandler::WebSocketHandler(QObject *parent) : QObject(parent)
|
||||
, m_webSocketServer(new QWebSocketServer(QStringLiteral("BCU"), QWebSocketServer::NonSecureMode, this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
WebSocketHandler::~WebSocketHandler()
|
||||
{
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
|
||||
Test::Test() : m_api(new BuildingControlUnit::VWM::Api(this))
|
||||
.getNGLLogger("BCU.VWM.Test")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_api, &BuildingControlUnit::VWM::Api::hitResult,
|
||||
this, &Test::hitResult);
|
||||
QTimer::singleShot(0, this, &Test::test1);
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ namespace BuildingControlUnit
|
||||
HandleHttpRequest::HandleHttpRequest(bool useQueue, QObject *parent) : QObject(parent)
|
||||
, m_nam(new QNetworkAccessManager(this))
|
||||
, m_bUseQueue(useQueue),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
INFO_LOG(m_logger) << "Using Queue: " << m_bUseQueue;
|
||||
connect(m_nam, &QNetworkAccessManager::finished,
|
||||
this, &HandleHttpRequest::onReplyFinished);
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ MainHandler::MainHandler() : QObject()
|
||||
, m_handelEffectsBsm(nullptr)
|
||||
, m_handleHttpRequest(nullptr)
|
||||
, m_bsmFlash(BEO_Auto),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
|
||||
@@ -21,7 +21,7 @@ IsmHandler::IsmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
|
||||
, m_ftcIsm(nullptr)
|
||||
, m_changeTimeoutTimer(new QTimer(this))
|
||||
, m_changeTimeoutTimerInit(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_changeTimeoutTimer, &QTimer::timeout,
|
||||
this, &IsmHandler::onBuildingsChanged);
|
||||
m_changeTimeoutTimer->setInterval(3 * 1000);
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
namespace Buildings
|
||||
{
|
||||
MainHandler::MainHandler(QObject *parent) : QObject(parent),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace Buildings
|
||||
{
|
||||
PdmHandler::PdmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
|
||||
, m_bPdmInitialized(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
PdmHandler::~PdmHandler()
|
||||
{}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
namespace Buildings
|
||||
{
|
||||
PpmHandler::PpmHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
PpmHandler::~PpmHandler()
|
||||
{}
|
||||
|
||||
Reference in new issue
Block a user