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
@@ -35,7 +35,7 @@ DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
|
||||
, m_dtcGroupInformation(nullptr)
|
||||
, m_mainThreadId(QThread::currentThreadId())
|
||||
.getNGLLogger("UnitTests.DataTopicTests")),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
if (!DDS::QosProfile::setDefault())
|
||||
ERROR_LOG(m_logger) << "Error setting default QoS from xml-file ";
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
ServiceManagement::HeartbeatListener::HeartbeatListener(const std::shared_ptr<DDSConnector::DdsConnector> &connector, const std::shared_ptr<ServiceDonator> &serviceDonator) : m_ddsConnector(connector)
|
||||
, m_serviceDonator(serviceDonator),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
ServiceManagement::HeartbeatListener::~HeartbeatListener()
|
||||
{}
|
||||
|
||||
@@ -30,7 +30,7 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
|
||||
, m_licenceHandler(nullptr)
|
||||
, m_serviceHandler(nullptr)
|
||||
, m_websocketHandler(nullptr),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
QtSingleCoreApplication *sa = qobject_cast<QtSingleCoreApplication*>(QCoreApplication::instance());
|
||||
Q_ASSERT(sa);
|
||||
connect(sa, &QtSingleCoreApplication::messageReceived,
|
||||
|
||||
@@ -33,7 +33,7 @@ ServiceManagement::ServiceProcess::ServiceProcess(const GroupRequest &groupData,
|
||||
, m_failedStartAttemptCounter(0)
|
||||
, m_stoppedFromRequest(false)
|
||||
, m_pidProc(new QProcess(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
QStringList args({QStringLiteral("-e"), QString::number(m_groupData.exercisePartitionId()),
|
||||
QStringLiteral("-d"), QString::number(m_groupData.domainId())});
|
||||
|
||||
|
||||
Reference in new issue
Block a user