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
@@ -21,7 +21,7 @@ ConnectionHandlerSerial::ConnectionHandlerSerial(QObject *parent) : QObject(pare
|
||||
, m_currentDataRead(QByteArray())
|
||||
, m_portName(QStringLiteral("COM5"))
|
||||
, m_readBuffer(new QByteArray()),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_receiveTimeoutTimer->setInterval(1700);
|
||||
connect(m_spQuerry, &LtsSerialPortQuerry::LtsSerialPortQuerry::connectionEstablished, this, &ConnectionHandlerSerial::open);
|
||||
m_spQuerry->restartQuerry();
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ ConnectionHandlerTcp::ConnectionHandlerTcp(QObject *parent) : QObject(parent)
|
||||
, m_socket(nullptr)
|
||||
, m_timer(new QTimer(this))
|
||||
, m_currentDataRead(QByteArray()),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_timer->setInterval(5000);
|
||||
connect(m_timer, &QTimer::timeout, this, &ConnectionHandlerTcp::open);
|
||||
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ ControlUnitHandler::ControlUnitHandler(QObject *parent) : QObject(parent)
|
||||
, m_connectionHandler(new ConnectionHandler(this))
|
||||
, m_timer(new QTimer(this))
|
||||
, m_feature(EffectShowManagement::Feature_e::NotSpecified),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_timer->setInterval(10000);
|
||||
connect(m_timer, &QTimer::timeout, this, &ControlUnitHandler::onConnectedToSerialConveter);
|
||||
m_timer->start();
|
||||
|
||||
@@ -23,7 +23,7 @@ HandlerVehicle::HandlerVehicle(MainHandler *mainHandler,
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_volleyTimer(new QTimer(this))
|
||||
, m_remainingTimer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
DEBUG_LOG(m_logger) << "HandlerVehicle ctor";
|
||||
m_volleyTimer->setSingleShot(true);
|
||||
m_remainingTimer->setInterval(1000);
|
||||
|
||||
@@ -29,7 +29,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
|
||||
, m_handlerTabData(nullptr)
|
||||
, m_handlerVehicle(nullptr)
|
||||
, m_handlerControlUnit(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
MainHandler::~MainHandler()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user