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:
torsten committed 2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
422 files changed
+1013 -599

No files matched your search

@@ -15,6 +15,7 @@ NGL_ADD_LIBRARY(WS IsmDataPlugin MODULE
ism_foreign_data_plugin.cpp
ism_foreign_data_plugin.h
)
set_target_properties(IsmDataPlugin PROPERTIES AUTOMOC ON)
NGL_TARGET_LINK_LIBRARIES(IsmDataPlugin
IsmDataPluginInterface
IsmShared
@@ -9,10 +9,9 @@
namespace InfrastructureManagement
{
class DataPlugin final : public QObject, public DataPluginBase::Plugin
class DataPlugin final : public DataPluginBase::Plugin
{
Q_PLUGIN_METADATA(IID "data:3:ism")
Q_INTERFACES(DataPluginBase::Plugin)
Q_OBJECT
public:
@@ -14,7 +14,7 @@ namespace InfrastructureManagement
{
SetRecordingDialogModel::SetRecordingDialogModel(QObject *parent) : NGLTreeModel(parent, new NGLTreeItem(QVariant()),,
m_logger(NGL::NGLLoggerBootstrap::getLogger()) { tr("Name") })
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { tr("Name") })
, m_dtc(nullptr)
{
}
@@ -250,7 +250,7 @@ TreeItem::TreeItem(int mseId, int sectionId, const QString &displayName, int exe
, m_exerciseId(exerciseId)
, m_originalExerciseId(exerciseId)
, m_parentItem(parentItem),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
}
@@ -12,7 +12,7 @@ namespace InfrastructureManagement
NewPlanDialog::NewPlanDialog(LtsSession::LtsSession *session, QWidget *parent) : QDialog(parent)
, m_ui(new Ui::NewPlanDialog)
, m_session(session),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
setWindowTitle(tr("Create New Plan"));
m_ui->setupUi(this);
@@ -25,7 +25,7 @@ PlanChooser::PlanChooser(const std::shared_ptr<Interface::Dtc> &dtc, QWidget *pa
, m_model(nullptr)
, m_dtc(dtc)
, m_selected(false),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
LtsWidgets::LtsGlobalWaitDialog::getInstance()->setVisible(false);
m_ui->setupUi(this);