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/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ namespace HighLevelArchitecture
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_exerciseHasHlaConnection(false),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ namespace HighLevelArchitecture
MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_exerciseId(0),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
MainHandler::~MainHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp
+1 -1
View File
@@ -144,7 +144,7 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_n
, m_bInitialized(false)
, m_bCanPublishData(false)
, m_timer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
connect(m_timer, &QTimer::timeout,
this, &NgsConnector::go);
connect(m_playerCallback, &PlayerCallback::firstTick,
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_handler.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ namespace HighLevelArchitecture
NgsHandler::NgsHandler(QObject *parent) : QObject(parent)
, m_ddsHandler(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
NgsHandler::~NgsHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/socketreader.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ SocketReader::SocketReader(QObject *parent) : QThread(parent)
, m_socket(new QTcpSocket(this))
, m_hlaRequestIdentifier(0)
.getNGLLogger("SocketReader")),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
}
bool SocketReader::init(const QString &host, quint16 port, int hlaRequestIdentifier)
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/web_socket_handler.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QOb
, m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
, m_mainHandler(mainHandler)
, m_exerciseId(exerciseId),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
WebSocketHandler::~WebSocketHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ namespace HighLevelArchitecture
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(new DDSConnector::DdsConnector(domainId, IDL::PartitionType::Exercise, exerciseId))
, m_hlaIsActive(false),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ namespace HighLevelArchitecture
MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_exerciseId(0),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
MainHandler::~MainHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_n
, m_bInitialized(false)
, m_bCanPublishData(false)
, m_timer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
connect(m_timer, &QTimer::timeout,
this, &NgsConnector::go);
connect(m_playerCallback, &PlayerCallback::firstTick,
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_handler.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ namespace HighLevelArchitecture
NgsHandler::NgsHandler(QObject *parent) : QObject(parent)
, m_ddsHandler(nullptr),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
NgsHandler::~NgsHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/web_socket_handler.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ WebSocketHandler::WebSocketHandler(int exerciseId, MainHandler *mainHandler, QOb
, m_webSocketServer(new QWebSocketServer(QStringLiteral("WLS"), QWebSocketServer::NonSecureMode, this))
, m_mainHandler(mainHandler)
, m_exerciseId(exerciseId),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
WebSocketHandler::~WebSocketHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ namespace HighLevelArchitecture
MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_exerciseId(0),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
MainHandler::~MainHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ NgsConnector::NgsConnector(const QString &fedName, NgsHandler *ngsHandler) : m_n
, m_bInitialized(false)
, m_bCanPublishData(false)
, m_timer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
connect(m_timer, &QTimer::timeout,
this, &NgsConnector::go);
connect(m_playerCallback, &PlayerCallback::firstTick,
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_handler.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ namespace HighLevelArchitecture
{
NgsHandler::NgsHandler(QObject *parent) : QObject(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
NgsHandler::~NgsHandler()
{
qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/web_socket_interface.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ WsInterface::WsInterface(std::shared_ptr<NgsHandler> ngsHandler, QObject *parent
, m_wsServer(new QWebSocketServer(QStringLiteral("GNA"), QWebSocketServer::NonSecureMode, this))
, m_ngsHandler(ngsHandler)
.getNGLLogger("HlaTestTool.WsInterface")),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}