Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules

Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/CMakeLists.txt

@@ -9,7 +9,8 @@
 ADD_SUBDIRECTORY(Common)
 ADD_SUBDIRECTORY(SymbologyXML)
 ADD_SUBDIRECTORY(Symbology)
-# ADD_SUBDIRECTORY(ElevationMap)
+# ElevationMapManager compatibility stub (src/ + include/ scaffolding) needed by LtsElevation
+ADD_SUBDIRECTORY(ElevationMap)
 
 # Remaining subdirectories not yet migrated:
 # ADD_SUBDIRECTORY(SymbologyGui)

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/ElevationMap/CMakeLists.txt

@@ -0,0 +1,37 @@
+#
+# $Id$
+# $HeadURL$
+# $Author$
+#
+
+# The GDAL-based ElevationMap module is not yet migrated to Qt6 (see the
+# commented-out entries in ../CMakeLists.txt). LtsElevation still needs an
+# ElevationMapManager, so build the compatibility stub that lives in the
+# src/ + include/ scaffolding (same API as the Qt5 class, no GDAL).
+NGL_ADD_LIBRARY(WS AAR HLA SV situationMapElevationMap SHARED
+  ${CMAKE_SOURCE_DIR}/src/Viewer/SituationMap/ElevationMap/elevation_map_manager.cpp
+  # The header lives in include/Viewer/SituationMap/ElevationMap, apart from
+  # the cpp. AUTOMOC only mocs headers that are target sources (or sit next
+  # to one); MOC_INCLUDES merely feeds moc's own -I flags, not header
+  # discovery. Listed explicitly, otherwise the vtable/staticMetaObject are
+  # undefined and the link of libsituationMapElevationMap.so fails.
+  ${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h
+)
+
+# The stub's ElevationMapManager is a Q_OBJECT class; without AUTOMOC the
+# moc symbols (staticMetaObject/vtable) are missing and the link of
+# libsituationMapElevationMap.so fails, cascading to every target that
+# links it (same pattern as LtsSessionDataDds).
+set_target_properties(situationMapElevationMap PROPERTIES AUTOMOC ON)
+
+NGL_TARGET_INCLUDE_DIRECTORIES(situationMapElevationMap
+  PUBLIC
+    # The stub cpp does #include "elevation_map_manager.h" - it lives in
+    # include/Viewer/SituationMap/ElevationMap/, not next to the source.
+    ${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap
+    ${CMAKE_SOURCE_DIR}/include
+)
+NGL_TARGET_LINK_LIBRARIES(situationMapElevationMap
+  PUBLIC
+    Qt6::Core
+)

qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h

@@ -27,19 +27,19 @@ AdvancedSymbology::Role roleToRole(const PARTICIPANT_ROLE_TYPE role)
 {
   switch (role.underlying())
   {
-  case ParticipantManagement::Role_def::Unknown:
+  case ParticipantManagement::Role::Unknown:
     return AdvancedSymbology::Role::Unknown;
-  case ParticipantManagement::Role_def::Friend:
+  case ParticipantManagement::Role::Friend:
     return AdvancedSymbology::Role::Friend;
-  case ParticipantManagement::Role_def::Neutral:
+  case ParticipantManagement::Role::Neutral:
     return AdvancedSymbology::Role::Neutral;
-  case ParticipantManagement::Role_def::Enemy:
+  case ParticipantManagement::Role::Enemy:
     return AdvancedSymbology::Role::HostileFaker;
-  case ParticipantManagement::Role_def::Pending:
+  case ParticipantManagement::Role::Pending:
     return AdvancedSymbology::Role::Pending;
-  case ParticipantManagement::Role_def::AssumedFriend:
+  case ParticipantManagement::Role::AssumedFriend:
     return AdvancedSymbology::Role::AssumedFriend;
-  case ParticipantManagement::Role_def::Suspect:
+  case ParticipantManagement::Role::Suspect:
     return AdvancedSymbology::Role::SuspectJoker;
   } // switch