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
@@ -26,7 +26,7 @@ UnitPositionCalculator::UnitPositionCalculator(ParticipantHandler *participantHa
|
||||
, m_bSomethingChangedSinceLastCalculation(false)
|
||||
, m_timer(new QTimer(this))
|
||||
, m_bRunning(true),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
connect(m_timer, &QTimer::timeout, this, &UnitPositionCalculator::calculate);
|
||||
m_timer->setSingleShot(true);
|
||||
|
||||
|
||||
+1
-1
@@ -109,7 +109,7 @@ std::vector<ShootbackArea> vecfromJson(const QJsonValue &val)
|
||||
|
||||
|
||||
ObjectTargetInformation::ObjectTargetInformation(MainHandler *mainHandler) : m_mainHandler(mainHandler),
|
||||
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";
|
||||
}
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ ObjectMissionPlan::ObjectMissionPlan(const std::shared_ptr<DdsHandler> &ddsHandl
|
||||
, m_ddsHandler(ddsHandler)
|
||||
, m_db(db)
|
||||
, m_missionplan(missionPlan),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
DEBUG_LOG(m_logger)<<" - ctor ObjectMissionPlan: planId: "<<m_missionplan.id();
|
||||
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ namespace ParticipantManagement
|
||||
{
|
||||
|
||||
DdsHandler::DdsHandler(int domainId, int exerciseId) : m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(domainId, exerciseId <= 0 ? IDL::PartitionType::Global : IDL::PartitionType::Exercise, exerciseId)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << domainId << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user