lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 Migration: BUILD_RTI guards und CMake fixes

Browse Source 
- 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:
torsten committed 2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
422 files changed
+1013 -599
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
namespace MeteoDataManagement
{
DdsHandler::DdsHandler(int domainId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, IDL::PartitionType::AllExercises)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
} // end of ctor()
//-----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_infrastructure_data.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ HandlerInfrastructureData::HandlerInfrastructureData(const std::shared_ptr<DdsHa
QObject *parent) : QObject(parent)
, m_ddsHandler(ddsHandler)
, m_handlerMeteoDataUnits(handlerMeteoDataUnits),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
} // end of ctor()
//-----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_unit.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ HandlerMeteoDataUnit::HandlerMeteoDataUnit(MainHandler *mainHandler,
, m_mainHandler(mainHandler)
, m_asset(asset)
, m_tcpWS(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
init();
} // end of ctor()
//-----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/handler_meteo_data_units.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ namespace MeteoDataManagement
{
HandlerMeteoDataUnits::HandlerMeteoDataUnits(MainHandler *mainHandler) : m_mainHandler(mainHandler),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
} // end of ctor()
//-----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ MainHandler::MainHandler() : m_ddsHandler(nullptr)
, m_handlerInfrastructureData(nullptr)
, m_handlerStaticMeteoData(nullptr)
, m_gnaService(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
} // end of ctor()
//-----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/tcpweatherstation.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ TcpWeatherStation::TcpWeatherStation(int id,
, m_speed(0.0)
, m_climateOk(false)
, m_windOk(false),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
INFO_LOG(m_logger) << "Start TcpWeatherStation ip/(hostname): " << m_converterIp
<< " climatePort: " << m_climatePort
<< " windPort: " << m_windPort;