Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -15,6 +15,8 @@ ADD_SUBDIRECTORY(Helper)
ADD_INTERFACE_LIBRARY(AsbDataPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/asb_data_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../Viewer/SituationMap/Symbology
DataPluginInterface
advancedSymbology
Qt6::Gui
@@ -14,6 +14,7 @@ NGL_ADD_LIBRARY(WS AsbData STATIC
TARGET_INCLUDE_DIRECTORIES(AsbData PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../..
${CMAKE_CURRENT_SOURCE_DIR}/../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../Viewer/SituationMap/Symbology
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Z/src
)
NGL_TARGET_LINK_LIBRARIES(AsbData
@@ -55,6 +56,12 @@ NGL_ADD_LIBRARY(WS AsbForeignDataPluginThp STATIC
logger.cpp
logger.h
)
TARGET_INCLUDE_DIRECTORIES(AsbForeignDataPluginThp PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../..
${CMAKE_CURRENT_SOURCE_DIR}/../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../Viewer/SituationMap/Symbology
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Z/src
)
NGL_TARGET_LINK_LIBRARIES(AsbForeignDataPluginThp
AsbData
Qt6::Core
@@ -6,7 +6,7 @@
#include "logger.h"
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <Plugins/GuezIedManagement/gim_data_plugin_interface.h>
#include <GuezIedManagement/gim_data_plugin_interface.h>
#include <SymbologyImpl/advanced_symbology_logging.h>
#include <Symbology/symbol_data_to_render_role.h>
#include <LtsSession/lts_session.h>
@@ -5,7 +5,7 @@
#include <AdvancedSymbology/asb_data_plugin_interface.h>
#include <PluginInterfaces/data_plugin_interface.h>
#ifdef BUILD_WITH_EXTERNAL_DDS
#include <Plugins/GuezIedManagement/gim_data_plugin_interface.h>
#include <GuezIedManagement/gim_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_enums.hpp>
#endif
#include <Symbology/symbol_dictionary.h>
@@ -39,6 +39,10 @@ NGL_WRAP_UI(symboleditor_SRCS ${symboleditor_UICS})
NGL_ADD_LIBRARY(WS AsbSymEditGuiPlugin MODULE ${symboleditor_SRCS} ${symboleditor_UICS})
set_target_properties(AsbSymEditGuiPlugin PROPERTIES AUTOUIC ON)
set_target_properties(AsbSymEditGuiPlugin PROPERTIES AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/forms")
TARGET_INCLUDE_DIRECTORIES(AsbSymEditGuiPlugin PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology
)
NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
NGLLogger
LtsWidgets
@@ -9,9 +9,9 @@
#include <QtWidgets/QLabel>
#include <QtCore/QList>
#include <QLocale>
#include <QPolygonF>
#include <QtGui/QPolygonF>
#include <QtGui/QPainter>
#include <QPainterPath>
#include <QtGui/QPainterPath>
#include <QtCore/QString>
#include <NGLLogger/NGLLoggerBootstrap.h>
@@ -6,8 +6,8 @@
#include <LtsWidgets/lts_dialog.h>
#include <NGLLogger/INGLLogger.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <SymbologyXML/symbol_types.h>
class QGraphicsScene;
@@ -5,8 +5,8 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <AdvancedSymbology/asb_gui_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
namespace LtsUtils
@@ -3,7 +3,7 @@
#pragma once
#include <FileManagement/flm_ftc.h>
#include <Lts/Services/FileManagement/flm_ftc.h>
#include <FileManagement/flm_ftc_types.h>
#include <QtCore/QObject>
@@ -19,6 +19,10 @@ NGL_WRAP_UI(AsbSymbolProxyGuiPlugin_SRCS
)
NGL_ADD_LIBRARY(WS AsbSymbolProxyGuiPlugin MODULE ${AsbSymbolProxyGuiPlugin_SRCS})
TARGET_INCLUDE_DIRECTORIES(AsbSymbolProxyGuiPlugin PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology
)
NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
AsbSymbolProxyGuiPluginInterface
NGLLogger
@@ -6,8 +6,8 @@
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <QtXml/QDomDocument>
#include <QtGui/QImage>
#include <QtCore/QJsonDocument>
@@ -3,11 +3,11 @@
#pragma once
#include <AdvancedSymbology/asb_symbol_proxy_gui_plugin_interface.h>
#include <FileManagement/flm.hpp>
#include <Lts/Services/FileManagement/flm.hpp>
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <memory>
namespace LtsUtils
@@ -10,8 +10,8 @@
#include <Symbology/sidc_codec.h>
#include "flm_symbol_proxy.h"
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
namespace AdvancedSymbology
{
@@ -11,6 +11,11 @@ SET(tmsr_SRCS
table_model_symbol_renderer.h
)
NGL_ADD_LIBRARY2(WS AsbHelper STATIC ${tmsr_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(AsbHelper
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/
)
NGL_TARGET_LINK_LIBRARIES(AsbHelper
PUBLIC
Qt6::Core