Qt6/RTI 7.7 Migration: Build-System und RTI-Integration fixes

CMake Build-System: - NGL_ADD_SUBDIR_GUARDED() vor erstem Aufruf definiert (Zeile 38) - Z/src wird VOR ENABLE_TESTING() eingebunden - InfrastructureManagement an Anfang von Lts/Services CMakeLists.txt - ALIAS Targets für RTI nur für existierende Libraries erstellt RTI 7.7 Integration: - generic_base.h: QMetaMethod Include hinzugefügt - generic_data_reader.h: Template-Signatur auf 2 Parameter angepasst - detail::DataReaderImpl<Q> als Default-Template-Parameter Qt6 Location Support: - Dockerfile: qtlocation und qtpositioning Module hinzugefügt Dokumentation: - C++23 Inkompatibilität mit RTI 7.7 in copilot-instructions.md - EXTERNAL_DEPENDENCIES.md Strategie dokumentiert Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-08-30 13:36:41 +02:00
1 parent a9c5b2181e
commit 497baa804b
@@ -1,15 +1,15 @@
-# GitHub Copilot Repository Instructions: C++23 Modernization
+# GitHub Copilot Repository Instructions: C++17 Modernization

 ## Context
 - Language: C++
- Target standard: C++23
+- Target standard: C++17
 - Goal: modernize legacy C++11/14/17 code safely and incrementally

 ## Primary Rule
 Preserve existing behavior unless functional changes are explicitly requested.

 ## Balanced Modernization Policy
- Prefer modern C++23 constructs when they clearly improve safety, readability, or maintainability.
+- Prefer modern C++17 constructs when they clearly improve safety, readability, or maintainability.
 - Keep refactors focused and reviewable; avoid broad rewrites unless requested.
 - Prefer standard library solutions over custom or legacy patterns.
 - Respect toolchain limitations, ABI-sensitive interfaces, and repository-local style.
@@ -35,7 +35,7 @@ Preserve existing behavior unless functional changes are explicitly requested.

 ## Avoid
 - Do not modernize mechanically if readability becomes worse.
- Do not introduce unsupported C++23 features.
+- Do not introduce unsupported C++17 features.
 - Do not introduce dangling references, dangling `std::string_view`, or unclear ownership.
 - Do not silently change ABI, object lifetime, exception behavior, or performance characteristics.
 - Do not rewrite unrelated code.
@@ -36,6 +36,28 @@ IF(DEFINED LTS_VERSION_MAJOR AND DEFINED LTS_VERSION_MINOR AND DEFINED LTS_VERSI
 ENDIF()
 PROJECT(LTS VERSION ${_ver})
 MESSAGE(STATUS "LTS Version: ${LTS_VERSION_MAJOR}.${LTS_VERSION_MINOR}.${LTS_VERSION_PATCH}")
+function(NGL_ADD_SUBDIR_GUARDED subdir)
+  if(MIGRATE_MODULE STREQUAL "")
+    add_subdirectory(${subdir})
+  else()
+    # normalize to forward slashes
+    string(REPLACE "\\" "/" _mig "${MIGRATE_MODULE}")
+    string(REPLACE "\\" "/" _sub "${subdir}")
+    # also compare basenames so MIGRATE_MODULE=Lts/DDS matches subdir 'DDS' when called from Lts
+    get_filename_component(_mig_base "${_mig}" NAME)
+    get_filename_component(_sub_base "${_sub}" NAME)
+    # If MIGRATE_MODULE either starts with the subdir, equals it, contains it as a path component,
+    # or the basename matches, include the subdir. This makes nested paths like
+    # 'Lts/Proxies/TrainingAreaBase' include both 'Lts' and its child 'Proxies'.
+    if(_mig MATCHES "^${_sub}(/|$)" OR _sub MATCHES "^${_mig}(/|$)" OR _mig MATCHES ".*/${_sub}(/|$)" OR _sub MATCHES ".*/${_mig}(/|$)" OR _mig_base STREQUAL _sub OR _sub_base STREQUAL _mig)
+      message(STATUS "Including subdir ${subdir} because MIGRATE_MODULE=${MIGRATE_MODULE}")
+      add_subdirectory(${subdir})
+    else()
+      message(STATUS "Skipping subdir ${subdir} because MIGRATE_MODULE=${MIGRATE_MODULE}")
+    endif()
+  endif()
+endfunction()
+
 SET(LTS_VERSION_DATE  "01.01.2018" CACHE STRING "The date when this software was compiled")
 ADD_DEFINITIONS(-DLTS_VERSION_MAJOR=\"${LTS_VERSION_MAJOR}\")
 ADD_DEFINITIONS(-DLTS_VERSION_MINOR=\"${LTS_VERSION_MINOR}\")
@@ -487,28 +509,6 @@ if(NOT DEFINED MIGRATE_MODULE)
  set(MIGRATE_MODULE "" CACHE STRING "If set, only add subdirectories covering this module (path relative to repo root)")
 endif()

-function(NGL_ADD_SUBDIR_GUARDED subdir)
-  if(MIGRATE_MODULE STREQUAL "")
-    add_subdirectory(${subdir})
-  else()
-    # normalize to forward slashes
-    string(REPLACE "\\" "/" _mig "${MIGRATE_MODULE}")
-    string(REPLACE "\\" "/" _sub "${subdir}")
-    # also compare basenames so MIGRATE_MODULE=Lts/DDS matches subdir 'DDS' when called from Lts
-    get_filename_component(_mig_base "${_mig}" NAME)
-    get_filename_component(_sub_base "${_sub}" NAME)
-    # If MIGRATE_MODULE either starts with the subdir, equals it, contains it as a path component,
-    # or the basename matches, include the subdir. This makes nested paths like
-    # 'Lts/Proxies/TrainingAreaBase' include both 'Lts' and its child 'Proxies'.
-    if(_mig MATCHES "^${_sub}(/|$)" OR _sub MATCHES "^${_mig}(/|$)" OR _mig MATCHES ".*/${_sub}(/|$)" OR _sub MATCHES ".*/${_mig}(/|$)" OR _mig_base STREQUAL _sub OR _sub_base STREQUAL _mig)
-      message(STATUS "Including subdir ${subdir} because MIGRATE_MODULE=${MIGRATE_MODULE}")
-      add_subdirectory(${subdir})
-    else()
-      message(STATUS "Skipping subdir ${subdir} because MIGRATE_MODULE=${MIGRATE_MODULE}")
-    endif()
-  endif()
-endfunction()
-
 # Add only guarded subdirectories
 NGL_ADD_SUBDIR_GUARDED(TetraIF)
 NGL_ADD_SUBDIR_GUARDED(Z/src)
@@ -4,6 +4,8 @@
 # $Author:
 #

+# InfrastructureManagement muss zuerst gebaut werden (svcIsmCommon wird von anderen Services benötigt)
+ADD_SUBDIRECTORY(InfrastructureManagement)
 ADD_SUBDIRECTORY(AlarmManagement)
 ADD_SUBDIRECTORY(AreaEffectSimulation)
 ADD_SUBDIRECTORY(AudioVideoManagement)
@@ -19,7 +21,6 @@ ADD_SUBDIRECTORY(FileManagement)
 ADD_SUBDIRECTORY(FilterManagement)
 ADD_SUBDIRECTORY(GuezIedManagement)
 ADD_SUBDIRECTORY(GuezMinelayerProcessing)
-ADD_SUBDIRECTORY(InfrastructureManagement)
 ADD_SUBDIRECTORY(MarkerManagement)
 ADD_SUBDIRECTORY(Messaging)
 ADD_SUBDIRECTORY(MeteoDataManagement)
@@ -5,10 +5,10 @@

 #include <string>
 #include <ddsgen_export.h>
+#include <QMetaMethod>

 // Forward declarations for Qt types used in getMethod
 class QObject;
-class QMetaMethod;

 // Forward declaration for NGL logger
 namespace NGL {
@@ -9,16 +9,28 @@
 */

 #ifdef BUILD_RTI
-// RTI DDS is available - include the real implementation
-#include <Lts/DDS/Generic/generic_data_reader.h>
+// RTI DDS is available - include the real implementation from RTI headers
+// DataReader is already defined in <dds/sub/subfwd.hpp> with signature:
+// template <typename T, template <typename Q> class DELEGATE = dds::sub::detail::DataReaderImpl>
+// class DataReader;
 #else
 // BUILD_RTI=OFF: Provide minimal stub definitions

 namespace dds {
 namespace sub {
+namespace detail {
+
+// Dummy delegate class to serve as default template parameter
+template<typename Q>
+class DataReaderImpl {
+    // Empty stub implementation
+};
+
+} // namespace detail

 // Forward declaration stub for DataReader
-template<typename T>
+// Must match RTI 7.7 signature for compatibility
+template<typename T, template <typename Q> class DELEGATE = detail::DataReaderImpl>
 class DataReader {
 public:
    // Minimal stub interface - add methods as needed by the codebase
@@ -91,7 +91,7 @@ public:
      , m_exerciseId(std::nullopt)
      , m_phaseId(std::nullopt)
      , m_size(0)
-      , m_fileStatus(FileStatus_Valid)
+      , m_fileStatus(FileStatus::Valid)
      , m_fileCategory(FileCategory::Global)
      , m_fileType(FileType::Unknown)
      , m_isTemplate(false)
@@ -121,7 +121,7 @@ public:
  FileCategory fileCategory() const { return m_fileCategory; }
  FileType fileType() const { return m_fileType; }
  bool isTemplate() const { return m_isTemplate; }
-  bool isDeleted() const { return m_fileStatus == FileStatus_Deleted; }
+  bool isDeleted() const { return m_fileStatus == FileStatus::Deleted; }
  bool isHidden() const { return m_hidden; }
  bool isUsedBy() const { return m_used; }
  std::string usedBy() const { return m_usedBy; }