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

@@ -9,6 +9,7 @@
# Data Plugin
#
NGL_ADD_LIBRARY(WS PpmDataPlugin MODULE ppm_data_plugin.cpp ppm_data_plugin.h)
set_target_properties(PpmDataPlugin PROPERTIES AUTOMOC ON)
NGL_TARGET_LINK_LIBRARIES(PpmDataPlugin
Qt6::Core
PpmDataPluginInterface
@@ -9,10 +9,9 @@
namespace ParticipantManagement
{
class DataPlugin final : public QObject, public DataPluginBase::Plugin
class DataPlugin final : public DataPluginBase::Plugin
{
Q_PLUGIN_METADATA(IID "data:3:ppm")
Q_INTERFACES(DataPluginBase::Plugin)
Q_OBJECT
public:
@@ -34,7 +34,7 @@ ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportServi
, m_ppmGuiCbxIfc(nullptr)
, m_session(session)
, m_ui(new Ui::ParticipantEditItemWidgetBase),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
m_ui->setupUi(this);
setWindowTitle(tr("Edit Participant"));
connect(m_ui->pbIcon, &QToolButton::clicked, this, &ParticipantEditItemWidgetBase::onSymbolSelection);
@@ -422,7 +422,7 @@ void ParticipantOrganisationDialog::showContextMenu(const QPoint &position)
DeleteDelegate::DeleteDelegate(QObject *parent) : QItemDelegate(parent),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
}
void DeleteDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
@@ -12,7 +12,7 @@ namespace ParticipantManagement
{
ParticipantInfoLtdGearComponent::ParticipantInfoLtdGearComponent(QTableWidget *tableWidget) : m_tableWidget(tableWidget),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
if (!m_tableWidget)
ERROR_LOG(m_logger) << "Got invalid table widget.";
}
@@ -661,7 +661,7 @@ void ParticipantTargetConfigurationDialog::showPreviewObject()
EditNameDelegate::EditNameDelegate(QWidget *parent) : QItemDelegate(parent),
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";
}
@@ -302,7 +302,7 @@ WebNofitifier::WebNofitifier(QObject *parent) : QObject(parent)
, m_currentJsonString(QString())
, m_updateString(QString())
, m_updateTimer(new QTimer(this)),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
connect(m_updateTimer, &QTimer::timeout, this, &WebNofitifier::onTimerTick);
}