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
@@ -18,7 +18,7 @@ EffectShowEffectCluster::EffectShowEffectCluster(const AreaEffectSimulation::Eff
|
||||
const std::shared_ptr<HandlerPdmData> &handlerPdmData) : m_effectCluster(effectCluster)
|
||||
, m_handlerPdmData(handlerPdmData)
|
||||
, m_numOfEffectShows(0),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ EffectShowExplosionArea::EffectShowExplosionArea(const AreaEffectSimulation::Exp
|
||||
const std::shared_ptr<HandlerPdmData> &handlerPdmData) : m_explosionArea(explosionArea)
|
||||
, m_handlerPdmData(handlerPdmData)
|
||||
, m_numOfEffectShows(0),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ EffectShowExplosionCluster::EffectShowExplosionCluster(const AreaEffectSimulatio
|
||||
const std::shared_ptr<HandlerPdmData> &handlerPdmData) : m_explosionCluster(explosionCluster)
|
||||
, m_handlerPdmData(handlerPdmData)
|
||||
, m_numOfEffectShows(0),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ EffectShowMineArea::EffectShowMineArea(const AreaEffectSimulation::MineArea &min
|
||||
, m_segment(getEffectShowSegment(mineArea))
|
||||
, m_utmZone(-1)
|
||||
, m_rotation(0.0),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ using namespace EffectShowManagement;
|
||||
|
||||
HandlerAesData::HandlerAesData(Initialization *mainHandler) : QObject()
|
||||
, m_mainHandler(mainHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
} // end of ctor()
|
||||
//=============================================================================
|
||||
HandlerAesData::~HandlerAesData()
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ namespace EffectShowManagement
|
||||
HandlerEffectShowVehicleStatus::HandlerEffectShowVehicleStatus(Initialization *mainHandler,
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_mainHandler(mainHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_timerVehicleStatus.setSingleShot(true);
|
||||
}
|
||||
//=============================================================================
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ using namespace EffectShowManagement;
|
||||
HandlerMdmData::HandlerMdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_ddsHandler(ddsHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ namespace EffectShowManagement
|
||||
HandlerPdmData::HandlerPdmData(const std::shared_ptr<DdsHandler> &ddsHandler,
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_ddsHandler(ddsHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
} // end of ctor()
|
||||
//=============================================================================
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ using namespace EffectShowManagement;
|
||||
HandlerPpmData::HandlerPpmData(Initialization *mainHandler,
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_mainHandler(mainHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
} // end of ctor()
|
||||
//=============================================================================
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ namespace EffectShowManagement
|
||||
ObjectAesData::ObjectAesData(Initialization *mainHandler,
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_mainHandler(mainHandler),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
//=============================================================================
|
||||
|
||||
|
||||
Reference in new issue
Block a user