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
@@ -76,7 +76,7 @@ DefaultAvMenus::DefaultAvMenus(const ExerciseContext &context, Interface::Dts *d
|
||||
, m_ismDtc(ismDtc)
|
||||
, m_timer(new QTimer)
|
||||
, m_isInitialized(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
Q_ASSERT(dts);
|
||||
Q_ASSERT(ismDtc);
|
||||
if(!m_ismDtc->isMainStructureElementEnabled())
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ ExerciseHandler::ExerciseHandler(MainHandler *mainHandler, int exerciseId) : QOb
|
||||
, m_updateTimer(new QTimer(this))
|
||||
, m_lastSeenTimer(new QTimer(this))
|
||||
, m_bWarnedOnce(false),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_updateTimer->setSingleShot(true);
|
||||
connect(m_updateTimer, &QTimer::timeout, this, &ExerciseHandler::onUpdateTimerTimeout);
|
||||
|
||||
|
||||
+1
-1
@@ -55,7 +55,7 @@ private:
|
||||
ExercisesHandler::ExercisesHandler(MainHandler *mainHandler) : m_mainHandler(mainHandler)
|
||||
, m_triggerAvUpdateTimer(new QTimer(this))
|
||||
, m_assetAssignmentManager(AssetAssignmentManager::create(mainHandler->ddsHandler()->ismDtc())),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
m_triggerAvUpdateTimer->setSingleShot(true);
|
||||
m_triggerAvUpdateTimer->setInterval(1000);
|
||||
connect(m_triggerAvUpdateTimer, &QTimer::timeout,
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ namespace AudioVideoManagement
|
||||
|
||||
FrequencySetHandler::FrequencySetHandler(Interface::Dts *dts, DatabaseInterface *db) : m_dts(dts)
|
||||
, m_db(db),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
Q_ASSERT(dts);
|
||||
Q_ASSERT(db);
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
using namespace AudioVideoManagement;
|
||||
|
||||
MainHandler::MainHandler(QObject *parent) : QObject(parent),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
|
||||
|
||||
MainHandler::~MainHandler() = default;
|
||||
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ namespace AudioVideoManagement
|
||||
ObjectFrequencyPlanningStatus::ObjectFrequencyPlanningStatus(Interface::Dts *dts,
|
||||
DatabaseInterface *db) : m_dts(dts)
|
||||
, m_db(db),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
+1
-1
@@ -77,7 +77,7 @@ namespace AudioVideoManagement
|
||||
|
||||
ObjectMenuStruct::ObjectMenuStruct(Interface::Dts *dts, DatabaseInterface *db) : m_dts(dts)
|
||||
, m_db(db),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
Q_ASSERT(dts);
|
||||
Q_ASSERT(db);
|
||||
}
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ namespace AudioVideoManagement
|
||||
ObjectVideoReceiver::ObjectVideoReceiver(Interface::Dts *dts,
|
||||
DatabaseInterface *db) : m_dts(dts)
|
||||
, m_db(db),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ namespace AudioVideoManagement
|
||||
ObjectVideoTeam::ObjectVideoTeam(Interface::Dts *dts,
|
||||
DatabaseInterface *db) : m_dts(dts)
|
||||
, m_db(db),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user