lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt
+6 -4
View File
@@ -36,6 +36,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmCommon SHARED ${SRCS_common})
set_target_properties(svcIsmCommon PROPERTIES AUTOMOC ON)
NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -46,7 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(svcIsmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
LtsUtilsCore
ngldb
NGLLogger
@@ -67,6 +68,7 @@ SET(SRCS_client
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmClient SHARED ${SRCS_client})
set_target_properties(svcIsmClient PROPERTIES AUTOMOC ON)
NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -76,7 +78,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmClient
NGL_TARGET_LINK_LIBRARIES(svcIsmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
Qt6::Xml
PUBLIC
svcIsmCommon
@@ -108,7 +110,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmServer
NGL_TARGET_LINK_LIBRARIES(svcIsmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcIsmCommon
@@ -190,7 +192,7 @@ NGL_TARGET_LINK_LIBRARIES(svcInfrastructureManagement
svcCoreClient
svcIsmCommon
svcIsmServer
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/CMakeLists.txt
+2 -2
View File
@@ -12,9 +12,9 @@ NGL_ADD_EXECUTABLE(AAR SV WS ismImportBuildings ${SRCS_IMPORT_BUILDINGS})
NGL_TARGET_LINK_LIBRARIES(ismImportBuildings
Qt6::Core
RTI::nddscpp2
svcIsmClient
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
LtsUtilsCoreHeaderOnly
Qt6::WebSockets
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp
+5 -5
View File
@@ -13,16 +13,16 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QFile>
#include <QTextStream>
#include <QTimer>
#include <QtCore/QFile>
#include <QtCore/QTextStream>
#include <QtCore/QTimer>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QtWebSockets/QWebSocket>
#include <QUrl>
#include <QtCore/QUrl>
#include <QThread>
#include <QtCore/QThread>
#include <InfrastructureManagement/ism_ftc.h>
#include <InfrastructureManagement/ism_dtc.h>
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include <InfrastructureManagement/ism_dtc.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <InfrastructureManagement/logger.h>
#include <QVector>
#include <QtCore/QVector>
//----------------------------------------------------------------------------------------------
namespace InfrastructureManagement
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/CMakeLists.txt
+3 -3
View File
@@ -21,10 +21,10 @@ IF(TARGET svcIsmClient)
ngldb
nglsettings
ngltools
svcIsmClient
svcIsmServer
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
$<IF:$<TARGET_EXISTS:svcIsmServer>,svcIsmServer,>
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
LtsUtilsCoreHeaderOnly
)
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ModuleTests/ism_tests.cpp
+4 -4
View File
@@ -12,11 +12,11 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QDateTime>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTest>
#include <QSet>
#include <QVector>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include <QJsonObject>
#include <QJsonDocument>
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/WebSocketInterface/Messages/client_message.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include <QtCore/QJsonDocument>
#include <QtCore/QUuid>
#include <QSet>
#include <QtCore/QSet>
namespace InfrastructureManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_effect_area.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QHash>
#include <QtCore/QHash>
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_instrumentation_asset.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QHash>
#include <QtCore/QHash>
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_schedule.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QHash>
#include <QtCore/QHash>
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_main_structure_element.h
+2 -2
View File
@@ -9,8 +9,8 @@
#pragma once
#include <QMap>
#include <QSet>
#include <QtCore/QMap>
#include <QtCore/QSet>
#include "main_handler.h"
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_mounting_point_asset.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QHash>
#include <QtCore/QHash>
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/handler_special_area.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QHash>
#include <QtCore/QHash>
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism.hpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include <cstdint>
#include <string>
#include <QString>
#include <QtCore/QString>
#include "ism_enums.hpp"
namespace InfrastructureManagement {
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom.cpp
+6 -4
View File
@@ -16,8 +16,8 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QSet>
#include <QVector>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
@@ -26,9 +26,9 @@
#include <QtGui/QTransform>
#include <unordered_map>
#include <algorithm>
#include <QFile>
#include <QtCore/QFile>
#include <QMutex>
#include <QtCore/QMutex>
#include <QMutexLocker>
//---------------------------------------------------------------------------------------------------------------------------------------------
@@ -1157,3 +1157,5 @@ QByteArray DtcImplCustom::getVulnerabilityModelData( int buildingId)
} // namespace Interface
} // namespace InfrastructureManagement
#include "ism_dtc_impl_custom.moc"
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_dtc_impl_custom_p.h
+3 -3
View File
@@ -11,9 +11,9 @@
#include "ism_dtc_impl_custom.h"
#include <LtsCoordinate/lts_coord_vector.h>
#include <QHash>
#include <QPolygonF>
#include <QTransform>
#include <QtCore/QHash>
#include <QtGui/QPolygonF>
#include <QtGui/QTransform>
//-------------------------------------------------------------------------------------------------------------
namespace InfrastructureManagement
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_enums.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#define ISM_ENUMS_HPP
#include <QDebug>
#include <QString>
#include <QtCore/QString>
#include <cstdint>
namespace InfrastructureManagement
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "object_main_schedule.h"
#include <ngldb/dbtransaction.h>
#include <QTimer>
#include <QtCore/QTimer>
using namespace InfrastructureManagement;
//----------------------------------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QJsonObject>
#include <QTimer>
#include <QtCore/QTimer>
namespace
{
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include <QJsonArray>
#include "base.h"
#include <DDS/Core/function_reply_object.h>
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "object_special_area.h"
#include <QJsonDocument>
#include <QPolygonF>
#include <QtGui/QPolygonF>
namespace InfrastructureManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h
+1 -1
View File
@@ -15,7 +15,7 @@
#include <InfrastructureManagement/ism_db.h>
#include <QtCore/QPointF>
#include <QString>
#include <QtCore/QString>
#include <LtsCoordTrans/lts_coord_trans.h>
namespace InfrastructureManagement
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.cpp
+2 -2
View File
@@ -9,8 +9,8 @@
#include "parse_building_xml.h"
#include <QDomDocument>
#include <QFile>
#include <QPointF>
#include <QtCore/QFile>
#include <QtCore/QPointF>
#include <QJsonArray>
#include <QJsonObject>
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/parse_building_xml.h
+2 -2
View File
@@ -10,8 +10,8 @@
#include "ism_export.h"
#include <QObject>
#include <QVector>
#include <QtCore/QObject>
#include <QtCore/QVector>
#include <InfrastructureManagement/ism_dtc.h>
#include "logger.h"
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_manager.h
+2 -2
View File
@@ -8,8 +8,8 @@
#pragma once
#include <QObject>
#include <QMap>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include <InfrastructureManagement/ism_enums.hpp>
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/schedule_status_state_machine.h
+1 -1
View File
@@ -10,7 +10,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QStateMachine>
#include <InfrastructureManagement/ism_enums.hpp>
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "settings.h"
#include <QSettings>
#include <QVariant>
#include <QtCore/QVariant>
#include <nglsettings/nglsettings_settings.h>
#include <ngltools/ngltools_filesystem.h>
qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/settings.h
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{