diff --git a/qt5-before/qt5-legatus-legacy b/qt5-before/qt5-legatus-legacy index 2d936b44b..c9e245a21 160000 --- a/qt5-before/qt5-legatus-legacy +++ b/qt5-before/qt5-legatus-legacy @@ -1 +1 @@ -Subproject commit 2d936b44b926ec6bcae732b2ae96b61c0afee6d8 +Subproject commit c9e245a211f0d537e8e4a82e0414fff28a8c2901 diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index c2fc036a0..0018ee7ab 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -74,7 +74,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories(${CMAKE_SOURCE_DIR}/include) # Include directory for generated export headers include_directories(${CMAKE_BINARY_DIR}) -include_directories(${CMAKE_BINARY_DIR}/Z/src/NGLLogger) +include_directories(${CMAKE_SOURCE_DIR}/Z/src) # Include directories for external dependencies and internal modules include_directories(${CMAKE_SOURCE_DIR}/Z/src) include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools) @@ -100,7 +100,9 @@ SET(CMAKE_CXX_STANDARD 17) SET(CMAKE_CXX_STANDARD_REQUIRED ON) SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) -SET(CMAKE_POSITION_INDEPENDENT_CODE ON) +# Qt6 Migration: Removed CMAKE_POSITION_INDEPENDENT_CODE - Qt6 handles PIC automatically +# and this setting conflicts with Qt6's reduce_relocations feature +# SET(CMAKE_POSITION_INDEPENDENT_CODE ON) IF(CMAKE_VERSION VERSION_GREATER 3.15.9) OPTION(USE_UNITY_BUILDS "Use Unity builds to speed up compilation (cmake 3.16 or newer required!)" OFF) @@ -347,6 +349,21 @@ if(NOT TARGET Qt6::Multimedia) message(STATUS "Created stub target for Qt6::Multimedia (library not available)") endif() +# Stub Qt6::Svg target if not available (needed by various plugins) +if(NOT TARGET Qt6::Svg) + add_library(Qt6::Svg INTERFACE IMPORTED) + message(STATUS "Created stub target for Qt6::Svg (library not available)") +endif() + +# Stub Qt6::SerialPort target if not available (needed by TrainingAreaBaseOC) +if(NOT TARGET Qt6::SerialPort) + add_library(Qt6::SerialPort INTERFACE IMPORTED) + set_target_properties(Qt6::SerialPort PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "QT_NO_SERIALPORT" + ) + message(STATUS "Created stub target for Qt6::SerialPort (library not available)") +endif() + # Stub Qt6::WebEngineCore target if not available (needed by thp_viewer) if(NOT TARGET Qt6::WebEngineCore) add_library(Qt6::WebEngineCore INTERFACE IMPORTED) @@ -420,8 +437,15 @@ IF(BUILD_RTI) IF(DEFINED ENV{DDS_PATH}) SET(RTI_INSTALL_DIR "$ENV{DDS_PATH}" CACHE PATH "RTI Connext DDS installation directory") ELSE() - # CMAKE_SOURCE_DIR is qt6-migrated-legatus, RTI is at ../../../external/ - SET(RTI_INSTALL_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory") + # In Docker container: /workspace/external/rti_connext_dds-7.7.0 + # On host: ${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0 + IF(EXISTS "/workspace/external/rti_connext_dds-7.7.0") + SET(RTI_INSTALL_DIR "/workspace/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory") + ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0") + SET(RTI_INSTALL_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory") + ELSE() + SET(RTI_INSTALL_DIR "/opt/RTI" CACHE PATH "RTI Connext DDS installation directory") + ENDIF() ENDIF() # Also set RTI_DIR for FindRTI.cmake compatibility (used by subdirectories) SET(RTI_DIR "${RTI_INSTALL_DIR}" CACHE PATH "RTI base path" FORCE) diff --git a/qt6-after/qt6-migrated-legatus/DartConfiguration.tcl b/qt6-after/qt6-migrated-legatus/DartConfiguration.tcl index e7582ab84..46d460a8b 100644 --- a/qt6-after/qt6-migrated-legatus/DartConfiguration.tcl +++ b/qt6-after/qt6-migrated-legatus/DartConfiguration.tcl @@ -11,7 +11,7 @@ BuildDirectory: /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus CostDataFile: # Site is something like machine.domain, i.e. pragmatic.crd -Site: d00b0d044d57 +Site: 993faf591d0a # Build name is osname-revision-compiler, i.e. Linux-2.4.2-2smp-c++ BuildName: Linux-c++ diff --git a/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt index f5aa0ce3e..d8f1c6d88 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt @@ -16,7 +16,7 @@ else() endif() # Add only existing subdirectories to allow partial checkouts / incremental migration -set(LTS_SUBDIRS Tools Application Common DDS Services Proxies Plugins Viewer Projects) +set(LTS_SUBDIRS Tools Application DDS Common Services Proxies Plugins Viewer Projects) foreach(dir IN LISTS LTS_SUBDIRS) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dir}") # Use guarded add so top-level MIGRATE_MODULE can restrict which Lts subdirs are included diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt index 838ee46e6..77c9ff97a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt @@ -123,6 +123,7 @@ IF(BUILD_GRANTLEE AND TARGET KF6::TextTemplate) NGL_TARGET_INCLUDE_DIRECTORIES(codegen_grantlee PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ + ${CMAKE_BINARY_DIR}/Z/src/NGLLogger ) # Smoke-test: parse all .grantlee templates in this directory to detect parse/render regressions diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp index 0ba176854..ecf597add 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp @@ -859,7 +859,7 @@ bool StructBuilder::fixupQVariantConversions(MemberInformation& mi) const QStringLiteral("static_cast<") + svcName + mi.enumeration->enumName + QStringLiteral(">("); mi.cpp.fromVariantPost = QStringLiteral(".toInt())"); mi.cpp.toVariantPre = QStringLiteral("static_cast("); - mi.cpp.toVariantPost.clear(); + mi.cpp.toVariantPost = QStringLiteral(")"); mi.cpp.toJsonPre = QStringLiteral("toJson(static_cast("); mi.cpp.toJsonPost = QStringLiteral("))"); if (!mi.enumeration->values.isEmpty()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py index d5e8c243f..48fd4aee4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/codegen_simple.py @@ -186,6 +186,8 @@ class DtcGenerator(object): def generate( self, outfile, parser ): outputHeader( outfile, parser, 'DTC' ) outfile.write('\n') + outfile.write('#include \n') + outfile.write('\n') outfile.write('/**\n') outfile.write(' * Type definitions \n') outfile.write(' * => DataTopicClients (DTCs)\n') @@ -462,13 +464,13 @@ def main(): generate(parser, OperatorRightsSql(), os.path.join(out_dir, parser.service_abbr + '_operator_rights.sql')) elif option_str == "ALL": out_dir = sys.argv[3] - fn = parser.service_abbr + '_%s_types.h' + fn = out_dir + '/' + parser.service_abbr + '_%s_types.h' generate(parser, DtsGenerator(), fn % 'dts') generate(parser, DtcGenerator(), fn % 'dtc') generate(parser, FtsGenerator(), fn % 'fts') generate(parser, FtcGenerator(), fn % 'ftc') - generate(parser, OperatorRights(), parser.service_abbr + '_operator_rights.h') - generate(parser, OperatorRightsCpp(), parser.service_abbr + '_operator_rights.cpp') + generate(parser, OperatorRights(), out_dir + '/' + parser.service_abbr + '_operator_rights.h') + generate(parser, OperatorRightsCpp(), out_dir + '/' + parser.service_abbr + '_operator_rights.cpp') else: usage("invalid option '%s'" % option_str) sys.exit(0) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.cpp.grantlee b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.cpp.grantlee index baa4ee475..c21d03c87 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.cpp.grantlee +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.cpp.grantlee @@ -30,6 +30,23 @@ QString fixupEmptyJsonString(const QString &str) return str.isEmpty() ? QStringLiteral("{}") : str; } +// Basic type toJson overloads +QJsonValue toJson(int val) +{ + return QJsonValue(val); +} +QJsonValue toJson(double val) +{ + return QJsonValue(val); +} +QJsonValue toJson(qint64 val) +{ + return QJsonValue(QString::number(val)); +} +QJsonValue toJson(const std::string &val) +{ + return QJsonValue(QString::fromStdString(val)); +} // QPointF QJsonValue toJson(const QPointF &element) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/CMakeLists.txt index 2864c81b1..5a30ffc1a 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CommonUnitTestsPlaceholder/CMakeLists.txt @@ -9,7 +9,9 @@ option(BUILD_GTEST_SMOKE "Build GTest smoke tests" OFF) add_subdirectory(mocks) if(BUILD_SMOKE_TESTS) - find_package(Qt6 REQUIRED COMPONENTS Test) + if(NOT TARGET Qt6::Test) + find_package(Qt6 REQUIRED COMPONENTS Test) + endif() add_executable(coordTransTests_smoke coordTransTests_smoke.cpp) target_link_libraries(coordTransTests_smoke PRIVATE Qt6::Test MockCoordTrans::MockCoordTrans) add_test(NAME coordTransTests_smoke COMMAND coordTransTests_smoke) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt index a0c44d7f2..7d5e91d2f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt @@ -13,24 +13,8 @@ else() set(Qt6_Gui "") endif() - -OPTION(BUILD_RTI "Build with RTI Connext DDS support" ON) - -# Find RTI Connext DDS - manual configuration (no CMake config file available) -IF(BUILD_RTI) - SET(RTI_BASE_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0") - SET(RTI_INCLUDE_DIR "${RTI_BASE_DIR}/include") - SET(RTI_LIB_DIR "${RTI_BASE_DIR}/lib/x64Linux4gcc8.5.0") - - # Check if RTI directories exist - IF(EXISTS "${RTI_INCLUDE_DIR}" AND EXISTS "${RTI_LIB_DIR}") - MESSAGE(STATUS "Using RTI Connext DDS from ${RTI_BASE_DIR}") - SET(BUILD_RTI ON) - ELSE() - MESSAGE(WARNING "RTI Connext DDS not found at ${RTI_BASE_DIR}, building without RTI support") - SET(BUILD_RTI OFF) - ENDIF() -ENDIF() +# BUILD_RTI is set by parent CMakeLists.txt - do not override here +# RTI paths are also set by parent and imported targets are available # LtsSessionDataDds (always built, with stub implementation for non-RTI builds) SET(LtsSessionDataDds_SRCS @@ -58,7 +42,11 @@ IF(BUILD_RTI) PUBLIC ${RTI_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/Lts + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_BINARY_DIR}/Lts/DDS ) + # ddscore target generates core_dtc_types.h + ADD_DEPENDENCIES(LtsSessionDataDds ddscore) NGL_TARGET_LINK_DIRECTORIES(LtsSessionDataDds PRIVATE ${RTI_LIB_DIR} diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp index ffe7826a4..10043ff7b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.cpp @@ -74,7 +74,7 @@ class DdsConnectionContainer for (int i = ddsConnections.size() - 1; i >= 0; --i) { const DdsConnection& conn = ddsConnections.at(i); - if (conn.partitionType != IDL::PartitionType::Global) + if (toIdlPartitionType(conn.partitionType) != IDL::PartitionType::Global) continue; auto ret = conn.ddsConnector.lock(); if (ret != nullptr) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h index 205bed2bc..52c80be4f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds.h @@ -22,10 +22,12 @@ #ifdef BUILD_RTI #include -#include "INGLLogger.h" -#include "DDS/Core/core_dtc_types.h" +#include +#include +#include "Core/core.hpp" +#include "Core/core_dtc_types.h" +#include "Lts/Common/ProjectConfig/project_defines.h" namespace DDSConnector { class DdsConnector; } -namespace DTC { template class GenericDTCImpl; } namespace DataPluginBase { class Interface; } namespace GuiPluginBase { class Interface; } #else @@ -165,8 +167,8 @@ class LTSSESSIONDATADDS_EXPORT LtsSessionDataDds : public QObject return true; } val.reset(); - if (m_logger.isDebug()) - m_logger.debug() << "Cannot find foreign gui ifc " << typeid(S).name() << " in " << toString(); + if (m_logger.isDebugEnabled()) + DEBUG_LOG(m_logger) << "Cannot find foreign gui ifc " << typeid(S).name() << " in " << toString(); #else val.reset(); #endif @@ -182,6 +184,7 @@ class LTSSESSIONDATADDS_EXPORT LtsSessionDataDds : public QObject bool initInternal(); void onPartitionTimeChangedInternal(); static LtsSession::PartitionType toPartitionType(IDL::PartitionType idlType); + static IDL::PartitionType toIdlPartitionType(LtsSession::PartitionType type); // Member variables - only with RTI int m_exerciseId; @@ -191,7 +194,7 @@ class LTSSESSIONDATADDS_EXPORT LtsSessionDataDds : public QObject Fetcher* m_fetcher; std::shared_ptr m_ddsConnector; std::shared_ptr m_ddsConnectorGlobal; - std::shared_ptr> m_dtcPartitionTime; + std::shared_ptr m_dtcPartitionTime; NGL::INGLLogger& m_logger; QMap> m_dataPluginInterfaces; QMap> m_guiPluginInterfaces; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt index d74cafd19..9313918c1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt @@ -4,55 +4,55 @@ # $Author$ # +set(CMAKE_AUTOMOC ON) + # DataPluginInterface -ADD_INTERFACE_LIBRARY( - DataPluginInterface +ADD_LIBRARY(DataPluginInterface SHARED ${CMAKE_CURRENT_SOURCE_DIR}/data_plugin_interface.h - ${CMAKE_CURRENT_SOURCE_DIR}/.. - Qt6::Core + ${CMAKE_CURRENT_SOURCE_DIR}/data_plugin_interface.cpp ) -set_target_properties(DataPluginInterface PROPERTIES AUTOMOC ON) +TARGET_INCLUDE_DIRECTORIES(DataPluginInterface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) +TARGET_LINK_LIBRARIES(DataPluginInterface PUBLIC Qt6::Core) # GuiPluginInterface -ADD_INTERFACE_LIBRARY( - GuiPluginInterface +ADD_LIBRARY(GuiPluginInterface SHARED ${CMAKE_CURRENT_SOURCE_DIR}/gui_plugin_interface.h - ${CMAKE_CURRENT_SOURCE_DIR}/.. - Qt6::Core LtsWidgets ProjectConfig LtsAppDescriptor LtsUtilsCore + ${CMAKE_CURRENT_SOURCE_DIR}/gui_plugin_interface.cpp ) -set_target_properties(GuiPluginInterface PROPERTIES AUTOMOC ON) +TARGET_INCLUDE_DIRECTORIES(GuiPluginInterface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) +TARGET_LINK_LIBRARIES(GuiPluginInterface PUBLIC Qt6::Core LtsWidgets ProjectConfig LtsAppDescriptor LtsUtilsCore) # projectPluginInterface -ADD_INTERFACE_LIBRARY( - ProjectPluginInterface +ADD_LIBRARY(ProjectPluginInterface SHARED ${CMAKE_CURRENT_SOURCE_DIR}/project_plugin_interface.h - ${CMAKE_CURRENT_SOURCE_DIR}/.. - Qt6::Core + ${CMAKE_CURRENT_SOURCE_DIR}/project_plugin_interface.cpp ) -set_target_properties(ProjectPluginInterface PROPERTIES AUTOMOC ON) +TARGET_INCLUDE_DIRECTORIES(ProjectPluginInterface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) +TARGET_LINK_LIBRARIES(ProjectPluginInterface PUBLIC Qt6::Core) # stylePluginInterface -ADD_INTERFACE_LIBRARY( - StylePluginInterface +ADD_LIBRARY(StylePluginInterface SHARED ${CMAKE_CURRENT_SOURCE_DIR}/style_plugin_interface.h - ${CMAKE_CURRENT_SOURCE_DIR}/.. - Qt6::Core + ${CMAKE_CURRENT_SOURCE_DIR}/style_plugin_interface.cpp ) -set_target_properties(StylePluginInterface PROPERTIES AUTOMOC ON) +TARGET_INCLUDE_DIRECTORIES(StylePluginInterface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) +TARGET_LINK_LIBRARIES(StylePluginInterface PUBLIC Qt6::Core) # record_replay_plugin -ADD_INTERFACE_LIBRARY( - RecordReplayPlugin +ADD_LIBRARY(RecordReplayPlugin SHARED ${CMAKE_CURRENT_SOURCE_DIR}/record_replay_plugin.h - ${CMAKE_CURRENT_SOURCE_DIR}/.. - Qt6::Core + ${CMAKE_CURRENT_SOURCE_DIR}/record_replay_plugin.cpp ) -set_target_properties(RecordReplayPlugin PROPERTIES AUTOMOC ON) +TARGET_INCLUDE_DIRECTORIES(RecordReplayPlugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) +TARGET_LINK_LIBRARIES(RecordReplayPlugin PUBLIC Qt6::Core) # Topic Replay Interface -ADD_INTERFACE_LIBRARY( - TopicReplayInterface +ADD_LIBRARY(TopicReplayInterface SHARED ${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.h - ${CMAKE_CURRENT_SOURCE_DIR}/.. - Qt6::Core + ${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.cpp ) +TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_BINARY_DIR}/Lts/Common/TopicEditorBase # topiceditorbase_export.h +) +TARGET_LINK_LIBRARIES(TopicReplayInterface PUBLIC Qt6::Core TopicEditorBase) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/data_plugin_interface.h index 050a4757c..af5341276 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/data_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/data_plugin_interface.h @@ -21,8 +21,7 @@ namespace DataPluginBase class Interface { - public: - Interface() = default; +public: virtual ~Interface() = default; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h index 11aa95a6b..791a6dc12 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h @@ -7,8 +7,8 @@ #include #include #include -#include #include +#include #include namespace NGL @@ -33,8 +33,9 @@ class Interface; class Plugin { + Q_GADGET + public: - Plugin() = default; virtual ~Plugin() = default; virtual QString pluginName() = 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/project_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/project_plugin_interface.h index 20926137a..481a22fb3 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/project_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/project_plugin_interface.h @@ -2,14 +2,16 @@ #pragma once -#include +#include namespace ProjectPlugin { + class Plugin { - public: - Plugin() = default; + Q_GADGET + +public: virtual ~Plugin() = default; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/record_replay_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/record_replay_plugin.h index 951cb6f99..27e15a10f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/record_replay_plugin.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/record_replay_plugin.h @@ -3,8 +3,8 @@ #pragma once #include -#include #include +#include #include #include @@ -19,8 +19,9 @@ namespace RecordReplay { class RecordReplayPlugin { + Q_GADGET + public: - RecordReplayPlugin() = default; virtual ~RecordReplayPlugin() = default; virtual QString pluginName() const = 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/style_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/style_plugin_interface.h index 736b7423b..93c1798dd 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/style_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/style_plugin_interface.h @@ -2,14 +2,15 @@ #pragma once -#include +#include namespace StylePlugin { class Plugin { + Q_GADGET + public: - Plugin() = default; virtual ~Plugin() = default; virtual void loadStyle(bool highDpi) = 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt index daed9c887..18158324c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt @@ -46,6 +46,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(TopicEditorBase PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file + ${CMAKE_BINARY_DIR}/Z/src/NGLLogger # ngllogger_export.h ) if(QT6_GUI_AVAILABLE) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp index e31396e37..d20887e0f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.cpp @@ -219,7 +219,8 @@ QColor topicTypeColor(TopicType topicType) std::ostream& operator<<(std::ostream& stream, TopicType topicType) { - stream << "TopicType::" << topicTypeString(topicType).toStdString().c_str(); + const std::string str = std::string("TopicType::") + topicTypeString(topicType).toStdString(); + stream << str; return stream; } @@ -274,7 +275,7 @@ QJsonObject TopicData::toJson() const QDataStream& operator<<(QDataStream& stream, const TopicData& data) { - const QByteArray properties = QJsonDocument(data.properties).toBinaryData(); + const QByteArray properties = QJsonDocument(data.properties).toJson(QJsonDocument::Compact); stream << data.id << static_cast(data.topicType) << data.startTime << data.duration << data.state << data.index << properties << data.description << data.channel << data.parentChannel << data.x << data.y << data.w << data.h; @@ -288,7 +289,7 @@ QDataStream& operator>>(QDataStream& stream, TopicData& data) stream >> data.id >> topicType >> data.startTime >> data.duration >> data.state >> data.index >> properties >> data.description >> data.channel >> data.parentChannel >> data.x >> data.y >> data.w >> data.h; data.topicType = static_cast(topicType); - data.properties = QJsonDocument::fromBinaryData(properties).object(); + data.properties = QJsonDocument::fromJson(properties).object(); return stream; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt index 5907c69ee..9cbbe0bcf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/Core/CMakeLists.txt @@ -38,10 +38,24 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE}) CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE}) # Get the generated core_dtc.h path for manual MOC handling -SET(CORE_DTC_H_GENERATED "${CMAKE_CURRENT_BINARY_DIR}/core_dtc.h") +# When BUILD_GRANTLEE=OFF, file is in source dir; otherwise in build dir +IF(BUILD_GRANTLEE) + SET(CORE_DTC_H_GENERATED "${CMAKE_CURRENT_BINARY_DIR}/core_dtc.h") +ELSE() + SET(CORE_DTC_H_GENERATED "${CMAKE_CURRENT_SOURCE_DIR}/core_dtc.h") + # Copy to build directory for consistent MOC handling + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/core_dtc.h" "${CMAKE_CURRENT_BINARY_DIR}/core_dtc.h" COPYONLY) +ENDIF() NGL_ADD_LIBRARY2(WS AAR HLA SV ddscore SHARED ${SRCS_common}) +# Add RTI compile definitions explicitly (required for RTI headers to compile) +TARGET_COMPILE_DEFINITIONS(ddscore PRIVATE + RTI_UNIX + RTI_LINUX + RTI_64BIT +) + # Skip AUTOMOC for generated header - it will be processed manually with correct dependencies SET_SOURCE_FILES_PROPERTIES(${CORE_DTC_H_GENERATED} PROPERTIES SKIP_AUTOMOC ON) diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt index 87cb539ff..4b8cf673b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/CMakeLists.txt @@ -12,14 +12,37 @@ SET(SRCS_common ddsut_export.h ) # Generates ddsut.idl / ddsut_enums.idl +IF(BUILD_GRANTLEE) CODEGEN_IDL_SVC(SRCS_common ${xml_FILE}) +ELSE() + # BUILD_GRANTLEE disabled: check for pre-generated files + IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ddsut.idl" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ddsut_enums.idl") + MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated IDL files for ddsut") + LIST(APPEND SRCS_common ddsut.idl ddsut_enums.idl) + ELSE() + MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated IDL files found for ddsut. Skipping service.") + SET(SRCS_common "") + ENDIF() +ENDIF() # Generate *.cpp/*.hpp from ddsut_enums.idl / ddsut.idl +IF(BUILD_GRANTLEE OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ddsut.idl" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ddsut_enums.idl")) RTIDDSGEN(SRCS_common ddsut_enums.idl) RTIDDSGEN(SRCS_common ddsut.idl) +ENDIF() # Generate ddsut_dt[s,c]_types.h, ddsut_ft[s,c]_types.h CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE}) # generate ddsut_[d|f]tc.h +IF(BUILD_GRANTLEE) CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE}) +ELSE() + # Check for pre-generated files + IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ddsut_dtc.h" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ddsut_ftc.h") + MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated DTC/FTC files for ddsut") + LIST(APPEND SRCS_common ddsut_dtc.h ddsut_ftc.h) + ELSE() + MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated DTC/FTC files found for ddsut") + ENDIF() +ENDIF() NGL_ADD_LIBRARY2(ALL ddsut_common SHARED ${SRCS_common}) IF(BUILD_RTI) diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc.h index 8c140fdb1..10f4637c2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h index e3f6ae54b..cdbbb0382 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h @@ -4,7 +4,7 @@ #include "generic_ftc.h" #include "generic_ftc_threading.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp index 9f507dd43..8888525fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_threading.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -135,7 +136,7 @@ void Threading::preInit() const } - name += words.takeFirst().leftRef(maxWordLen); + name += words.takeFirst().left(maxWordLen); wordsLeft--; } @@ -153,7 +154,7 @@ void Threading::preInit() const name = orgName; } - m_threadName = QStringLiteral("%1%2[%3]").arg(base, name).arg(qrand(), 8, 16, QLatin1Char('0')); + m_threadName = QStringLiteral("%1%2[%3]").arg(base, name).arg(QRandomGenerator::global()->bounded(0x100000000LL), 8, 16, QLatin1Char('0')); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h index c9350a4a3..4f5bb0b07 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h @@ -7,7 +7,7 @@ #include "connext.h" #include "generic_fts_internal.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h index db3470d86..487ba885f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h @@ -6,7 +6,7 @@ #include "logger.h" #if BUILD_RTI -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.h index 0e7b52b7e..d71820e3d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h index 0ed0735dd..d53ce2188 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptEditor/pre_script_dialog.h @@ -8,7 +8,7 @@ #include "pre_storyboard.h" #include "filter_topic.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h index 11b047396..435ba05bf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.h @@ -7,7 +7,7 @@ #include "pre_journal_types.h" #include "pre_utils.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp index e706982a0..30f375a57 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Data/srm_data_plugin.cpp @@ -4,12 +4,12 @@ #include "srm_data_plugin.h" #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.h index 6572003cb..21b548ef2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.h index 35949936b..9c2b87859 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/Gui/ReplayManagement/replay_dialog_model.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/srm_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/srm_data_plugin_interface.h index 31c6f1667..3ce7cc485 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/srm_data_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationReplayManagement/srm_data_plugin_interface.h @@ -5,7 +5,7 @@ #include #include -#include +#include namespace Core { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/CMakeLists.txt index b06ae70aa..eb22e2740 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/CMakeLists.txt @@ -7,6 +7,8 @@ # Created by Mike Wille, NLSE, 2018-02-15 # +set(CMAKE_AUTOMOC ON) + # Make ${Qt6_Gui} optional if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui) set(Qt6_Gui ${Qt6_Gui}) @@ -31,6 +33,10 @@ SET(RmeDarkStylePlugin_SRCS NGL_ADD_BIG_RESOURCES(RmeDarkStylePlugin_SRCS resources/rme_dark_style.qrc) NGL_ADD_LIBRARY2(AAR SV WS RmeDarkStylePlugin SHARED ${RmeDarkStylePlugin_SRCS}) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +TARGET_INCLUDE_DIRECTORIES(RmeDarkStylePlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common) +set_target_properties(RmeDarkStylePlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common") + if(QT6_GUI_AVAILABLE) NGL_TARGET_LINK_LIBRARIES(RmeDarkStylePlugin PRIVATE diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.h index f60119a70..61c5abacb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Dark/rme_dark_style.h @@ -10,11 +10,10 @@ class RmeDarkStyle : public QObject, public StylePlugin::Plugin { + Q_OBJECT Q_PLUGIN_METADATA(IID "style:3:rme.dark") Q_INTERFACES(StylePlugin::Plugin) - Q_OBJECT - public: RmeDarkStyle(); virtual ~RmeDarkStyle(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/CMakeLists.txt index 0d9967372..eb15c7635 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/CMakeLists.txt @@ -7,6 +7,11 @@ # Created by Mike Wille, SLSE, 2016-10-14 # +set(CMAKE_AUTOMOC ON) + +# Add include path for PluginInterfaces before AUTOMOC runs +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common) + # Make ${Qt6_Gui} optional if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui) set(Qt6_Gui ${Qt6_Gui}) @@ -33,6 +38,10 @@ NGL_ADD_LIBRARY(AAR SV WS RmeLightStyleQrc STATIC ${RmeLightStylePlugin_QRC}) NGL_ADD_LIBRARY(AAR SV WS RmeLightStylePlugin MODULE ${RmeLightStylePlugin_SRCS}) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +TARGET_INCLUDE_DIRECTORIES(RmeLightStylePlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common) +set_target_properties(RmeLightStylePlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common") + if(QT6_GUI_AVAILABLE) NGL_TARGET_LINK_LIBRARIES(RmeLightStylePlugin PRIVATE diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.h index 77d1d4be9..bea40505e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Styles/Light/rme_light_style.h @@ -10,11 +10,10 @@ class RmeLightStyle : public QObject, public StylePlugin::Plugin { + Q_OBJECT Q_PLUGIN_METADATA(IID "style:3:rme.light") Q_INTERFACES(StylePlugin::Plugin) - Q_OBJECT - public: RmeLightStyle(); virtual ~RmeLightStyle(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/AHTC/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Projects/AHTC/CMakeLists.txt index 5156749b1..53f302c67 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Projects/AHTC/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/AHTC/CMakeLists.txt @@ -6,6 +6,8 @@ # Created by Mike Wille, SLSE, 2016-10-10 # +set(CMAKE_AUTOMOC ON) + SET(ProjectAhtcPlugin_SRCS main.h main.cpp @@ -13,9 +15,16 @@ SET(ProjectAhtcPlugin_SRCS ./resources/apps.json ) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common) + NGL_ADD_BIG_RESOURCES(ProjectAhtcPlugin_SRCS ahtc_resources.qrc) NGL_ADD_LIBRARY(WS ProjectAhtcPlugin MODULE ${ProjectAhtcPlugin_SRCS}) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +TARGET_INCLUDE_DIRECTORIES(ProjectAhtcPlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common) +set_target_properties(ProjectAhtcPlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common") + NGL_TARGET_LINK_LIBRARIES(ProjectAhtcPlugin PUBLIC Qt6::Core diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/Ets/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Projects/Ets/CMakeLists.txt index 72c94ba35..c7d3f163f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Projects/Ets/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/Ets/CMakeLists.txt @@ -3,9 +3,11 @@ # $HeadURL$ # $Author$ # -# Created by Mike Wille, SLSE, 2016-11-25 +# Created by Mike Wille, SLSE, 2016-10-10 # +set(CMAKE_AUTOMOC ON) + SET(ProjectEtsPlugin_SRCS main.h main.cpp @@ -13,9 +15,16 @@ SET(ProjectEtsPlugin_SRCS ./resources/apps.json ) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common) + NGL_ADD_BIG_RESOURCES(ProjectEtsPlugin_SRCS ets_resources.qrc) NGL_ADD_LIBRARY(WS ProjectEtsPlugin MODULE ${ProjectEtsPlugin_SRCS}) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +TARGET_INCLUDE_DIRECTORIES(ProjectEtsPlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common) +set_target_properties(ProjectEtsPlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common") + NGL_TARGET_LINK_LIBRARIES(ProjectEtsPlugin PUBLIC Qt6::Core diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/L400P2/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Projects/L400P2/CMakeLists.txt index 14b19b87a..84fcdca4a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Projects/L400P2/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/L400P2/CMakeLists.txt @@ -6,6 +6,8 @@ # Created by Mike Wille, SLSE, 2016-10-10 # +set(CMAKE_AUTOMOC ON) + SET(ProjectL400P2Plugin_SRCS main.h main.cpp @@ -13,9 +15,16 @@ SET(ProjectL400P2Plugin_SRCS ./resources/apps.json ) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common) + NGL_ADD_BIG_RESOURCES(ProjectL400P2Plugin_SRCS l400p2_resources.qrc) NGL_ADD_LIBRARY(WS ProjectL400P2Plugin MODULE ${ProjectL400P2Plugin_SRCS}) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +TARGET_INCLUDE_DIRECTORIES(ProjectL400P2Plugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common) +set_target_properties(ProjectL400P2Plugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common") + NGL_TARGET_LINK_LIBRARIES(ProjectL400P2Plugin PUBLIC Qt6::Core diff --git a/qt6-after/qt6-migrated-legatus/Lts/Projects/Qatar/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Projects/Qatar/CMakeLists.txt index bd7bc9b99..4dfa78a55 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Projects/Qatar/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Projects/Qatar/CMakeLists.txt @@ -6,6 +6,8 @@ # Created by Mike Wille, SLSE, 2016-10-10 # +set(CMAKE_AUTOMOC ON) + SET(ProjectQatarPlugin_SRCS main.h main.cpp @@ -13,9 +15,16 @@ SET(ProjectQatarPlugin_SRCS ./resources/apps.json ) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common) + NGL_ADD_BIG_RESOURCES(ProjectQatarPlugin_SRCS qatar_resources.qrc) NGL_ADD_LIBRARY(WS ProjectQatarPlugin MODULE ${ProjectQatarPlugin_SRCS}) +# Add include path for PluginInterfaces for both compilation and AUTOMOC +TARGET_INCLUDE_DIRECTORIES(ProjectQatarPlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common) +set_target_properties(ProjectQatarPlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common") + NGL_TARGET_LINK_LIBRARIES(ProjectQatarPlugin PUBLIC Qt6::Core diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp index 2e1f597ad..227e4d48c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/dds_handler.cpp @@ -3,7 +3,7 @@ #include "dds_handler.h" -#include +#include namespace Buildings { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp index 486bced7e..7d162ace9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp @@ -3,7 +3,7 @@ #include "main_handler.h" #include "settings.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp index 92b83c4b1..1df6a66d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace CombatNetRadio { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/main_handler.cpp index 0457761a4..3289bac2e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/main_handler.cpp @@ -6,7 +6,7 @@ #include "active_exercises.h" #include "exercise_manager.h" #include "WebSocketInterface/websocket_interface_handler.h" -#include +#include using namespace CombatNetRadio; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.cpp index 22f718746..0938be1fe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.cpp @@ -7,7 +7,7 @@ #include "cmo_fts.h" #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.h index 89cea33db..c1936a95f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/dds_handler.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.cpp index e16224162..6d1b077fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/main_handler.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include namespace ComponentMonitor { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.h index 0df0199db..dc37d2270 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/Simulator/main_sim.h @@ -4,6 +4,7 @@ #pragma once #include +#include class QTimer; class PayloadSender : public QObject diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp index 93e5d0149..276bf84f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/dds_handler.cpp @@ -2,7 +2,7 @@ #include "dds_handler.h" -#include +#include namespace DifferentialGPS { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp index 7331be373..e4bcca196 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/DifferentialGPS/mainthread.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include namespace DifferentialGPS { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp index a4059e921..7d9ffc82b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/initialization.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp index a4c05c873..956c1825d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.cpp @@ -3,7 +3,7 @@ #include "dds_handler.h" -#include +#include #include namespace HighLevelArchitecture diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h index 7f20e163e..996717b5d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/dds_handler.h @@ -3,7 +3,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp index 79bb31e91..1e8b790ee 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/main_handler.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace HighLevelArchitecture { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp index a182aa87d..e37d304a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.cpp @@ -3,7 +3,7 @@ #include "dds_handler.h" -#include +#include #include namespace HighLevelArchitecture diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h index ddd1da378..b5cfb5d9a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/dds_handler.h @@ -3,7 +3,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp index 8f977b269..7a4296f89 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/main_handler.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace HighLevelArchitecture { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp index f4d60979b..1c6b59872 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/main_handler.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace HighLevelArchitecture { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt index 369172330..1940f7f4a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/CMakeLists.txt @@ -85,7 +85,8 @@ IF(BUILD_RTI) CODEGEN_DATABASE(SRCS_common ${xml_FILE}) # Generate *.cpp/*.hpp from idl (only with BUILD_RTI) RTIDDSGEN(SRCS_common tab_enums.idl) - RTIDDSGEN(SRCS_common tab.idl) + # tab.idl includes pdm.idl, so add explicit dependency on pdm.idl generation + RTIDDSGEN(SRCS_common tab.idl DEPENDS ${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement/pdm.idl) # Generate tab_dt[s,c]_types.h, tab_ft[s,c]_types.h CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE}) # generate tab_[d|f]tc.h diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/CMakeLists.txt index 31db448e1..7825144c4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/CMakeLists.txt @@ -30,6 +30,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(saaTelegrams PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../ + ${CMAKE_BINARY_DIR}/Lts/Services ) NGL_TARGET_LINK_LIBRARIES(saaTelegrams # svcPdmClient # Externe Dependency - nicht verfügbar @@ -37,6 +38,11 @@ NGL_TARGET_LINK_LIBRARIES(saaTelegrams ${Qt6_WebSockets} ) +# Ensure PDM IDL files are generated before building saaTelegrams +if(TARGET svcPdmCommon) + add_dependencies(saaTelegrams svcPdmCommon) +endif() + SET(SRCS logger.cpp logger.h diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp index 782d5636b..9524ee0ce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp @@ -3,7 +3,7 @@ #include "aes_handler.h" #include -#include "DDS/Core/core_types.h" +#include "Core/core_types.h" #include "aes.hpp" #include "json_dispatcher.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h index f230280cf..c8db1efbe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.h @@ -3,7 +3,7 @@ #pragma once -#include "DDS/Core/core_types.h" +#include "Core/core_types.h" #include "logger.h" #include "main_dispatcher.h" #include "telegrams.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp index 42c5f2d7b..2410c1b3d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/main_dispatcher.cpp @@ -6,7 +6,7 @@ #include "json_dispatcher.h" #include -#include +#include #include namespace AdlerJson diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp index 71b170b4d..71957f506 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/ApacheHlaJson/dds_handler.cpp @@ -3,7 +3,7 @@ #include "dds_handler.h" -#include +#include namespace ApHlaJson { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp index 2e1efef37..e9b481813 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.h index 4bb893775..9b2f9b9ad 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.h @@ -5,7 +5,7 @@ #if BUILD_RTI #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp index 9d49db58a..39dc753ed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp @@ -9,7 +9,7 @@ #include "WebSocketInterface/json_keys.h" #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_plugin_interface.h index 5c5fb0a9e..64c694ad2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_plugin_interface.h @@ -45,6 +45,7 @@ public: class Plugin { + Q_GADGET public: Plugin() = default; virtual ~Plugin() = default; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.cpp index a10593afc..826c2d730 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.cpp @@ -3,7 +3,7 @@ #include "dds_handler.h" -#include +#include namespace TrainingAreaBaseOC { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.h index 4409890e3..c339a5a9d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/dds_handler.h @@ -3,7 +3,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp index 5344ed985..91446d009 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/main_handler.cpp @@ -4,7 +4,7 @@ #include "main_handler.h" #include "settings.h" #include "logger.h" -#include +#include namespace TrainingAreaBaseOC { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp index 2c0db525a..0dd6d6f6d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp @@ -3,7 +3,7 @@ #include "dds_handler.h" -#include +#include namespace WarehouseManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp index 4a4c3fd9b..80e88dc5b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler_exercise.cpp @@ -3,7 +3,7 @@ #include "dds_handler_exercise.h" -#include +#include #include namespace WarehouseManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp index c1d7c6586..f99323612 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp @@ -1,7 +1,7 @@ #include "main_handler.h" -#include +#include namespace WarehouseManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp index b11372a8a..a75bb2340 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/dds_handler.cpp @@ -3,7 +3,7 @@ #include "dds_handler.h" -#include +#include namespace WirelessLocationSystem { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp index 749e4c86d..daddc4bf3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WirelessLocationSystem/main_handler.cpp @@ -3,7 +3,7 @@ #include "main_handler.h" #include "settings.h" -#include +#include namespace WirelessLocationSystem { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt index 08ba673dd..d4dea6c60 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/CMakeLists.txt @@ -18,25 +18,43 @@ SET(SRCS_common ) # Generate alm_enums.idl / alm.idl -IF(BUILD_RTI) +IF(BUILD_RTI AND BUILD_GRANTLEE) CODEGEN_IDL_SVC(SRCS_common ${xml_FILE}) +ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE) + # BUILD_GRANTLEE disabled: check for pre-generated files + IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm.idl" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_enums.idl") + MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated IDL files for alm") + LIST(APPEND SRCS_common alm.idl alm_enums.idl) + ELSE() + MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated IDL files found for alm. Skipping service.") + ENDIF() ENDIF() # Generate alm_db_impl.cpp/.h, alm_db.h -IF(BUILD_RTI) +IF(BUILD_RTI AND BUILD_GRANTLEE) CODEGEN_DATABASE(SRCS_common ${xml_FILE}) ENDIF() # Generate *.cpp/*.hpp from idl +IF(BUILD_RTI AND (BUILD_GRANTLEE OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm.idl" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_enums.idl"))) RTIDDSGEN(SRCS_common alm_enums.idl) RTIDDSGEN(SRCS_common alm.idl) +ENDIF() # Generate alm_dt[s,c]_types.h, alm_ft[s,c]_types.h -IF(BUILD_RTI) +IF(BUILD_RTI AND BUILD_GRANTLEE) CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE}) ENDIF() # Generate alm_[d|f]tc.h -IF(BUILD_RTI) +IF(BUILD_RTI AND BUILD_GRANTLEE) CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE}) +ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE) + # Check for pre-generated files + IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_dtc.h" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_ftc.h") + MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated DTC/FTC files for alm") + LIST(APPEND SRCS_common alm_dtc.h alm_ftc.h) + ELSE() + MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated DTC/FTC files found for alm") + ENDIF() ENDIF() NGL_ADD_LIBRARY(AAR SV WS svcAlmCommon SHARED ${SRCS_common}) @@ -64,8 +82,16 @@ SET(SRCS_client alm_export.h ) # generate alm_[d|f]tc.h, tlm_[d|f]tc_impl.[cpp|h] -IF(BUILD_RTI) +IF(BUILD_RTI AND BUILD_GRANTLEE) CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE}) +ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE) + # Check for pre-generated files + IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_dtc.h" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_ftc.h") + MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated DTC/FTC files for alm client") + LIST(APPEND SRCS_client alm_dtc.h alm_ftc.h) + ELSE() + MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated DTC/FTC files found for alm client") + ENDIF() ENDIF() NGL_ADD_LIBRARY(AAR SV WS svcAlmClient SHARED ${SRCS_client}) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.h index c815b4b68..f6df12cfa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/dds_handler.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h index af701c61e..cd77b5439 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/object_emergency_call.h @@ -4,7 +4,7 @@ #include #include "logger.h" -#include +#include //Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp index 1b532d45f..7a5ae0b58 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp @@ -13,7 +13,7 @@ // AES #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp index c38a03329..aebd2001a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.cpp @@ -9,8 +9,8 @@ #include "aes_dts.h" #include "aes_fts.h" -#include -#include +#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h index 96401a72b..2c568bf7f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/dds_handler.h @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.cpp index 267f22e7e..626239dc5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/main_handler.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h index 89fa87963..af45e8982 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/mine_corridor_creator.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h index 92db56565..52ed51e04 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h @@ -16,7 +16,7 @@ #include "special_area_provider.h" #include "logger.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.h index f1e0618e5..48eb6ef68 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.h @@ -10,7 +10,7 @@ #include #include "object_base.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h index 21805fd70..05e05f472 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h @@ -11,7 +11,7 @@ #include "logger.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.h index f0a47a194..4ab3511cb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.h @@ -10,7 +10,7 @@ #include #include "object_base.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.cpp index 533614944..577d7ca40 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace AssetManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.h index 74c561772..84feccdce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp index 100983a50..4d88ad699 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/main_handler.cpp @@ -15,7 +15,7 @@ #include "settings.h" #include -#include +#include #include namespace AssetManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.h index 1a97a53bb..c834ba0b3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_asset.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.h index 3f45ebc2c..bc41ed9cb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_map_description.h @@ -8,7 +8,7 @@ #pragma once #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.h index ae48cba13..b9609e7e1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_relay_info.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h index 1f37ad745..ee6819981 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AssetManagement/object_training_area.h @@ -10,7 +10,7 @@ #include #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp index f5f0bbe97..e67c06eb7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/UnitTests/ava_test_server.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include "ava_test_server.h" @@ -325,7 +324,7 @@ AvaTestServer::AvaTestServer() AvaTestServer::~AvaTestServer() { - for (QTcpSocket *conn : qAsConst(m_Conns)) + for (QTcpSocket *conn : std::as_const(m_Conns)) { // disconnect before we delete as otherwise closedConnection() would be called wich would // also delete the socket. @@ -366,14 +365,13 @@ void AvaTestServer::closedConnection() qDebug() << "connection closed"; m_PosUpdate->stop(); - QMutableVectorIterator l_It(m_Conns); - while (l_It.hasNext()) + for (int i = 0; i < m_Conns.size(); ++i) { - QTcpSocket *l_Conn = l_It.next(); + QTcpSocket *l_Conn = m_Conns[i]; if (l_Conn->state() == QAbstractSocket::UnconnectedState) { l_Conn->disconnect(this); - l_It.remove(); + m_Conns.removeAt(i); l_Conn->deleteLater(); // use deleteLater() as we want to delete the object which was emitting the signal return; } @@ -404,18 +402,15 @@ void AvaTestServer::sendScriptPosUpdate() if (m_RelScriptPos >= m_SelStreamFromScript.getDuration()) { - QVectorIterator l_Iterator(m_Script.getStreamSequences()); float l_Duration = 0; - while (l_Iterator.hasNext()) + for (const ScrEdAVStream &l_Stream : m_Script.getStreamSequences()) { - ScrEdAVStream l_Stream = l_Iterator.next(); l_Duration += l_Stream.getDuration(); qDebug() << "l_Duration " << l_Duration << " abs_scriptpos " << m_AbsScriptPos << " stream " << l_Stream.getName(); if (l_Duration > m_AbsScriptPos) { qDebug() << "set stream " << l_Stream.getName(); m_SelStreamFromScript = l_Stream; - l_Iterator.toBack(); m_RelScriptPos = 0; } } @@ -434,11 +429,8 @@ void AvaTestServer::sendScriptPosUpdate() void AvaTestServer::readAndAnswer() { - QVectorIterator l_It(m_Conns); - while (l_It.hasNext()) + for (QTcpSocket *l_Conn : std::as_const(m_Conns)) { - QTcpSocket *l_Conn = l_It.next(); - if (l_Conn->state() != QAbstractSocket::ConnectedState) continue; @@ -1102,20 +1094,15 @@ void AvaTestServer::processLine(const QByteArray &line) qDebug() << l_Parts[4].trimmed(); //check if absolute pos is in current played stream of script, and set corresponding stream as selected Stream - QVectorIterator l_Iterator(m_Script.getStreamSequences()); float l_Duration = 0; - while (l_Iterator.hasNext()) + for (const ScrEdAVStream &l_Stream : m_Script.getStreamSequences()) { - ScrEdAVStream l_Stream = l_Iterator.next(); float l_OldDuration = l_Duration; l_Duration += l_Stream.getDuration(); //qDebug() << "l_Duration " << l_Duration.toString("hh:mm:ss") << " abspos " << m_AbsScriptPos.toString("hh:mm:ss") << " l_Stream = " << l_Stream.getName(); if (l_Duration > m_AbsScriptPos) { - m_SelStreamFromScript = l_Stream; - l_Iterator.toBack(); - m_RelScriptPos = m_AbsScriptPos - l_OldDuration; qDebug() << "set stream 2" << l_Stream.getName() << " pos is " << m_RelScriptPos; //m_RelScriptPos = QDateTime::fromTime_t(0); @@ -1328,11 +1315,8 @@ void AvaTestServer::sendData(const QString &data_) qDebug() << "Outgoing RCP_AVA: " << data_; QString data = data_; data.append(EOL); - QVectorIterator l_It(m_Conns); - while (l_It.hasNext()) + for (QTcpSocket *l_Conn : std::as_const(m_Conns)) { - QTcpSocket *l_Conn = l_It.next(); - if (l_Conn->state() == QAbstractSocket::ConnectedState) { //qDebug() << "sent to conn " << l_Conn; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp index c297a26e2..d12196457 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include namespace AudioVideoManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h index 94f2b687a..a17845638 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/dds_handler.h @@ -9,11 +9,11 @@ #include "logger.h" #include -#include +#include #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.cpp index ff4d9decb..fcea092fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/main_handler.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include using namespace AudioVideoManagement; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp index 71b151119..8917db8b6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp @@ -13,7 +13,7 @@ #include "logger.h" #include #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp index 5f5591f33..d15ad3958 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace TargetAreas { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h index 8251f4e0b..2349c0e3c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/dds_handler.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_plugin_interface.h index 8dec28b9b..c24a894b9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ces_plugin_interface.h @@ -49,6 +49,8 @@ public: class Plugin { + Q_GADGET + public: Plugin() = default; virtual ~Plugin() = default; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp index 034d2335e..90f23adcf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace CentralEffectSimulation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.h index cd9ab5622..f4dee95d1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/main_handler.cpp index 78c1805d6..4d2776cd5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/main_handler.cpp @@ -9,7 +9,7 @@ #include "main_handler.h" #include "settings.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h index 7c76182d7..fbaabbcd9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace CentralEffectSimulation { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.h index 28d29aee0..b15c7a6b1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/dds_handler.h @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.cpp index 879c753d7..bec7e806a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CodificationManagement/initialization.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include using namespace CodificationManagement; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.cpp index 1b8691081..5f9b0be0a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.cpp @@ -7,7 +7,7 @@ */ #include "dds_handler.h" -#include +#include namespace EffectShowClient { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.h index b3f0b6b8b..0777d576a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/dds_handler.h @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp index ba11402c1..2c1b29f6a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.cpp @@ -14,7 +14,7 @@ #include "handler_vehicle.h" #include "control_unit_handler.h" #include "settings.h" -#include +#include namespace EffectShowClient { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h index 4137f133e..3251e869f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h @@ -11,7 +11,7 @@ #include #include -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h index 6200abbf1..d5ae4927e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/dds_handler.h @@ -9,9 +9,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h index 426ad652f..c43ae7115 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h index a9f2fa215..912527ab2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.h @@ -12,7 +12,7 @@ #include "esm_convert_from_tab.h" #include "logger.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h index 692177f8a..996b7bffb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.h @@ -10,7 +10,7 @@ #include "esm_convert_to_tab.h" #include "logger.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h index 9887827e1..7c15b69d3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.h @@ -11,7 +11,7 @@ #include "handler_ppm_data.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.cpp index 5e395b783..05e3fdae2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace Evaluations { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp index 41dd0ca67..05fa0b075 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/initialization.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include namespace Evaluations { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h index 8b6d53609..739ff5043 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_comment.h @@ -9,7 +9,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h index 3566e4f90..744308a77 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_criterium.h @@ -9,7 +9,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h index ddc2060d9..4e5c1a036 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_evaluation_element.h @@ -9,7 +9,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h index fa79a9444..14dd4b620 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_category_line.h @@ -9,7 +9,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h index 31c4c8af3..925bfa9cc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/object_san_nine_liner.h @@ -9,7 +9,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h index f6165336a..061704e6a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp index 5d24395ea..18d21ab3e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/main_handler.cpp @@ -14,7 +14,7 @@ #include "web_socket_avs.h" #include "web_socket_server.h" -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.cpp index 84be6d90b..2abc9a930 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace ExerciseManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.h index 3f99cf010..85c9115b7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.cpp index affebfcff..18d58da8a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/main_handler.cpp @@ -13,7 +13,7 @@ #include "settings.h" #include -#include +#include #include namespace ExerciseManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h index 104b62223..477176a8d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise.h @@ -8,7 +8,7 @@ #include #include "dds_handler.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.h index 6525bc334..e57410b1c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/object_exercise_phase.h @@ -8,7 +8,7 @@ */ #pragma once -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.cpp index 3e8672694..ae20ffcbe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.cpp @@ -9,7 +9,7 @@ #include "dds_handler.h" -#include +#include namespace FileManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.h index 827061ee6..cfc8d269b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/dds_handler.h @@ -10,7 +10,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp index 1b8cb8f52..3df9cee25 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.cpp @@ -17,7 +17,7 @@ #include "pdf_server.h" #include -#include +#include namespace FileManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_content.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_content.h index 3fb70235b..595a535a0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_content.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_content.h @@ -11,7 +11,7 @@ #include "base.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_type_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_type_info.h index 1928bf4fc..7bb28c986 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_type_info.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_file_type_info.h @@ -11,7 +11,7 @@ #include "base.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_folder.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_folder.h index a0265eb8b..be427b7e2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_folder.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/object_folder.h @@ -11,7 +11,7 @@ #include "base.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp index eb4355834..d5c9dab1c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.cpp @@ -7,7 +7,7 @@ */ #include "dds_handler.h" -#include +#include namespace FilterManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h index 93f77d322..878f5982a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/dds_handler.h @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.cpp index 86570807e..0aa28263f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FilterManagement/main_handler.cpp @@ -8,7 +8,7 @@ #include "settings.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.cpp index ae312140a..a739537c9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace GuezIedManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.h index c98008348..634cb87a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/dds_handler.h @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.cpp index 3a33d5c29..ed6aa9c70 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/main_handler.cpp @@ -10,7 +10,7 @@ #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h index d3a4a7e7d..92bfe3898 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include #include // Generated diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp index 65a3fd18d..2028f9edb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace GuezMinelayerProcessing { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h index 83cb11f2d..9fd1db594 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezMinelayerProcessing/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include "logger.h" namespace GuezMinelayerProcessing diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt index 62495323b..2e6a03356 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/CMakeLists.txt @@ -48,9 +48,17 @@ ENDIF() IF(BUILD_RTI) CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE}) ENDIF() -# generate ism_[d|f]tc.h -IF(BUILD_RTI) +# Generate ism_[d|f]tc.h +IF(BUILD_GRANTLEE) CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE}) +ELSEIF(BUILD_RTI) + # Use pre-generated files when BUILD_GRANTLEE=OFF + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc.h ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc.h COPYONLY) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_ftc.h ${CMAKE_CURRENT_BINARY_DIR}/ism_ftc.h COPYONLY) + LIST(APPEND SRCS_common + ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc.h + ${CMAKE_CURRENT_BINARY_DIR}/ism_ftc.h + ) ENDIF() NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmCommon SHARED ${SRCS_common}) @@ -83,8 +91,16 @@ SET(SRCS_client parse_building_xml.h ) # generate ism_[d|f]tc_impl.[cpp|h] -IF(BUILD_RTI) +IF(BUILD_GRANTLEE) CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE}) +ELSEIF(BUILD_RTI) + # Use pre-generated files when BUILD_GRANTLEE=OFF + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc_impl_custom.cpp ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.cpp COPYONLY) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc_impl_custom.h ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.h COPYONLY) + LIST(APPEND SRCS_client + ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.cpp + ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.h + ) ENDIF() NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmClient SHARED ${SRCS_client}) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.cpp index 400fc370e..eb94e81b5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.cpp @@ -9,7 +9,7 @@ #include "dds_handler.h" -#include +#include namespace InfrastructureManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.h index 67cb07a62..64c4dfdd1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/dds_handler.h @@ -10,7 +10,7 @@ #pragma once #include -#include +#include #include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism.hpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism.hpp index 78dd9e15f..7fa924fdf 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism.hpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism.hpp @@ -10,8 +10,16 @@ #include #include +#include #include +#include +#include +#include #include "ism_enums.hpp" +#include "ParticipantManagement/ppm_enums.hpp" + +// Using-declaration for DataModification +using DataModification = ParticipantManagement::DataModification; namespace InfrastructureManagement { @@ -53,7 +61,7 @@ private: // StructureElement Stub-Klasse class StructureElement { public: - StructureElement() : id_(0), mainStructureElementId_(0), mountingPointTypeId_(MountingPointType::Undefined) {} + StructureElement() : id_(0), mainStructureElementId_(0), mountingPointTypeId_(MountingPointType::Undefined), mountingPointId_(0) {} int32_t id() const { return id_; } void id(int32_t v) { id_ = v; } @@ -64,6 +72,14 @@ public: MountingPointType mountingPointTypeId() const { return mountingPointTypeId_; } void mountingPointTypeId(MountingPointType v) { mountingPointTypeId_ = v; } + // Für Kompatibilität: structureElementTypeId() als Alias + MountingPointType structureElementTypeId() const { return mountingPointTypeId_; } + void structureElementTypeId(MountingPointType v) { mountingPointTypeId_ = v; } + + // mountingPointId() für Sub-ID + int32_t mountingPointId() const { return mountingPointId_; } + void mountingPointId(int32_t v) { mountingPointId_ = v; } + Core::GeoPosition geoPosition() const { return geoPosition_; } void geoPosition(const Core::GeoPosition& v) { geoPosition_ = v; } @@ -79,17 +95,138 @@ public: std::string displayName() const { return displayName_; } void displayName(const std::string& v) { displayName_ = v; } + // path() returns vector of IDs im Hierarchie-Pfad + const std::vector& path() const { return path_; } + void path(const std::vector& v) { path_ = v; } + private: int32_t id_; int32_t mainStructureElementId_; MountingPointType mountingPointTypeId_; + int32_t mountingPointId_; Core::GeoPosition geoPosition_; Core::RelativePosition relPosition_; std::string properties_; std::string name_; std::string displayName_; + std::vector path_; }; +// MainStructureElement - Stub für DDS-generierten Typ +class MainStructureElement { +public: + MainStructureElement() : id_(0), groupId_(0) {} + + int32_t id() const { return id_; } + void id(int32_t v) { id_ = v; } + + int32_t groupId() const { return groupId_; } + void groupId(int32_t v) { groupId_ = v; } + + std::string name() const { return name_; } + void name(const std::string& v) { name_ = v; } + + std::string displayName() const { return displayName_; } + void displayName(const std::string& v) { displayName_ = v; } + + Core::GeoPosition geoPosition() const { return geoPosition_; } + void geoPosition(const Core::GeoPosition& v) { geoPosition_ = v; } + + // For compatibility: elements() returns empty vector by default + const std::vector& elements() const { return elements_; } + void elements(const std::vector& v) { elements_ = v; } + +private: + int32_t id_; + int32_t groupId_; + std::string name_; + std::string displayName_; + Core::GeoPosition geoPosition_; + std::vector elements_; +}; + +// MountingPointAsset - Stub für DDS-generierten Typ +class MountingPointAsset { +public: + MountingPointAsset() : id_(0), mountingPointId_(0), assetId_(0) {} + + int32_t id() const { return id_; } + void id(int32_t v) { id_ = v; } + + int32_t mountingPointId() const { return mountingPointId_; } + void mountingPointId(int32_t v) { mountingPointId_ = v; } + + int32_t assetId() const { return assetId_; } + void assetId(int32_t v) { assetId_ = v; } + + std::string name() const { return name_; } + void name(const std::string& v) { name_ = v; } + + // For compatibility: structureElementId() alias for mountingPointId() + int32_t structureElementId() const { return mountingPointId_; } + void structureElementId(int32_t v) { mountingPointId_ = v; } + +private: + int32_t id_; + int32_t mountingPointId_; + int32_t assetId_; + std::string name_; +}; + +// Forward declaration - full definition in ism_mounting_point.h +class MountingPoint; + +// FootprintElement - für Footprint-Daten +class FootprintElement { +public: + FootprintElement() : isGroundLevel_(false) {} + + bool isGroundLevel() const { return isGroundLevel_; } + void isGroundLevel(bool v) { isGroundLevel_ = v; } + + Core::RelativePosition relPosition() const { return relPosition_; } + void relPosition(const Core::RelativePosition& v) { relPosition_ = v; } + +private: + bool isGroundLevel_; + Core::RelativePosition relPosition_; +}; + +// MainFootprint - Footprint-Daten für MainStructureElement +class MainFootprint { +public: + MainFootprint() : id_(0) {} + + int32_t id() const { return id_; } + void id(int32_t v) { id_ = v; } + + const std::vector& elements() const { return elements_; } + void elements(const std::vector& v) { elements_ = v; } + +private: + int32_t id_; + std::vector elements_; +}; + +// InstrumentationAsset - Stub für DDS-generierten Typ +class InstrumentationAsset { +public: + InstrumentationAsset() : id_(0) {} + + int32_t id() const { return id_; } + void id(int32_t v) { id_ = v; } + + std::string name() const { return name_; } + void name(const std::string& v) { name_ = v; } + +private: + int32_t id_; + std::string name_; +}; + +// StructureElementType Enum (Alias für MountingPointType für Kompatibilität) +using StructureElementType = MountingPointType; + } // namespace InfrastructureManagement #endif // ISM_HPP diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_ftc.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_ftc.h index 73af8bbc0..e20321d57 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_ftc.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ism_ftc.h @@ -1,10 +1,36 @@ - #pragma once -#include -#include -namespace InfrastructureManagement { - struct FtcData { - std::string name; - uint32_t id; - }; -} +// STUB-HEADER: Diese Datei wird normalerweise von ddsftc generiert +// Für die Migration erstellen wir minimale Implementierungen + +#include +#include "ism.hpp" + +namespace InfrastructureManagement +{ +namespace Interface +{ + +// Ftc - Function Transfer Component +class Ftc : public QObject +{ + Q_OBJECT + +public: + Ftc(QObject* parent = nullptr) : QObject(parent) {} + ~Ftc() override = default; + + // MainStructureElement operations + virtual void setMainStructureElement(const MainStructureElement& data) = 0; + virtual void removeMainStructureElement(int32_t id) = 0; + + // MainSchedule operations + virtual void setMainSchedule(const MainSchedule& data) = 0; + virtual void removeMainSchedule(int32_t id) = 0; + + // MountingPointAsset operations + virtual void setMountingPointAsset(const MountingPointAsset& data) = 0; + virtual void removeMountingPointAsset(int32_t id) = 0; +}; + +} // namespace Interface +} // namespace InfrastructureManagement \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.cpp index 88f7c7b4b..a7d265ef4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/main_handler.cpp @@ -19,7 +19,7 @@ #include "settings.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_effect_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_effect_area.h index 2bd6913db..10a2cbb12 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_effect_area.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_effect_area.h @@ -10,7 +10,7 @@ #pragma once #include "base.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_instrumentation_asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_instrumentation_asset.h index 2d0575eab..e8b3f2fa8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_instrumentation_asset.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_instrumentation_asset.h @@ -10,7 +10,7 @@ #pragma once #include "base.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.h index a858b9da0..37fc246dd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_schedule.h @@ -10,7 +10,7 @@ #pragma once #include "base.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h index deee25588..aaf724a2e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_main_structure_element.h @@ -12,7 +12,7 @@ #include #include #include "base.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_mounting_point_asset.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_mounting_point_asset.h index f8ffeec00..b33e0cef5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_mounting_point_asset.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_mounting_point_asset.h @@ -10,7 +10,7 @@ #pragma once #include "base.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h index a072f373d..a494b74d6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_special_area.h @@ -10,7 +10,7 @@ #pragma once #include "base.h" -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_structure_element.h b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_structure_element.h index dd69e9f4d..3b2fb2242 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_structure_element.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/object_structure_element.h @@ -10,7 +10,7 @@ #pragma once #include "base.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h index c62b9748d..ebccd956c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h index 8091db8b4..fea4e5ab8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_marker.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "mrk_db.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h index 6920a70ff..5025ae659 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/object_snapshot.h @@ -11,7 +11,7 @@ #include #include "dds_handler.h" #include "mrk_db.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.cpp index c1e5c2dcb..e3cdcac8f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace Messaging { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.h index 4d6afd3a5..82879910d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/dds_handler.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.cpp index 67b3cd398..75345f9c7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/main_handler.cpp @@ -9,7 +9,7 @@ #include "main_handler.h" #include "settings.h" -#include +#include #include namespace Messaging diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp index b6b00cf9d..cdb97815c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace MeteoDataManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.h index b81282634..77ccf3231 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/dds_handler.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp index e40314e9b..3d352eff6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MeteoDataManagement/main_handler.cpp @@ -9,7 +9,7 @@ #include "main_handler.h" #include "settings.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.cpp index 4569f0cfd..bd7869811 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.cpp @@ -12,7 +12,7 @@ #include "nme_fts.h" #include -#include +#include namespace NmeaManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h index ca8bbc154..417420e05 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/dds_handler.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp index fe90c6793..b141c111b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp @@ -7,6 +7,7 @@ */ #include #include +#include #include "nmea_handler.h" namespace NmeaManagement { @@ -64,7 +65,7 @@ void NmeaHandler::IIXDR(QString package) NmeaManagement::BatteryState batteryState; NmeaManagement::ServiceControl serviceControl; - QRegExp sep(QStringLiteral("(\\,|\\*)")); + QRegularExpression sep(QStringLiteral("(\\,|\\*)")); QStringList pkt_data = package.split(sep.pattern()); INFO_LOG(m_logger) << "----------------------------------------------------"; INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size(); @@ -185,7 +186,7 @@ qint64 NmeaHandler::getDateTime(QString receivedTimeStr) void NmeaHandler::IIALR(QString package) { NmeaManagement::BatteryAlarm batteryAlarm; - QRegExp sep(QStringLiteral("(\\,|\\*)")); + QRegularExpression sep(QStringLiteral("(\\,|\\*)")); QStringList pkt_data = package.split(sep.pattern()); alarm_state packageData; INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size(); @@ -229,7 +230,7 @@ void NmeaHandler::GPGGA(QString package) NmeaManagement::PositionExcon PositionExcon; double latDecimal; double lonDecimal; - QRegExp sep(QStringLiteral("(\\,|\\*)")); + QRegularExpression sep(QStringLiteral("(\\,|\\*)")); QStringList pkt_data = package.split(sep.pattern()); gpgga_data packageData; @@ -316,7 +317,7 @@ void NmeaHandler::GPGGA(QString package) void NmeaHandler::GPRMC(QString package) { - QRegExp sep(QStringLiteral("(\\,|\\*)")); + QRegularExpression sep(QStringLiteral("(\\,|\\*)")); QStringList pkt_data = package.split(sep.pattern()); gprmc_data packageData; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.cpp index d27dba811..b534364a9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace NotificationManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.h index 0ab3dd64d..10941109e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/dds_handler.h @@ -7,8 +7,8 @@ */ #pragma once -#include -#include +#include +#include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.cpp index abe510243..9841ea31b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/main_handler.cpp @@ -9,7 +9,7 @@ #include "main_handler.h" #include "settings.h" -#include +#include #include namespace NotificationManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.h b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.h index 537a0f9d0..2b27c6010 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.h @@ -10,7 +10,7 @@ #include "dds_handler.h" //#include "nom_db.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.h index c8f2fea4c..2d26ca83d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/reply_message.h index e11726926..372878e12 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/reply_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/reply_message.h @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.cpp index 969925679..14f719546 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.cpp @@ -9,7 +9,7 @@ #include "dds_handler.h" #include -#include +#include namespace OcBaseDownload { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.h index 2ab4b6f70..95d5e0991 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/dds_handler.h @@ -9,8 +9,8 @@ #pragma once #include -#include -#include +#include +#include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp index e950ee61f..eebdf6bf2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include "copy_database.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.cpp index ec9520bb6..fcc10f1f4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/main_handler.cpp @@ -7,7 +7,7 @@ #include "main_handler.h" -#include +#include #include namespace OcBaseDownload diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/client_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/client_message.h index 7375e2c51..c3710376c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/client_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/client_message.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/reply_message.h index 996bcd5ca..012132073 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/reply_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/WebSocketInterface/Messages/reply_message.h @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.cpp index 4cdcac7be..8d3eb709a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace OcSituationClient { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.h index 118c7d490..9c09984d2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/dds_handler.h @@ -9,8 +9,8 @@ #pragma once #include -#include -#include +#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.cpp index 98a45f215..46c884c4f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/main_handler.cpp @@ -8,7 +8,7 @@ #include "main_handler.h" -#include +#include #include "handler_oc_data.h" #include "settings.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.cpp index dad19cab2..7d21a457b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace OcSituationServer { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.h index 04713d28c..5e96631c2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/dds_handler.h @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.cpp index c6eec6272..737423070 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationServer/main_handler.cpp @@ -8,7 +8,7 @@ #include "main_handler.h" -#include +#include #include "handler_oc_data.h" #include "position_converter.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.cpp index 7cf0eb4d8..033e54424 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace OperatorManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.h index fb0f1cd04..fc9128d20 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp index 56d6e9d3d..6f6ef4717 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp @@ -11,7 +11,7 @@ #include "handler_operator.h" #include #include -#include +#include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.h index bbe07a17a..0ed49115e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.h @@ -11,9 +11,9 @@ #include "logger.h" #include "opm_db.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.cpp index 9d145270b..caa128f49 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/main_handler.cpp @@ -15,7 +15,7 @@ #include "settings.h" #include -#include +#include #include namespace OperatorManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.h index ba2450dba..b4f444c7e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_access_control_level.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.h index 7f39e1ebd..953d8905b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_group.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h index 85ae678f7..2de533351 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/object_operator.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include #include // Generated diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.h index ced15a098..f3fc69ae1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/firing_unit_validator.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace ParticipantManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.h index 17789106b..687c49b9f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp index 41ced27f0..bda523cf2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.cpp @@ -10,7 +10,7 @@ #include "exercise_time.h" -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h index b90b989a4..d7c8edd2b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.h index 1a7802ae2..bef0e374d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/exercise_time.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include "dds_handler.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.cpp index 207d331fe..63f70d1f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/main_handler.cpp @@ -13,7 +13,7 @@ #include "WebSocketInterface/websocket_interface_handler.h" #include "settings.h" -#include +#include #include namespace ParticipantManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.h index ba2690cbd..0f43a0fe2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h index a56a6c475..bfe49f4ae 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/PresentationManagement/object_presentation.h @@ -10,7 +10,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt index a6312e283..bf5783711 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt @@ -20,15 +20,81 @@ SET(SRCS_common logger.h ) +# Copy pdm_types.h.stub to pdm_types.h in build directory +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_types.h.stub + ${CMAKE_CURRENT_BINARY_DIR}/pdm_types.h + COPYONLY +) + +# Copy pdm_translation.h.stub to pdm_translation.h in build directory +CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_translation.h.stub + ${CMAKE_CURRENT_BINARY_DIR}/pdm_translation.h + COPYONLY +) + +# Copy pdm_enums.hpp.stub to pdm_enums.hpp in build directory (when BUILD_RTI=OFF) +IF(NOT BUILD_RTI) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_enums.hpp.stub + ${CMAKE_CURRENT_BINARY_DIR}/pdm_enums.hpp + COPYONLY + ) +ENDIF() + +# Add current binary dir to include path for generated headers +NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET} + PUBLIC + ${CMAKE_CURRENT_BINARY_DIR} +) + # Generate pdm_enums.idl / pdm.idl IF(BUILD_RTI) CODEGEN_IDL_SVC(SRCS_common ${xml_FILE}) ENDIF() -# Generate pdm_db.h -CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE}) -# Generate pdm_db_impl.cpp/.h, -CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE}) +# Generate pdm_db.h and pdm_db_impl - requires Grantlee +IF(BUILD_GRANTLEE) + # Generate pdm_db.h + CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE}) + # Generate pdm_db_impl.cpp/.h, + CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE}) +ELSE() + # Use pre-generated stub files when BUILD_GRANTLEE=OFF + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/pdm_db_structs.h.stub + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db_structs.h + COPYONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/pdm_db_structs.cpp.stub + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db_structs.cpp + COPYONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/pdm_db.h.stub + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db.h + COPYONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/pdm_db_impl.h.stub + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db_impl.h + COPYONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/pdm_db_impl.cpp.stub + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db_impl.cpp + COPYONLY + ) + LIST(APPEND SRCS_common + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db_structs.h + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db_structs.cpp + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db.h + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db_impl.h + ${CMAKE_CURRENT_BINARY_DIR}/pdm_db_impl.cpp + ) +ENDIF() # Generate *.cpp/*.hpp from idl IF(BUILD_RTI) @@ -45,47 +111,28 @@ IF(BUILD_RTI) CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE}) ENDIF() -# Check if svcPdmCommon target exists -IF(TARGET svcPdmCommon) - SET(PDM_COMMON_TARGET svcPdmCommon) -ELSE() - SET(PDM_COMMON_TARGET "") -ENDIF() - -IF(PDM_COMMON_TARGET) - NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED ${SRCS_common}) - NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET} - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/../ - ${CMAKE_CURRENT_BINARY_DIR}/../ - ) - NGL_TARGET_LINK_LIBRARIES(${PDM_COMMON_TARGET} - PRIVATE - RTI::nddscpp2 - PUBLIC - Qt6::Core - $,ddscore,> - NGLLogger - LtsUtilsCore - ngldb - ) - NGL_INSTALL_TARGET(${PDM_COMMON_TARGET}) -ELSE() - # Create a dummy interface library if svcPdmCommon doesn't exist - ADD_LIBRARY(svcPdmCommon INTERFACE) - TARGET_INCLUDE_DIRECTORIES(svcPdmCommon - INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/../ - ${CMAKE_CURRENT_BINARY_DIR}/../ - ) - TARGET_LINK_LIBRARIES(svcPdmCommon - INTERFACE - Qt6::Core - NGLLogger - LtsUtilsCore - ngldb - ) -ENDIF() +# Create svcPdmCommon library with common sources +SET(PDM_COMMON_TARGET svcPdmCommon) +NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED ${SRCS_common}) +generate_export_header(${PDM_COMMON_TARGET} + EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/svcpdmcommon_export.h" +) +NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../ + ${CMAKE_CURRENT_BINARY_DIR}/../ +) +NGL_TARGET_LINK_LIBRARIES(${PDM_COMMON_TARGET} + PRIVATE + RTI::nddscpp2 + PUBLIC + Qt6::Core + $,ddscore,> + NGLLogger + LtsUtilsCore + ngldb +) +NGL_INSTALL_TARGET(${PDM_COMMON_TARGET}) # # --- Library svcPdmClient -------------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp index ddfa335f5..fb03bc41e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace ProjectDataManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h index cf3fd8aca..708f84e5b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/dds_handler.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp index 29de893b6..8540a03aa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/main_handler.cpp @@ -12,7 +12,7 @@ #include "convert_db_to_dds.h" #include -#include +#include #include #include "static_pvsan_import.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp index c4d5ee3de..3266d39e2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp @@ -1161,7 +1161,7 @@ QStringList DtcImplCustom::chargeNames(std::vector &chargeIds) QStringList sl; auto uleisClassOffsets = (*it); sl.reserve(uleisClassOffsets.size()); - for (UleisClassOffset o : qAsConst(uleisClassOffsets)) + for (UleisClassOffset o : std::as_const(uleisClassOffsets)) sl << offsetName(o); if (sl.size() == 6) @@ -1628,7 +1628,7 @@ ProjectDataManagement::BuildingChargeEffect DtcImplCustom::getBuildingChargeEffe waitForHistoricalDataBuildingChargeEffect(2000); } - for (const ProjectDataManagement::BuildingChargeEffect &bcEffect : qAsConst(m_buildingChargeEffectCont)) + for (const ProjectDataManagement::BuildingChargeEffect &bcEffect : std::as_const(m_buildingChargeEffectCont)) { if (bcEffect.chargeTypeId == chargeTypeId) { @@ -1688,7 +1688,7 @@ QString DtcImplCustom::adlerLoadTypeName(int loadTypeId) QString DtcImplCustom::adlerTargetTypeName(int targetTypeId) { - for (const ProjectDataManagement::TargetType &targetTyp : qAsConst(m_targetTypeCont)) + for (const ProjectDataManagement::TargetType &targetTyp : std::as_const(m_targetTypeCont)) { const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(targetTyp.properties.c_str(), targetTyp.properties.size())).object(); @@ -1700,7 +1700,7 @@ QString DtcImplCustom::adlerTargetTypeName(int targetTypeId) QString DtcImplCustom::adlerTargetSubTypeName(int targetSubTypeId) { - for (const ProjectDataManagement::TargetSubType &targetSubTyp : qAsConst(m_targetSubTypeCont)) + for (const ProjectDataManagement::TargetSubType &targetSubTyp : std::as_const(m_targetSubTypeCont)) { const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(targetSubTyp.properties.c_str(), targetSubTyp.properties.size())).object(); @@ -1709,6 +1709,7 @@ QString DtcImplCustom::adlerTargetSubTypeName(int targetSubTypeId) } return {}; } +} int DtcImplCustom::getAmountFireMarkers(int firePurposeId) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp index 4181af551..6d37ed021 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp @@ -18,52 +18,52 @@ namespace ProjectDataManagement // static QString toStringBuilding(VulnerabilityState vs) { - switch (vs.underlying()) + switch (vs) { #ifdef ETS_MODE - case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding"); - case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding"); + case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready", "VulnerabilityStateBuilding"); + case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Damaged", "VulnerabilityStateBuilding"); #else - case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding"); - case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding"); + case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Combat Ready", "VulnerabilityStateBuilding"); + case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "CatastrophicKill", "VulnerabilityStateBuilding"); #endif default: break; } - return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(vs.underlying()); + return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast(vs)); } static QString toStringVehicle(VulnerabilityState vs) { - switch (vs.underlying()) + switch (vs) { #ifdef ETS_MODE - case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle"); + case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle"); + case VulnerabilityState::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Communication Damage", "VulnerabilityStateVehicle"); + case VulnerabilityState::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Function Damage", "VulnerabilityStateVehicle"); + case VulnerabilityState::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Lost", "VulnerabilityStateVehicle"); + case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Fully Damaged", "VulnerabilityStateVehicle"); default: break; #else - case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::VisibleMobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::CombatReady: - case VulnerabilityState_def::NoChange: - case VulnerabilityState_def::TemporarySeverance: - case VulnerabilityState_def::NearMiss: - case VulnerabilityState_def::HitWithNoEffect: - case VulnerabilityState_def::VulnerabilityBitsChanged: - case VulnerabilityState_def::NContamination: - case VulnerabilityState_def::BContamination: - case VulnerabilityState_def::CContamination: - case VulnerabilityState_def::NotReady: // Internal - case VulnerabilityState_def::Reserved: // Internal + case VulnerabilityState::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Comms Damaged", "VulnerabilityStateVehicle"); + case VulnerabilityState::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Veh Body Damaged", "VulnerabilityStateVehicle"); + case VulnerabilityState::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Main Funct Damaged", "VulnerabilityStateVehicle"); + case VulnerabilityState::MobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Mobility Kill", "VulnerabilityStateVehicle"); + case VulnerabilityState::VisibleMobilityKill: return QCoreApplication::translate("ProjectDataManagement", "Visible Mobility Kill", "VulnerabilityStateVehicle"); + case VulnerabilityState::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Wpn / Turret Damaged", "VulnerabilityStateVehicle"); + case VulnerabilityState::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Wpn / Turret Damaged", "VulnerabilityStateVehicle"); + case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill", "VulnerabilityStateVehicle"); + case VulnerabilityState::CombatReady: + case VulnerabilityState::NoChange: + case VulnerabilityState::TemporarySeverance: + case VulnerabilityState::NearMiss: + case VulnerabilityState::HitWithNoEffect: + case VulnerabilityState::VulnerabilityBitsChanged: + case VulnerabilityState::NContamination: + case VulnerabilityState::BContamination: + case VulnerabilityState::CContamination: + case VulnerabilityState::NotReady: // Internal + case VulnerabilityState::Reserved: // Internal break; // use common translation from toString() #endif } @@ -73,38 +73,38 @@ static QString toStringVehicle(VulnerabilityState vs) static QString toStringSoldier(VulnerabilityState vs) { - switch (vs.underlying()) + switch (vs) { #ifdef ETS_MODE - case VulnerabilityState_def::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle"); - case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle"); + case VulnerabilityState::CombatReady: return QCoreApplication::translate("ProjectDataManagement", "Ready / OK", "VulnerabilityStateVehicle"); + case VulnerabilityState::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "lightly injured", "VulnerabilityStateVehicle"); + case VulnerabilityState::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "moderatly injured", "VulnerabilityStateVehicle"); + case VulnerabilityState::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "seriously injured", "VulnerabilityStateVehicle"); + case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "dead", "VulnerabilityStateVehicle"); default: break; #else - case VulnerabilityState_def::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier"); - case VulnerabilityState_def::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier"); - case VulnerabilityState_def::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier"); - case VulnerabilityState_def::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier"); - case VulnerabilityState_def::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier"); - case VulnerabilityState_def::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier"); - case VulnerabilityState_def::CombatReady: - case VulnerabilityState_def::TemporarySeverance: - case VulnerabilityState_def::NearMiss: - case VulnerabilityState_def::HitWithNoEffect: - case VulnerabilityState_def::VulnerabilityBitsChanged: - case VulnerabilityState_def::NContamination: - case VulnerabilityState_def::BContamination: - case VulnerabilityState_def::CContamination: - case VulnerabilityState_def::NoChange: + case VulnerabilityState::LightDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Walking", "VulnerabilityStateSoldier"); + case VulnerabilityState::MediumDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Sitting", "VulnerabilityStateSoldier"); + case VulnerabilityState::HeavyDamage: return QCoreApplication::translate("ProjectDataManagement", "Wounded Laying", "VulnerabilityStateSoldier"); + case VulnerabilityState::CatastrophicKill: return QCoreApplication::translate("ProjectDataManagement", "Catastrophic Kill / Killed", "VulnerabilityStateSoldier"); + case VulnerabilityState::WeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Weapon Damage", "VulnerabilityStateSoldier"); + case VulnerabilityState::VisibleWeaponSystemDamage: return QCoreApplication::translate("ProjectDataManagement", "Visible Weapon Damage", "VulnerabilityStateSoldier"); + case VulnerabilityState::CombatReady: + case VulnerabilityState::TemporarySeverance: + case VulnerabilityState::NearMiss: + case VulnerabilityState::HitWithNoEffect: + case VulnerabilityState::VulnerabilityBitsChanged: + case VulnerabilityState::NContamination: + case VulnerabilityState::BContamination: + case VulnerabilityState::CContamination: + case VulnerabilityState::NoChange: break; // use common translation from toString() // those should not happen ... - case VulnerabilityState_def::MobilityKill: - case VulnerabilityState_def::VisibleMobilityKill: - case VulnerabilityState_def::NotReady: // Internal - case VulnerabilityState_def::Reserved: // Internal + case VulnerabilityState::MobilityKill: + case VulnerabilityState::VisibleMobilityKill: + case VulnerabilityState::NotReady: // Internal + case VulnerabilityState::Reserved: // Internal break; #endif } @@ -113,20 +113,20 @@ static QString toStringSoldier(VulnerabilityState vs) QString toString(VulnerabilityState vs, VulnerabilityClass vc) { - switch (vc.underlying()) + switch (vc) { - case VulnerabilityClass_def::Unknown: - case VulnerabilityClass_def::WtdDamages: - case VulnerabilityClass_def::WtdInjuries: + case VulnerabilityClass::Unknown: + case VulnerabilityClass::WtdDamages: + case VulnerabilityClass::WtdInjuries: return toString(vs); - case VulnerabilityClass_def::BuildingDamages: + case VulnerabilityClass::BuildingDamages: return toStringBuilding(vs); - case VulnerabilityClass_def::VehicleDamages: + case VulnerabilityClass::VehicleDamages: return toStringVehicle(vs); - case VulnerabilityClass_def::SoldierInjuries: + case VulnerabilityClass::SoldierInjuries: return toStringSoldier(vs); } - return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(vs.underlying()); + return QCoreApplication::translate("ProjectDataManagement", "Unknown (%1)", "VulnerabilityState").arg(static_cast(vs)); } } // namespace ProjectDataManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.cpp index e792e7c9a..e039a2362 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" #include -#include +#include namespace RecordingManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/main_handler.cpp index efdc1f81b..4fdf090da 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RecordingManagement/main_handler.cpp @@ -9,7 +9,7 @@ #include "settings.h" #include "logger.h" #include -#include +#include #include namespace RecordingManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.cpp index 1ae8b4691..a251a5c40 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/main_handler.cpp @@ -9,7 +9,7 @@ #include "settings.h" #include "logger.h" #include -#include +#include #include namespace ReportManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp index 377f24372..35062bcbb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include using namespace ReportManagement; //----------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.cpp index a23c26eb6..751eaf4e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.cpp @@ -9,7 +9,7 @@ #include "settings.h" #include "logger.h" #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h index 9962da54e..7b0f8e822 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h @@ -9,7 +9,7 @@ #include #include "dds_handler.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.cpp index 3476f0002..527b8a56a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace ReportManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.h index d42302525..0284d2fc0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/dds_handler.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp index c0e7a52df..ef43e68c1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include namespace RoutingService diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.h index 36c908110..6a5ad1393 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/WebSocketInterface/Messages/reply_message.h @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.h index 0f5473e5d..b573a9f0b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/group.h @@ -13,7 +13,7 @@ #include #include -#include +#include #include "logger.h" #include "dds_handler.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/heartbeat_listener.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/heartbeat_listener.h index 420d65507..2b38bbbdf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/heartbeat_listener.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/heartbeat_listener.h @@ -10,7 +10,7 @@ #include "logger.h" #include -#include +#include namespace Core { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.h index 447602976..580677f17 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/service_process.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.h index 23aa50b50..388c24ca7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/dds_handler.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include "logger.h" namespace SituationReplay diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h index 32106a1ca..7aa28301c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/object_situation_replay.h @@ -11,7 +11,7 @@ #include #include "dds_handler.h" #include "db_reader.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.cpp index 4afef2f67..95f6cb11b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.cpp @@ -9,7 +9,7 @@ #include "dds_handler.h" #include -#include +#include namespace SoundManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h index b23fc3e12..95dde5e38 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/dds_handler.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp index dcfb91505..fc148680e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SoundManagement/main_handler.cpp @@ -8,7 +8,7 @@ #include "main_handler.h" #include -#include +#include #include #include "som_db.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp index d721a8b8a..585262d65 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.cpp @@ -9,7 +9,7 @@ #include "dds_handler.h" #include -#include +#include namespace TargetManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h index 0317dd83c..332be5f24 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/dds_handler.h @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp index cab23265f..d1d1909e6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/main_handler.cpp @@ -8,7 +8,7 @@ #include "main_handler.h" #include -#include +#include #include #include "settings.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.h index bd7c071c6..59a67c239 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_area.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.h index 09397dc63..4389eac3f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_shootback_target.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.h b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.h index 4251788b7..b65d7ce95 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/object_target_area_assignment.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp index a2c0f74e7..38645fac7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/dds_handler.cpp @@ -8,7 +8,7 @@ #include "dds_handler.h" -#include +#include namespace VideoOverlayManagement { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp index 6e2c02aaf..9867c8b74 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/VideoOverlayManagement/main_handler.cpp @@ -11,7 +11,7 @@ #include -#include +#include using namespace VideoOverlayManagement; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/reply_message.h index a65ddaf9a..cbfd1ceb0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/reply_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/Messages/reply_message.h @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.h index c04fb5ab3..c0b69d7fd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/dds_handler.h @@ -9,8 +9,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.h index 29cecd5c9..c91a7b481 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.h @@ -9,7 +9,7 @@ #include "logger.h" #include "main_handler.h" -#include +#include namespace WarehouseGuez { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.h b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.h index c6b3b273d..f5c56738a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_injury_model.h @@ -9,7 +9,7 @@ #include "logger.h" #include "main_handler.h" -#include +#include namespace WarehouseGuez { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp index a4a606cb3..f9d9b6691 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.cpp @@ -12,7 +12,7 @@ #include "xxx_fts.h" #include -#include +#include namespace XxxXxxXxx { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h index f8060af19..3f7fbc3d8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/base/dds_handler.h @@ -9,7 +9,7 @@ #pragma once #include -#include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h index 8e7202a97..ded9118f1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/skeleton/stub/object_xxx.h @@ -10,7 +10,7 @@ #include "dds_handler.h" #include "logger.h" -#include +#include // Generated #include diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt index 0a04ed9c4..ed92a7c63 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt @@ -26,14 +26,20 @@ NGL_TARGET_LINK_LIBRARIES(ngltools # Smoke test for ngltools DTG conversion utilities IF(BUILD_TESTING) - find_package(Qt6 COMPONENTS Test Core QUIET) - if (Qt6_FOUND) + # Check if Qt6::Test already exists from parent CMakeLists.txt + if(TARGET Qt6::Test) set(_QTTEST_TARGET Qt6::Test) set(_QTCORE_TARGET Qt6::Core) else() - find_package(Qt6 COMPONENTS Test Core REQUIRED) - set(_QTTEST_TARGET Qt6::Test) - set(_QTCORE_TARGET Qt6::Core) + find_package(Qt6 COMPONENTS Test Core QUIET) + if (Qt6_FOUND) + set(_QTTEST_TARGET Qt6::Test) + set(_QTCORE_TARGET Qt6::Core) + else() + find_package(Qt6 COMPONENTS Test Core REQUIRED) + set(_QTTEST_TARGET Qt6::Test) + set(_QTCORE_TARGET Qt6::Core) + endif() endif() if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/tests/NGLToolsQtSmokeTest.cpp) diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt index e45711841..df763f7a4 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt @@ -88,17 +88,17 @@ endif() # SV: logView NGL_ADD_LIBRARY2(WS AAR SV nglwidgets SHARED ${nglwidgets_SRCS} ${oxygen_SRCS}) -NGL_TARGET_INCLUDE_DIRECTORIES(nglwidgets - PRIVATE - ${POPPLER_QT6_INCLUDE_DIR} -) +if(HAVE_POPPLER_QT6) + target_compile_definitions(nglwidgets PRIVATE HAVE_POPPLER_QT6) + target_include_directories(nglwidgets PRIVATE ${POPPLER_QT6_INCLUDE_DIRS}) + target_link_libraries(nglwidgets PRIVATE ${POPPLER_QT6_LIBRARIES}) +endif() if(QT6_GUI_AVAILABLE) NGL_TARGET_LINK_LIBRARIES(nglwidgets PRIVATE NGLLogger ngltranslator ngltools - ${POPPLER_QT6_LIBRARY} PUBLIC Qt6::Core ${Qt6_Widgets} diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h index 98c1e3125..115377fe4 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h @@ -36,6 +36,7 @@ public: Q_SIGNALS: void linkClicked(const Poppler::LinkDestination &dest); #endif +public: void setZoomFactor(double zoom); void clearPixmap(); QSize sizeHint() const override; diff --git a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt index 19f717c43..50131cb91 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt @@ -16,10 +16,17 @@ SET(CMAKE_CXX_STANDARD_REQUIRED 11) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_INCLUDE_CURRENT_DIR ON) SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON) -SET(CMAKE_POSITION_INDEPENDENT_CODE ON) +# Qt6 Migration: Removed CMAKE_POSITION_INDEPENDENT_CODE - conflicts with Qt6 reduce_relocations +# SET(CMAKE_POSITION_INDEPENDENT_CODE ON) SET(CMAKE_AUTOMOC TRUE) SET(QT_USE_IMPORTED_TARGETS TRUE) -find_package(Qt6 5.9.0 COMPONENTS Core Sql Test Core5Compat REQUIRED) + +# Check if Qt6 components already exist from parent CMakeLists.txt +if(TARGET Qt6::Core AND TARGET Qt6::Sql AND TARGET Qt6::Test) + # Already found by parent +else() + find_package(Qt6 5.9.0 COMPONENTS Core Sql Test Core5Compat REQUIRED) +endif() FIND_PACKAGE(IClientSDK REQUIRED) diff --git a/qt6-after/qt6-migrated-legatus/cmake/FindRTI.cmake b/qt6-after/qt6-migrated-legatus/cmake/FindRTI.cmake index 5da0938fe..b962f3754 100755 --- a/qt6-after/qt6-migrated-legatus/cmake/FindRTI.cmake +++ b/qt6-after/qt6-migrated-legatus/cmake/FindRTI.cmake @@ -31,9 +31,13 @@ SET(_rti_gcc_arch "") # Check if RTI_DIR is not set OR is empty (cached empty string from previous failed detection) IF(NOT RTI_DIR OR RTI_DIR STREQUAL "") - SET(_arch "unknown") - IF(WIN32) - SET(_RTI_DIR $ENV{DDS_PATH}) + # First check RTI_INSTALL_DIR CMake variable (set by parent CMakeLists.txt) + IF(RTI_INSTALL_DIR AND EXISTS "${RTI_INSTALL_DIR}") + SET(_RTI_DIR "${RTI_INSTALL_DIR}") + ELSE() + SET(_arch "unknown") + IF(WIN32) + SET(_RTI_DIR $ENV{DDS_PATH}) IF(NOT _RTI_DIR) GET_FILENAME_COMPONENT(_rti_root_path "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Real-Time Innovations\\RTI Connext DDS Pro 5.2.3;Location]" ABSOLUTE) SET(_RTI_DIR "${_rti_root_path}") @@ -65,12 +69,13 @@ IF(NOT RTI_DIR OR RTI_DIR STREQUAL "") SET(_RTI_DIR $ENV{DDS_PATH}) IF(NOT _RTI_DIR) # Try local external directory first (check multiple levels for different repo structures) - IF(EXISTS "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0") - SET(_RTI_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0") + # Check container path first (/workspace/external), then host-relative paths + IF(EXISTS "${CMAKE_SOURCE_DIR}/external/rti_connext_dds-7.7.0") + SET(_RTI_DIR "${CMAKE_SOURCE_DIR}/external/rti_connext_dds-7.7.0") ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/../external/rti_connext_dds-7.7.0") SET(_RTI_DIR "${CMAKE_SOURCE_DIR}/../external/rti_connext_dds-7.7.0") - ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/external/rti_connext_dds-7.7.0") - SET(_RTI_DIR "${CMAKE_SOURCE_DIR}/external/rti_connext_dds-7.7.0") + ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0") + SET(_RTI_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0") ELSE() SET(_RTI_DIR "/opt/RTI") ENDIF() @@ -111,8 +116,40 @@ IF(NOT RTI_DIR OR RTI_DIR STREQUAL "") ENDIF() SET(_arch "${_rti_gcc_arch}") ENDIF() + ENDIF() SET(RTI_DIR "${_RTI_DIR}" CACHE STRING "RTI base path" FORCE) MESSAGE(STATUS "Trying to use RTI from ${RTI_DIR} with arch ${_arch}") +ELSE() + # RTI_DIR was provided externally - auto-detect architecture + SET(_rti_gcc_arch "x64Linux3gcc4.8.2") + IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0.0) + # Prefer newer gcc-based RTI builds; try a sequence then fall back to any x64Linux4gcc* dir found under RTI lib + SET(_preferred_archs "x64Linux4gcc8.5.0;x64Linux4gcc7.3.0;x64Linux3gcc5.4.0") + SET(_found_arch "") + foreach(_cand IN LISTS _preferred_archs) + if(EXISTS "${RTI_DIR}/lib/${_cand}") + SET(_found_arch "${_cand}") + break() + endif() + endforeach() + if(_found_arch STREQUAL "") + # fallback: pick any x64Linux* directory under lib + file(GLOB _rti_arch_dirs RELATIVE "${RTI_DIR}/lib" "${RTI_DIR}/lib/x64Linux*") + list(LENGTH _rti_arch_dirs _rti_arch_dirs_len) + if(_rti_arch_dirs_len GREATER 0) + list(GET _rti_arch_dirs 0 _found_arch) + endif() + endif() + if(NOT _found_arch STREQUAL "") + SET(_rti_gcc_arch "${_found_arch}") + else() + # final fallbacks + SET(_rti_gcc_arch "x64Linux4gcc7.3.0") + endif() + ENDIF() + ENDIF() + MESSAGE(STATUS "Using externally provided RTI from ${RTI_DIR} with arch ${_rti_gcc_arch}") ENDIF() IF(WIN32) SET(_rti_include_hint "${RTI_DIR}/include/") @@ -151,7 +188,8 @@ IF(NOT RTI_INCLUDE_DIR) MESSAGE(WARNING "RTI not found - disabling BUILD_RTI. Set DDS_PATH to RTI installation to enable RTI features.") return() else() - FIND_PATH(RTI_INCLUDE_DIR ndds/ndds_cpp.h HINTS ${_rti_include_hint}) + # Use PATHS instead of HINTS for more reliable path resolution + FIND_PATH(RTI_INCLUDE_DIR ndds/ndds_cpp.h PATHS ${_rti_include_hint} NO_DEFAULT_PATH) IF(RTI_INCLUDE_DIR) SET(RTI_INCLUDE_DIRS "${RTI_INCLUDE_DIR}" "${RTI_INCLUDE_DIR}/ndds" "${RTI_INCLUDE_DIR}/ndds/hpp" CACHE STRING "RTI include directories" FORCE) MARK_AS_ADVANCED(RTI_INCLUDE_DIRS) @@ -175,19 +213,19 @@ IF(NOT RTI_VERSION_MAJOR) SET(RTI_VERSION_MAJOR ${_rti_version_major} CACHE STRING "RTI version" FORCE) ENDIF() -INCLUDE(FindLibraryWithDebug) INCLUDE(FindPackageHandleStandardArgs) +# Set policy for imported target library requirements +if(POLICY CMP0111) + cmake_policy(SET CMP0111 NEW) +endif() SET(_RTI_LIBS nddscore nddsc nddscpp2 rtiroutingservice) SET(_libs "") SET(_lib_vars "") # Build list of library search paths including arch-specific subdirs -set(_rti_lib_search_paths "${RTI_DIR}/lib") -if(EXISTS "${RTI_DIR}/lib/${_rti_gcc_arch}") - list(APPEND _rti_lib_search_paths "${RTI_DIR}/lib/${_rti_gcc_arch}") -endif() +set(_rti_lib_search_paths "${RTI_DIR}/lib" "${RTI_DIR}/lib/${_rti_gcc_arch}") # Also scan for any arch subdirs under lib/ file(GLOB _rti_arch_dirs "${RTI_DIR}/lib/*") foreach(_arch_dir IN LISTS _rti_arch_dirs) @@ -198,11 +236,32 @@ endforeach() FOREACH(_lib ${_RTI_LIBS}) SET(_libname "RTI_${_lib}_LIBRARY") - IF (NOT ${_libname}) - FIND_LIBRARY_WITH_DEBUG("${_libname}" - WIN32_DEBUG_POSTFIX d - NAMES ${_lib} - HINTS ${_rti_lib_search_paths}) + SET(_libname_release "RTI_${_lib}_LIBRARY_RELEASE") + SET(_libname_debug "RTI_${_lib}_LIBRARY_DEBUG") + + # Build explicit search paths for this library + set(_lib_search_paths + "${RTI_DIR}/lib/${_rti_gcc_arch}" + "${RTI_DIR}/lib" + ) + + # Find release library (no suffix) + FIND_LIBRARY(${_libname_release} + NAMES ${_lib} + PATHS ${_lib_search_paths} + NO_DEFAULT_PATH) + + # Find debug library (d suffix on Linux) + FIND_LIBRARY(${_libname_debug} + NAMES ${_lib}d + PATHS ${_lib_search_paths} + NO_DEFAULT_PATH) + + # Set combined library variable + IF(${_libname_release}) + SET(${_libname} "${${_libname_release}}" CACHE STRING "RTI ${_lib} library" FORCE) + ELSEIF(${_libname_debug}) + SET(${_libname} "${${_libname_debug}}" CACHE STRING "RTI ${_lib} library" FORCE) ENDIF() SET(_tgt_name RTI::${_lib}) @@ -222,21 +281,38 @@ FOREACH(_lib ${_RTI_LIBS}) ENDIF() ENDIF() - IF(${_libname}_RELEASE) - SET_PROPERTY(TARGET ${_tgt_name} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + # Set library locations - use release for both configs if debug not found + IF(${_libname}_RELEASE AND ${_libname}_DEBUG) + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG) SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION_RELEASE "${${_libname}_RELEASE}") - ENDIF() - IF(${_libname}_DEBUG) - SET_PROPERTY(TARGET ${_tgt_name} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION_DEBUG "${${_libname}_DEBUG}") - ENDIF() - IF(NOT ${_libname}_RELEASE AND NOT ${_libname}_DEBUG) - SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION "${${_libname}}") + # Set default IMPORTED_LOCATION for non-configured builds + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION "${${_libname}_RELEASE}") + ELSEIF(${_libname}_RELEASE) + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG) + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION_RELEASE "${${_libname}_RELEASE}") + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION_DEBUG "${${_libname}_RELEASE}") + # Set default IMPORTED_LOCATION for non-configured builds + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION "${${_libname}_RELEASE}") + ELSEIF(${_libname}_DEBUG) + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_CONFIGURATIONS RELEASE DEBUG) + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION_RELEASE "${${_libname}_DEBUG}") + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION_DEBUG "${${_libname}_DEBUG}") + # Set default IMPORTED_LOCATION for non-configured builds + SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION "${${_libname}_DEBUG}") + ELSE() + # No library found - skip creating this target + MESSAGE(WARNING "RTI library ${_lib} not found in ${RTI_DIR}") + SET(${_libname} "" CACHE STRING "RTI ${_lib} library (not found)" FORCE) + CONTINUE() ENDIF() ENDIF() LIST(APPEND _libs "${${_libname}}") - LIST(APPEND _lib_vars "${_libname}") + # rtiroutingservice is optional - only add required libs to _lib_vars for FIND_PACKAGE_HANDLE_STANDARD_ARGS + IF(NOT "${_lib}" STREQUAL "rtiroutingservice") + LIST(APPEND _lib_vars "${_libname}") + ENDIF() ENDFOREACH() IF(TARGET RTI::nddscore AND UNIX) diff --git a/qt6-after/qt6-migrated-legatus/cmake/MacroCodeGenIdl.cmake b/qt6-after/qt6-migrated-legatus/cmake/MacroCodeGenIdl.cmake index d4f4c00ce..8785d057c 100755 --- a/qt6-after/qt6-migrated-legatus/cmake/MacroCodeGenIdl.cmake +++ b/qt6-after/qt6-migrated-legatus/cmake/MacroCodeGenIdl.cmake @@ -217,23 +217,67 @@ ENDMACRO() MACRO(CODEGEN_IDL_SVC srcList xmlFile_in) _GET_SERVICENAME( "${xmlFile_in}" svcNameOut ) - SET(in_files "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc.idl.grantlee" - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_enums.idl.grantlee" - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_json.cpp.grantlee" - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_json.h.grantlee" - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_translation.cpp.grantlee" - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_translation.h.grantlee" - ) SET(out_files "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl" - "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl") - SET_PROPERTY(GLOBAL APPEND PROPERTY CODEGEN_IDL_FILES "${out_files}") - SET_SOURCE_FILES_PROPERTIES(${out_files} PROPERTIES HEADER_FILE_ONLY TRUE) - LIST(APPEND out_files + "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl" "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.cpp" "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.h" "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.cpp" "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.h") - _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files ${ARGN}) + + IF(BUILD_GRANTLEE) + SET(in_files "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc.idl.grantlee" + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_enums.idl.grantlee" + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_json.cpp.grantlee" + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_json.h.grantlee" + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_translation.cpp.grantlee" + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_translation.h.grantlee" + ) + SET(idl_out_files "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl" + "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl") + SET_PROPERTY(GLOBAL APPEND PROPERTY CODEGEN_IDL_FILES "${idl_out_files}") + SET_SOURCE_FILES_PROPERTIES(${idl_out_files} PROPERTIES HEADER_FILE_ONLY TRUE) + _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files ${ARGN}) + ELSE() + # BUILD_GRANTLEE disabled: use pre-generated files if they exist + MESSAGE(STATUS "BUILD_GRANTLEE disabled: checking for pre-generated files for ${svcNameOut}") + + # Check if pre-generated .idl files exist in source directory + SET(source_idl "${CMAKE_CURRENT_SOURCE_DIR}/${svcNameOut}.idl") + SET(source_idl_enums "${CMAKE_CURRENT_SOURCE_DIR}/${svcNameOut}_enums.idl") + + IF(EXISTS ${source_idl} AND EXISTS ${source_idl_enums}) + MESSAGE(STATUS "Found pre-generated IDL files for ${svcNameOut}") + # Copy pre-generated files to build directory + ADD_CUSTOM_COMMAND(OUTPUT ${out_files} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${source_idl} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${source_idl_enums} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.cpp + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.h + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.cpp + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.h + DEPENDS ${source_idl} ${source_idl_enums} + COMMENT "Copying pre-generated IDL files for ${svcNameOut}" + ) + SET_PROPERTY(GLOBAL APPEND PROPERTY CODEGEN_IDL_FILES "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl" "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl") + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl PROPERTIES HEADER_FILE_ONLY TRUE) + LIST(APPEND ${srcList} ${out_files}) + ELSE() + MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated IDL files found for ${svcNameOut}. Skipping service.") + # Create empty stub files to satisfy CMake + ADD_CUSTOM_COMMAND(OUTPUT ${out_files} + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.cpp + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.h + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.cpp + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.h + COMMENT "Creating stub files for ${svcNameOut} (no pre-generated IDL)" + ) + SET_PROPERTY(GLOBAL APPEND PROPERTY CODEGEN_IDL_FILES "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl" "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl") + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl PROPERTIES HEADER_FILE_ONLY TRUE) + LIST(APPEND ${srcList} ${out_files}) + ENDIF() + ENDIF() CODEGEN_HANDLE_SVC_XML(${srcList} ${xmlFile_in}) ENDMACRO() @@ -291,75 +335,112 @@ MACRO(CODEGEN_CLIENT_TOPICS_IFC srcList xmlFile_in) IF(NOT _CST_PARTS) SET(_CST_PARTS "DTC" "FTC") ENDIF() - SET(in_files "") - SET(out_files "") - FOREACH(part ${_CST_PARTS}) - IF(part STREQUAL "DTC") - LIST(APPEND in_files - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_dtc.h.grantlee" - ) - LIST(APPEND out_files - "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h" - ) - IF(NOT POLICY CMP0071) - QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h") + + # When BUILD_GRANTLEE=OFF, use pre-generated files from source directory + IF(NOT BUILD_GRANTLEE) + FOREACH(part ${_CST_PARTS}) + IF(part STREQUAL "DTC") + SET(generated_file "${CMAKE_CURRENT_SOURCE_DIR}/${svcNameOut}_dtc.h") + IF(EXISTS "${generated_file}") + LIST(APPEND ${srcList} "${generated_file}") + IF(NOT POLICY CMP0071) + QT6_WRAP_CPP(${srcList} "${generated_file}") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "Pre-generated file ${generated_file} not found. BUILD_GRANTLEE=OFF requires pre-generated files.") + ENDIF() + ELSEIF(part STREQUAL "FTC") + SET(generated_file "${CMAKE_CURRENT_SOURCE_DIR}/${svcNameOut}_ftc.h") + IF(EXISTS "${generated_file}") + LIST(APPEND ${srcList} "${generated_file}") + IF(NOT POLICY CMP0071) + QT6_WRAP_CPP(${srcList} "${generated_file}") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "Pre-generated file ${generated_file} not found. BUILD_GRANTLEE=OFF requires pre-generated files.") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})") ENDIF() - ELSEIF(part STREQUAL "FTC") - LIST(APPEND in_files - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_ftc.h.grantlee" - ) - LIST(APPEND out_files - "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc.h" - ) - ELSE() - MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})") - ENDIF() - ENDFOREACH() - _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files) + ENDFOREACH() + ELSE() + # Original codegen logic with Grantlee + SET(in_files "") + SET(out_files "") + FOREACH(part ${_CST_PARTS}) + IF(part STREQUAL "DTC") + LIST(APPEND in_files + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_dtc.h.grantlee" + ) + LIST(APPEND out_files + "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h" + ) + IF(NOT POLICY CMP0071) + QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h") + ENDIF() + ELSEIF(part STREQUAL "FTC") + LIST(APPEND in_files + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_ftc.h.grantlee" + ) + LIST(APPEND out_files + "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc.h" + ) + IF(NOT POLICY CMP0071) + QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc.h") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})") + ENDIF() + ENDFOREACH() + _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files) + ENDIF() ENDMACRO() MACRO(CODEGEN_CLIENT_TOPICS_IMPL srcList xmlFile_in) - SET(options) - SET(oneValueArgs) - SET(multiValueArgs PARTS) - CMAKE_PARSE_ARGUMENTS(_CST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + # Skip code generation when BUILD_GRANTLEE=OFF - use pre-generated files instead + IF(BUILD_GRANTLEE) + SET(options) + SET(oneValueArgs) + SET(multiValueArgs PARTS) + CMAKE_PARSE_ARGUMENTS(_CST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - _GET_SERVICENAME( "${xmlFile_in}" svcNameOut ) - IF(NOT _CST_PARTS) - SET(_CST_PARTS "DTC" "FTC") - ENDIF() - SET(in_files "") - SET(out_files "") - FOREACH(part ${_CST_PARTS}) - IF(part STREQUAL "DTC") - LIST(APPEND in_files - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_dtc_impl.h.grantlee" - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee" - ) - LIST(APPEND out_files - "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.h" - "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.cpp" - ) - IF(NOT POLICY CMP0071) - QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.h") - ENDIF() - ELSEIF(part STREQUAL "FTC") - LIST(APPEND in_files - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_ftc_impl.h.grantlee" - "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee" - ) - LIST(APPEND out_files - "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.h" - "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.cpp" - ) - IF(NOT POLICY CMP0071) - QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.h") - ENDIF() - ELSE() - MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})") + _GET_SERVICENAME( "${xmlFile_in}" svcNameOut ) + IF(NOT _CST_PARTS) + SET(_CST_PARTS "DTC" "FTC") ENDIF() - ENDFOREACH() - _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files) + SET(in_files "") + SET(out_files "") + FOREACH(part ${_CST_PARTS}) + IF(part STREQUAL "DTC") + LIST(APPEND in_files + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_dtc_impl.h.grantlee" + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee" + ) + LIST(APPEND out_files + "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.h" + "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.cpp" + ) + IF(NOT POLICY CMP0071) + QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.h") + ENDIF() + ELSEIF(part STREQUAL "FTC") + LIST(APPEND in_files + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_ftc_impl.h.grantlee" + "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee" + ) + LIST(APPEND out_files + "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.h" + "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.cpp" + ) + IF(NOT POLICY CMP0071) + QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.h") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})") + ENDIF() + ENDFOREACH() + _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files) + ENDIF() ENDMACRO() MACRO(CODEGEN_SERVER_TOPICS srcList xmlFile_in) diff --git a/qt6-after/qt6-migrated-legatus/cmake/PlaceholderInternalTargets.cmake b/qt6-after/qt6-migrated-legatus/cmake/PlaceholderInternalTargets.cmake index e52e8f7ca..d801e3f58 100644 --- a/qt6-after/qt6-migrated-legatus/cmake/PlaceholderInternalTargets.cmake +++ b/qt6-after/qt6-migrated-legatus/cmake/PlaceholderInternalTargets.cmake @@ -7,20 +7,24 @@ if(NOT TARGET ddsgen) add_library(ddsgen UNKNOWN IMPORTED) - set_target_properties(ddsgen PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON) + # Qt6 Migration: Removed INTERFACE_POSITION_INDEPENDENT_CODE - conflicts with Qt6 reduce_relocations + # set_target_properties(ddsgen PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON) endif() if(NOT TARGET ddsdtc) add_library(ddsdtc UNKNOWN IMPORTED) - set_target_properties(ddsdtc PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON) + # Qt6 Migration: Removed INTERFACE_POSITION_INDEPENDENT_CODE - conflicts with Qt6 reduce_relocations + # set_target_properties(ddsdtc PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON) endif() if(NOT TARGET ddsfts) add_library(ddsfts UNKNOWN IMPORTED) - set_target_properties(ddsfts PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON) + # Qt6 Migration: Removed INTERFACE_POSITION_INDEPENDENT_CODE - conflicts with Qt6 reduce_relocations + # set_target_properties(ddsfts PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON) endif() if(NOT TARGET ddsQoS) add_library(ddsQoS UNKNOWN IMPORTED) - set_target_properties(ddsQoS PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON) + # Qt6 Migration: Removed INTERFACE_POSITION_INDEPENDENT_CODE - conflicts with Qt6 reduce_relocations + # set_target_properties(ddsQoS PROPERTIES INTERFACE_POSITION_INDEPENDENT_CODE ON) endif() diff --git a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt index 3b08ba05d..eacce98fd 100644 --- a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt @@ -5,9 +5,10 @@ cmake_minimum_required(VERSION 3.16) # Qt6 finden (wird vom Hauptprojekt gesetzt, aber sicherheitshalber hier auch) if(QT6_GUI_AVAILABLE) - # Try standard find_package first, fall back to manual targets if OpenGL missing - find_package(Qt6 QUIET COMPONENTS Core Gui Widgets Test) - if(NOT TARGET Qt6::Gui OR NOT TARGET Qt6::Widgets) + # Check if targets already exist from parent CMakeLists.txt + if(TARGET Qt6::Core AND TARGET Qt6::Gui AND TARGET Qt6::Widgets AND TARGET Qt6::Test) + # Already found by parent - use existing targets + elseif(NOT TARGET Qt6::Gui OR NOT TARGET Qt6::Widgets) # Manual fallback: create imported targets when standard find fails due to OpenGL if(NOT TARGET Qt6::Gui) add_library(Qt6::Gui SHARED IMPORTED) @@ -24,31 +25,36 @@ if(QT6_GUI_AVAILABLE) INTERFACE_LINK_LIBRARIES "Qt6::Gui;Qt6::Core" ) endif() + else() + # Try standard find_package first, fall back to manual targets if OpenGL missing + find_package(Qt6 QUIET COMPONENTS Core Gui Widgets Test) endif() # Ensure Core and Test are found if(NOT TARGET Qt6::Core) find_package(Qt6 REQUIRED COMPONENTS Core Test) endif() else() - find_package(Qt6 REQUIRED COMPONENTS Core Test) -endif() - -# Try to find system-wide GTest first, fallback to FetchContent -find_package(GTest QUIET) -if(NOT TARGET GTest::gtest_main) - include(FetchContent) - FetchContent_Declare( - googletest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG v1.13.0 - ) - # For Windows: Prevent overriding the parent project's compiler/linker settings - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - FetchContent_MakeAvailable(googletest) + if(NOT TARGET Qt6::Core OR NOT TARGET Qt6::Test) + find_package(Qt6 REQUIRED COMPONENTS Core Test) + endif() endif() # Nur bauen wenn BUILD_TESTING aktiviert ist if(BUILD_TESTING) + # Try to find system-wide GTest first, fallback to FetchContent + find_package(GTest QUIET) + if(NOT TARGET GTest::gtest_main) + include(FetchContent) + FetchContent_Declare( + googletest + GIT_REPOSITORY https://github.com/google/googletest.git + GIT_TAG v1.13.0 + ) + # For Windows: Prevent overriding the parent project's compiler/linker settings + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + FetchContent_MakeAvailable(googletest) + endif() + # Collect all test source files dynamically file(GLOB MIGRATION_TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/test_*.cpp") diff --git a/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp b/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp index 06dd16ff5..3afa1b56d 100644 --- a/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp +++ b/qt6-after/qt6-migrated-legatus/tests/test_migration_stubs.cpp @@ -109,7 +109,7 @@ TEST(MigrationStubs, CoreDtcCompiles) } // DDS Core -#include "DDS/Core/core_dtc.h" +#include "Core/core_dtc.h" TEST(MigrationStubs, DDSCoreDtcCompiles) {