Removes deleted files

- Document Release 2 scope: 37 targets
- AP3/AP4/AP9 modules + Release 1 (TetraIF/Z/Lts)
- Build instructions with aqt install-qt
- DEB package list (5 packages)
- Known absent: Krypto module
- Docker image: guez-release2:2.0

.gitignore

@@ -9,3 +9,21 @@ fix_qt6_gui_deps.py
 fix_rti_conditionals.py
 fix_target_checks.py
 build
+__pycache__/
+add_logger_bootstrap_include.py
+aqtinstall.log
+ces_fix.py
+ces_pass2.py
+fix_additem_enum.py
+fix_broken_includes.py
+fix_enum_as_int.py
+fix_enums.py
+fix_logger_init.py
+fix_logger_remnant.py
+fix_members.py
+fix_mlogger.py
+fix_pdm_combo.py
+fix_sco.py
+restore_underlying.py
+../../restore_ppm_dtc.py
+*.py

ci/Dockerfile.ci

@@ -27,9 +27,11 @@ RUN apt-get update && \
       libpq-dev \
       libbz2-dev \
       libboost-all-dev \
+      libglib2.0-dev \
       libxml2-dev \
       libssl-dev \
-      libcurl4-openssl-dev && \
+      libcurl4-openssl-dev \
+      libkf6texttemplate-dev && \
     rm -rf /var/lib/apt/lists/*
 
 # Install Qt 6.10.2 via aqtinstall
@@ -52,6 +54,7 @@ RUN git clone --depth 1 https://github.com/MEONMedical/Log4Qt.git /tmp/log4qt &&
           -DBUILD_SHARED_LIBS=ON .. && \
     cmake --build . -- -j$(nproc) && \
     cmake --install . && \
+    sed -i 's/return (mThreshold <= level);/return (mThreshold.load() <= level);/' /usr/local/include/log4qt/appenderskeleton.h && \
     rm -rf /tmp/log4qt
 
 # Create minimal CMake config for Log4Qt
@@ -81,8 +84,27 @@ ENV QT_QPA_PLATFORM=offscreen
 # Configure git for containerized environments
 RUN git config --global --add safe.directory "*"
 
-# Setup RTI Connext license (developer license file)
-COPY rti_license.dat /root/rti_license.dat
-ENV RTI_LICENSE_FILE=/root/rti_license.dat
+# Configure internal SCM repository for external dependencies
+RUN echo "deb [trusted=yes] http://remote-repo.sl.defence-elec.de:8081/repository/external-rpms/general/ ./" > /etc/apt/sources.list.d/scm-external.list
+
+# Install external dependencies from DEB packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libavs-dev \
+    libarcgis-dev \
+    libbuildingmodels-dev \
+    libgeographiclib-dev \
+    libschusstafel-dev \
+    libdtentity-dev \
+    librti-connext-dds-7.7.0-dev \
+    libtmsif-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Setup RTI Connext license (included in DEB package)
+ENV RTI_LICENSE_FILE=/opt/rti_connext_dds-7.7.0/rti_license.dat
+ENV RTI_CONNEXT_HOME=/opt/rti_connext_dds-7.7.0
+ENV NDDSHOME=/opt/rti_connext_dds-7.7.0
+ENV PATH=/opt/rti_connext_dds-7.7.0/bin:$PATH
+ENV LD_LIBRARY_PATH=/opt/rti_connext_dds-7.7.0/lib/x64Linux4gcc7.3.0:$LD_LIBRARY_PATH
+ENV CMAKE_PREFIX_PATH=/opt/rti_connext_dds-7.7.0/lib/cmake:$CMAKE_PREFIX_PATH
 
 WORKDIR /workspace

qt6-after/qt6-migrated-legatus/.envrc

@@ -1,4 +1,4 @@
 # export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline"
-export MIGRATE_PIPELINE_ROOT="/home/nkana/repo/qt6-migration-pipeline"
+export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline"
 export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
+export LC_ALL=C.UTF-8

qt6-after/qt6-migrated-legatus/.gitignore

@@ -14,3 +14,4 @@ build/
 build2/
 .envrc
 build4
+deb_build_tmp

qt6-after/qt6-migrated-legatus/BUILD_STATUS_REPORT.md

@@ -1,137 +0,0 @@
-# Build Status Report - Qt6 Migration
-
-**Date:** $(date +%Y-%m-%d)
-**Branch:** feature/qt6-migration-basis-modules
-**Merge Target:** origin/feature/migrate-and-test-DDS-targets
-
-## Executive Summary
-
-The Qt6 migration for DDS and Proxies modules is **technically complete**, but full build validation is blocked by pre-existing errors in Services modules that are unrelated to the migration work.
-
-## Build Status by Module Group
-
-### ✅ Group 1: Core Libraries (Z-Module)
-**Status:** BUILDING SUCCESSFULLY
-- libnglcoreapplication.so
-- libngldb.so
-- libngltools.so
-- libnglsettings.so
-- libNGLLogger.so
-- libLtsUtilsCore.so
-- libLtsCoordTrans.so
-- libLtsCommandLineParser.so
-- libcodegen_base.so
-
-**Qt6 Migration:** ✅ Complete
-
-### ✅ Group 2: DDS Core Libraries
-**Status:** BUILDING SUCCESSFULLY
-- libddscore.so
-- libddsfts.so
-- libddsftccore.so
-- libddsQoS.so
-- libddsconnector.so
-- libddsgen.so
-
-**Qt6 Migration:** ✅ Complete
-**Applied Fixes:**
-1. Added `readAlive(TopicType& data)`, `takeAlive(TopicType& data)`, `takeDisposed(TopicType& data)` wrapper methods to GenericDtc template classes
-2. Fixed `setSubscriberCallback` signature (void→bool, added override keyword)
-3. Added `using BaseClass::SubscriberCallback` declaration to expose type alias
-4. Fixed `Core::getLogger` namespace in svc_dtc_impl.cpp.grantlee template
-5. Fixed `Core::getLogger` references in Lts/DDS/FTS/connext.h (9 occurrences)
-
-### ⚠️ Group 3: Services (Pre-existing Errors)
-**Status:** BUILD FAILING - NOT RELATED TO MIGRATION
-
-#### ParticipantManagement
-**Errors:**
-- `ppm_common.cpp:185`: `stateList.at(i)` - stateList is `const int`, not container
-- `ppm_db_impl_custom.cpp`: Missing members in `EquipmentExerciseMapping` struct
-  - `equipmentNumber`, `participantId` not found
-- `ppm_db_impl_custom.cpp`: Undefined symbols `m_query`, `m_bEmitMessageOnError`, `m_lastError`, `getTableName`
-
-**Root Cause:** Generated types in `build4/Lts/Services/ParticipantManagement/` don't match custom implementation code. Requires type definition updates.
-
-#### InfrastructureManagement
-**Errors:**
-- `ism_db_impl_custom.cpp:52`: `ERROR_LOG` not declared in scope
-- `ism_db_impl_custom.cpp`: Missing members `m_query`, `m_bEmitMessageOnError`, `m_lastError`
-- `ism_db_impl_custom.cpp`: `getTableName` ambiguous (needs `DBCommon::` qualifier)
-- `ism_db_impl_custom.cpp`: `MountingPointState.underlying()` - not a class type
-- `ism_db_impl_custom.cpp`: Missing struct members `mountingPointScheduleId`, `structureElementId`, `mountingPointState`
-
-**Root Cause:** Generated types and database interface implementation mismatch.
-
-#### ProjectDataManagement
-**Errors:**
-- `pdm_dtc_impl.cpp`: Compilation errors in DTC implementation
-
-**Root Cause:** Requires separate fix for missing type definitions.
-
-### ⚠️ Group 4: Proxies (Blocked by Dependencies)
-**Status:** BUILD BLOCKED
-- svcBuildings.so - NOT BUILT (depends on broken Services modules)
-
-**Qt6 Migration:** ✅ Code changes complete
-**Blocking Issue:** Cannot build because svcBuildings depends on:
-- svcPpmCommon (ParticipantManagement) - BUILD FAILING
-- svcIsmCommon (InfrastructureManagement) - BUILD FAILING
-- svcPdmClient (ProjectDataManagement) - BUILD FAILING
-
-**Migration Work Completed:**
-- All `include/*/*_dtc.h` stub headers updated to include generated files from `build4/Lts/Proxies/*/`
-- Code generation templates updated for Qt6 compatibility
-- No migration-related errors in Proxies source code
-
-## Merge Conflict Resolution Status
-
-### Resolved Files (8 total):
-1. ✅ `Lts/Common/CodeGen/codegen_simple.py`
-2. ✅ `Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee`
-3. ✅ `Lts/DDS/DTC/generic_dtc.h`
-4. ✅ `Lts/DDS/DTC/generic_dtc_impl.h`
-5. ✅ `Lts/DDS/FTS/connext.h`
-6. ✅ `include/DDS/DTC/generic_dtc.h`
-7. ✅ `include/DDS/DTC/generic_dtc_impl.h`
-8. ✅ `new_docker_build.sh`
-
-**Conflict Strategy:** Preserved Qt6 migration changes from target branch while incorporating DDS test/target improvements from source branch.
-
-## Integration Tests
-
-**Status:** READY TO RUN (once build blockers resolved)
-- Test file: `tests/test_z_proxies_integration.cpp`
-- Test count: 10 integration tests
-- Build script option: `--integration-test`
-- Test pattern: `(test_z_|bld_|tab_|wls_*)`
-
-## Next Steps
-
-### Immediate (Required for Full Build):
-1. **Fix ParticipantManagement types** - Update generated type definitions to match custom implementation
-2. **Fix InfrastructureManagement types** - Align struct definitions with database interface expectations
-3. **Fix ProjectDataManagement** - Resolve DTC implementation errors
-
-### Migration Work (Complete):
-- ✅ DDS core libraries migration
-- ✅ Proxies module code migration
-- ✅ Merge conflict resolution
-- ✅ Integration test framework
-- ✅ Build script enhancements
-
-### Low Priority (Post-Migration):
-- Replace Qt6 Multimedia stub with actual implementation
-- Replace Qt6 Svg stub with libqt6svg6-dev package
-- Clean up stub files after full migration
-
-## Conclusion
-
-The DDS and Proxies migration work is **complete and correct**. The current build failures are **pre-existing issues** in Services modules that require separate investigation and fixes unrelated to the Qt6 migration effort.
-
-**Recommendation:** 
-1. Commit current migration work to preserve progress
-2. Address Services module errors in separate task/branch
-3. Once Services modules build, Proxies module will build automatically
-4. Run integration tests to validate DDS/Proxies interaction
-

qt6-after/qt6-migrated-legatus/CMakeLists.txt

@@ -18,6 +18,10 @@ ENDIF()
 IF(POLICY CMP0072)
   CMAKE_POLICY(SET CMP0072 NEW) # cmake >= 3.11.0 - prefer libOpenGL.so over legacy libGL.so
 ENDIF()
+# Set policy CMP0111 unconditionally - imported targets require location property
+IF(POLICY CMP0111)
+  CMAKE_POLICY(SET CMP0111 NEW)
+ENDIF()
 
 
 IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -40,6 +44,11 @@ MESSAGE(STATUS "LTS Version: ${LTS_VERSION_MAJOR}.${LTS_VERSION_MINOR}.${LTS_VER
 # Enable CTest integration for unit tests
 include(CTest)
 
+# Set RPATH to find libraries in build directory
+SET(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/lib")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib")
+SET(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
+
 function(NGL_ADD_SUBDIR_GUARDED subdir)
   if(MIGRATE_MODULE STREQUAL "")
     add_subdirectory(${subdir})
@@ -82,6 +91,9 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 # (The qt5 legacy has no include/ tree; Lts/ is the real include root.)
 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/Lts)
 include_directories(${CMAKE_SOURCE_DIR}/include)
+# Legacy also used source-root-relative includes (<Lts/Services/<Svc>/logger.h>, ...);
+# the source root must be an include root so those resolve.
+include_directories(${CMAKE_SOURCE_DIR})
 # Include directory for generated export headers
 include_directories(${CMAKE_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/Z/src)
@@ -89,10 +101,28 @@ include_directories(${CMAKE_SOURCE_DIR}/Z/src)
 include_directories(${CMAKE_SOURCE_DIR}/Z/src)
 include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology)
+# <Symbology/...> headers (symbol_dictionary.h, sidc_codec.h, ...) are consumed tree-wide
+# (e.g. AdvancedSymbology/asb_data_plugin_interface.h is pulled into PpmCommon), so the
+# parent dir must be a global root too, not only on the AdvancedSymbology target.
+include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap)
+# Generated SymbologyGui/advancedsymbologygui_export.h lives in the build dir; the source
+# SituationMap root above only covers the source Symbology headers.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Viewer/SituationMap)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Services)
+# Consumers include generated DDS service headers by service-prefixed name
+# (<ParticipantManagement/ppm.hpp>, <GuezNasat/gna_dtc.h>, ...). Those headers
+# live in the per-service BUILD dirs, so the binary Lts/Services ROOT must be
+# visible tree-wide (the per-service build dirs below only satisfy the bare
+# <ppm.hpp> form). Placed right after the source Lts/Services so a header
+# present in both still resolves to the source (binary only supplies the
+# generated headers). This mirrors the legacy <Services/...> form.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Services)
+# Generated DDS headers for Proxies (GuezNasat/gna_dtc.h, ...) live under the binary
+# Lts/Proxies dir; consumers include them by proxy-prefixed name (<GuezNasat/gna_dtc.h>).
+include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies)
 include_directories(${CMAKE_SOURCE_DIR}/include/ProjectDataManagement)
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement)
 include_directories(${CMAKE_SOURCE_DIR}/include/InfrastructureManagement)
@@ -120,6 +150,9 @@ include_directories(${CMAKE_SOURCE_DIR}/include/SituationReplay)
 # is added (same shape as FileManagement above, which has no stub tree either).
 include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Evaluations)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat)
+# GuezNasat's generated export header (svcgnacommon_export.h) lives in the build dir;
+# logger.h includes it by bare name, so the build dir must be visible tree-wide.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies/GuezNasat)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS)
 include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS/QosProfile)
 # Generated DDS headers (BUILD_RTI=ON)
@@ -137,6 +170,9 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
 # directory holding the generated header has to be visible tree-wide. The directory contains
 # only that generated header, so appending it cannot shadow an existing include.
 include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsSettings)
+# LtsUtilsGui ConnectDialog's generated ltsutilsguiconnectdialog_export.h is included by bare
+# name from connect_dialog.h / connect_dialog_nt.h; same tree-wide visibility as the dirs above.
+include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog)
 # DDSConnector's generated ddsconnector_export.h is included by bare name from
 # dds_connector.h and pub_sub_base.h, and reaches targets (the AES ModuleTests) that include
 # DDSConnector headers without linking ddsconnector. Same shape as LtsUtilsSettings above: the
@@ -192,6 +228,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Lts)
 IF(BUILD_RTI)
   # Define BUILD_RTI as preprocessor macro for all targets
   ADD_COMPILE_DEFINITIONS(BUILD_RTI)
+  # External (RTI) DDS is available: compile the BUILD_WITH_EXTERNAL_DDS code paths
+  # (used by 73 guards across plugins, e.g. MrkCommon's MarkerManagementDialogModel /
+  # CustomViewMarker). Legacy always compiled this DDS code; the flag is a migration
+  # option that was never wired into CMake, so its absence silently dropped the
+  # definitions while the unguarded class declarations still referenced them (link error).
+  ADD_COMPILE_DEFINITIONS(BUILD_WITH_EXTERNAL_DDS)
 ENDIF()
 OPTION(BUILD_ARCGIS "Build ArcGIS SDK dependent modules" ON)
 OPTION(BUILD_FILTERMANAGEMENT "Build FilterManagement plugins (temporarily disabled for migration)" OFF)
@@ -221,17 +263,28 @@ IF(WIN32)
 ELSE()
   # Linux: ArcGIS SDK Pfad konfigurieren (nur wenn BUILD_ARCGIS=ON)
   IF(BUILD_ARCGIS)
-    # Use environment variable ARCGIS_ROOT if set, otherwise default to /workspace/external/... (Docker) or host path
+    # Use environment variable ARCGIS_ROOT if set, otherwise check relative to source dir, then Docker/host paths
     IF(DEFINED ENV{ARCGIS_ROOT})
       SET(ARCGIS_SDK_DIR "$ENV{ARCGIS_ROOT}" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+    ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
+      SET(ARCGIS_SDK_DIR "${CMAKE_SOURCE_DIR}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+    ELSEIF(DEFINED ENV{DOCKER_MOUNT_ROOT})
+      SET(ARCGIS_SDK_DIR "$ENV{DOCKER_MOUNT_ROOT}/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+    ELSEIF(EXISTS "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
+      SET(ARCGIS_SDK_DIR "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
     ELSEIF(EXISTS "/workspace/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk")
       SET(ARCGIS_SDK_DIR "/workspace/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
     ELSE()
-      SET(ARCGIS_SDK_DIR "/repo/external/ArcGIS/MapsSDK_Qt_300.0.0/ArcGIS_Maps_SDK_Qt_300.0.0/qt300.0.0/sdk" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
+      SET(ARCGIS_SDK_DIR "" CACHE STRING "ArcGIS Runtime SDK for Qt directory")
     ENDIF()
     IF(EXISTS "${ARCGIS_SDK_DIR}")
       LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}")
       MESSAGE(STATUS "ArcGIS SDK found at: ${ARCGIS_SDK_DIR}")
+      # arcgisversion.h (a custom RME file in the SDK include dir) is pulled in via
+      # <SituationMap/Map/layer_factory.h> by many non-ArcGIS plugin targets (e.g.
+      # IsmResGuiPlugin); the ArcGIS::ArcGIS target include dir does not reach them, so
+      # expose the SDK include dir tree-wide when the SDK is present.
+      include_directories(${ARCGIS_SDK_DIR}/include)
     ELSE()
       MESSAGE(WARNING "ArcGIS SDK not found at: ${ARCGIS_SDK_DIR}")
     ENDIF()
@@ -242,12 +295,6 @@ ENDIF()
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 INCLUDE(FindLibraryWithDebug)
 
-# Find ArcGIS SDK globally if BUILD_ARCGIS is enabled
-# This creates ArcGIS::ArcGIS target for all modules to use
-IF(BUILD_ARCGIS)
-  FIND_PACKAGE(ArcGIS REQUIRED)
-ENDIF()
-
 ENABLE_TESTING()
 INCLUDE(CTest)
 CONFIGURE_FILE(CTestCustom.ctest ${CMAKE_BINARY_DIR}/CTestCustom.ctest COPYONLY)
@@ -297,7 +344,7 @@ endif()
 # server uses QWebSocketServer; LtsWebSocket/httq enable their real websocket
 # paths via QT6_WEBSOCKETS_AVAILABLE when the module is found).
 find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network
-  Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL QUIET)
+  Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL OpenGLWidgets QUIET)
 
 if(Qt6_FOUND)
   # Skip GUI find_package - it fails without OpenGL. We'll create manual targets below.
@@ -307,7 +354,7 @@ endif()
 
 # If Qt6 not found yet, try with full component list including OpenGL
 if(NOT Qt6_FOUND)
-  find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network OpenGL PrintSupport
+  find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network OpenGL OpenGLWidgets PrintSupport
     Multimedia Sql Svg SerialPort Test UiTools WebSockets WebEngineCore WebEngineWidgets
     Widgets Xml Positioning QUIET)
   if(Qt6_FOUND AND OpenGL_FOUND)
@@ -327,6 +374,14 @@ if(NOT TARGET Qt6::Core)
   find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
 endif()
 
+# Qt State Machine (QState/QStateMachine) was moved out of QtGui in Qt6 into the
+# separate "Qt State Machine" add-on (the qtscxml package). In Qt5 the state
+# machine classes lived inside QtGui/QtCore, so the ExerciseManagement state
+# machines (exercise_state_base/exercise_state_machine) compiled without an
+# explicit StateMachine dependency. Probe for the module now; if present the
+# affected targets link Qt6::StateMachine (guarded per-target below).
+find_package(Qt6 6.2 COMPONENTS StateMachine QUIET)
+
 # Create imported targets for all available Qt6 libraries
 # Use Qt6 installation path from find_package or fall back to system paths
 if(Qt6Core_DIR)
@@ -397,6 +452,30 @@ if(EXISTS "${QT6_LIB_DIR}/libQt6Widgets.so.6")
   message(STATUS "Manually configured Qt6 Widgets target")
 endif()
 
+# Qt6::OpenGL - create manual target if not found (QOpenGLPaintDevice, used by ArcGIS SDK)
+if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6")
+  add_library(Qt6::OpenGL SHARED IMPORTED)
+  set_target_properties(Qt6::OpenGL PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGL.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtGui;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core"
+  )
+  message(STATUS "Manually configured Qt6 OpenGL target")
+endif()
+
+# Qt6::OpenGLWidgets - create manual target if not found
+# (QOpenGLWidget, used by the ArcGIS SDK MapGraphicsView/SceneGraphicsView objects;
+#  Qt6 splits QOpenGLWidget into its own libQt6OpenGLWidgets.so)
+if(NOT TARGET Qt6::OpenGLWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6")
+  add_library(Qt6::OpenGLWidgets SHARED IMPORTED)
+  set_target_properties(Qt6::OpenGLWidgets PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWidgets;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets"
+  )
+  message(STATUS "Manually configured Qt6 OpenGLWidgets target")
+endif()
+
 # Qt6::Sql - create manual target if not found
 if(NOT TARGET Qt6::Sql AND EXISTS "${QT6_LIB_DIR}/libQt6Sql.so.6")
   add_library(Qt6::Sql SHARED IMPORTED)
@@ -502,6 +581,30 @@ if(NOT TARGET Qt6::SerialPort)
   message(STATUS "Created stub target for Qt6::SerialPort (library not available)")
 endif()
 
+# Qt6::WebEngineCore - real imported target if the library exists (stub below otherwise).
+# The stub carries no library, so targets linking it (e.g. SmoSystemMonitorGuiPlugin)
+# fail --no-undefined on QWebEngine* symbols.
+if(NOT TARGET Qt6::WebEngineCore AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6")
+  add_library(Qt6::WebEngineCore SHARED IMPORTED)
+  set_target_properties(Qt6::WebEngineCore PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebEngineCore;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
+  )
+  message(STATUS "Manually configured Qt6 WebEngineCore target")
+endif()
+
+# Qt6::WebEngineWidgets - real imported target if the library exists.
+if(NOT TARGET Qt6::WebEngineWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineWidgets.so.6")
+  add_library(Qt6::WebEngineWidgets SHARED IMPORTED)
+  set_target_properties(Qt6::WebEngineWidgets PROPERTIES
+    IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebEngineWidgets.so.6"
+    INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebEngineWidgets;${QT6_INC_DIR}"
+    INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets;Qt6::WebEngineCore"
+  )
+  message(STATUS "Manually configured Qt6 WebEngineWidgets target")
+endif()
+
 # Stub Qt6::WebEngineCore target if not available (needed by thp_viewer)
 if(NOT TARGET Qt6::WebEngineCore)
   add_library(Qt6::WebEngineCore INTERFACE IMPORTED)
@@ -621,6 +724,12 @@ endif()
 
 MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}, GUI available: ${QT6_GUI_AVAILABLE}")
 
+# Find ArcGIS SDK after Qt6 is configured
+# This creates ArcGIS::ArcGIS target for all modules to use
+IF(BUILD_ARCGIS)
+  FIND_PACKAGE(ArcGIS REQUIRED)
+ENDIF()
+
 #
 # RTI Connext DDS - manuelle Konfiguration da keine CMake Config Files vorhanden
 #
@@ -628,10 +737,15 @@ IF(BUILD_RTI)
   # Support environment variable override, otherwise use relative path from repo root
   IF(DEFINED ENV{DDS_PATH})
     SET(RTI_INSTALL_DIR "$ENV{DDS_PATH}" CACHE PATH "RTI Connext DDS installation directory")
+  ELSEIF(DEFINED ENV{DOCKER_MOUNT_ROOT})
+    # Use DOCKER_MOUNT_ROOT environment variable if set (supports both /repo and /workspace)
+    SET(RTI_INSTALL_DIR "$ENV{DOCKER_MOUNT_ROOT}/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
   ELSE()
-    # In Docker container: /workspace/external/rti_connext_dds-7.7.0
+    # In Docker container: /repo/external/rti_connext_dds-7.7.0 (current) or /workspace/external/rti_connext_dds-7.7.0 (old)
     # On host: ${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0
-    IF(EXISTS "/workspace/external/rti_connext_dds-7.7.0")
+    IF(EXISTS "/repo/external/rti_connext_dds-7.7.0")
+      SET(RTI_INSTALL_DIR "/repo/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
+    ELSEIF(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")
@@ -686,6 +800,26 @@ IF(BUILD_RTI)
     # reach the AutogenInfo MOC_INCLUDES.
     SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Common)
 
+    # The TrainingAreaBase tab plugins (tabPluginHla / tabPluginWlsTetra /
+    # tabPluginDebugJsonDir / ...) declare Q_INTERFACES(TrainingAreaBase::Plugin::Plugin)
+    # and include <TrainingAreaBase/tab_plugin_interface.h>. That include dir
+    # (Lts/Proxies) is only a target-level INTERFACE include of tabPluginInterface and
+    # is NOT part of the global include_directories that reach the AutogenInfo
+    # MOC_INCLUDES, so moc fails with "Undefined interface". Add the Lts/Proxies root
+    # explicitly so moc can resolve the interface. Must be set at root scope - subdir
+    # appends do not reach the AutogenInfo MOC_INCLUDES.
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Proxies)
+
+    # Designer plugins (ltswidgetsplugin) declare Q_INTERFACES(QDesignerCustomWidgetInterface)
+    # and include <QtUiPlugin/QDesignerCustomWidgetInterface>. That interface's
+    # Q_DECLARE_INTERFACE lives in the Qt6 QtUiPlugin module, which moc cannot resolve
+    # without the Qt6 parent include dir (it is only a target-level INTERFACE include of
+    # Qt6::UiTools and does not reach the global AutogenInfo MOC_INCLUDES). Add Qt6::Core's
+    # interface include dirs (which expose the <QtModule>/header root) so moc finds the
+    # interface. Must be set at root scope.
+    get_target_property(_qt6_autmoc_incs Qt6::Core INTERFACE_INCLUDE_DIRECTORIES)
+    SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${_qt6_autmoc_incs})
+
     # IMPORTED Targets für RTI Libraries erstellen
     # Debug und Release Varianten korrekt konfigurieren
     FOREACH(lib nddsc nddscore nddscpp nddscpp2 nddsctesthelpers)

qt6-after/qt6-migrated-legatus/CTEST-INTEGRATION-STATUS.md

@@ -1,294 +0,0 @@
-# CTest Integration Status - Qt6 Migration
-
-**Project:** qt-migration-legatus  
-**Branch:** showcase/unittest-and-validate-step-integration-in-lts-svc-s  
-**Last Updated:** 2026-09-17  
-**Build Configuration:** BUILD_RTI=ON, Qt6, GCC 15
-
----
-
-## Executive Summary
-
-✅ **92% Test Success Rate** (427/463 tests passing)  
-✅ **All 7 Success Criteria Met**  
-✅ **BUILD_RTI=ON Compilation Working**  
-✅ **CTest Integration Complete**
-
----
-
-## Success Criteria Verification
-
-| # | Criterion | Status | Notes |
-|---|-----------|--------|-------|
-| 1 | Qt6 build succeeds | ✅ PASS | No Qt5 targets linked |
-| 2 | CTest runs successfully | ✅ PASS | 92% pass rate (427/463) |
-| 3 | Tests registered with CTest | ✅ PASS | 463 tests discovered |
-| 4 | BUILD_RTI=ON compilation | ✅ PASS | Generated headers + stubs working |
-| 5 | No Qt5 targets linked | ✅ PASS | All targets use Qt6 |
-| 6 | Generated outputs in build tree | ✅ PASS | `${CMAKE_BINARY_DIR}/Lts/Services/` |
-| 7 | All 7 LTS services present | ✅ PASS | See Services section below |
-
----
-
-## Build Configuration
-
-### CMake Options
-```bash
-cmake -G "Unix Makefiles" \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DBUILD_RTI=ON \
-  -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-  ..
-```
-
-### Environment
-- **Qt Version:** Qt6 (all targets)
-- **Compiler:** GCC 15
-- **Test Framework:** Google Test (gtest_discover_tests)
-- **Headless Testing:** QT_QPA_PLATFORM=offscreen
-
----
-
-## Test Results Summary
-
-### Overall Statistics
-```
-Total Tests:    463
-Passed:         427 (92%)
-Failed:           9 (2%)
-Not Run:         27 (6%)
-```
-
-### Test Executables Status
-
-| Executable | Tests | Status | Notes |
-|------------|-------|--------|-------|
-| migration_tests | 362 | ✅ Running | Google Test, all passing |
-| test_qt6_api_migrations | 12 | ⚠️ 1 Failed | QStringView pointer comparison |
-| test_qt6_compatibility | 12 | ✅ Passing | Qt6 API compatibility |
-| test_item | 12 | ✅ Passing | LtsTimelineClassic excluded |
-| test_passiveeventcontainer | 12 | ✅ Passing | LtsTimelineClassic excluded |
-| test_eventdelegate | 12 | ✅ Passing | LtsTimelineClassic excluded |
-| BuildRTIGuards | 4 | ⚠️ 2 Failed | RTI detection logic |
-| ExportHeaders | 4 | ⚠️ 4 Failed | Export header paths |
-| CppTopicGeneratorGrantleeTest | 2 | ⚠️ 2 Failed | Grantlee template loading |
-| ddsGenericDataTests | 9 | ❌ Not Run | DDS executable not built |
-| ddsDataTopicTests | 9 | ❌ Not Run | DDS executable not built |
-| ddsFunctionTopicTests | 9 | ❌ Not Run | DDS executable not built |
-| aes_*_tests | 18 | ❌ Not Run | AES executables not built |
-| GrantleeParserSmoke | 1 | ❌ Not Run | Stub test infrastructure |
-
----
-
-## Known Issues (Non-Critical)
-
-### 0. Buildings Include Directory Warning
-**Issue:** `cc1plus: warning: .../build4/Lts/Services/Buildings: No such file or directory`  
-**Location:** CMake cache (legacy include path)  
-**Impact:** Cosmetic warning only, no build impact  
-**Status:** Harmless warning, does not affect build or tests
-
-### 1. Qt6ApiMigrations.QStringViewBasic Failure
-**Issue:** Pointer comparison with QStringView not guaranteed  
-**Location:** `tests/test_qt6_api_migrations.cpp`  
-**Impact:** Test infrastructure issue, not migration bug  
-**Status:** Accepted limitation
-
-### 2. BuildRTIGuards Failures (2 tests)
-**Issue:** Test expects RTI unavailable, but BUILD_RTI=ON  
-**Location:** `tests/test_build_rti_guards.cpp`  
-**Impact:** Test logic mismatch with build configuration  
-**Status:** Expected behavior with BUILD_RTI=ON
-
-### 3. ExportHeaders Failures (4 tests)
-**Issue:** Tests search for export headers in incorrect paths  
-**Location:** `tests/test_export_headers.cpp`  
-**Impact:** Test path configuration, not actual missing headers  
-**Status:** Test infrastructure issue
-
-### 4. CppTopicGeneratorGrantleeTest Failures (2 tests)
-**Issue:** Grantlee template loading errors  
-**Location:** `tests/test_cpp_topic_generator_grantlee.cpp`  
-**Impact:** Grantlee integration test infrastructure  
-**Status:** Test infrastructure issue
-
-### 5. DDS Tests Not Run (27 tests)
-**Issue:** DDS test executables not built in current configuration  
-**Location:** `tests/dds/` directory  
-**Impact:** DDS tests excluded from migration_tests target  
-**Status:** Expected - DDS requires separate build configuration
-
----
-
-## Resolved Issues
-
-### BUILD_RTI=ON Header Generation ✅
-
-#### pdm_types.h
-- **Location:** `build4/Lts/Services/ProjectDataManagement/pdm_types.h`
-- **Include Path:** `${CMAKE_BINARY_DIR}/Lts/Services`
-- **Status:** Generated and found correctly
-
-#### aes_enums.hpp
-- **Location:** `include/AreaEffectSimulation/aes_enums.hpp.stub`
-- **Type:** Stub file (IDL generation not available)
-- **Enums:** `SymbolAppearance`, `SymbolVisibility`
-- **Status:** Created and integrated
-
-#### flm_enums.hpp
-- **Location:** `include/FileManagement/flm_enums.hpp.stub`
-- **Type:** Stub file (used when BUILD_RTI=ON)
-- **Status:** Present and used correctly
-
-#### Codegen Pattern
-- FileManagement CMakeLists.txt fixed: CONFIGURE_FILE for stub only when BUILD_RTI=OFF
-- Include directory order fixed: NGL_TARGET_INCLUDE_DIRECTORIES before CODEGEN_IDL_SVC
-- Matches ProjectDataManagement pattern for consistent header generation
-
-#### Other Enum Stubs
-- ✅ `ppm_enums.hpp.stub` (ParticipantManagement)
-- ✅ `ism_enums.hpp.stub` (InfrastructureManagement)
-- ✅ `exm_enums.hpp.stub` (ExerciseManagement)
-- ✅ `flm_enums.hpp.stub` (FileManagement)
-- ✅ `aes_enums.hpp.stub` (AreaEffectSimulation)
-
-### Include Path Fixes ✅
-- Added `${CMAKE_BINARY_DIR}/Lts/Services` to include directories
-- Fixed export header includes to use parent directory pattern
-- Added NGLLogger and IsmShared include paths
-- Fixed TrainingAreaBaseOC include directory
-- Fixed LtsTimelineClassic include path: `${CMAKE_BINARY_DIR}` → `${CMAKE_SOURCE_DIR}`
-- Removed non-existent Buildings include directory from root CMakeLists.txt
-
-### Qt6 API Compatibility ✅
-- Fixed `QString("...")` → `QStringLiteral("...")` in all test files
-- Fixed `QChar('A')` → `QChar(u'A')` for Qt6
-- Fixed `QString::count()`, `QString::values()`, `QString::contains()` with string literals
-- Fixed `QStringList{"test"}` → `QStringList{QStringLiteral("test")}`
-
-### Test Framework Conflict ✅
-- **Issue:** migration_tests linked both Qt Test and Google Test
-- **Fix:** Removed `Qt6::Test` from `target_link_libraries`
-- **Excluded:** `test_lts_app_descriptor.cpp` (uses QTEST_MAIN)
-
-### LtsTimelineClassic Exclusions ✅
-**13 test files excluded** when LtsTimelineClassic target not available:
-- test_event.cpp, test_eventdelegate.cpp, test_eventgraphic.cpp
-- test_eventlist.cpp, test_eventtools.cpp, test_item.cpp
-- test_passiveeventcontainer.cpp, test_testtimelinemodel.cpp
-- test_timelineheaderview.cpp, test_timelinemodel.cpp
-- test_timelinewidget.cpp, test_abstracttimelinemodel.cpp
-- test_lts_app_descriptor.cpp (Qt Test conflict)
-
-### Headless Testing ✅
-- Added `QT_QPA_PLATFORM=offscreen` to `docker_build.sh`
-- Resolves "no Qt platform plugin could be initialized" error
-
----
-
-## LTS Services Status
-
-All 7 required services are present and building:
-
-| # | Service | CMakeLists.txt | Status |
-|---|---------|----------------|--------|
-| 1 | AlarmManagement | `Lts/Services/AlarmManagement/CMakeLists.txt` | ✅ |
-| 2 | AreaEffectSimulation | `Lts/Services/AreaEffectSimulation/CMakeLists.txt` | ✅ |
-| 3 | ExerciseManagement | `Lts/Services/ExerciseManagement/CMakeLists.txt` | ✅ |
-| 4 | FileManagement | `Lts/Services/FileManagement/CMakeLists.txt` | ✅ |
-| 5 | InfrastructureManagement | `Lts/Services/InfrastructureManagement/CMakeLists.txt` | ✅ |
-| 6 | ParticipantManagement | `Lts/Services/ParticipantManagement/CMakeLists.txt` | ✅ |
-| 7 | ProjectDataManagement | `Lts/Services/ProjectDataManagement/CMakeLists.txt` | ✅ |
-
----
-
-## File Changes Summary
-
-### CMake Configuration
-- `CMakeLists.txt` - Added `include(CTest)`, fixed include directories, added all service paths
-- `tests/CMakeLists.txt` - Test configuration, gtest_discover_tests, exclusions
-- All service `CMakeLists.txt` files - Added `CONFIGURE_FILE` commands for enum stubs
-
-### Test Files Fixed
-- `tests/test_item.cpp` - Qt6 QString fixes
-- `tests/test_lts_app_descriptor.cpp` - QString assignment fix
-- `tests/test_ltswidgets_qt6.cpp` - Multiple QString fixes
-- `tests/test_migration_stubs.cpp` - Namespace fixes, duplicate include removed
-- `tests/test_passiveeventcontainer.cpp` - QString literal fixes
-- `tests/test_qt6_api_migrations.cpp` - QStringLiteral throughout
-- `tests/test_qt6_compatibility.cpp` - QChar and QString fixes
-- `tests/test_symbology_xml.cpp` - Multiple QString/method call fixes
-- `tests/test_testtimelinemodel.cpp` - QStringList fixes
-- `tests/test_taboc_dtc.cpp` - Include path fix
-- `tests/test_pdm_dtc.cpp` - Include path fix
-- 14× `tests/test_*_enums.cpp` - Include path fixes
-
-### Stub Files Created
-- `include/ParticipantManagement/ppm_enums.hpp.stub`
-- `include/InfrastructureManagement/ism_enums.hpp.stub`
-- `include/ExerciseManagement/exm_enums.hpp.stub`
-- `include/FileManagement/flm_enums.hpp.stub`
-- `include/AreaEffectSimulation/aes_enums.hpp.stub`
-- `Lts/Common/CodeGen/GrantleeParserSmoke.h` (stub header)
-- `Lts/Common/LtsTimelineClassic/ltstimelineclassic_export.h` (stub export header)
-
-### Build Configuration
-- `docker_build.sh` - Added `QT_QPA_PLATFORM=offscreen` for headless testing
-
----
-
-## CTest Integration
-
-### Configuration
-```cmake
-# Main CMakeLists.txt
-include(CTest)
-enable_testing()
-
-# tests/CMakeLists.txt
-gtest_discover_tests(migration_tests)
-```
-
-### Execution
-```bash
-cd build4 && ctest --output-on-failure
-```
-
-### Path Configuration
-- **Working Directory:** `/home/torsten/sandbox/qt6-migration-pipeline`
-- **Docker Container Path:** `/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus`
-- **Test Executables:** `build4/bin/<Configuration>/`
-
----
-
-## Recommendations
-
-### For Production Migration
-1. ✅ Current state is **production-ready** for Qt6 migration
-2. ✅ 92% test pass rate exceeds typical CI/CD thresholds
-3. ✅ All critical success criteria met
-4. ℹ️ Remaining failures are test infrastructure issues, not migration bugs
-
-### Optional Improvements
-1. Fix ExportHeaders test paths (low priority)
-2. Update BuildRTIGuards test logic (low priority)
-3. Investigate Grantlee template loading (medium priority)
-4. Build DDS test executables separately (optional)
-
----
-
-## Conclusion
-
-The Qt6 migration for LTS Services is **complete and successful**. All 7 success criteria are met, BUILD_RTI=ON compilation works correctly with generated headers and stub files, and CTest integration is fully functional with 92% test pass rate.
-
-The remaining 36 "failures" consist of:
-- 27 tests not run (DDS/AES executables not built - expected)
-- 9 test infrastructure failures (not Qt6 migration bugs)
-
-**Migration Status: ✅ COMPLETE**
-
----
-
-*Generated: 2026-09-17*  
-*Branch: showcase/unittest-and-validate-step-integration-in-lts-svc-s*  
-*Build: build_full24.log*

qt6-after/qt6-migrated-legatus/DDS_MIGRATION_REPORT.md

@@ -1,116 +0,0 @@
-# DDS Modules Migration Report
-
-## Status: ✅ COMPLETE
-
-The DDS (Data Distribution Service) modules have been successfully migrated to Qt6. All DDS core libraries compile and link successfully.
-
----
-
-## Build Results
-
-### Successfully Built DDS Libraries (GROUP1)
-| Library | Size | Status |
-|---------|------|--------|
-| libddscore.so | 855 KB | ✅ Built |
-| libddsconnector.so | 228 KB | ✅ Built |
-| libddsQoS.so | 88 KB | ✅ Built |
-| libddsfts.so | 182 KB | ✅ Built |
-| libddsftccore.so | 23 KB | ✅ Built |
-| libddsgen.so | 179 KB | ✅ Built |
-
-**Build Progress:** 75% complete before stopping on unrelated pre-existing errors
-
----
-
-## Fixes Applied
-
-### 1. GenericDtc Template Class (`include/DDS/DTC/generic_dtc.h`)
-- **Issue:** `readAlive(TopicType& data)` method signature mismatch with base class
-- **Fix:** Added wrapper methods returning `bool`:
-  - `bool readAlive(TopicType& data)`
-  - `bool takeAlive(TopicType& data)`
-  - `bool takeDisposed(TopicType& data)`
-- **Fix:** Added `using BaseClass::readAlive` declarations to expose base class const overloads
-- **Fix:** Added `using BaseClass::SubscriberCallback` to expose type alias in template class
-
-### 2. GenericDtc Implementation (`include/DDS/DTC/generic_dtc_impl.h`)
-- **Fix:** Implemented the three wrapper methods for `GenericDtcImplSubscriberTemplate`
-
-### 3. Codegen Template (`Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee`)
-- **Issue:** Wrong namespace for logger (`ProjectDataManagement::getLogger`)
-- **Fix:** Changed to `Core::getLogger` with proper namespace include
-
-### 4. Connext Wrapper (`Lts/DDS/FTS/connext.h`)
-- **Issue:** Include path `TrainingAreaBase/logger.h` not found
-- **Fix:** Changed to `<DDS/Core/logger.h>`
-- **Issue:** 9 occurrences of `::TrainingAreaBase::getLogger`
-- **Fix:** Replaced all with `Core::getLogger`
-
-### 5. SetSubscriberCallback Signature (`include/DDS/DTC/generic_dtc.h`)
-- **Issue:** Method signature didn't match pure virtual in base class
-- **Fix:** Changed return type from `void` to `bool`, added `override` keyword
-
----
-
-## Files Modified
-
-| File | Changes |
-|------|---------|
-| `include/DDS/DTC/generic_dtc.h` | Added readAlive wrappers, using declarations, fixed setSubscriberCallback |
-| `Lts/DDS/DTC/generic_dtc.h` | Matched include/ version for consistency |
-| `include/DDS/DTC/generic_dtc_impl.h` | Implemented readAlive wrapper methods |
-| `Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee` | Fixed logger namespace |
-| `Lts/DDS/FTS/connext.h` | Fixed logger include and 9 getLogger calls |
-| `new_docker_build.sh` | Fixed install_qt6_packages() scope, added pip3 support |
-
----
-
-## Build Errors (Pre-existing, Unrelated to DDS)
-
-The build stopped at 75% due to **pre-existing errors** in other modules:
-
-### ParticipantManagement Module
-- `DataModification` type not declared (ppm.hpp:161, 122, 129, 141)
-- `StateInformation` type not found (ppm_common.h/cpp)
-- `ProjectDataManagement::VulnerabilityState` not found
-- `ProjectDataManagement::StateChangeOriginator` not found
-
-### ProjectDataManagement Module
-- `TypeClass::eUninitialized` not found
-- Missing type definitions for DataModification, StateInformation
-
-**These errors existed before the DDS migration work and require separate investigation.**
-
----
-
-## Verification
-
-To verify DDS modules build independently:
-```bash
-./new_docker_build.sh --no-group2 --no-group3 --no-group4
-```
-
-This builds only GROUP1 (DDS core libraries) without the modules that have pre-existing errors.
-
----
-
-## Next Steps
-
-1. **DDS Migration:** ✅ Complete - No further work needed
-2. **ParticipantManagement:** Requires separate fix for missing type definitions
-3. **ProjectDataManagement:** Requires separate fix for missing type definitions
-4. **Integration Tests:** Can run DDS tests once pre-existing errors are resolved
-
----
-
-## Related Documentation
-
-- `LTS_PROXIES_MIGRATION_REPORT.md` - Proxies module migration
-- `MIGRATION_SUMMARY_Z_AND_PROXIES.md` - Overall migration summary
-- `tests/test_z_proxies_integration.cpp` - Integration tests (10 test cases)
-
----
-
-**Report Generated:** $(date)
-**Branch:** feature/qt6-migration-basis-modules
-**Merge Commit:** ab29b7b2d (resolved 8 conflict files)

qt6-after/qt6-migrated-legatus/DDS_MIGRATION_STATUS.md

@@ -1,185 +0,0 @@
-# DDS Targets Qt6 Migration Status
-
-## Summary
-All 7 buildable DDS targets compile successfully with Qt6. Runtime test failures are due to external RTI Connext licensing, not code issues.
-
-## Build Status (BUILD_RTI=ON, BUILD_GRANTLEE=ON)
-
-### Docker Build Configuration
-- **Base Image:** ubuntu:26.04 (no prebuilt image)
-- **KTextTemplate:** libkf6texttemplate-dev from apt repositories
-- **Prebuilt Image:** Deleted (qt-migration-builder:latest removed)
-- **Build Script:** `new_docker_build.sh ON --no-prebuilt-image`
-
-### Successfully Compiled Targets (7/7)
-1. **ddscore** (Lts/DDS/Core/) - Core DDS library
-2. **svcCoreClient** (Lts/DDS/Core/) - Core client service
-3. **ddsftccore** (Lts/DDS/FTC/) - Function topic core
-4. **ddsfts** (Lts/DDS/FTS/) - Function topic server
-5. **ddsgen** (Lts/DDS/Generic/) - DDS code generator
-6. **topic_type_plugin** (Lts/DDS/Generic/) - Topic type plugin (INTERFACE)
-7. **ddsQoS** (Lts/DDS/QosProfile/) - QoS profile management
-8. **ddsconnector** (Lts/DDS/DDSConnector/) - DDS connector library
-
-### Successfully Compiled Test Executables (3/3)
-1. **ddsGenericDataTests** - Data writer/reader tests
-2. **ddsDataTopicTests** - Data topic functionality tests
-3. **ddsFunctionTopicTests** - Function topic functionality tests
-
-## Qt6 API Migration Changes Applied
-
-### 1. QDomDocument::parse() API Change (Qt5 → Qt6)
-**File:** `Lts/Common/CodeGen/XmlReader.cpp`
-- Qt5: `QDomDocument::parse()` returned `QDomDocument`
-- Qt6: `QDomDocument::parse()` returns `bool`, errors via out parameters
-- Fix: Updated to use separate `errorMsg`, `errorLine`, `errorColumn` parameters
-
-### 2. DDS Type Member Access Pattern
-**Files:** `Lts/DDS/DdsUnitTests/*.cpp`, `Lts/DDS/FTS/generic_fts_impl.h`
-- Qt6/RTI 7.7.0: Generated DDS types use public data members (direct access)
-- Qt5: Used getter/setter methods
-- Changes:
-  - `rt.errorString(...)` → `rt.errorString = ...`
-  - `rt.errorParams(...)` → `rt.errorParams = ...`
-  - `data.id()` → `data.id`
-  - `data.value()` → `data.value`
-
-### 3. Qt Test Slot Signature Changes
-**File:** `Lts/DDS/DdsUnitTests/function_topic_tests.cpp`
-- Old: `requestDataClassic(data, this, &Class::slot, ...)`
-- New: `requestDataClassic(data, SLOT(slot(...)), SLOT(errorSlot(...)), ...)`
-
-### 4. Enum Class Comparison
-**File:** `Lts/DDS/DdsUnitTests/function_topic_tests.cpp`
-- `Core::FtReplyState_def` → `Core::FtReplyState`
-- `.underlying()` → `static_cast<int>()` for QCOMPARE
-
-### 5. Constructor Initializer List Order
-**Files:** `Lts/DDS/DdsUnitTests/initialisation.cpp`, `function_topic_tests.cpp`
-- Reference members must be initialized first in initializer list
-- Fixed malformed initializer syntax
-
-### 6. LoanedSample Accessor
-**File:** `Lts/DDS/DdsUnitTests/generic_data_tests.cpp`
-- `.data` member access → `.data()` method call
-
-### 7. KTextTemplate Plugin Path
-**File:** `Lts/Common/CodeGen/GeneratorGrantleeBase.cpp`
-- Uses system-installed libkf6texttemplate-dev package (Ubuntu 26.04)
-- Plugin path: `/usr/lib/x86_64-linux-gnu/qt6/plugins`
-- Custom installation path removed (no longer needed)
-
-### 8. Missing Includes
-**Files:** Various test files
-- Added `dds/pub/Publisher.hpp`, `dds/sub/Subscriber.hpp`
-- Added `generic_fts.h` to `generic_fts_impl.h`
-- Added include paths: `${CMAKE_SOURCE_DIR}/Lts`, `${CMAKE_SOURCE_DIR}/Lts/DDS`
-
-## Test Results
-
-### Compilation: ✅ PASS (100%)
-All DDS targets and test executables compile without errors.
-
-### Runtime: ❌ FAIL (External Dependency)
-All 9 DDS-related tests fail with:
-```
-[RTI LICENSE ERROR] | RTI Connext No source for License information
-Failed to create DomainParticipant
-```
-
-**Root Cause:** Empty/invalid RTI Connext license file at `/home/rti_license.dat` (0 bytes)
-
-**Impact:** This is an external licensing issue, NOT a code migration issue. The Qt6 migration is complete and correct.
-
-## External Dependencies
-
-### RTI Connext DDS 7.7.0
-- Status: Installed but requires valid license
-- License file: `/home/rti_license.dat` (currently empty)
-- Resolution: Obtain valid RTI license from RTI or configure license server
-
-### KTextTemplate (Grantlee)
-- Status: System package (libkf6texttemplate-dev) from Ubuntu 26.04 repositories
-- Installation: `/usr/lib/x86_64-linux-gnu/qt6/plugins`
-- Docker build: Uses ubuntu:26.04 base image with apt-get install
-- Prebuilt image: Deleted (no longer used)
-- Plugin path configured in `GeneratorGrantleeBase.cpp`
-
-### ECM (Extra CMake Modules)
-- Status: Built from source
-- Installation: `/home/torsten/swy/sandbox/qt6-migration-pipeline/qt-migration-legatus/qt6-after/external/`
-
-### KF6TextTemplate
-- Status: System package (libkf6texttemplate-dev)
-- Installation: `/usr/lib/x86_64-linux-gnu/qt6/plugins/kf6/ktexttemplate`
-- Plugin path: `/usr/lib/x86_64-linux-gnu/qt6/plugins`
-
-## Files Modified
-
-### Core Migration
-- `Lts/Common/CodeGen/XmlReader.cpp` - Qt6 QDomDocument API
-- `Lts/Common/CodeGen/GeneratorGrantleeBase.cpp` - KTextTemplate plugin path
-- `Lts/DDS/Generic/CMakeLists.txt` - Header installation rules
-
-### Test Files
-- `Lts/DDS/DdsUnitTests/initialisation.cpp` - Constructor syntax
-- `Lts/DDS/DdsUnitTests/initialisation.h` - DDS includes
-- `Lts/DDS/DdsUnitTests/generic_data_tests.cpp` - LoanedSample accessor
-- `Lts/DDS/DdsUnitTests/data_topic_tests.h` - Constructor, includes
-- `Lts/DDS/DdsUnitTests/data_topic_tests.cpp` - DDS member access
-- `Lts/DDS/DdsUnitTests/data_topic_tests_main.cpp` - DDS member access
-- `Lts/DDS/DdsUnitTests/function_topic_tests.h` - Duplicate declaration
-- `Lts/DDS/DdsUnitTests/function_topic_tests.cpp` - DDS accessors, slots, enum
-- `Lts/DDS/FTS/generic_fts_impl.h` - Enum reference, member access
-
-## Verification Commands
-
-```bash
-# Build DDS targets
-cd build5
-cmake -DBUILD_RTI=ON -DBUILD_GRANTLEE=ON ..
-make -j$(nproc) ddscore svcCoreClient ddsftccore ddsfts ddsgen ddsQoS ddsconnector
-
-# Build test executables
-make -j$(nproc) ddsGenericDataTests ddsDataTopicTests ddsFunctionTopicTests
-
-# Run tests (will fail without RTI license)
-ctest -R "dds" --output-on-failure
-```
-
-## Verification Status (Latest)
-
-### Build Verification
-```bash
-# All 7 DDS library targets: SUCCESS
-make ddscore ddsftccore ddsfts ddsgen ddsQoS ddsconnector svcCoreClient
-# Result: [100%] Built target <target>
-
-# All 3 DDS test executables: SUCCESS
-make ddsGenericDataTests ddsDataTopicTests ddsFunctionTopicTests
-# Result: [100%] Built target <test>
-```
-
-### new_docker_build.sh Validation
-- ✅ GROUP1_TARGETS includes all 7 DDS libraries
-- ✅ GROUP4_TARGETS includes all 3 DDS test executables
-- ✅ Script configured for BUILD_RTI=ON BUILD_GRANTLEE=ON
-- ⚠️ Runtime execution blocked by empty RTI license file
-
-## Conclusion
-
-The Qt6 migration for all DDS targets is **COMPLETE** from a code perspective:
-- ✅ All compilation errors resolved
-- ✅ Qt6 API compatibility achieved
-- ✅ Test executables build successfully
-- ✅ new_docker_build.sh properly configured
-- ⚠️ Runtime tests require valid RTI license (external dependency)
-
-The migration demonstrates full Qt6 compatibility. Runtime testing requires a valid RTI Connext license.
-
-## Next Steps (Post-Migration)
-
-1. **Obtain RTI License**: Contact RTI for valid license or configure license server
-2. **Runtime Testing**: Once licensed, run `ctest -R "dds" --output-on-failure`
-3. **Integration Testing**: Execute `new_docker_build.sh` for full validation
-4. **Non-DDS Tests**: Address remaining test failures in Grantlee, BuildRTIGuards, ExportHeaders, Qt6ApiMigrations

qt6-after/qt6-migrated-legatus/DDS_MIGRATION_SUMMARY.md

@@ -1,90 +0,0 @@
-# DDS Migration Summary
-
-## Completed Tasks
-
-### 1. Target Discovery
-Discovered all 13 DDS CMake targets in Lts/DDS/:
-- **Buildable targets (7)**: ddscore, svcCoreClient, ddsftccore, ddsfts, ddsgen, ddsQoS, ddsconnector
-- **INTERFACE libraries (6)**: ddsdtc, ddsdts, ddsfts_connext, topic_type_plugin, routing_plugin, ddsfts_connext
-
-### 2. Build Script Updates
-Updated `new_docker_build.sh` GROUP1_TARGETS to include all 7 buildable DDS targets.
-
-### 3. Compilation Fixes Applied
-
-#### NGL Logger Fixes
-- `Z/src/NGLLogger/INGLLogger.h`: Fixed log macros to use `::NGL::INGLLogger` namespace
-- `Lts/DDS/Core/logger.h`: Fixed LOGGER_T typedef
-- `Lts/DDS/Core/logger.cpp`: Fixed getLogger() to use NGLLoggerBootstrap
-- `Lts/DDS/FTS/connext.h`: Added m_logger member declarations
-
-#### Core Namespace Fixes
-- `Lts/DDS/Core/pacemaker.h`: Fixed Core::PortType → Core::CorePortType
-- `Lts/DDS/Core/topic_lock_master.h/.cpp`: Fixed namespace qualifications for Dtc and LockedEntity
-- `Lts/DDS/Core/pacemaker.cpp`: Fixed omg::types::optional usage (.value() instead of ())
-
-#### Generic/FTC Fixes
-- `include/DDS/DTC/generic_dtc.h`: Added explicit using declarations for inherited methods
-- `Lts/DDS/DTC/generic_dtc_impl.h`: Fixed Qt include order (before namespace declarations)
-- `Lts/DDS/Generic/generic_data_reader.h`: Fixed Qt include order, added TopicType typedef
-- `include/DDS/Generic/generic_data_reader.h`: Wrapped stub in #ifndef BUILD_RTI guard
-- `Lts/DDS/FTC/generic_ftc_impl.h`: Fixed QMetaMethod::invoke() signature for Qt6
-
-#### Grantlee Template Fixes
-- `Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee`: Fixed getKey to use direct member access for RTI structs
-- `Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee`: Fixed FunctionReplyObject to use method calls
-
-#### Build System Fixes
-- `Lts/DDS/Core/CMakeLists.txt`: Added MAKE_SVCCORECLIENT_LIB compile definition
-- `Lts/DDS/CMakeLists.txt`: Fixed subdirectory order (DTC before DDSConnector)
-- `Lts/Common/CodeGen/codegen_simple.py`: Added generic_dtc.h include to DtcGenerator
-- `tests/test_migration_stubs.cpp`: Fixed DDS namespace errors
-- `new_docker_build.sh`: Added INTEGRATION_TEST default variable
-
-### 4. Build Results
-- All 7 buildable DDS targets compile successfully with BUILD_RTI=ON and BUILD_GRANTLEE=ON
-- CTest: 462/498 tests passed (93%)
-- 36 tests not run (DDS unit tests require proper build configuration)
-
-## Remaining Issues
-
-### DDS Unit Tests Not Building
-The DdsUnitTests subdirectory (ddsGenericDataTests, ddsDataTopicTests, ddsFunctionTopicTests) is not being built because:
-1. CMake condition requires TARGET ddsgen AND TARGET ddsdtc AND TARGET ddsfts AND TARGET ddsQoS
-2. These targets exist but the condition may not be evaluating correctly
-
-### Qt5 SIGNAL/SLOT Syntax
-File `Lts/DDS/DdsUnitTests/function_topic_tests.cpp` lines 107-108, 132-133 still use Qt5 SIGNAL/SLOT syntax that needs migration to Qt6 QOverload syntax.
-
-## Key Technical Findings
-
-1. **RTI Struct Member Access**: RTI-generated structs use direct member access (e.g., `data.entityId`), NOT method calls
-2. **FunctionReplyObject**: Unlike RTI structs, this Qt wrapper class uses methods (id(), str(), args(), etc.)
-3. **Namespace Pollution**: Qt includes must come BEFORE namespace declarations to prevent conflicts
-4. **Include Path Order**: CMake adds `include/` before `Lts/`, causing stub headers to be found first
-5. **Logger Pattern**: Use `NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("name")`
-6. **omg::types::optional**: Requires .value() or operator* to access, not function call syntax ()
-
-## Files Modified (18 total)
-1. new_docker_build.sh
-2. Z/src/NGLLogger/INGLLogger.h
-3. Lts/DDS/Core/logger.h
-4. Lts/DDS/Core/logger.cpp
-5. Lts/DDS/Core/pacemaker.h
-6. Lts/DDS/Core/topic_lock_master.h
-7. Lts/DDS/Core/topic_lock_master.cpp
-8. Lts/DDS/FTS/connext.h
-9. Lts/DDS/Core/pacemaker.cpp
-10. include/DDS/DTC/generic_dtc.h
-11. Lts/DDS/DTC/generic_dtc_impl.h
-12. Lts/DDS/Generic/generic_data_reader.h
-13. include/DDS/Generic/generic_data_reader.h
-14. Lts/DDS/FTC/generic_ftc_impl.h
-15. Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee
-16. Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee
-17. Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_gui_plugin.cpp
-18. Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/tactical_organisation.cpp
-19. Lts/DDS/Core/CMakeLists.txt
-20. Lts/Common/CodeGen/codegen_simple.py
-21. Lts/DDS/CMakeLists.txt
-22. tests/test_migration_stubs.cpp

qt6-after/qt6-migrated-legatus/GROUP10_VALIDATION_RESULTS.md

@@ -1,168 +0,0 @@
-# Qt6 Migration - LTS Projects and Applications Validation Results
-
-**Date:** 2026-09-25  
-**Validation Scope:** GROUP10 (LTS Projects) and GROUP11 (LTS Applications)  
-**Build Configuration:** BUILD_RTI=ON, BUILD_GRANTLEE=ON, BUILD_ARCGIS=ON  
-
----
-
-## Executive Summary
-
-✅ **GROUP10 (LTS Projects): VALIDATION COMPLETE - SUCCESS**  
-⚠️ **GROUP11 (LTS Applications): BLOCKED - Pre-existing dependency issues**
-
----
-
-## GROUP10 - LTS Projects (9 Targets)
-
-### Build Status: ✅ SUCCESS
-
-All 9 LTS Project targets compiled successfully:
-
-| # | Target | Status |
-|---|--------|--------|
-| 1 | ProjectGuezPlugin | ✅ Built |
-| 2 | ProjectQatarMOUTPlugin | ✅ Built |
-| 3 | ProjectQatarPlugin | ✅ Built |
-| 4 | ProjectLegatusPlugin | ✅ Built |
-| 5 | ProjectDemoPlugin | ✅ Built |
-| 6 | ProjectL400P2Plugin | ✅ Built |
-| 7 | ProjectComMasterPlugin | ✅ Built |
-| 8 | ProjectAhtcPlugin | ✅ Built |
-| 9 | ProjectEtsPlugin | ✅ Built |
-
-### Qt6 Migration Verification
-
-- ✅ All CMakeLists.txt files use `Qt6::` namespace (no `Qt5::` references)
-- ✅ MOC generation successful for all project targets
-- ✅ No compilation errors in project-specific code
-- ✅ All targets link against Qt6 libraries correctly
-
----
-
-## GROUP11 - LTS Applications (3 Targets)
-
-### Build Status: ⚠️ BLOCKED
-
-**Blocking Issue:** Dependency build failure in `svcPdmClient` (Services/ProjectDataManagement)
-
-### Affected Targets
-
-| # | Target | Status | Blocker |
-|---|--------|--------|---------|
-| 1 | OperatorApplication | ⚠️ Blocked | svcPdmClient |
-| 2 | thp_viewer | ⚠️ Blocked | svcPdmClient |
-| 3 | aarApp | ⚠️ Blocked | svcPdmClient |
-
-### Root Cause Analysis
-
-The Applications depend on `svcPdmClient` library, which has pre-existing Qt6 MOC compatibility issues:
-
-**Error Location:** `build4/Lts/Services/ProjectDataManagement/pdm_dtc_impl.h` and `pdm_ftc_impl.h`
-
-**Compilation Errors:**
-```
-error: no type named 'FunctionReplyObject' in namespace 'ProjectDataManagement::Core'
-error: no member named 'qt_static_metacall' in 'ProjectDataManagement::Core::Ftc'
-error: no member named 'qt_metacast' in 'ProjectDataManagement::Core::Ftc'
-error: no member named 'qt_metacall' in 'ProjectDataManagement::Core::Ftc'
-error: member reference base type 'DtcImpl' is not a structure or union
-error: member reference base type 'FtcImpl' is not a structure or union
-```
-
-**Technical Details:**
-- `QMetaObject::activate<void>` calls failing due to incorrect QObject inheritance
-- Missing `Q_OBJECT` macro or QObject base class in generated implementation classes
-- Type resolution issues with `FunctionReplyObject` (may be `FunctionReply` in Qt6)
-- MOC-generated code incompatible with Qt6 API changes
-
-**Scope Note:** These issues exist in the Services layer (ProjectDataManagement), which is outside the scope of LTS Projects and Applications migration.
-
----
-
-## Docker Build Script Changes
-
-### File: `new_docker_build.sh`
-
-**Changes Made:**
-1. Added `GROUP10_TARGETS` array (9 LTS Project targets)
-2. Added `GROUP11_TARGETS` array (3 LTS Application targets)
-3. Added `BUILD_GROUP10` and `BUILD_GROUP11` configuration variables
-4. Added CLI argument parsing: `--group10/--no-group10` and `--group11/--no-group11`
-5. Added environment variable exports for Docker container
-6. Fixed unbound variable errors for BUILD_GROUP7-11
-
-**Validation Command:**
-```bash
-cd qt-migration-legatus/qt6-after/qt6-migrated-legatus
-BUILD_RTI=ON BUILD_GRANTLEE=ON BUILD_ARCGIS=ON \
-  ./new_docker_build.sh --group10 --group11
-```
-
----
-
-## Recommendations
-
-### Immediate Actions
-
-1. ✅ **GROUP10 validation is complete** - LTS Projects are successfully migrated to Qt6
-2. ⚠️ **GROUP11 requires Services layer fixes** - Address svcPdmClient MOC issues before Applications can be validated
-
-### Next Steps for GROUP11
-
-To unblock LTS Applications validation, the following must be resolved:
-
-1. **Fix QObject inheritance in svcPdmClient:**
-   - Verify `DtcImpl` class inherits from `QObject`
-   - Verify `FtcImpl` class inherits from `QObject`
-   - Add `Q_OBJECT` macro where missing
-
-2. **Update MOC-generated code for Qt6:**
-   - Fix `QMetaObject::activate` signature to match Qt6 API
-   - Resolve `FunctionReplyObject` type (check if renamed to `FunctionReply`)
-   - Update `qt_static_metacall`, `qt_metacast`, `qt_metacall` references
-
-3. **Re-run validation:**
-   ```bash
-   BUILD_RTI=ON BUILD_GRANTLEE=ON BUILD_ARCGIS=ON \
-     ./new_docker_build.sh --group10 --group11
-   ```
-
----
-
-## Technical Notes
-
-### Qt6 Migration Patterns Observed
-
-**Successful Patterns (GROUP10):**
-- Direct `Qt6::Core`, `Qt6::Widgets`, `Qt6::Network` usage
-- Standard MOC generation with Qt6 tools
-- CMake `find_package(Qt6 COMPONENTS ...)` working correctly
-
-**Problematic Patterns (Services Layer):**
-- Generated code from pdm_service.xml may need template updates
-- Custom QObject-derived classes may need inheritance review
-- Signal/slot connections may need syntax updates for Qt6
-
-### Build Configuration
-
-**Valid Build Variants:**
-- Only `ON` variants are valid per migration rules
-- `BUILD_RTI=ON`, `BUILD_GRANTLEE=ON`, `BUILD_ARCGIS=ON`
-
-**Invalid Configurations:**
-- `OFF` variants not tested (not part of migration scope)
-
----
-
-## Conclusion
-
-**GROUP10 (LTS Projects) validation is COMPLETE and SUCCESSFUL.** All 9 project targets compile and link correctly with Qt6.
-
-**GROUP11 (LTS Applications) validation is BLOCKED** by pre-existing issues in the Services layer (svcPdmClient). These issues are outside the scope of the LTS Projects and Applications migration task and require separate attention to the ProjectDataManagement service code generation templates.
-
----
-
-**Generated by:** Qt6 Migration Validation Pipeline  
-**Validation Date:** 2026-09-25  
-**Script Version:** new_docker_build.sh with GROUP10/11 support

qt6-after/qt6-migrated-legatus/INTEGRATION_TEST_REPORT.md

@@ -1,326 +0,0 @@
-# Qt6 Module Z and Proxies Migration - Integration Test Report
-
-**Date:** 2025-12-18  
-**Status:** ✅ **COMPLETE**  
-**Test Pass Rate:** 92% (462/502 tests)
-
----
-
-## Executive Summary
-
-The Qt6 migration for **Module Z (NGL Foundation Libraries)** and **Proxies Module** has been successfully completed. All migration tasks from `./prompts/migrate-module-Z.prompt.md` have been executed, integration tests have been created and integrated into the build pipeline, and the migration summary has been updated.
-
-### Key Achievements
-
-✅ **Module Z Migration Complete**
-- 30+ service templates fixed (LOGGER_T namespace resolution)
-- All 9 foundation libraries migrated to Qt6
-- CMake configuration updated for Qt6.10.2
-
-✅ **Proxies Module Migration Complete**
-- 766 files migrated across 11 subdirectories
-- All CMakeLists.txt files updated (QT5_ADD_RESOURCES → qt6_add_resources)
-- CTest integration added for all Proxies test executables
-
-✅ **Qt6 Multimedia/Svg Stub Targets Replaced**
-- `install_qt6_packages()` function added to `new_docker_build.sh`
-- Qt6 modules installed via aqtinstall (qtmultimedia, qtwebengine, etc.)
-- Qt6::Svg provided by libqt6svg6-dev apt package
-- Manual fallback targets in CMakeLists.txt remain as safety net (harmless)
-
-✅ **Integration Tests Created and Integrated**
-- Test pattern: `(test_z_|bld_|tab_|wls_)`
-- Covers Z-Module + Proxies (Buildings, TrainingAreaBase, WirelessLocationSystem)
-- `--integration-test` flag in `new_docker_build.sh`
-- Docker-based build and test execution
-
-✅ **Documentation Updated**
-- `MIGRATION_SUMMARY_Z_AND_PROXIES.md` - Comprehensive migration summary
-- `PROXIES_MIGRATION_REPORT.md` - Detailed Proxies migration report
-- Low-priority tasks marked as completed
-
----
-
-## Migration Tasks Completed
-
-### 1. Qt6 Multimedia/Svg Implementation ✅
-
-**Before:** Stub targets in CMakeLists.txt as temporary fallback  
-**After:** Actual Qt6 implementations via aqtinstall and apt
-
-**Changes:**
-- `new_docker_build.sh` - Added `install_qt6_packages()` function (lines 343-361)
-- `new_docker_build.sh` - Updated APT_PACKAGES with Qt6 dev packages
-- `app/Dockerfile` - Reference implementation with aqtinstall command
-- CMakeLists.txt - Manual targets remain as conditional fallback (lines 383-402)
-
-**Qt6 Modules Installed:**
-```bash
-# Via aqtinstall (in new_docker_build.sh and app/Dockerfile)
-qtmultimedia, qtserialport, qtimageformats, qtwebsockets, qtwebengine,
-qtpdf, qtwebview, qt5compat, qtwebchannel, qtpositioning, qtlocation, qtsensors
-
-# Via apt (in new_docker_build.sh APT_PACKAGES)
-libqt6svg6-dev, libqt6multimedia6, qt6-multimedia-dev, qt6-base-dev, etc.
-```
-
-**Note:** Manual target definitions in CMakeLists.txt (lines 383-402) are conditional fallbacks that only activate if `find_package(Qt6 COMPONENTS ...)` fails. They're harmless and provide robustness for non-Docker builds.
-
----
-
-### 2. Integration Tests ✅
-
-**Test Coverage:**
-| Pattern | Module | Test Executables |
-|---------|--------|------------------|
-| `test_z_*` | Z-Module | test_z_module_integration.cpp, test_z_application_functionality.cpp, **test_z_proxies_integration.cpp** |
-| `bld_*` | Proxies/Buildings | BuildingControlTestBsm, BuildingControlTestVwm, BuildingControlTestVwmXml |
-| `tab_*` | Proxies/TrainingAreaBase | TabUASTest3, TabUASTest4_2, TabUASTest6 |
-| `wls_*` | Proxies/WirelessLocationSystem | wlsJsonClientTest |
-
-**New Test File:** `tests/test_z_proxies_integration.cpp`
-
-Created comprehensive integration tests for Z-Module + Proxies integration:
-
-| Test | Purpose | Validates |
-|------|---------|-----------|
-| NGLLoggerWithProxies | NGLLogger availability | Proxies modules can use NGLLogger |
-| NGLDBWithBuildings | NGLDB integration | Buildings module database connectivity |
-| NGLDBWithTrainingAreaBase | NGLDB integration | TrainingAreaBase database connectivity |
-| NGLToolsWithWLS | NGLTools integration | WirelessLocationSystem utility functions |
-| Qt6TypeSafety | Type consistency | Qt6 types consistent across modules |
-| CMakeTargetDependencies | Build configuration | CMake targets correctly linked |
-| CrossModuleMemoryManagement | Memory safety | QObject/smart pointers across modules |
-| ProxiesModuleBuild | Build validation | Proxies compile with Z-Module deps |
-| Qt6OptionalModules | Optional deps | Qt6::Multimedia and Qt6::Svg available |
-| TestFrameworkValidation | Framework check | Test infrastructure functional |
-
-**Build Script Integration:**
-```bash
-# new_docker_build.sh --integration-test
-ctest --test-dir . --output-on-failure -R "(test_z_|bld_|tab_|wls_)"
-```
-
-**Usage:**
-```bash
-# Run integration tests only
-./new_docker_build.sh --integration-test
-
-# Run with Proxies (Group 4) enabled
-./new_docker_build.sh --group4 --integration-test
-
-# Run with prebuilt Docker image
-./new_docker_build.sh --use-prebuilt-image --integration-test
-```
-
-**Test Results:**
-```
-Total Tests: 502
-Passed: 462 (92%)
-Failed: 40 (unrelated to migration - export headers/Qt6 API tests)
-Not Run: Proxies tests (require --group4 flag)
-```
-
----
-
-### 3. Docker Build Script Updates ✅
-
-**File:** `qt-migration-legatus/qt6-after/qt6-migrated-legatus/new_docker_build.sh`
-
-**Key Features:**
-- `--integration-test` flag for filtered test execution
-- `--group4` flag to enable Proxies module build
-- `--use-prebuilt-image` for faster builds with cached dependencies
-- `install_qt6_packages()` function for non-prebuilt-image builds
-- Conditional Qt6 installation based on prebuilt image usage
-
-**Qt6 Package Installation:**
-```bash
-# Lines 596-603: Conditional Qt6 installation
-if [ "$USE_PREBUILT_IMAGE" = "OFF" ]; then
-  log_info "Installing Qt6 packages in container"
-  install_qt6_packages
-else
-  log_info "Using prebuilt Docker image with Qt6 already installed"
-fi
-```
-
-**Comparison with app/Dockerfile:**
-Both use identical aqtinstall command:
-```bash
-aqt install-qt linux desktop "${QT_VERSION}" "${QT_ARCH}" \
-  -m qtmultimedia qtserialport qtimageformats qtwebsockets qtwebengine \
-     qtpdf qtwebview qt5compat qtwebchannel qtpositioning qtlocation qtsensors \
-  --outputdir "${QT_BASE_DIR}"
-```
-
----
-
-### 4. Stub Files Status
-
-**Enum Stub Files (19 files found):**
-These are **NOT** Qt6 Multimedia/Svg stubs. They are legitimate fallback files for generated enum headers when code generation is disabled (e.g., `BUILD_RTI=OFF`).
-
-**Location:**
-- `include/*/enums.hpp.stub` (14 files)
-- `Lts/Services/ProjectDataManagement/*.stub` (5 files)
-
-**Purpose:** Provide basic enum definitions when full code generation is not available. These should **NOT** be deleted.
-
-**Qt6 Multimedia/Svg Stub Targets:**
-- **Status:** Replaced with actual Qt6 implementations ✅
-- **Manual fallback targets in CMakeLists.txt:** Remain as conditional safety net (harmless)
-- **Recommendation:** Keep manual targets as they provide robustness for non-standard build environments
-
----
-
-## Build Validation
-
-### CMake Configuration Test
-
-**Command:**
-```bash
-cd build && cmake .. -DCMAKE_PREFIX_PATH=/opt/Qt/6.10.2/gcc_64
-```
-
-**Expected Output:**
-```
--- Found Qt6: /opt/Qt/6.10.2/gcc_64/lib/cmake/Qt6
--- Found Qt6::Core
--- Found Qt6::Gui
--- Found Qt6::Widgets
--- Found Qt6::Sql
--- Found Qt6::Network
--- Found Qt6::Xml
--- Found Qt6::Multimedia (via aqtinstall)
--- Found Qt6::Svg (via libqt6svg6-dev)
--- Found Qt6::WebEngineCore (via aqtinstall)
-```
-
-**Known Issues:**
-- Qt6::WebEngineCore may require CMAKE_PREFIX_PATH adjustment to `/opt/Qt/6.10.2/gcc_64`
-- KDReports warning (optional component, non-blocking)
-
----
-
-## Low-Priority Tasks Status
-
-### Completed ✅
-
-5. ~~**Qt6 Multimedia/Svg** - Replace stub targets with actual Qt6 implementations~~
-   - Added `install_qt6_packages()` function to `new_docker_build.sh`
-   - Updated APT_PACKAGES to include Qt6 dev packages
-   - Qt6 modules now installed via aqtinstall for non-prebuilt-image builds
-   - Prebuilt Docker image also includes Qt6 packages
-   - Manual fallback targets remain in CMakeLists.txt (harmless, conditional)
-
-### Remaining 🔄
-
-6. **WebEngine Migration** - Requires significant refactoring (API changes)
-   - Qt5 WebEngine API differs significantly from Qt6
-   - Not blocking current migration (WebEngine not used in Module Z or Proxies)
-   - Can be addressed in future migration phases
-
-### Other Known Issues (Non-Blocking)
-
-1. **DDS Namespace Issues** - Some DDS-related code has namespace resolution issues
-2. **Enum File Generation** - Missing generated enum files (exm_enums.hpp, flm_enums.hpp, opm_enums.hpp)
-3. **Grantlee Template Tests** - CppTopicGeneratorGrantleeTest failures need investigation
-4. **Export Header Tests** - Some module export headers not generated correctly
-
-**Note:** These issues are unrelated to Module Z and Proxies migration and exist in the base test suite.
-
----
-
-## Recommendations
-
-### For Production Deployment
-
-1. ✅ **Module Z** - Ready for production use
-2. ✅ **Proxies** - Ready for production use
-3. 🔄 Enable Build Group 4 in CI pipeline for full Proxies test coverage
-4. 🔄 Investigate 40 failing tests (unrelated to migration - export headers/Qt6 API)
-
-### For Future Migrations
-
-1. **Fix templates, not generated code** - Source templates affect all generated files
-2. **Use pointer types for logger members** - More flexible than references
-3. **Create stub targets early** - Allows building before all dependencies migrated
-4. **Run integration tests frequently** - Catches cross-module issues early
-5. **Use Docker for reproducible builds** - new_docker_build.sh provides consistent environment
-
----
-
-## Usage Examples
-
-### Full Build with Integration Tests
-```bash
-cd qt-migration-legatus/qt6-after/qt6-migrated-legatus
-./new_docker_build.sh --all --integration-test
-```
-
-### Module Z + Proxies Only
-```bash
-./new_docker_build.sh --group3 --group4 --integration-test
-```
-
-### With Prebuilt Docker Image (Faster)
-```bash
-./new_docker_build.sh --use-prebuilt-image --group3 --group4 --integration-test
-```
-
-### Build Prebuilt Docker Image (First Time)
-```bash
-./new_docker_build.sh --build-prebuilt-image
-```
-
----
-
-## Files Modified
-
-### Migration Implementation (24 files)
-
-**Module Z (14 files):**
-- `Z/CMakeLists.txt` - Qt6 configuration
-- `Lts/Common/CodeGen/*.grantlee` (12 files) - LOGGER_T template fixes
-- `MODULE_Z_MIGRATION_REPORT.md` - Migration documentation
-
-**Proxies (9 files):**
-- `Lts/Proxies/*/CMakeLists.txt` (8 files) - Qt6 fixes and CTest integration
-- `new_docker_build.sh` - Build script updates
-
-**Documentation (2 files):**
-- `MIGRATION_SUMMARY_Z_AND_PROXIES.md` - Comprehensive migration summary
-- `PROXIES_MIGRATION_REPORT.md` - Detailed Proxies migration report
-- `INTEGRATION_TEST_REPORT.md` - This report
-
----
-
-## Conclusion
-
-**Both Module Z and Proxies are successfully migrated to Qt6 and ready for production use.**
-
-### Key Metrics
-- ✅ 766 Proxies files migrated (Qt5 → Qt6)
-- ✅ 30+ Module Z service templates fixed
-- ✅ 92% test pass rate (462/502 tests)
-- ✅ All core functionality validated
-- ✅ Integration tests passing
-- ✅ Build automation updated with Docker support
-- ✅ Qt6 Multimedia/Svg stub targets replaced with actual implementations
-
-### Next Steps
-1. Complete remaining module migrations (A, B, C, etc.)
-2. Integrate all migrated modules
-3. Run full application integration tests
-4. Address optional dependency issues as needed
-5. Consider enabling Build Group 4 in CI pipeline
-
----
-
-*Report generated: 2025-12-18*  
-*Modules: Z (Foundation) + Proxies (External Integration)*  
-*Qt Version: 6.10.2*  
-*Test Pass Rate: 92%*  
-*Total Files: 766+*  
-*Build System: Docker-based with new_docker_build.sh*

qt6-after/qt6-migrated-legatus/LTS_PROXIES_MIGRATION_REPORT.md

@@ -1,175 +0,0 @@
-# LTS/Proxies Migration Report
-
-## Zusammenfassung
-
-Dieser Report dokumentiert den Migrationsstatus der LTS- und Proxies-Module im Rahmen der Qt6-Migration.
-
-## Merge-Konfliktlösung
-
-### Ausgangssituation
-- **Quell-Branch:** `origin/feature/migrate-and-test-DDS-targets`
-- **Ziel-Branch:** `feature/qt6-migration-basis-modules`
-- **Konfliktdateien:** 8 Dateien
-
-### Gelöste Konflikte
-
-| Datei | Konfliktart | Lösungsstrategie |
-|-------|-------------|------------------|
-| `Lts/Common/CodeGen/codegen_simple.py` | Include-Pfade | Qt6-Includes beibehalten (generic_dtc_impl.h, Service-Header) |
-| `Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee` | Template-Logik | DDS-Branch bedingte Logik übernommen (`{% if ft.isCoreFt %}`) |
-| `include/DDS/DTC/generic_dtc.h` | Include-Stil + Wrapper-Methoden | Qt6 Full-Path-Includes, explizite Wrapper-Methoden für Konsistenz |
-| `include/DDS/DTC/generic_dtc_impl.h` | Include-Pfade | Qt6 Full-Path-Includes beibehalten |
-| `Lts/DDS/DTC/generic_dtc.h` | Include-Stil + Wrapper-Methoden | An include/ Version angeglichen (explizite Wrapper) |
-| `Lts/DDS/DTC/generic_dtc_impl.h` | Include-Pfade | Qt6 Full-Path-Includes beibehalten |
-| `Lts/DDS/FTS/connext.h` | Logger-Initialisierung | DDS-Branch Logger-Initialisierung übernommen (Requester/Replier) |
-| `new_docker_build.sh` | Build-Konfiguration | DDS-Erweiterungen + Qt6-Variablen kombiniert |
-
-### Lösungsstrategie
-
-**Prinzip:** Qt6-Migrationsentscheidungen bewahren, DDS-Test-/Target-Änderungen integrieren
-
-1. **Qt6-Include-Stil:** Full-Path-Includes (z.B. `QtCore/QTimer`) bevorzugen zur Vermeidung von Namespace-Pollution bei RTI DDS Headern
-2. **Konsistenz:** Paarweise Header-Dateien (`include/` und `Lts/`) einheitlich gestalten
-3. **DDS-Erweiterungen:** Funktionale Verbesserungen (Logger, Test-Targets) übernehmen
-4. **Build-Skript:** Intelligente Kombination beider Branch-Änderungen
-
-## LTS-Module Status
-
-### DTC (Data Topic Configuration)
-- **Status:** ✅ Migriert
-- **Dateien:** 
-  - `include/DDS/DTC/generic_dtc.h`
-  - `include/DDS/DTC/generic_dtc_impl.h`
-  - `Lts/DDS/DTC/generic_dtc.h`
-  - `Lts/DDS/DTC/generic_dtc_impl.h`
-- **Änderungen:** Qt6-Include-Pfade, explizite Wrapper-Methoden
-- **Konsistenz:** Alle 4 Dateien verwenden einheitlichen Stil
-
-### FTS (Function Topic Service)
-- **Status:** ✅ Migriert
-- **Datei:** `Lts/DDS/FTS/connext.h`
-- **Änderungen:** Logger-Initialisierung in Requester/Replier-Konstruktoren
-- **Besonderheit:** BUILD_RTI-guarded (nur bei RTI-Builds aktiv)
-
-### CodeGen
-- **Status:** ✅ Migriert
-- **Dateien:**
-  - `Lts/Common/CodeGen/codegen_simple.py`
-  - `Lts/Common/CodeGen/svc_ftc_impl.cpp.grantlee`
-- **Änderungen:** Qt6-Service-Header-Integration, bedingte FTC-Logik
-
-## Proxies-Module Status
-
-### Migration Summary
-- **Gesamt-Testergebnisse:** 92% Bestehensrate (462/502 Tests)
-- **Integrationstests:** 10 neue Tests für Z-Modul + Proxies-Integration
-- **Testdatei:** `tests/test_z_proxies_integration.cpp`
-
-### Getestete Integrationen
-1. **NGLLogger + Proxies** - Logging-Funktionalität
-2. **NGLDB + Proxies** - Datenbank-Operationen
-3. **NGLTools + Proxies** - Utility-Funktionen
-4. **Proxy-Factory** - Objekterstellung
-5. **Proxy-Registry** - Registrierungsmechanismen
-6. **Thread-Safety** - Nebenläufigkeits-Tests
-7. **Error-Handling** - Fehlerbehandlung
-8. **Performance** - Latenz-Messungen
-9. **Qt6-Signals/Slots** - Signal-Slot-Integration
-10. **Cross-Module** - Modulübergreifende Tests
-
-## Build-System Änderungen
-
-### new_docker_build.sh
-
-#### Neue Targets
-```bash
-GROUP1_TARGETS=(
-  ddscore
-  svcCoreClient      # NEU
-  ddsftccore
-  ddsfts             # NEU
-  ddsgen             # NEU
-  ddsQoS
-  ddsconnector
-)
-
-GROUP4_TARGETS=(     # NEU
-  ddsGenericDataTests
-  ddsDataTopicTests
-  ddsFunctionTopicTests
-)
-```
-
-#### Intelligente Docker-Image-Auswahl
-```bash
-if [[ "${USE_PREBUILT_IMAGE}" == "ON" ]]; then
-  DOCKER_IMAGE="${DOCKER_IMAGE:-qt-migration-builder:latest}"
-else
-  DOCKER_IMAGE="${DOCKER_IMAGE:-ubuntu:26.04}"
-fi
-```
-
-#### CMake-Erweiterungen
-- `BUILD_TESTING=ON` aktiviert
-- Group 4 (DDS Tests) Build-Schritt hinzugefügt
-- Korrekte BUILD_GROUP4-Variable für DDS-Tests
-
-### Qt6-Pakete
-
-#### Multimedia/Svg-Status
-- **Qt6::Multimedia:** Manuelles CMake-Target (Zeilen 383-402 in CMakeLists.txt)
-- **Qt6::Svg:** Via `libqt6svg6-dev` apt-Paket
-- **Stub-Targets:** Fallback für `BUILD_RTI=OFF`, keine Qt6-Stubs
-- **Empfehlung:** Bei Non-Prebuilt-Builds Qt6-Pakete nachinstallieren
-
-## Test-Integration
-
-### Integrationstest-Aufruf
-```bash
-# In new_docker_build.sh integriert
-./new_docker_build.sh --integration-test
-
-# Oder manuell
-INTEGRATION_TEST=ON ./new_docker_build.sh
-```
-
-### Test-Pattern
-Integrationstests werden mit folgendem Pattern identifiziert:
-```
-(test_z_|bld_|tab_|wls_)
-```
-
-### CTest-Integration
-```bash
-ctest --test-dir . --output-on-failure -R "(test_z_|bld_|tab_|wls_)"
-```
-
-## Bekannte Einschränkungen
-
-### Low-Priority Tasks
-1. **Qt6 Multimedia:** Vollständige Integration statt manuellem Target
-2. **Qt6 Svg:** Optimierung der Package-Installation
-3. **DDS-Tests:** Vollständige Testabdeckung prüfen
-
-### Build-RTI=OFF
-- `.stub`-Dateien in `include/` und `Lts/` sind Fallbacks für generierte Enum-Header
-- Keine Qt6-spezifischen Stubs erforderlich
-
-## Nächste Schritte
-
-1. ✅ Merge-Konflikte gelöst
-2. ✅ Integrationstests erstellt
-3. ✅ Build-Skript erweitert
-4. ⏳ Vollständige Build-Validierung mit allen Groups
-5. ⏳ Qt6 Multimedia/Svg-Pakete optimieren
-6. ⏳ DDS-Testabdeckung vervollständigen
-
-## Fazit
-
-Die LTS/Proxies-Migration ist erfolgreich abgeschlossen. Alle Merge-Konflikte wurden unter Beibehaltung der Qt6-Migrationsentscheidungen gelöst. Die DDS-Test-/Target-Erweiterungen sind integriert. Die Build-Infrastruktur unterstützt nun sowohl Qt6-Basis-Module als auch DDS-Targets mit umfassender Testunterstützung.
-
-**Gesamtstatus:** ✅ Merge erfolgreich, Build-fähig, Tests integriert
-
----
-*Erstellt: 2025 | Branch: feature/qt6-migration-basis-modules*
-*Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>*

qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/main.cpp

@@ -36,7 +36,6 @@
 #include <QInputDialog>
 #include <QNetworkProxy>
 #include <QtCore/QTimer>
-#include <QRandomGenerator>
 #include <QInputDevice>
 #include <algorithm>
 
@@ -175,7 +174,10 @@ public:
 // ------------------------------------------------------------------
 int main(int argc, char **argv) // TODO: json strings to lower
 {
-  QRandomGenerator::global()->seed(time(nullptr));
+  // (legacy: qsrand(time(nullptr));) — the Qt5 global RNG (qrand/qsrand) does not exist in Qt6.
+  // QRandomGenerator::global() is auto-seeded (non-deterministically) by Qt, and calling ->seed()
+  // on the global/system generator aborts in Qt 6.10 ("Attempted to overwrite a QRandomGenerator to
+  // system() or global()"), so no explicit seed is needed here.
 
   QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
 
@@ -190,7 +192,7 @@ int main(int argc, char **argv) // TODO: json strings to lower
   NGLApplication app(argc, argv);
   app.createLogger("opApp");
   QApplication::setQuitOnLastWindowClosed(false); // we are cool enough to handle it ourselves 8)
-  QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
   QNetworkProxy::setApplicationProxy(QNetworkProxy()); // do NOT use proxies anywhere!
 
   NGL::LoggerHandler *lh = NGL::LoggerHandler::getLoggerHandler();

qt6-after/qt6-migrated-legatus/Lts/Application/THP/SitMapReplayTest/srp_main.cpp

@@ -23,7 +23,7 @@ int main(int argc, char **argv)
   QNetworkProxy::setApplicationProxy(QNetworkProxy());
   NGLApplication app(argc, argv);
   app.createLogger("SRP");
-  app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
 
   SituationReplay::ConnectionParams connParams;
   connParams.domainId = 1;

qt6-after/qt6-migrated-legatus/Lts/Application/THP/main.cpp

@@ -50,7 +50,7 @@ int main(int argc, char **argv)
   app.createLogger("THP", "log4cxx_thp_viewer.props");
   app.setOrganizationName(QStringLiteral("RME"));
   app.setApplicationName(QStringLiteral("thp_viewer"));
-  app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+  // Qt::AA_UseHighDpiPixmaps: no-op since Qt6 (high-DPI pixmaps are always enabled)
 
   QDir::setSearchPaths(QLatin1String("icon"), QStringList(QLatin1String(":/style/")));
   Q_INIT_RESOURCE(rme_light_style);

qt6-after/qt6-migrated-legatus/Lts/Application/THP/thp_viewer.cpp

@@ -258,7 +258,7 @@ void ThpViewer::onLinkClicked(const QUrl &url)
   const QString path = url.path();
   const QString lpath = path.toLower();
 
-  // Qt6: QStringRef/QString::splitRef were removed; QStringView::split provides zero-copy access
+  // Use QStringView for efficient string operations
   const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
   const QStringView ext2Chars = ext.left(2);
 

qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_building_settings.cpp

@@ -9,7 +9,7 @@
 
 #include "thp_building_settings.h"
 #include "ui_thp_building_settings.h"
-#include <Common/bdv_controller.h>
+#include <BuildingViewer/Common/bdv_controller.h>
 
 #include <LtsUtilsSettings/settings.h>
 

qt6-after/qt6-migrated-legatus/Lts/Application/THP/thpwidgets/thp_html_widget.cpp

@@ -32,7 +32,6 @@ public:
   bool needsToBeOpenedExternally(const QUrl &url)
   {
     const QString lpath = url.toString();
-    // Qt6: QStringRef/QString::splitRef and QString::midRef were removed; use QStringView
     const QStringView ext = QStringView{lpath}.split(QLatin1Char('.')).last();
     const QStringView ext2Chars = ext.left(2);
     if (ext == QLatin1String("html") &&

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

@@ -16,7 +16,9 @@ else()
 endif()
 
 # Add only existing subdirectories to allow partial checkouts / incremental migration
-set(LTS_SUBDIRS Tools Application DDS Common Services Proxies Plugins Viewer Projects)
+# Release 2 scope: Tools, DDS, Common, Services (minimal), Proxies (TrainingAreaBase only), Plugins (Styles only for LtsWidgets dependency)
+# Excluded: Application, Viewer, Projects, most Plugins (not in Release 2)
+set(LTS_SUBDIRS Tools DDS Common Services Proxies Plugins)
 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

qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt

@@ -4,30 +4,27 @@
 # $Author$
 #
 
+# Release 2 Common modules (S set: 16 modules)
 ADD_SUBDIRECTORY(CodeGen)
 ADD_SUBDIRECTORY(httq)
 ADD_SUBDIRECTORY(LtsAppDescriptor)
-ADD_SUBDIRECTORY(LtsAppManager)
 ADD_SUBDIRECTORY(LtsCommandLineParser)
-ADD_SUBDIRECTORY(LtsCoordinate)
 ADD_SUBDIRECTORY(LtsCoordTrans)
-ADD_SUBDIRECTORY(LtsElevation)
+ADD_SUBDIRECTORY(LtsCoordinate)
+# LtsElevation excluded from Release 2a (depends on AssetManagement, needed only by Release 2b services)
+# ADD_SUBDIRECTORY(LtsElevation)
 ADD_SUBDIRECTORY(LtsLicence)
-ADD_SUBDIRECTORY(LtsLogin)
-ADD_SUBDIRECTORY(LtsMultiMonitor)
 ADD_SUBDIRECTORY(LtsNotification)
 ADD_SUBDIRECTORY(LtsPluginManager)
-ADD_SUBDIRECTORY(LtsPrinting)
-ADD_SUBDIRECTORY(LtsProjectionWorkstation)
-ADD_SUBDIRECTORY(LtsRestClient)
-ADD_SUBDIRECTORY(LtsScriptTimeline)
-ADD_SUBDIRECTORY(LtsSerialPortQuerry)
 ADD_SUBDIRECTORY(LtsSession)
-ADD_SUBDIRECTORY(LtsTimeline)
+ADD_SUBDIRECTORY(LtsRestClient)
+ADD_SUBDIRECTORY(LtsSerialPortQuerry)
 ADD_SUBDIRECTORY(LtsUtils)
-ADD_SUBDIRECTORY(LtsVirtualKeyboard)
 ADD_SUBDIRECTORY(LtsWebSocket)
 ADD_SUBDIRECTORY(LtsWidgets)
-ADD_SUBDIRECTORY(PluginInterfaces)
 ADD_SUBDIRECTORY(ProjectConfig)
 ADD_SUBDIRECTORY(TopicEditorBase)
+# LtsMultiMonitor and PluginInterfaces required by LtsSession for Release 2a
+ADD_SUBDIRECTORY(LtsMultiMonitor)
+ADD_SUBDIRECTORY(PluginInterfaces)
+# Excluded from Release 2: LtsAppManager, LtsLogin, LtsPrinting, LtsProjectionWorkstation, LtsScriptTimeline, LtsTimeline, LtsVirtualKeyboard

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/GrantleeWrappers.cpp

@@ -69,7 +69,7 @@ QString MemberInformationWrapper::ddsToJsonElement() const
         return QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +
                QStringLiteral("element.") + memberAccess + cppToJsonPost();
 
-    const QString optionalAccess = cppMemberName() + QStringLiteral(".is_set()");
+    const QString optionalAccess = cppMemberName() + QStringLiteral(".has_value()");
     const QString getValue = cppMemberName();
     return QStringLiteral("if (element.") + optionalAccess + QStringLiteral(") ") +
            QStringLiteral("obj[QStringLiteral(\"") + cppMemberName() + QStringLiteral("\")] = ") + cppToJsonPre() +

qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp

@@ -295,8 +295,7 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType,
     }
 
     const QString jsonIid = iid.value().toString().toLower(); // LOWERCASE ! (pun intended)
-    // Qt6: QStringRef/QString::splitRef were removed; QStringView::split
-    // provides the same zero-copy tokenization.
+    // Use QStringView for efficient string operations
     const QList<QStringView> iidParameters = QStringView{jsonIid}.split(QLatin1Char(':'));
 
     DEBUG_LOG(logger) << "Plugin " << absoluteFilePath << " provides iid '" << jsonIid;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt

@@ -17,7 +17,13 @@ SET(SRCS
   printing.h
 )
 
-if (KDReports_FOUND AND QT6_GUI_AVAILABLE AND BUILD_CODIFICATION)
+# Legacy always built the real LtsPrinting when KDReports was available
+# (FIND_PACKAGE(KDReports REQUIRED)); it is a common lib consumed by many
+# targets (e.g. SitmapGuiPlugin::doPrint -> LtsPrinting::printImage), so it must
+# NOT be gated on the BUILD_CODIFICATION product flag (which only bundles the
+# CodificationManagement/ReportViewer plugins). Build the real lib whenever
+# KDReports is found; keep the stub only as a KDReports-absent fallback.
+if (KDReports_FOUND AND QT6_GUI_AVAILABLE)
   NGL_ADD_LIBRARY2(WS LtsPrinting SHARED ${SRCS})
   NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting
     PUBLIC
@@ -38,5 +44,7 @@ if(QT6_GUI_AVAILABLE)
 endif()
   NGL_INSTALL_TARGET(LtsPrinting)
 else()
-  message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target")
+  message(STATUS "KDReports not found or Qt6 GUI unavailable; building LtsPrinting stub (link-only, no printing symbols)")
+  add_library(LtsPrinting SHARED lts_printing_stub.cpp)
+  NGL_INSTALL_TARGET(LtsPrinting)
 endif()

qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/lts_printing_stub.cpp

@@ -0,0 +1,14 @@
+// LtsPrinting link stub for the Qt6 migration.
+//
+// The real LtsPrinting library requires KDReports (a Qt5/KDE print-reporting
+// library that is not available in the Qt6 toolchain). When KDReports is not
+// found the real library is skipped (see CMakeLists.txt); this stub provides a
+// linkable `LtsPrinting` target so that consumers referencing the target name
+// (e.g. SmoCheckButtonHandler) still link. It exports no printing symbols.
+namespace lts_printing_stub
+{
+int lts_printing_stub_marker()
+{
+  return 0;
+}
+}

qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.cpp

@@ -84,7 +84,7 @@ void printView(LtsSession::LtsSession* session, QWidget* dialogParent, const QAb
 
     doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
     LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(dialogParent->windowTitle()),
-                                 dialogParent->windowTitle(), QPrinter::A4, QPrinter::Landscape);
+                                 dialogParent->windowTitle(), QPageSize(QPageSize::A4), QPageLayout::Landscape);
     if (!nglPrinter.printer())
         return;
 
@@ -118,8 +118,8 @@ void printView(LtsSession::LtsSession* session, QWidget* dialogParent, QAbstract
 }
 
 void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QImage& image, const QString& imageTitle,
-                const QString& description, const QPrinter::PageSize& pageSize,
-                const QPrinter::Orientation& pageOrientation)
+                const QString& description, const QPageSize& pageSize,
+                const QPageLayout::Orientation& pageOrientation)
 {
     QTextDocument doc;
     QTextCursor cursor(&doc);
@@ -141,7 +141,7 @@ void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QI
 
 void printImages(LtsSession::LtsSession* session, QWidget* dialogParent, const QString& docName,
                  QVector<QImage>& images, QVector<QString>& imageTitles, QVector<QString>& descriptions,
-                 const QPrinter::PageSize& pageSize, const QPrinter::Orientation& pageOrientation)
+                 const QPageSize& pageSize, const QPageLayout::Orientation& pageOrientation)
 
 {
     QTextDocument doc;
@@ -181,8 +181,8 @@ void printPDFImages(QWidget* dialogParent, const QString& docName, const QString
     QPrinter printer;
 
     printer.setColorMode(QPrinter::ColorMode::Color);
-    printer.setOrientation(QPrinter::Orientation::Portrait);
-    printer.setPageSize(QPrinter::PageSize::A4);
+    printer.setPageOrientation(QPageLayout::Portrait);
+    printer.setPageSize(QPageSize(QPageSize::A4));
     QString fn = docName;
     fn = fn.remove(QLatin1Char(' '));
     fn = fn.remove(QLatin1String(".."));
@@ -224,7 +224,7 @@ void printReport(LtsSession::LtsSession* session, QWidget* dialogParent, KDRepor
 
     doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
     LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(dialogParent->windowTitle()),
-                                 dialogParent->windowTitle(), QPrinter::A3, QPrinter::Landscape);
+                                 dialogParent->windowTitle(), QPageSize(QPageSize::A3), QPageLayout::Landscape);
     if (!nglPrinter.printer())
         return;
 
@@ -233,8 +233,8 @@ void printReport(LtsSession::LtsSession* session, QWidget* dialogParent, KDRepor
     cursor.movePosition(QTextCursor::End);
 
     report.setWidthForEndlessPrinter(0);
-    report.setPageSize(QPrinter::A3);
-    report.setOrientation(QPrinter::Landscape);
+    report.setPageSize(QPageSize::A3);
+    report.setPageOrientation(QPageLayout::Landscape);
 
     LtsPrinting::Base::printReportData(doc, report);
     nglPrinter.print(&doc);
@@ -249,8 +249,8 @@ void printWidget(LtsSession::LtsSession* session, QWidget* dialogParent, QWidget
 
     QString windowTitle = dialogParent->windowTitle();
     doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A3,
-                                 QPrinter::Landscape);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A3), QPageLayout::Landscape);
     if (!nglPrinter.printer())
         return;
 
@@ -271,8 +271,8 @@ void printMessage(LtsSession::LtsSession* session, QWidget* dialogParent, const
     QString windowTitle = subject;
 
     doc.setMetaInformation(QTextDocument::DocumentTitle, subject);
-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A4,
-                                 QPrinter::Portrait);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A4), QPageLayout::Portrait);
 
     QString str = QString(QStringLiteral("<H2><strong>%1</strong> %2 </H2>")).arg(subject).arg(subjectContent);
     str.append(QString(QStringLiteral("<strong>%1</strong> %2<br>")).arg(time).arg(timeContent));
@@ -302,8 +302,8 @@ void printStoryboard(LtsSession::LtsSession* session, QWidget* dialogParent, QAb
     QString windowTitle = dialogParent->windowTitle();
     doc.setMetaInformation(QTextDocument::DocumentTitle, dialogParent->windowTitle());
 
-    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle, QPrinter::A4,
-                                 QPrinter::Portrait);
+    LtsPrinting::Base nglPrinter(doc, dialogParent, QObject::tr("Print %1").arg(windowTitle), windowTitle,
+                                 QPageSize(QPageSize::A4), QPageLayout::Portrait);
 
     if (!nglPrinter.printer())
         return;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing.h

@@ -3,6 +3,8 @@
 #pragma once
 
 #include <QtPrintSupport/QPrinter>
+#include <QtGui/QPageSize>
+#include <QtGui/QPageLayout>
 
 #ifndef LTSPRINTING_EXPORT
 #ifdef BUILD_STATIC_LIBRARIES
@@ -42,13 +44,13 @@ LTSPRINTING_EXPORT void printStoryboard(LtsSession::LtsSession* session, QWidget
 
 LTSPRINTING_EXPORT void printImage(LtsSession::LtsSession* session, QWidget* dialogParent, const QImage& image,
                                    const QString& imageTitle, const QString& description,
-                                   const QPrinter::PageSize& pageSize = QPrinter::A3,
-                                   const QPrinter::Orientation& pageOrientation = QPrinter::Landscape);
+                                   const QPageSize& pageSize = QPageSize(QPageSize::A3),
+                                   const QPageLayout::Orientation& pageOrientation = QPageLayout::Landscape);
 
 LTSPRINTING_EXPORT void printImages(LtsSession::LtsSession* session, QWidget* dialogParent, const QString& docName,
                                     QVector<QImage>& images, QVector<QString>& imageTitles,
-                                    QVector<QString>& descriptions, const QPrinter::PageSize& pageSize = QPrinter::A3,
-                                    const QPrinter::Orientation& pageOrientation = QPrinter::Landscape);
+                                    QVector<QString>& descriptions, const QPageSize& pageSize = QPageSize(QPageSize::A3),
+                                    const QPageLayout::Orientation& pageOrientation = QPageLayout::Landscape);
 
 LTSPRINTING_EXPORT void printPDFImages(QWidget* dialogParent, const QString& docName, const QString& printPath,
                                        QVector<QImage>& images);

qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.cpp

@@ -50,8 +50,8 @@ Base::Base(QTextDocument &doc,
            QWidget *dialogParent,
            const QString &dialogTitle,
            const QString        &_fn,
-           QPrinter::PaperSize   _ps,
-           QPrinter::Orientation _or,
+           QPageSize             _ps,
+           QPageLayout::Orientation _or,
            QPrinter::ColorMode   _cm) : m_printer(new QPrinter),
     m_painter(new QPainter),
     m_iconFilenameNr(0),
@@ -61,9 +61,9 @@ Base::Base(QTextDocument &doc,
     headersize_(10), headerrule_(0.5), headertext_(HeaderText),
     footersize_(10), footerrule_(0.5), footertext_(FooterText),
     itemFontSize_(2),
-    m_settings(new NGL::Settings(NGL::findProjectConfigFile())).getNGLLogger("NGLPrinting")),
-    m_currentPage(1),
-    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
+    m_settings(new NGL::Settings(NGL::findProjectConfigFile())),
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("NGLPrinting")),
+    m_currentPage(1)
 {
     QString fn = _fn;
     fn = fn.remove(QLatin1Char(' '));
@@ -77,8 +77,8 @@ Base::Base(QTextDocument &doc,
 #endif
     m_printer->setOutputFormat(QPrinter::NativeFormat);
 
-    m_printer->setPaperSize(_ps);
-    m_printer->setOrientation(_or);
+    m_printer->setPageSize(_ps);
+    m_printer->setPageOrientation(_or);
     m_printer->setColorMode(_cm);
 
     m_printer->setFullPage(true);
@@ -101,13 +101,13 @@ Base::Base(QTextDocument &doc,
         QAbstractPrintDialog::PrintCollateCopies;
     dialog->setOptions(op);
     QString title = dialogTitle;
-    if (_ps == QPrinter::A2)
+    if (_ps.id() == QPageSize::A2)
         title += QLatin1String(" (A2)");
-    if (_ps == QPrinter::A3)
+    if (_ps.id() == QPageSize::A3)
         title += QLatin1String(" (A3)");
-    if (_ps == QPrinter::A4)
+    if (_ps.id() == QPageSize::A4)
         title += QLatin1String(" (A4)");
-    if (_ps == QPrinter::A5)
+    if (_ps.id() == QPageSize::A5)
         title += QLatin1String(" (A5)");
     dialog->setWindowTitle(title);
     if (dialog->exec() != QDialog::Accepted)
@@ -153,7 +153,7 @@ QString Base::styleSheet()
 
 QSize Base::printerPageSize() const
 {
-    return QSize(m_printer->pageRect().width() - 2 * DOC_MARGIN, m_printer->pageRect().height() - 2 * DOC_MARGIN);
+    return QSize(m_printer->pageRect(QPrinter::Point).width() - 2 * DOC_MARGIN, m_printer->pageRect(QPrinter::Point).height() - 2 * DOC_MARGIN);
 }
 
 bool Base::newPage()
@@ -543,7 +543,7 @@ bool Base::printItemData(QString& str, const QAbstractItemModel* model, const QM
         displayString += vdata.toString();
 
     QString fgColorString;
-    vdata = model->data(mi, Qt::TextColorRole);
+    vdata = model->data(mi, Qt::ForegroundRole);
     if (vdata.isValid())
         fgColorString = vdata.value<QColor>().name();
 
@@ -684,24 +684,24 @@ bool Base::printReportData(QTextDocument& doc, KDReports::Report& report)
     return true;
 }
 
-QPrinter::PageSize Base::pageSize() const
+QPageSize Base::pageSize() const
 {
-    return m_printer->pageSize();
+    return m_printer->pageLayout().pageSize();
 }
 
-void Base::setPageSize(QPrinter::PageSize size)
+void Base::setPageSize(QPageSize size)
 {
     m_printer->setPageSize(size);
 }
 
-QPrinter::Orientation Base::orientation() const
+QPageLayout::Orientation Base::orientation() const
 {
-    return m_printer->orientation();
+    return m_printer->pageLayout().orientation();
 }
 
-void Base::setOrientation(QPrinter::Orientation orientation)
+void Base::setOrientation(QPageLayout::Orientation orientation)
 {
-    m_printer->setOrientation(orientation);
+    m_printer->setPageOrientation(orientation);
 }
 
 double Base::leftMargin() const
@@ -711,7 +711,7 @@ double Base::leftMargin() const
 
 void Base::setLeftMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
         leftmargin_ = margin;
     else
         leftmargin_ = 0;
@@ -724,7 +724,7 @@ double Base::rightMargin() const
 
 void Base::setRightMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
         rightmargin_ = margin;
     else
         rightmargin_ = 0;
@@ -737,7 +737,7 @@ double Base::topMargin() const
 
 void Base::setTopMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
         topmargin_ = margin;
     else
         topmargin_ = 0;
@@ -750,7 +750,7 @@ double Base::bottomMargin() const
 
 void Base::setBottomMargin(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 4))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 4))
         bottommargin_ = margin;
     else
         bottommargin_ = 0;
@@ -758,7 +758,7 @@ void Base::setBottomMargin(double margin)
 
 void Base::setMargins(double margin)
 {
-    if ((margin > 0) && (margin < m_printer->paperRect().height() / 2) && (margin < m_printer->paperRect().width() / 2))
+    if ((margin > 0) && (margin < m_printer->paperRect(QPrinter::Point).height() / 2) && (margin < m_printer->paperRect(QPrinter::Point).width() / 2))
         leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = margin;
     else
         leftmargin_ = rightmargin_ = topmargin_ = bottommargin_ = 0;
@@ -771,7 +771,7 @@ double Base::spacing() const
 
 void Base::setSpacing(double spacing)
 {
-    if ((spacing > 0) && (spacing <= m_printer->paperRect().height() / 8))
+    if ((spacing > 0) && (spacing <= m_printer->paperRect(QPrinter::Point).height() / 8))
         spacing_ = spacing;
     else
         spacing_ = 0;
@@ -784,7 +784,7 @@ double Base::headerSize() const
 
 void Base::setHeaderSize(double size)
 {
-    if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
+    if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
         headersize_ = size;
     else
         headersize_ = 0;
@@ -817,7 +817,7 @@ double Base::footerSize() const
 
 void Base::setFooterSize(double size)
 {
-    if ((size > 0) && (size <= m_printer->paperRect().height() / 8))
+    if ((size > 0) && (size <= m_printer->paperRect(QPrinter::Point).height() / 8))
         footersize_ = size;
     else
         footersize_ = 0;
@@ -851,7 +851,7 @@ void Base::setItemFontSize(int itemFontSize)
 QRectF Base::paperRect(QPaintDevice* device)
 {
 
-    QRectF rect = m_printer->paperRect();
+    QRectF rect = m_printer->paperRect(QPrinter::Point);
 
     rect.setWidth(rect.width() * device->logicalDpiX() / m_printer->logicalDpiX());
     rect.setHeight(rect.height() * device->logicalDpiY() / m_printer->logicalDpiY());
@@ -930,7 +930,7 @@ void Base::printSinglePage()
     m_tempdoc->setPageSize(contentRect(m_printer).size());
 
     QTextFrameFormat fmt = m_tempdoc->rootFrame()->frameFormat();
-    fmt.setContentsMargins(0, 0, 0, 0);
+    fmt.setMargin(0);
     m_tempdoc->rootFrame()->setFrameFormat(fmt);
 
     int doccopies;
@@ -938,11 +938,11 @@ void Base::printSinglePage()
     if (m_printer->collateCopies())
     {
         doccopies = 1;
-        pagecopies = m_printer->numCopies();
+        pagecopies = m_printer->copyCount();
     }
     else
     {
-        doccopies = m_printer->numCopies();
+        doccopies = m_printer->copyCount();
         pagecopies = 1;
     }
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/printing_base.h

@@ -4,6 +4,8 @@
 
 #include <QtCore/QSet>
 #include <QtPrintSupport/QPrinter>
+#include <QtGui/QPageSize>
+#include <QtGui/QPageLayout>
 
 namespace NGL
 {
@@ -50,7 +52,7 @@ class Base
 {
   public:
     Base(QTextDocument& doc, QWidget* dialogParent, const QString& dialogTitle, const QString& _fn,
-         QPrinter::PaperSize _ps = QPrinter::A4, QPrinter::Orientation _or = QPrinter::Portrait,
+         QPageSize _ps = QPageSize(QPageSize::A4), QPageLayout::Orientation _or = QPageLayout::Portrait,
          QPrinter::ColorMode _cm = QPrinter::Color);
 
     virtual ~Base();
@@ -61,13 +63,13 @@ class Base
 
     static QString styleSheet();
 
-    QPrinter::PageSize pageSize() const;
+    QPageSize pageSize() const;
 
-    void setPageSize(QPrinter::PageSize size);
+    void setPageSize(QPageSize size);
 
-    QPrinter::Orientation orientation() const;
+    QPageLayout::Orientation orientation() const;
 
-    void setOrientation(QPrinter::Orientation orientation);
+    void setOrientation(QPageLayout::Orientation orientation);
 
     bool newPage();
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/WebSocket/messages.cpp

@@ -175,7 +175,13 @@ bool CTS::DisconnectRequest::hasValidData() const
     return true;
 }
 
-LtsProjectionWorkstation::ErrorMessage::ErrorMessage(const QString& uuid, const QString& reason)
+// Unqualified: we are already inside namespace LtsProjectionWorkstation, and the unity
+// build concatenates lts_projection_workstation.cpp (which declares
+// class LtsProjectionWorkstation in this same namespace) into this TU, so
+// "LtsProjectionWorkstation::ErrorMessage" would resolve to the class (which has no
+// such member) instead of the namespace. In a separate TU (legacy structure) the
+// class is not visible here and the qualified name resolved to the namespace.
+ErrorMessage::ErrorMessage(const QString& uuid, const QString& reason)
     : Message(nullptr, nullptr, JsonKeys::ERROR_MESSAGE(), uuid, QJsonValue()), m_reason(reason)
 {
     QJsonObject result;
@@ -183,7 +189,7 @@ LtsProjectionWorkstation::ErrorMessage::ErrorMessage(const QString& uuid, const
     m_replyData = result;
 }
 
-void LtsProjectionWorkstation::ErrorMessage::process()
+void ErrorMessage::process()
 {
     if (!m_handler || !m_client)
         return;
@@ -192,7 +198,7 @@ void LtsProjectionWorkstation::ErrorMessage::process()
     m_handler->handleMessage(this);
 }
 
-bool LtsProjectionWorkstation::ErrorMessage::hasValidData() const
+bool ErrorMessage::hasValidData() const
 {
     if (!m_handler || !m_client)
         return false;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt

@@ -48,7 +48,9 @@ IF(BUILD_RTI)
       ${CMAKE_BINARY_DIR}/Lts/DDS
   )
   # ddscore target generates core_dtc_types.h
-  ADD_DEPENDENCIES(LtsSessionDataDds ddscore)
+  IF(TARGET ddscore)
+    ADD_DEPENDENCIES(LtsSessionDataDds ddscore)
+  ENDIF()
   NGL_TARGET_LINK_DIRECTORIES(LtsSessionDataDds
     PRIVATE
       ${RTI_LIB_DIR}

qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.cpp

@@ -916,6 +916,11 @@ void LtsSession::setExerciseData(const LtsWidgets::ExerciseData& exerciseData)
     emit signalExerciseDataChanged();
 }
 
+const LtsWidgets::ExerciseData* LtsSession::exerciseData() const
+{
+    return m_exerciseData;
+}
+
 void LtsSession::setProfilePicture(const QPixmap& pixmap)
 {
     // partitionType(); ?!?

qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_lock_handler.cpp

@@ -1,4 +1,5 @@
 #include "lts_session_lock_handler.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <QtCore/QDebug>
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/Event.cpp

@@ -1,6 +1,7 @@
 
 
 #include "Event.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <LtsSession/lts_session.h>
 #include <QtGui/QPainter>

qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/TimelineHeaderView.cpp

@@ -1,6 +1,7 @@
 
 
 #include "TimelineHeaderView.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include "TimelineWidget.h"
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt

@@ -53,6 +53,20 @@ NGL_TARGET_COMPILE_DEFINITIONS(LtsUtilsGuiDds
     REQUEST_HELPER_WITH_GUI
 )
 
+# The dds_vector_to_pixmap free functions (iconFromSvg / pixmapFromIcon / ...) are
+# declared with LTSUTILSCORE_EXPORT, but this TU's include
+# <LtsUtils/LtsUtilsCore/ltsutilscore_export.h> resolves to the SOURCE-tree header,
+# where the macro expands to Q_DECL_IMPORT (empty on Linux) because
+# MAKE_LTSUTILSCORE_LIB is only defined when building LtsUtilsCore itself. Under the
+# project-wide -fvisibility=hidden they therefore compile as hidden symbols and, with
+# USE_IPO=ON, LTO drops them from the DSO entirely (they are unreferenced inside this
+# lib), breaking every consumer that links them (LtsMultiMonitor, LtsSession, ...).
+# Legacy exported them because its include <LtsUtilsCore/ltsutilscore_export.h>
+# resolved to the GENERATED export header (visibility("default")). Restore that
+# default visibility for this target only (same fix shape as the PluginInterfaces
+# visibility preset); behavior-neutral.
+set_target_properties(LtsUtilsGuiDds PROPERTIES CXX_VISIBILITY_PRESET default)
+
 
 NGL_ADD_LIBRARY2(AAR HLA  SV LtsUtilsDds SHARED request_helper.cpp request_helper.h)
 NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsDds

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt

@@ -161,7 +161,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
 NGL_TARGET_LINK_LIBRARIES(LtsWidgets
   PRIVATE
     Qt6::Network # for QHostInfo - for portability
-    Qt6::Svg
+    $<IF:$<TARGET_EXISTS:Qt6::Svg>,Qt6::Svg,>
     ngltools
     ngltranslator
     NGLLogger
@@ -183,6 +183,13 @@ NGL_INSTALL_TARGET(LtsWidgets)
 SET(ltswidgetsplugin_SRCS ltswidgetsplugin.cpp ltswidgetsplugin.json)
 NGL_ADD_LIBRARY(WS ltswidgetsplugin MODULE ${ltswidgetsplugin_SRCS})
 NGL_TARGET_LINK_LIBRARIES(ltswidgetsplugin LtsWidgets ltsCoordWidget LtsDataView LtsFileDialog LtsReportDisplay svcFlmCommon)
+# ltswidgetsplugin.cpp unconditionally includes <LtsReportDisplay/lts_report_display_widget.h>,
+# which pulls KDReports -> #include <QPrinter>. In Qt6 that forwarding header lives in
+# <QtInc>/QtPrintSupport. With BUILD_CODIFICATION=OFF the LtsReportDisplay->KDReports
+# include chain is not built, so expose the QtPrintSupport module dir directly.
+if(DEFINED QT6_INC_DIR AND EXISTS "${QT6_INC_DIR}/QtPrintSupport")
+  NGL_TARGET_INCLUDE_DIRECTORIES(ltswidgetsplugin PRIVATE "${QT6_INC_DIR}/QtPrintSupport")
+endif()
 NGL_SET_TARGET_PROPERTIES(ltswidgetsplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/designer)
 NGL_INSTALL_TARGET(ltswidgetsplugin DESTINATION lib/designer COMPONENT Devel)
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base_layout_widget.cpp

@@ -39,7 +39,9 @@
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QScrollArea>
 #include <QScroller>
-#include <QSvgRenderer>
+#ifdef QT_SVG_LIB
+#include <QtSvg/QSvgRenderer>
+#endif
 #include <QtCore/QTimer>
 #include <QtWidgets/QToolButton>
 #include <QtCore/QPropertyAnimation>
@@ -399,6 +401,7 @@ void LtsBaseLayoutWidget::showEvent(QShowEvent *event)
   {
     const QSize s(QSize(rendererSizeHint.height(), rendererSizeHint.height()) * dpr);
     // RDE SPLITTER LEFT
+#ifdef QT_SVG_LIB
     QSvgRenderer svgRenderer;
     QPixmap pixmap(s);
     pixmap.fill(Qt::transparent);
@@ -410,6 +413,9 @@ void LtsBaseLayoutWidget::showEvent(QShowEvent *event)
 
     pixmap.setDevicePixelRatio(dpr);
     m_ui->lbRdeSplitterLeft->setPixmap(pixmap);
+#else
+    qWarning() << "QSvgRenderer not available - skipping SVG rendering for splitter";
+#endif
   }
 
   {

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_checkable_table_model.h

@@ -59,7 +59,7 @@ public:
     {
       const T &entry = LtsAbstractTableModel<T>::m_vecData.at(row);
       if (entry.first)
-        ids << entry.second.id();
+        ids << entry.second.id;
     }
 
     return ids;
@@ -73,7 +73,7 @@ public:
     {
       const T &entry = LtsAbstractTableModel<T>::m_vecData.at(row);
       if (!entry.first)
-        ids << entry.second.id();
+        ids << entry.second.id;
     }
 
     return ids;
@@ -84,7 +84,7 @@ public:
     for (int row = 0; row < LtsAbstractTableModel<T>::rowCount(); ++row)
     {
       T &entry = LtsAbstractTableModel<T>::m_vecData[row];
-      bool bContains = vecCheckedIds.contains(entry.second.id());
+      bool bContains = vecCheckedIds.contains(entry.second.id);
       if (entry.first != bContains)
       {
         entry.first = bContains;

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_column_filter_proxy_model.cpp

@@ -64,7 +64,7 @@ void LtsColumnFilterProxyModel::setColumnStringFilter(const QString &newFilterSt
     }
   }
   beginFilterChange();
-    endFilterChange();
+  endFilterChange();
 }
 
 void LtsColumnFilterProxyModel::setColumnDataFilter(const QVariant &newFilterData, int column)
@@ -92,7 +92,7 @@ void LtsColumnFilterProxyModel::setColumnDataFilter(const QVariant &newFilterDat
     }
   }
   beginFilterChange();
-    endFilterChange();
+  endFilterChange();
 }
 
 
@@ -141,7 +141,7 @@ void LtsColumnFilterProxyModel::setRecursiveFilteringEnabled(bool recursive)
     return;
   m_bRecursiveFiltering = recursive;
   beginFilterChange();
-    endFilterChange();
+  endFilterChange();
 }
 
 bool LtsColumnFilterProxyModel::recursiveFilteringEnabled() const

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.cpp

@@ -7,6 +7,7 @@
 */
 
 #include "lts_dialog.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "lts_progress_dialog_helper.h"
 #include "lts_message_dialog.h"
 #include "lts_dialog_helper.h"

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_dialog.h

@@ -327,7 +327,7 @@ protected:
    */
   void translate(T *ui, const S &data, const QString &custom, const QString &title) // same as 'void translate(T *ui, const S &data, const QString &title)', but for topics without the 'name' entry
   {
-    translate(ui, QString::fromUtf8(typeid(data).name()), data.id(), custom /* can be empty */, title);
+    translate(ui, QString::fromUtf8(typeid(data).name()), data.id, custom /* can be empty */, title);
   }
 
 
@@ -341,7 +341,7 @@ protected:
    */
   void translate(T *ui, const S &data, const QString &title)
   {
-    translate(ui, data, QString::fromStdString(data.name()), title);    // -> translate #5
+    translate(ui, data, QString::fromStdString(data.name), title);    // -> translate #5
   }
 
 

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_msec_date_time_edit.cpp

@@ -1,4 +1,5 @@
 #include "lts_msec_date_time_edit.h"
+#include <QTimeZone>
 
 
 namespace LtsWidgets

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.cpp

@@ -1,142 +0,0 @@
-
-
-#include "requirement_widget.h"
-
-#include <LtsWidgets/lts_message_dialog.h>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QLabel>
-
-namespace LtsWidgets
-{
-UiRequirement::UiRequirement(QLabel* descriptionLabel, const std::function<bool()>& requirementCheck,
-                             const QString& userWarningMessage)
-    : m_descriptionLabel(descriptionLabel), m_requirementCheck(requirementCheck), m_lastResult(true),
-      m_userWarningMessage(userWarningMessage)
-{
-    retranslate();
-}
-
-void UiRequirement::reset()
-{
-    if (!isValid())
-        return;
-    m_descriptionLabel->setText(m_originalText);
-    m_descriptionLabel->setToolTip(m_originalTooltip);
-}
-
-void UiRequirement::setTexts()
-{
-    if (!isValid())
-        return;
-    if (!m_lastResult)
-    {
-        m_descriptionLabel->setText(
-            QStringLiteral("<span style=\"color:#aa0000;\">\u2022 %1</span>").arg(m_originalText));
-
-        if (!m_userWarningMessage.isEmpty())
-        {
-            m_descriptionLabel->setCursor(Qt::WhatsThisCursor);
-            m_descriptionLabel->setToolTip(m_userWarningMessage);
-        }
-    }
-    else
-    {
-        if (m_originalText.startsWith(QStringLiteral("\u2022 ")))
-            return;
-
-        m_descriptionLabel->setText(QStringLiteral("\u2022 %1").arg(m_originalText));
-        m_descriptionLabel->setCursor(Qt::ArrowCursor);
-        m_descriptionLabel->setToolTip(m_originalTooltip);
-    }
-}
-
-void UiRequirement::retranslate()
-{
-    if (!isValid())
-        return;
-
-    if (m_originalText.startsWith(QStringLiteral("\u2022 ")))
-        return;
-
-    auto x = m_descriptionLabel->text();
-    if (x.startsWith(QStringLiteral("\u2022 ")))
-        return;
-
-    m_originalText = x;
-
-    m_originalTooltip = m_descriptionLabel->toolTip();
-    setTexts();
-}
-
-bool UiRequirement::checkRequirement()
-{
-    if (!isValid())
-        return m_lastResult;
-
-    m_lastResult = m_requirementCheck();
-
-    if (!m_descriptionLabel->isVisible() && !m_descriptionLabel->property("checkMe").toBool())
-    {
-        return true;
-    }
-
-    setTexts();
-
-    return m_lastResult;
-}
-
-bool UiRequirementList::checkRequirements(QWidget* messageOnThisParent)
-{
-    bool result = true;
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& r = (*i);
-
-        if (!r.isValid())
-            continue;
-
-        if (!r.checkRequirement())
-        {
-            result = false;
-        }
-    }
-
-    if (!result && messageOnThisParent)
-    {
-        LtsWidgets::LtsMessageDialog::showMessage(
-            messageOnThisParent,
-            QApplication::translate("LtsWidgets::LtsDialog",
-                                    "There are elements that have invalid or no value.<br>"
-                                    "Please change values in the elements which are marked with red text."),
-            QApplication::translate("LtsWidgets::LtsDialog", "Operation not complete"));
-    }
-
-    return result;
-}
-
-void UiRequirementList::addRequirement(const UiRequirement& uiRequirement)
-{
-    m_requirementList.append(uiRequirement);
-}
-
-void UiRequirementList::clear()
-{
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& uir = *i;
-        uir.reset();
-    }
-
-    m_requirementList.clear();
-}
-
-void UiRequirementList::retranslate()
-{
-    for (auto i = m_requirementList.begin(); i != m_requirementList.end(); ++i)
-    {
-        UiRequirement& r = (*i);
-
-        r.retranslate();
-    }
-}
-} // namespace LtsWidgets

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/requirement_widget.h

@@ -1,62 +0,0 @@
-
-
-#pragma once
-
-#include "lts_widgets_export.h"
-
-#include <QtCore/QVector>
-#include <QtWidgets/QWidget>
-#include <functional>
-
-class QLabel;
-
-namespace LtsWidgets
-{
-
-class LTSWIDGETS_EXPORT UiRequirement
-{
-  public:
-    explicit UiRequirement() = default;
-
-    UiRequirement(QLabel* descriptionLabel, const std::function<bool()>& requirementCheck,
-                  const QString& userWarningMessage = QString());
-
-    void reset();
-
-    bool checkRequirement();
-
-    bool isValid() const
-    {
-        return m_descriptionLabel != nullptr;
-    }
-
-    void retranslate();
-
-  private:
-    void setTexts();
-
-    QLabel* m_descriptionLabel;
-    std::function<bool()> m_requirementCheck;
-    QString m_originalText;
-    QString m_originalTooltip;
-    bool m_lastResult;
-    QString m_userWarningMessage;
-};
-
-class LTSWIDGETS_EXPORT UiRequirementList
-{
-  public:
-    UiRequirementList() = default;
-
-    bool checkRequirements(QWidget* messageOnThisParent = nullptr);
-
-    void addRequirement(const UiRequirement& uiRequirement);
-
-    void clear();
-
-    void retranslate();
-
-  private:
-    QVector<UiRequirement> m_requirementList;
-};
-} // namespace LtsWidgets

qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/CMakeLists.txt

@@ -51,8 +51,27 @@ ADD_LIBRARY(TopicReplayInterface SHARED
   ${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.cpp
 )
-TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC 
+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)
+
+# These interface base classes (e.g. DataPluginBase::Plugin) are Q_OBJECT classes. The top-level
+# CMAKE_CXX_VISIBILITY_PRESET hidden compiles their Q_OBJECT meta symbols (staticMetaObject/vtable/
+# qt_metacall/typeinfo) as GLOBAL HIDDEN, so they are not exported from the .so. A cross-DSO
+# subclass (e.g. AsbDataPlugin) then fails with "undefined reference to ...::staticMetaObject".
+# Compile these interface libs with default visibility so the meta symbols are exported to consumers
+# (the legacy build, without LTO, exported them). This only widens the export surface of these tiny
+# interface libs; it changes no runtime behaviour.
+set_target_properties(
+  DataPluginInterface
+  GuiPluginInterface
+  ProjectPluginInterface
+  StylePluginInterface
+  RecordReplayPlugin
+  TopicReplayInterface
+  PROPERTIES
+    CXX_VISIBILITY_PRESET default
+    CXX_VISIBILITY_INLINES_HIDDEN OFF
+)

qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h

@@ -132,12 +132,12 @@ class Interface
 
   protected:
     LtsSession::LtsSession* m_session;
+    NGL::INGLLogger& m_logger;
 
   private:
     QFlags<LtsAppDescriptor::PluginInfo::Flag> m_flags;
     QStringList m_options;
     LtsAppDescriptor::App m_appId;
-    NGL::INGLLogger& m_logger;
 };
 
 } // namespace GuiPluginBase

qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt

@@ -45,6 +45,7 @@ NGL_ADD_LIBRARY2(WS TopicEditorBase SHARED ${topic_editor_base_SRCS})
 NGL_TARGET_INCLUDE_DIRECTORIES(TopicEditorBase
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
+    ${CMAKE_CURRENT_BINARY_DIR} # topiceditorbase_export.h (generated here)
     ${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file
     ${CMAKE_BINARY_DIR}/Z/src/NGLLogger # ngllogger_export.h
 )

qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_base.h

@@ -2,7 +2,7 @@
 
 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
 
 #include <LtsUtils/LtsUtilsCore/promise.h>
 #include <LtsWidgets/lts_dialog.h>

qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_editor_utils.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
 
 #include <LtsScriptTimeline/track_entry.h>
 #include <QtCore/QVector>

qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_preview_widget.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
 
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>

qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/topic_previewer.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "topic_editor_utils.h"
-#include "topiceditorbase_export.h"
+#include <Lts/Common/TopicEditorBase/topiceditorbase_export.h>
 
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>

qt6-after/qt6-migrated-legatus/Lts/DDS/CMakeLists.txt

@@ -24,11 +24,12 @@ ADD_SUBDIRECTORY(Routing)
 
 ADD_SUBDIRECTORY(Core)
 
-# During stepwise migration, add placeholder CTest entries before the
-# real DdsUnitTests subdir so the test-suite shows migration status even
-# when internal codegen targets are not yet available.
-ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)
-
+# During stepwise migration, add placeholder CTest entries after the
+# real DdsUnitTests subdir so the test-suite can use real targets when
+# internal codegen/RTI targets are available, and fall back to placeholders
+# only when they are not.
 IF(BUILD_RTI)
   ADD_SUBDIRECTORY(DdsUnitTests)
 ENDIF()
+
+ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder)

qt6-after/qt6-migrated-legatus/Lts/DDS/Core/pacemaker.cpp

@@ -59,7 +59,7 @@ void Pacemaker::addPort(unsigned short number, Core::CorePortType portType, cons
 
 void Pacemaker::addPortInternal(unsigned short number, Core::CorePortType portType, const QString& properties)
 {
-    if (!m_state.ports.is_set())
+    if (!m_state.ports.has_value())
         m_state.ports = std::vector<Core::PortInformation>();
     m_state.ports.get().push_back(Core::PortInformation(number, portType, properties.toStdString()));
 

qt6-after/qt6-migrated-legatus/Lts/DDS/DdsUnitTests/function_topic_tests.cpp

@@ -1,6 +1,7 @@
 
 
 #include "function_topic_tests.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 
 #include <DDS/DDSConnector/publisher.h>
 #include <DDS/DDSConnector/subscriber.h>

qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/CMakeLists.txt

@@ -5,14 +5,22 @@
 #
 
 
-# ddsftc
-ADD_LIBRARY(ddsftc INTERFACE)
+# ddsftc - Changed from INTERFACE to STATIC library to fix source path issues
+# When INTERFACE libraries provide sources, CMake compiles them in the consuming
+# target's directory context, causing path resolution issues with relative paths
+ADD_LIBRARY(ddsftc STATIC
+  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_impl.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.cpp
+)
 TARGET_INCLUDE_DIRECTORIES(ddsftc
-  INTERFACE
+  PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/../../
 )
 TARGET_LINK_LIBRARIES(ddsftc
-  INTERFACE
+  PUBLIC
     Qt6::Core
     $<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
     ddsgen
@@ -22,21 +30,12 @@ TARGET_LINK_LIBRARIES(ddsftc
 )
 IF(BUILD_RTI)
 TARGET_LINK_LIBRARIES(ddsftc
-  INTERFACE
+  PUBLIC
     ddsfts_connext
     RTI::nddsc
     RTI::nddscpp2
 )
 ENDIF()
-SET(SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_impl.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc_threading.cpp
-)
-
-TARGET_SOURCES(ddsftc INTERFACE ${SRCS})
 
 
 # ddsftccore

qt6-after/qt6-migrated-legatus/Lts/DDS/FTC/generic_ftc_impl.h

@@ -430,12 +430,9 @@ private:
           INFO_LOG(m_logger) << "#receiveReply for " << TopicNameHelper::replyTopicTypeName();
           // QueuedConnection to make sure the data is handled in the correct Qt (main) thread
           request.replySlot.invoke(m_objToInform, Qt::QueuedConnection,
-                                   // Qt6: QMetaMethod::invoke takes QMetaMethodArgument; pass the
-                                   // registered topic type name like Q_ARG does, but with the
-                                   // runtime name (ReplyTopic is a template parameter).
                                    QtPrivate::Invoke::argument<ReplyTopic>(TopicNameHelper::replyTopicTypeName(), reply.data()),
                                    Q_ARG(int, request.uniqueId),
-                                   Q_ARG(bool, !inProgress)); // finished yes/no
+                                   Q_ARG(bool, !inProgress));
         }
         else
         {

qt6-after/qt6-migrated-legatus/Lts/DDS/Generic/generic_data_writer.h

@@ -86,7 +86,7 @@ template <typename TOPICTYPE> class GenericDataWriter final
             return false;
         }
 
-        if (si.is_set())
+        if (si.has_value())
         {
             rti::pub::WriteParams writeParams;
             rti::core::SampleIdentity sampleIdentity(si.get()->source_guid(), si.get()->publication_sequence_number());

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp

@@ -17,7 +17,7 @@ namespace AdvancedSymbology
 AdvancedSymbology::SidcDefinitions::Identity roleToIdentity(const ParticipantManagement::Role role)
 {
   AdvancedSymbology::SidcDefinitions::Identity identity = AdvancedSymbology::SidcDefinitions::Identity::Unknown;
-  switch (role.underlying()) {
+  switch (role) {
   case ParticipantManagement::Role::Unknown:
     identity = AdvancedSymbology::SidcDefinitions::Identity::Unknown;
     break;

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp

@@ -6,7 +6,7 @@
 
 #ifdef BUILD_WITH_EXTERNAL_DDS
 #include "AreaEffectSimulation/aes_dtc.h"
-#include "ParticipantManagement/ppm.hpp"
+#include "ParticipantManagement/ppm_dtc.h"
 #endif
 #include "Symbology/symbol_data_to_render_role.h"
 #include "SymbologyImpl/advanced_symbology_logging.h"
@@ -18,6 +18,7 @@ ForeignInterfaceImpl::ForeignInterfaceImpl(const std::shared_ptr<ParticipantMana
                                            const std::shared_ptr<AreaEffectSimulation::Interface::Dtc>& aesDtc,
                                            const std::shared_ptr<GuezIedManagement::Interface::Dtc>& guezIedDtc)
     : m_ppmDtc(ppmDtc), m_aesDtc(aesDtc), m_guezIedDtc(guezIedDtc)
+    , m_logger(getLogger("AdvancedSymbologyPlugin"))
 {
     if (!m_ppmDtc)
     {
@@ -53,100 +54,100 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const SymbolDataToR
 QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantManagement::Participant& participant,
                                                              int sizeL, const QColor& desiredColor) const
 {
-    AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(participant.symbol()), sizeL);
+    AdvancedSymbology::SymbolDataToRender symDataToRender(QString::fromStdString(participant.symbol), sizeL);
 
     if (!m_ppmDtc)
         return findImage(symDataToRender);
 
-    const ParticipantManagement::Party& party = m_ppmDtc->party(participant.partyId());
-    symDataToRender.role = AdvancedSymbology::roleToRole<>(party.role());
+    const ParticipantManagement::Party& party = m_ppmDtc->party(participant.partyId);
+    symDataToRender.role = AdvancedSymbology::roleToRole<>(party.role);
 
-    symDataToRender.fillColor = desiredColor.isValid() ? desiredColor : QColor::fromRgb(QRgb(party.color()));
+    symDataToRender.fillColor = desiredColor.isValid() ? desiredColor : QColor::fromRgb(QRgb(party.color));
     symDataToRender.fillColorReplace = true;
 
     QColor injuryColor = QColor(100, 100, 0);
     ProjectDataManagement::VulnerabilityState currentState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady;
 
-    const ParticipantManagement::DynamicParticipantData dData = m_ppmDtc->dynamicParticipantData(participant.id());
+    const ParticipantManagement::DynamicParticipantData dData = m_ppmDtc->dynamicParticipantData(participant.id);
 
-    if (dData.stateHistory().size())
+    if (dData.stateHistory.size())
     {
         const ParticipantManagement::StateInformation& lastState =
-            m_ppmDtc->youngestStateInformation(dData.stateHistory());
-        currentState = lastState.vulnerabilityState();
+            m_ppmDtc->youngestStateInformation(dData.stateHistory);
+        currentState = lastState.vulnerabilityState;
 
-        switch (lastState.originatorType().underlying())
+        switch (lastState.originatorType)
         {
-            case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice: {
                 if (m_guezIedDtc)
                 {
-                    const GuezIedManagement::Ied& gIed = m_guezIedDtc->iedForEquipmentNumber(lastState.originatorId());
-                    if (gIed.id() > 0)
+                    const GuezIedManagement::Ied& gIed = m_guezIedDtc->iedForEquipmentNumber(lastState.originatorId);
+                    if (gIed.id > 0)
                     {
-                        int injuryPartyId = gIed.partyId();
+                        int injuryPartyId = gIed.partyId;
                         if (injuryPartyId >= 0)
-                            injuryColor = m_ppmDtc->party(injuryPartyId).color();
+                            injuryColor = m_ppmDtc->party(injuryPartyId).color;
                     }
                 }
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::DusMine: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine: {
                 if (!m_aesDtc)
                 {
                     WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed,  No color and injury information will be "
                                              "included in symbol created for participant.id() "
-                                          << participant.id();
+                                          << participant.id;
                     return findImage(symDataToRender);
                 }
-                const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId());
+                const int partyId = m_aesDtc->partyForDusMine(lastState.originatorId);
                 if (partyId >= 0)
-                    injuryColor = m_ppmDtc->party(partyId).color();
+                    injuryColor = m_ppmDtc->party(partyId).color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation:
-            case ProjectDataManagement::StateChangeOriginator::FunctionalArea: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea: {
                 if (!m_aesDtc)
                 {
                     WARNING_LOG(m_logger) << "Fetching 'm_aesDtc' failed,  No color and injury information will be "
                                              "included in symbol created for participant.id() "
-                                          << participant.id();
+                                          << participant.id;
                     return findImage(symDataToRender);
                 }
 
                 AreaEffectSimulation::AesItem aesItem;
-                m_aesDtc->aesItemFromId(lastState.originatorId(), aesItem);
+                m_aesDtc->aesItemFromId(lastState.originatorId, aesItem);
 
-                if (aesItem.partyId().is_set())
-                    injuryColor = m_ppmDtc->party(aesItem.partyId().get()).color();
+                if (aesItem.partyId.has_value())
+                    injuryColor = m_ppmDtc->party(aesItem.partyId.get()).color;
 
                 break;
             }
 
-            case ProjectDataManagement::StateChangeOriginator::Participant: {
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant: {
                 const ParticipantManagement::Participant& participantOrigin =
-                    m_ppmDtc->participant(lastState.originatorId());
+                    m_ppmDtc->participant(lastState.originatorId);
 
-                if (participantOrigin.id())
-                    injuryColor = m_ppmDtc->party(participantOrigin.partyId()).color();
+                if (participantOrigin.id)
+                    injuryColor = m_ppmDtc->party(participantOrigin.partyId).color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::Party: {
-                const ParticipantManagement::Party& partyOrigin = m_ppmDtc->party(lastState.originatorId());
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party: {
+                const ParticipantManagement::Party& partyOrigin = m_ppmDtc->party(lastState.originatorId);
 
-                if (partyOrigin.id())
-                    injuryColor = partyOrigin.color();
+                if (partyOrigin.id)
+                    injuryColor = partyOrigin.color;
                 break;
             }
-            case ProjectDataManagement::StateChangeOriginator::ObserverController:
-            case ProjectDataManagement::StateChangeOriginator::ExerciseControl:
-            case ProjectDataManagement::StateChangeOriginator::Initialization:
-                injuryColor = m_ppmDtc->party(1).color();
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization:
+                injuryColor = m_ppmDtc->party(1).color;
                 break;
-            case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice:
-            case ProjectDataManagement::StateChangeOriginator::MedicalTimeout:
-            case ProjectDataManagement::StateChangeOriginator::Sanitation:
-            case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice:
-            case ProjectDataManagement::StateChangeOriginator::Unknown:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice:
+            case ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown:
                 break;
         }
     }
@@ -159,7 +160,7 @@ QSharedPointer<SymbolResult> ForeignInterfaceImpl::findImage(const ParticipantMa
 
 AdvancedSymbology::Injury ForeignInterfaceImpl::stateToInjury(const ProjectDataManagement::VulnerabilityState& state)
 {
-    switch (state.underlying())
+    switch (state)
     {
         case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady:
         case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance:

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_save_as_symbol.cpp

@@ -70,10 +70,10 @@ void SaveAsSymbol::onInputChanged(const QString &input)
 
 void SaveAsSymbol::onFileContentChanged(const FileManagement::FileContent &data, DataModification modType)
 {
-  if (data.fileType() != FileManagement::FileType::OperatorDefinedSymbol)
+  if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
     return;
 
-  QString name = QString::fromStdString(data.name());
+  QString name = QString::fromStdString(data.name);
 
   if (modType == DataModification::eRemoved)
     m_takenNames.removeAll(name);

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_select_text_dialog.h

@@ -19,7 +19,7 @@ class SelectTextDialog final : public LtsWidgets::LtsFramelessDialog
     ~SelectTextDialog();
 
   protected:
-    NGL::INGLLogger& m_logger;
+    //NGL::INGLLogger& m_logger;  // unused (legacy: commented out)
     Ui_SelectTextDialog* ui;
 
   private:

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.cpp

@@ -125,7 +125,7 @@ SymbolEditor::SymbolEditor(LtsSession::LtsSession *session, QWidget *parent)
   : LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
   , m_ui(new Ui::SymbolEditor)
   , m_session(session)
-  .getNGLLogger("SymbolEditor"))
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("SymbolEditor"))
 {
     DEBUG_LOG(m_logger) << "SymbolEditor(" << "parent=" << parent << ")";
     m_ui->setupUi(this);
@@ -227,9 +227,9 @@ bool SymbolEditor::init(const std::shared_ptr<FileManagement::Interface::Ftc>& f
     m_internal->m_symbolColorsPreview.clear();
     m_internal->m_ppmDtc->partys([this](const ParticipantManagement::Party& data) {
         m_internal->m_symbolColorsPreview.append(
-            {ParticipantManagement::trPartyName(data.name()), QColor::fromRgb(data.color())});
-        m_internal->m_symbolColorsPreview.append({tr("%1 (faded)").arg(ParticipantManagement::trPartyName(data.name())),
-                                                  QColor::fromRgb(data.fadingColor())});
+            {ParticipantManagement::trPartyName(data.name), QColor::fromRgb(data.color)});
+        m_internal->m_symbolColorsPreview.append({tr("%1 (faded)").arg(ParticipantManagement::trPartyName(data.name)),
+                                                  QColor::fromRgb(data.fadingColor)});
     });
 
     m_internal->m_toolButtonGroup.addButton(m_ui->ToolButtonRect);
@@ -812,11 +812,9 @@ void SymbolEditor::updateSymbolAttributesWidgets()
     m_ui->ListViewMisc->clearSelection();
     m_ui->ListViewTruppengattung->clearSelection();
 
-    QLinkedList<SymbologyXML::Primitive*> primitives = m_internal->m_symbol.getPrimitives();
-    QLinkedListIterator<SymbologyXML::Primitive*> pi(primitives);
-    while (pi.hasNext())
+    auto primitives = m_internal->m_symbol.getPrimitives();
+    for (auto* prim : primitives)
     {
-        SymbologyXML::Primitive* prim = pi.next();
         int iconId = prim->icon();
         SymbologyXML::SymbolTypes::t_icon_type iconType = prim->iconType();
         SymbologyXML::SymbolTypes::t_sector_position sectorPosition = prim->position();
@@ -1445,7 +1443,7 @@ void SymbolEditor::slotImportTemplate()
         else
         {
             FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-            QString symbolName = QString::fromStdString(fc.name());
+            QString symbolName = QString::fromStdString(fc.name);
             SymbologyXML::SymbolReader sr;
             pushUndo();
             sr.read(content, m_internal->m_symbol);
@@ -1453,7 +1451,7 @@ void SymbolEditor::slotImportTemplate()
 
             m_internal->m_lastFileId = fileId;
             m_internal->m_lastFileName = symbolName;
-            m_internal->m_lastFolderId = fc.folderId();
+            m_internal->m_lastFolderId = fc.folderId;
 
             updateGUI();
             __unchange__();
@@ -1850,7 +1848,7 @@ void SymbolEditor::onToolButtonTextClicked()
 
 void SymbolEditor::resetToolButtonGroupState()
 {
-    m_ui->ToolButtonSelect->animateClick(1);
+    m_ui->ToolButtonSelect->animateClick();
 }
 
 void SymbolEditor::onPushButtonFillColorClicked()
@@ -1934,11 +1932,9 @@ void SymbolEditor::copyElementsFromSymbol(const SymbologyXML::Symbol& tmpSymbol)
             m_internal->m_symbol.addBranch((SymbologyXML::SymbolTypes::t_branch)idx);
     }
 
-    QLinkedList<SymbologyXML::Primitive*> prims = tmpSymbol.getPrimitives();
-    QLinkedListIterator<SymbologyXML::Primitive*> pi(prims);
-    while (pi.hasNext())
+    auto prims = tmpSymbol.getPrimitives();
+    for (auto* prim : prims)
     {
-        SymbologyXML::Primitive* prim = pi.next();
         if ((prim->type() == SymbologyXML::Primitive::ICON) &&
             m_internal->m_symbol.containsPrimitive(prim->iconType(), prim->position(), prim->icon()))
             continue;
@@ -3016,8 +3012,8 @@ bool SymbolEditor::writeFile(bool saveAsNew)
         DEBUG_LOG(m_logger) << "Saved file with id = " << fileId;
         m_internal->m_lastFileId = fileId;
         FileManagement::FileContent fc = m_internal->m_flmDtc->fileContent(fileId);
-        m_internal->m_lastFolderId = fc.folderId();
-        const QString fileName = QString::fromStdString(fc.name());
+        m_internal->m_lastFolderId = fc.folderId;
+        const QString fileName = QString::fromStdString(fc.name);
         m_internal->m_lastFileName = fileName;
         m_internal->m_symbol.setName(fileName);
         bRet = true;

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor.h

@@ -6,7 +6,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <NGLLogger/INGLLogger.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <SymbologyXML/symbol_types.h>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/asb_symbol_editor_gui_plugin.h

@@ -5,7 +5,7 @@
 
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <AdvancedSymbology/asb_gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <FileManagement/flm_explorer_gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/flm_reply_handler.cpp

@@ -27,8 +27,8 @@ void FileManagementReplyHandler::requestReply(const Core::FunctionReplyObject &r
 
 void FileManagementReplyHandler::onGetFileContentDataReply(const FileManagement::GetFileContentDataReply &replyObject)
 {
-  m_content = replyObject.content();
-  m_id = replyObject.id();
+  m_content = replyObject.content;
+  m_id = replyObject.id;
   m_requestHelper->requestReply(replyObject);
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/forms/asb_symbol_editor.ui

@@ -318,7 +318,7 @@
              <enum>Qt::ScrollBarAsNeeded</enum>
             </property>
             <property name="renderHints">
-             <set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+             <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
             </property>
            </widget>
           </item>
@@ -576,7 +576,7 @@
              <enum>Qt::ScrollBarAlwaysOff</enum>
             </property>
             <property name="renderHints">
-             <set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+             <set>QPainter::Antialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
             </property>
            </widget>
           </item>

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.cpp

@@ -6,7 +6,7 @@
 
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <QtXml/QDomDocument>
 #include <QtGui/QImage>
@@ -152,7 +152,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
 
 #ifdef SKIP_SOME_TO_TEST_REFETCHING
         if (fileContentId >= 98)
-            request.fileContentId(-1);
+            request.fileContentId = -1;
 #endif
 #endif
 
@@ -179,7 +179,7 @@ bool FlmSubscriber::createFlmSymbolProxy(int type_placeholder)
 
 void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileContentDataReply& reply)
 {
-    const int32_t fileContentId = reply.id();
+    const int32_t fileContentId = reply.id;
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, " << fileContentId;
 
@@ -197,16 +197,16 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
 
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " fileContentId=" << fileContentId << " name=" << name
                         << " operatorName=" << operatorName << " lastModified=" << lastModified
-                        << " #bytes =" << reply.content().size();
+                        << " #bytes =" << reply.content.size();
 
-    fcData.monitoring.replyContentSize = reply.content().size();
+    fcData.monitoring.replyContentSize = reply.content.size();
 
     switch (fcData.type)
     {
         case FileContentStruct::SymbolType::EtsSymbol: {
             QImage image;
-            if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content().at(0)),
-                                                    reply.content().size()),
+            if (!svgToImage(QByteArray::fromRawData(reinterpret_cast<const char*>(&reply.content.at(0)),
+                                                    reply.content.size()),
                             image))
             {
                 ERROR_LOG(m_logger) << Q_FUNC_INFO << " svgToImage failed, fileContentId=" << fileContentId;
@@ -225,7 +225,7 @@ void FlmSubscriber::onGetFileContentDataReply(const FileManagement::GetFileConte
 
         case FileContentStruct::SymbolType::XmlSymbol: {
             FlmSymbolProxy::SymbolData symbolData(name, operatorName, lastModified,
-                                                  LtsUtils::toQByteArray(reply.content()));
+                                                  LtsUtils::toQByteArray(reply.content));
 
             if (symbolData.isXmlSymbol())
             {
@@ -277,7 +277,7 @@ bool FlmSubscriber::svgToImage(const QByteArray& svgByteArray, QImage& imageOut)
 QString FlmSubscriber::operatorName(int operatorId)
 {
     if (d->m_opmDtc)
-        return QString::fromStdString(d->m_opmDtc->user(operatorId).name());
+        return QString::fromStdString(d->m_opmDtc->user(operatorId).name);
     return QStringLiteral("unknown user<%1>").arg(operatorId);
 }
 
@@ -339,20 +339,20 @@ void FlmSubscriber::checkForReFetching()
 
 void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data, DataModification modType)
 {
-    TRACE_LOG(m_logger) << Q_FUNC_INFO << " data.id=" << data.id()
-                        << " data.fileStatus=" << data.fileStatus().underlying() << " modType=" << modType
-                        << " data.name='" << data.name().c_str() << "'";
+    TRACE_LOG(m_logger) << Q_FUNC_INFO << " data.id=" << data.id
+                        << " data.fileStatus=" << data.fileStatus << " modType=" << modType
+                        << " data.name='" << data.name.c_str() << "'";
 
     if (!d->m_flmFtc)
         return;
 
-    if (data.isDeleted())
+    if (data.isDeleted)
         return;
 
-    if (data.fileType().underlying() != FileManagement::FileType::OperatorDefinedSymbol)
+    if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
         return;
 
-    if (data.fileStatus().underlying() == FileManagement::FileStatus::Deleted)
+    if (data.fileStatus == FileManagement::FileStatus::Deleted)
     {
         switch (modType)
         {
@@ -367,7 +367,7 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data
         }
     }
 
-    const int32_t fileContentId = data.id();
+    const int32_t fileContentId = data.id;
     switch (modType)
     {
         case DataModification::eAdded:
@@ -383,13 +383,13 @@ void FlmSubscriber::onFileContentChanged(const FileManagement::FileContent& data
 
         case DataModification::eRemoved: {
             DEBUG_LOG(m_logger) << Q_FUNC_INFO << " modType=" << modType << " fileContentId=" << fileContentId
-                                << " fileContentName=" << data.name();
+                                << " fileContentName=" << data.name;
 
             d->m_fileContentMap.remove(fileContentId);
 
             if (!d->m_symbolProxy.removeSymbol(fileContentId))
                 ERROR_LOG(m_logger) << Q_FUNC_INFO << " removeSymbol failed"
-                                    << " fileContentId=" << fileContentId << " fileContentName='" << data.name() << "'"
+                                    << " fileContentId=" << fileContentId << " fileContentName='" << data.name << "'"
                                     << " contains=" << d->m_fileContentMap.contains(fileContentId);
             break;
         }
@@ -400,35 +400,35 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent& data
 {
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START"
                         << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
-                        << " fileContentId=" << data.id() << " data.isDeleted()=" << data.isDeleted()
-                        << " data.fileStatus().underlying()=" << data.fileStatus().underlying() << " data.name='"
-                        << QString::fromStdString(data.name()) << "'";
+                        << " fileContentId=" << data.id << " data.isDeleted=" << data.isDeleted
+                        << " data.fileStatus=" << data.fileStatus << " data.name='"
+                        << QString::fromStdString(data.name) << "'";
 
-    if (data.isDeleted())
+    if (data.isDeleted)
         return;
 
-    if (data.fileStatus().underlying() == FileManagement::FileStatus::Deleted)
+    if (data.fileStatus == FileManagement::FileStatus::Deleted)
         return;
 
-    if (data.fileType() != FileManagement::FileType::OperatorDefinedSymbol)
+    if (data.fileType != FileManagement::FileType::OperatorDefinedSymbol)
         return;
 
-    const int32_t fileContentId = data.id();
+    const int32_t fileContentId = data.id;
 
     FileContentStruct fcData;
 
-    fcData.name = QString::fromStdString(data.name());
+    fcData.name = QString::fromStdString(data.name);
     fcData.type = FileContentStruct::SymbolType::UnsupportedSymbol;
-    fcData.operatorName = operatorName(data.operatorId());
-    fcData.lastModified = data.lastModified();
+    fcData.operatorName = operatorName(data.operatorId);
+    fcData.lastModified = data.lastModified;
 
     fcData.usrTags << QStringLiteral("file-id=%1").arg(fileContentId);
-    fcData.usrTags << QStringLiteral("exercise-id=%1").arg(data.exerciseId().is_set() ? data.exerciseId().get() : -1);
+    fcData.usrTags << QStringLiteral("exercise-id=%1").arg(data.exerciseId.has_value() ? data.exerciseId.get() : -1);
     fcData.usrTags << fcData.operatorName;
 
-    if (data.properties().size() != 0)
+    if (data.properties.size() != 0)
     {
-        const QByteArray attributesJson(QByteArray::fromRawData(data.properties().c_str(), data.properties().size()));
+        const QByteArray attributesJson(QByteArray::fromRawData(data.properties.c_str(), data.properties.size()));
         QJsonParseError parseError;
         QJsonDocument jDoc(QJsonDocument::fromJson(attributesJson, &parseError));
 
@@ -476,9 +476,9 @@ void FlmSubscriber::updateFileContentMap(const FileManagement::FileContent& data
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"
                         << " d->m_fileContentMap.size()=" << d->m_fileContentMap.size()
-                        << " fileContentId=" << data.id() << " data.isDeleted()=" << data.isDeleted()
-                        << " data.fileStatus().underlying()=" << data.fileStatus().underlying() << " data.name='"
-                        << QString::fromStdString(data.name()) << "'";
+                        << " fileContentId=" << data.id << " data.isDeleted=" << data.isDeleted
+                        << " data.fileStatus=" << data.fileStatus << " data.name='"
+                        << QString::fromStdString(data.name) << "'";
 }
 
 void FlmSubscriber::onLocalSymbolProxyEtsSymbolAdded(qint32 fileContentId, const QString& name, const QImage& image,

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_flm_subscriber.h

@@ -6,7 +6,7 @@
 #include <Lts/Services/FileManagement/flm.hpp>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 #include <memory>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/asb_symbol_proxy_gui_plugin.cpp

@@ -10,7 +10,7 @@
 #include <Symbology/sidc_codec.h>
 #include "flm_symbol_proxy.h"
 
-#include <flm_data_plugin_interface.h>
+#include <Plugins/FileManagement/flm_data_plugin_interface.h>
 #include <OperatorManagement/opm_data_plugin_interface.h>
 
 namespace AdvancedSymbology

qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/flm_symbol_proxy.h

@@ -9,6 +9,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QString>
 #include <QtGui/QImage>
+#include <QtCore/QObject>
 
 
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp

@@ -63,58 +63,47 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
         return QVariant();
 
     const AlarmManagement::AlarmConfig& alarmConfig = m_vecData.at(index.row());
-    if (alarmConfig.global() != m_global)
+    if (alarmConfig.global != m_global)
         return QVariant();
 
     switch (index.column())
     {
         case Id:
-            return alarmConfig.id();
+            return alarmConfig.id;
         case EquipmentNumber: {
-            const int equipmentNumber = m_alarmHistoryModel->participantId2EquipNo(alarmConfig.participantId());
+            const int equipmentNumber = m_alarmHistoryModel->participantId2EquipNo(alarmConfig.participantId);
             if (equipmentNumber == 0)
                 return tr("All");
             return equipmentNumber;
         }
         case Designator:
-            return m_alarmHistoryModel->getDesignator(alarmConfig.participantId());
+            return m_alarmHistoryModel->getDesignator(alarmConfig.participantId);
         case TactIdentifier:
-            return m_alarmHistoryModel->getTactIdentifier(alarmConfig.participantId());
+            return m_alarmHistoryModel->getTactIdentifier(alarmConfig.participantId);
         case VulnerabilityState: {
             QString vulnerabilityState = tr("All Types");
-            if (alarmConfig.vulnerabilityState() >= 0)
+            if (alarmConfig.vulnerabilityState >= 0)
             {
-                // participant() existiert nicht mehr, suche in participantsList()
-                auto participantIt = std::find_if(
-                    m_ppmDtc->participantsList().begin(), m_ppmDtc->participantsList().end(),
-                    [id = alarmConfig.participantId()](const ParticipantManagement::Participant& p) {
-                        return p.id() == id;
-                    });
-
-                ParticipantManagement::TypeClass typeClass = ParticipantManagement::TypeClass::Other;
-                // STUB: type()-Methode nicht verfügbar - verwende Default-Wert
-                // if (participantIt != m_ppmDtc->participantsList().end())
-                // {
-                //     typeClass = m_ppmDtc->type(participantIt->typeId()).typeClass();
-                // }
+                ParticipantManagement::TypeClass typeClass =
+                    m_ppmDtc->type(m_ppmDtc->participant(alarmConfig.participantId).typeId).typeClass;
 
                 const ProjectDataManagement::VulnerabilityClass vc =
                     typeClass == ParticipantManagement::TypeClass::Human
-                        ? ProjectDataManagement::VulnerabilityClass::SoldierInjuries
-                        : ProjectDataManagement::VulnerabilityClass::VehicleDamages;
+                        ? ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries
+                        : ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages;
                 ProjectDataManagement::VulnerabilityState vs =
-                    static_cast<ProjectDataManagement::VulnerabilityState>(alarmConfig.vulnerabilityState());
+                    static_cast<ProjectDataManagement::VulnerabilityState>(alarmConfig.vulnerabilityState);
                 vulnerabilityState = ProjectDataManagement::toString(vs, vc);
             }
             return vulnerabilityState;
         }
 
         case EventType:
-            return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(alarmConfig.eventTypeId()));
+            return ProjectDataManagement::toString(static_cast<ProjectDataManagement::PdmEventType>(alarmConfig.eventTypeId));
         case MessageWindow:
-            return alarmConfig.messageWindow() ? tr("Yes") : tr("No");
+            return alarmConfig.messageWindow ? tr("Yes") : tr("No");
         case SetMarker:
-            return alarmConfig.setMarker() ? tr("Yes") : tr("No");
+            return alarmConfig.setMarker ? tr("Yes") : tr("No");
     }
 
     return QVariant();
@@ -122,15 +111,15 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const
 
 void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, const DataModification modType)
 {
-    const int id = data.id();
-    if (data.global() != m_global)
+    const int id = data.id;
+    if (data.global != m_global)
         return;
 
     int row = findRowForId(id);
 
-    const int eventTypeId = data.eventTypeId();
-    const bool messageWindow = data.messageWindow();
-    const bool setMarker = data.setMarker();
+    const int eventTypeId = static_cast<int>(data.eventTypeId);
+    const bool messageWindow = data.messageWindow;
+    const bool setMarker = data.setMarker;
     DEBUG_LOG(getLogger()) << "onAlarmConfigChanged: " << eventTypeId << " messageWindow=" << messageWindow << "setMarker"
                         << setMarker;
 
@@ -140,8 +129,8 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
 
             DEBUG_LOG(getLogger()) << "AlarmConfig was removed: " << id;
             AlarmManagement::AlarmConfig data1 = data;
-            data1.setMessageWindow(false);
-            data1.setSetMarker(false);
+            data1.messageWindow = false;
+            data1.setMarker = false;
             setRowData(row, data1);
             removeRow(row);
             return;
@@ -153,7 +142,7 @@ void ConfigAlarmModel::onAlarmConfigChanged(const AlarmManagement::AlarmConfig&
 
                 return;
             }
-            if (m_alarmHistoryModel->participantId2EquipNo(data.participantId()) > 0)
+            if (m_alarmHistoryModel->participantId2EquipNo(data.participantId) > 0)
                 setRowData(row, data);
             break;
         }

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h

@@ -6,7 +6,6 @@
 #include "almcommon_export.h"
 
 #include <AlarmManagement/alm_dtc.h>
-#include <AlarmManagement/alm_types.h>
 #include <GuezNasat/logger.h>
 #include <LtsSession/lts_session.h>
 #include <LtsWidgets/lts_abstract_table_model.h>

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.cpp

@@ -49,7 +49,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
 
     // Register callbacks instead of enableParticipant()
     const auto cbParticipants = [this](const ParticipantManagement::Participant& participant) {
-        onParticipantChanged(participant, ParticipantManagement::DataModification::eAdded);
+        onParticipantChanged(participant, DataModification::eAdded);
     };
     m_ppmDtc->participants(cbParticipants);
 
@@ -66,7 +66,7 @@ bool AlarmHistoryModel::initModel(const std::shared_ptr<AlarmManagement::Interfa
     auto cbAesItem = [this](const AreaEffectSimulation::AesItem& item) {
         onAesItemChanged(item, DataModification::eAdded);
     };
-    m_aesDtc->bcContaminations(cbAesItem);
+    m_aesDtc->bCContaminations(cbAesItem);
     m_aesDtc->boobyTraps(cbAesItem);
     m_aesDtc->offRouteMines(cbAesItem);
 
@@ -84,7 +84,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
 
     if (role == Qt::BackgroundRole)
     {
-        if (notificationEx.eventType() == ProjectDataManagement::PdmEventType::Alarm)
+        if (notificationEx.eventType == ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
             return QColor(Qt::red);
         return QVariant();
     }
@@ -94,7 +94,7 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
         case Id:
             return notificationEx.id;
         case Date:
-            return QDateTime::fromMSecsSinceEpoch(notificationEx.time());
+            return QDateTime::fromMSecsSinceEpoch(notificationEx.time);
         case EquipmentNumber:
             if (notificationEx.equipmentNumber)
                 return notificationEx.equipmentNumber;
@@ -107,10 +107,10 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
             return notificationEx.participantId;
         case Position:
             if (role == Qt::DisplayRole)
-                return LtsCoordTrans::mgrsFromGeographic(notificationEx.position().lon(),
-                                                         notificationEx.position().lat());
+                return LtsCoordTrans::mgrsFromGeographic(notificationEx.position.lon,
+                                                         notificationEx.position.lat);
             else if (role == Qt::UserRole)
-                return QPointF(notificationEx.position().lon(), notificationEx.position().lat());
+                return QPointF(notificationEx.position.lon, notificationEx.position.lat);
             break;
         case AesId:
             return notificationEx.aesId;
@@ -124,9 +124,9 @@ QVariant AlarmHistoryModel::data(const QModelIndex& index, int role) const
 bool AlarmHistoryModel::isFiltered(const NotificationEx& data, DataModification modType) const
 {
     Q_UNUSED(modType);
-    if (data.operatorId() == 0)
+    if (data.operatorId == 0)
         return false;
-    return data.operatorId() != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    return data.operatorId != LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 }
 
 void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType)
@@ -135,16 +135,16 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
         return;
 
     NotificationEx notification(data);
-    const QByteArray properties = QByteArray::fromRawData(data.properties().c_str(), data.properties().size());
+    const QByteArray properties = QByteArray::fromRawData(data.properties.c_str(), data.properties.size());
     const QJsonDocument propertieJsonDoc = QJsonDocument::fromJson(properties);
     const QJsonObject propertieJsonObj = propertieJsonDoc.object();
 
-    notification.equipmentNumber = data.equipmentNumber();
-    if (data.participantId().has_value())
-        notification.participantId = data.participantId().value();
-    notification.eventTypeId = static_cast<ProjectDataManagement::PdmEventType>(data.eventType());
-    if (data.aesId().has_value())
-        notification.aesId = data.aesId().value();
+    notification.equipmentNumber = data.equipmentNumber;
+    if (data.participantId.has_value())
+        notification.participantId = data.participantId.value();
+    notification.eventTypeId = static_cast<ProjectDataManagement::PdmEventType>(data.eventType);
+    if (data.aesId.has_value())
+        notification.aesId = data.aesId.value();
     const int global = propertieJsonObj[QStringLiteral("Global")].toInt();
     const int friendlyFire = propertieJsonObj[QStringLiteral("FriendlyFire")].toInt();
 
@@ -155,19 +155,19 @@ void AlarmHistoryModel::onNotificationChanged(const AlarmManagement::Notificatio
 }
 
 void AlarmHistoryModel::onParticipantChanged(const ParticipantManagement::Participant& participant,
-                                             const ParticipantManagement::DataModification modType)
+                                             const DataModification modType)
 {
-    if (modType == ParticipantManagement::DataModification::eRemoved)
+    if (modType == DataModification::eRemoved)
         return;
-    QString designator = participant.designator();
-    m_idDesignatorMap.insert(participant.id(), designator);
+    QString designator = QString::fromStdString(participant.designator);
+    m_idDesignatorMap.insert(participant.id, designator);
 
     const int equipNo = participant.equipmentNumber.has_value() ? participant.equipmentNumber.value() : 0;
-    m_partId2EquipNoMap.insert(participant.id(), equipNo);
+    m_partId2EquipNoMap.insert(participant.id, equipNo);
 
-    QString tacticalIdentifier = participant.tacticalIdentifier();
-    m_idTactIdentifierMap.insert(participant.id(), tacticalIdentifier);
-    DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " id=" << participant.id() << " designator=" << designator
+    QString tacticalIdentifier = QString::fromStdString(participant.tacticalIdentifier);
+    m_idTactIdentifierMap.insert(participant.id, tacticalIdentifier);
+    DEBUG_LOG(getLogger("AlarmHistoryModel")) << Q_FUNC_INFO << " id=" << participant.id << " designator=" << designator
                         << " tacticalIdentifier=" << tacticalIdentifier;
 }
 
@@ -199,8 +199,8 @@ void AlarmHistoryModel::onBCContaminationChanged(const AreaEffectSimulation::BCC
 {
     if (modType == DataModification::eRemoved)
         return;
-    int id = data.id();
-    QString name = QString::fromStdString(data.name());
+    int id = data.id;
+    QString name = QString::fromStdString(data.name);
     m_aesNameMap[id] = name;
     DEBUG_LOG(getLogger("AlarmHistoryModel")) << "onBCContaminationChanged: id=" << id << " Name=" << name;
 }
@@ -209,8 +209,8 @@ void AlarmHistoryModel::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap
 {
     if (modType == DataModification::eRemoved)
         return;
-    int id = data.id();
-    QString name = QString::fromStdString(data.name());
+    int id = data.id;
+    QString name = QString::fromStdString(data.name);
     m_aesNameMap[id] = name;
     DEBUG_LOG(getLogger("AlarmHistoryModel")) << "BoobyTrap: id=" << id << " Name=" << name;
 }
@@ -220,8 +220,8 @@ void AlarmHistoryModel::onOffRouteMineChanged(const AreaEffectSimulation::OffRou
 {
     if (modType == DataModification::eRemoved)
         return;
-    int id = data.id();
-    QString name = QString::fromStdString(data.name());
+    int id = data.id;
+    QString name = QString::fromStdString(data.name);
     m_aesNameMap[id] = name;
     DEBUG_LOG(getLogger("AlarmHistoryModel")) << "OffRouteMine: id=" << id << " Name=" << name;
 }
@@ -230,8 +230,8 @@ void AlarmHistoryModel::onAesItemChanged(const AreaEffectSimulation::AesItem& it
 {
     if (modType == DataModification::eRemoved)
         return;
-    QString name = QString::fromStdString(item.name());
-    int id = item.id();
+    QString name = QString::fromStdString(item.name);
+    int id = item.id;
     m_aesNameMap[id] = name;
     DEBUG_LOG(getLogger("AlarmHistoryModel")) << "AreaEffectSimulation::AesItem onAesItemChanged: id=" << id
                         << " Name=" << name;
@@ -253,7 +253,7 @@ bool AlarmHistoryProxyModel::lessThan(const QModelIndex& source_left, const QMod
     switch (source_left.column())
     {
         case AlarmHistoryModel::Date:
-            return dataLeft.time() < dataRight.time();
+            return dataLeft.time < dataRight.time;
 
         case AlarmHistoryModel::Id:
         case AlarmHistoryModel::Incident:

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h

@@ -11,7 +11,8 @@
 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <ParticipantManagement/ppm.hpp>
-#include <ProjectDataManagement/project_data_management.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
+#include <ProjectDataManagement/pdm_enums.hpp>
 
 namespace AlarmManagement
 {
@@ -50,7 +51,7 @@ class ALMCOMMON_EXPORT AlarmHistoryModel final : public LtsWidgets::LtsAbstractT
     bool isFiltered(const NotificationEx& data, DataModification modType) const override;
   public slots:
     void onNotificationChanged(const AlarmManagement::Notification& data, const DataModification modType);
-    void onParticipantChanged(const ParticipantManagement::Participant& participant, const ParticipantManagement::DataModification modType);
+    void onParticipantChanged(const ParticipantManagement::Participant& participant, const DataModification modType);
     void onAesItemChanged(const AreaEffectSimulation::AesItem& item, const DataModification modType);
     void onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data, const DataModification modType);
     void onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, const DataModification modType);

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp

@@ -57,24 +57,24 @@ void InterfaceImpl::clearInterfaces()
 
 void InterfaceImpl::showEmergencyMessage(const AlarmManagement::Notification &data)
 {
-  if (data.eventType() != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
+  if (data.eventType != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
     return;
 
-  const int issi = data.equipmentNumber();
-  const QString &positionStr = LtsCoordTrans::mgrsFromGeographic(data.position().lon(), data.position().lat());
+  const int issi = data.equipmentNumber;
+  const QString &positionStr = LtsCoordTrans::mgrsFromGeographic(data.position.lon, data.position.lat);
 
   
    new LtsWidgets::LtsMessageDialogNew(m_session->baseLayout(),
                                                           tr("ISSI: %1 --- Position: %2\n").arg(issi).arg(positionStr),
-                                                          tr("!!!!!! Emergency Call --- %1 !!!!!").arg(DTG::toStringMSec(data.time())));
+                                                          tr("!!!!!! Emergency Call --- %1 !!!!!").arg(DTG::toStringMSec(data.time)));
 }
 
 void InterfaceImpl::showAlarm(const AlarmManagement::Notification &data)
 {
   showEmergencyMessage(data);
 
-  if (data.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId() ||
-      data.operatorId() == 0) 
+  if (data.operatorId == LtsSessionData::LtsSessionData::getInstance()->getOperatorId() ||
+      data.operatorId == 0) 
   {
     bool bWidgetExists = m_session->widgetExists(menuGroup(), m_alarmHistoryDialogIdentifier, m_alarmHistoryDialogLayoutArea);
     if (!bWidgetExists)
@@ -87,7 +87,7 @@ void InterfaceImpl::onNotificationChanged(const AlarmManagement::Notification &d
   if (mod != DataModification::eAdded)
     return;
 
-  INFO_LOG(m_logger) << "ALARM! data.operatorId(): " << data.operatorId()
+  INFO_LOG(m_logger) << "ALARM! data.operatorId(): " << data.operatorId
                      << "currentOperatorId: " << LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
   

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.h

@@ -7,11 +7,12 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <AlarmManagement/alm_gui_plugin_interface.h>
 #include <AlarmManagement/alm_data_plugin_interface.h>
-#include <AlarmManagement/Common/alm_config_alarm_model.h>
-#include <AlarmManagement/Common/alm_history_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 
 namespace AlarmManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp

@@ -2,14 +2,15 @@
 
 #include "alm_dialog.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "alm_history.h"
 #include "ui_alm_dialog.h"
 
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <AlarmManagement/Common/alm_config_alarm_model.h>
-#include <AlarmManagement/Common/alm_history_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include <utility>
 
@@ -19,7 +20,7 @@ namespace AlarmManagement
 AlarmDialog::AlarmDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_configAlarmModel(nullptr),
       m_dtc(nullptr), m_ftc(nullptr), m_ui(new Ui::AlarmDialog), m_requestHelper(new LtsUtils::RequestHelper(this)),
-      m_operatorId(-1)
+      m_operatorId(-1), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     AlarmCheckBox alarmCheckBox;
     LtsUtils::ProjectSettings* ps = LtsUtils::ProjectSettings::getInstance();
@@ -158,23 +159,23 @@ void AlarmDialog::retranslate()
 
 void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, DataModification modType)
 {
-    bool setMarker = data.setMarker();
-    bool messageWindow = data.messageWindow();
+    bool setMarker = data.setMarker;
+    bool messageWindow = data.messageWindow;
     if (modType == DataModification::eRemoved)
         return;
 
     DEBUG_LOG(m_logger) << "************** onAlarmConfigChanged "
-                        << " id=" << data.id() << " operatorId=" << data.operatorId()
-                        << " m_operatorId=" << m_operatorId << " participantId=" << data.participantId()
-                        << " eventTypeId=" << data.eventTypeId() << " messageWindow=" << messageWindow
+                        << " id=" << data.id << " operatorId=" << data.operatorId
+                        << " m_operatorId=" << m_operatorId << " participantId=" << data.participantId
+                        << " eventTypeId=" << data.eventTypeId << " messageWindow=" << messageWindow
                         << " setMarker=" << setMarker;
-    if (data.global() == false)
+    if (data.global == false)
         return;
 
-    if (data.operatorId() == m_operatorId)
+    if (data.operatorId == m_operatorId)
     {
         DEBUG_LOG(m_logger) << "************** onAlarmConfig zuweisen ";
-        switch (data.eventTypeId().underlying())
+        switch (data.eventTypeId)
         {
             case ProjectDataManagement::PdmEventType::EventType_EnterNuclear: {
                 DEBUG_LOG(m_logger) << "EnterNuclear zuweisen ";
@@ -247,28 +248,28 @@ std::vector<AlarmManagement::AlarmAction> AlarmDialog::getCheckedValues() const
     ret.reserve(m_checkBoxes.size());
     for (const AlarmCheckBox& item : std::as_const(m_checkBoxes))
     {
-        alarmActionDds.eventTypeId(item.eventTypeId);
+        alarmActionDds.eventTypeId = item.eventTypeId;
         if (item.checkboxMarker->isChecked())
         {
-            alarmActionDds.setMarker(true);
+            alarmActionDds.setMarker = true;
             DEBUG_LOG(m_logger) << item.name << " setMarker = true";
         }
         else
         {
-            alarmActionDds.setMarker(false);
+            alarmActionDds.setMarker = false;
             DEBUG_LOG(m_logger) << item.name << " setMarker = false";
         }
         if (item.checkboxWindow->isChecked())
         {
-            alarmActionDds.messageWindow(true);
+            alarmActionDds.messageWindow = true;
             DEBUG_LOG(m_logger) << item.name << " messageWindow = true";
         }
         else
         {
-            alarmActionDds.messageWindow(false);
+            alarmActionDds.messageWindow = false;
             DEBUG_LOG(m_logger) << item.name << " messageWindow = false";
         }
-        if (alarmActionDds.setMarker() || alarmActionDds.messageWindow())
+        if (alarmActionDds.setMarker || alarmActionDds.messageWindow)
             ret.push_back(alarmActionDds);
     }
     return ret;

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h

@@ -7,6 +7,7 @@
 #include <AlarmManagement/alm_ftc.h>
 #include <AlarmManagement/alm_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <AlarmManagement/logger.h>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_history.cpp

@@ -2,11 +2,12 @@
 
 #include "alm_history.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_alm_history.h"
 
 #include <LtsPrinting/printing.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <AlarmManagement/Common/alm_history_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
 #include <QtWidgets/QTreeView>
 
 namespace AlarmManagement
@@ -14,7 +15,8 @@ namespace AlarmManagement
 
 AlarmView::AlarmView(LtsSession::LtsSession* session, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_alarmHistoryModel(nullptr),
-      m_dtc(nullptr), m_sitMapGuiIfc(nullptr), m_session(session), m_ui(new Ui::AlarmView)
+      m_dtc(nullptr), m_sitMapGuiIfc(nullptr), m_session(session), m_ui(new Ui::AlarmView),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << " --- AlarmView Konstruktor() ";
     m_ui->setupUi(this);

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp

@@ -50,13 +50,13 @@ ConfigParticipantsDialog::~ConfigParticipantsDialog()
 
 void ConfigParticipantsDialog::retranslate()
 {
-    if (!m_participantData.equipmentNumber().is_set())
+    if (!m_participantData.equipmentNumber.has_value())
     {
-        QString hierarchy = m_ppmDtc->hierarchyFromParticipant(m_participantData.id());
+        QString hierarchy = m_ppmDtc->hierarchyFromParticipant(m_participantData.id);
         translate(m_ui, m_participantData, hierarchy, tr("Participant Alarm"));
     }
     else
-        translate(m_ui, m_participantData, QString::number(m_participantData.equipmentNumber().get()),
+        translate(m_ui, m_participantData, QString::number(m_participantData.equipmentNumber.get()),
                   tr("Participant Alarm"));
 
     m_uiRequirements->clear();
@@ -82,12 +82,12 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
 
     m_operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
 
-    m_ui->lbHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participantData.id()));
+    m_ui->lbHierarchy->setText(m_ppmDtc->hierarchyFromParticipant(m_participantData.id));
 
     QString equipmentNumbersStr;
-    if (participantData.equipmentNumber().is_set())
+    if (participantData.equipmentNumber.has_value())
     {
-        equipmentNumbersStr.append(QString::number(participantData.equipmentNumber().get()));
+        equipmentNumbersStr.append(QString::number(participantData.equipmentNumber.get()));
         equipmentNumbersStr.append(QStringLiteral(": "));
     }
 
@@ -97,10 +97,10 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
 
     m_ui->equipmentNoContent->setText(equipmentNumbersStr);
 
-    DEBUG_LOG(m_logger) << "current participantId = " << participantData.id();
+    DEBUG_LOG(m_logger) << "current participantId = " << participantData.id;
 
-    m_typeClass = ppmDtc->type(participantData.typeId()).typeClass();
-    DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId();
+    m_typeClass = ppmDtc->type(participantData.typeId).typeClass;
+    DEBUG_LOG(m_logger) << "m_typeClass=" << m_typeClass << " TypeId=" << participantData.typeId;
     fillCbx();
 
     m_almDtc->alarmConfigs([this](const AlarmManagement::AlarmConfig& alarm) { setAlaramData(alarm); });
@@ -110,21 +110,21 @@ bool ConfigParticipantsDialog::init(const std::shared_ptr<ParticipantManagement:
 void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig& alarm)
 {
     DEBUG_LOG(m_logger) << "setAlaramData:" << alarm;
-    if (alarm.operatorId() != m_operatorId || alarm.participantId() != m_participantData.id() || alarm.global())
+    if (alarm.operatorId != m_operatorId || alarm.participantId != m_participantData.id || alarm.global)
         return;
 
-    switch (alarm.eventTypeId().underlying())
+    switch (alarm.eventTypeId)
     {
         case ProjectDataManagement::PdmEventType::EventType_Hit: {
             DEBUG_LOG(m_logger) << "Hit zuweisen ";
             m_ui->cbxDirectFire->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
-            if (alarm.vulnerabilityState() >= 0)
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
+            if (alarm.vulnerabilityState >= 0)
             {
                 ProjectDataManagement::VulnerabilityState vulState =
-                    static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState());
-                int index = m_ui->cbStatusDirect->findData(QVariant(vulState.underlying()));
+                    static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState);
+                int index = m_ui->cbStatusDirect->findData(QVariant(static_cast<int>(vulState)));
                 m_ui->cbStatusDirect->setCurrentIndex(index);
             }
             break;
@@ -132,22 +132,22 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
         case ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation: {
             DEBUG_LOG(m_logger) << "HitIndirect zuweisen ";
             m_ui->cbxIndirectFire->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_AirSupport: {
             DEBUG_LOG(m_logger) << "AirSupport zuweisen ";
             m_ui->cbxAirSupport->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_HitMine: {
             DEBUG_LOG(m_logger) << "HitMine zuweisen ";
             m_ui->cbxMines->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_HitB:
@@ -155,20 +155,20 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
         case ProjectDataManagement::PdmEventType::EventType_HitC: {
             DEBUG_LOG(m_logger) << "Hit N/B/C zuweisen ";
             m_ui->cbxNbcAgent->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_FriendlyFire: {
             DEBUG_LOG(m_logger) << "FriendlyFire zuweisen ";
             m_ui->cbxFriendlyFire->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
-            if (alarm.vulnerabilityState() >= 0)
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
+            if (alarm.vulnerabilityState >= 0)
             {
                 ProjectDataManagement::VulnerabilityState vulState =
-                    static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState());
-                int index = m_ui->cbStatusDirect->findData(QVariant(vulState.underlying()));
+                    static_cast<ProjectDataManagement::VulnerabilityState>(alarm.vulnerabilityState);
+                int index = m_ui->cbStatusDirect->findData(QVariant(static_cast<int>(vulState)));
                 m_ui->cbStatusFriendly->setCurrentIndex(index);
             }
             break;
@@ -176,22 +176,22 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig&
         case ProjectDataManagement::PdmEventType::EventType_Manipulation: {
             DEBUG_LOG(m_logger) << "Manipulation zuweisen ";
             m_ui->cbxManipulation->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline: {
             DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen ";
             m_ui->cbxGlobalBorderLine->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline: {
             DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen ";
             m_ui->cbxLocalBorderLine->setChecked(true);
-            m_ui->cbxSetMarker->setChecked(alarm.setMarker());
-            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow());
+            m_ui->cbxSetMarker->setChecked(alarm.setMarker);
+            m_ui->cbxMessageWindow->setChecked(alarm.messageWindow);
             break;
         }
         default: {
@@ -207,68 +207,68 @@ std::vector<AlarmManagement::AlarmAction> ConfigParticipantsDialog::getCheckedVa
 
     std::vector<AlarmManagement::AlarmAction> alarmsDds;
 
-    alarmActionDds.setMarker(m_ui->cbxSetMarker->isChecked());
-    alarmActionDds.messageWindow(m_ui->cbxMessageWindow->isChecked());
-    alarmActionDds.vulnerabilityState(-1);
+    alarmActionDds.setMarker = m_ui->cbxSetMarker->isChecked();
+    alarmActionDds.messageWindow = m_ui->cbxMessageWindow->isChecked();
+    alarmActionDds.vulnerabilityState = -1;
 
-    if (alarmActionDds.setMarker() || alarmActionDds.messageWindow())
+    if (alarmActionDds.setMarker || alarmActionDds.messageWindow)
     {
         if (m_ui->cbxDirectFire->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Hit);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Hit;
             int statusDirect = -1;
             if (m_ui->cbStatusDirect->currentIndex() > 0)
                 statusDirect = m_ui->cbStatusDirect->currentData().toInt();
-            alarmActionDds.vulnerabilityState(statusDirect);
+            alarmActionDds.vulnerabilityState = statusDirect;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxFriendlyFire->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_FriendlyFire);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_FriendlyFire;
             int statusFriendly = -1;
             if (m_ui->cbStatusFriendly->currentIndex() > 0)
                 statusFriendly = m_ui->cbStatusFriendly->currentData().toInt();
-            alarmActionDds.vulnerabilityState(statusFriendly);
+            alarmActionDds.vulnerabilityState = statusFriendly;
             alarmsDds.push_back(alarmActionDds);
         }
-        alarmActionDds.vulnerabilityState(-1);
+        alarmActionDds.vulnerabilityState = -1;
         if (m_ui->cbxIndirectFire->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxAirSupport->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_AirSupport);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_AirSupport;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxMines->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitMine);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitMine;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxNbcAgent->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitN);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitN;
             alarmsDds.push_back(alarmActionDds);
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitB);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitB;
             alarmsDds.push_back(alarmActionDds);
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitC);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitC;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxManipulation->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Manipulation);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Manipulation;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxGlobalBorderLine->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline;
             alarmsDds.push_back(alarmActionDds);
         }
         if (m_ui->cbxLocalBorderLine->isChecked())
         {
-            alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline);
+            alarmActionDds.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline;
             alarmsDds.push_back(alarmActionDds);
         }
     }
@@ -279,11 +279,11 @@ bool ConfigParticipantsDialog::apply()
 {
     DEBUG_LOG(m_logger) << "apply";
     AlarmManagement::ConfigureAlarmsRequest req;
-    req.participantIds(m_participantVector);
-    req.alarms(getCheckedValues());
-    req.operatorId(m_operatorId);
-    req.global(false);
-    req.remove(false);
+    req.participantIds = m_participantVector;
+    req.alarms = getCheckedValues();
+    req.operatorId = m_operatorId;
+    req.global = false;
+    req.remove = false;
 
     return m_requestHelper->startSingleRequest([req, this]() { return m_almFtc->configureAlarmsRequest(req, this); });
 }
@@ -298,9 +298,9 @@ void ConfigParticipantsDialog::fillCbx()
     ParticipantManagement::insertVulnerabilityStates(m_ui->cbStatusDirect, m_typeClass);
     ParticipantManagement::insertVulnerabilityStates(m_ui->cbStatusFriendly, m_typeClass);
     m_ui->cbStatusDirect->removeItem(
-        m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance));
+        m_ui->cbStatusDirect->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance)));
     m_ui->cbStatusFriendly->removeItem(
-        m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance));
+        m_ui->cbStatusDirect->findData(static_cast<int>(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance)));
 }
 
 } // namespace ParticipantAlarms

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp

@@ -99,8 +99,8 @@ void ParticipantsDialog::onSelectionChanged()
     for (const QModelIndex& index : currentlySelectedParticipants)
     {
         const ParticipantManagement::ParticipantData data(m_participantModel->getParticipantData(index));
-        if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
-            m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
+        if ((data.equipmentNumber.has_value() && data.equipmentNumber.get() > 0) ||
+            m_ppmDtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
             configureAlarms = true;
         DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column();
     }
@@ -138,13 +138,13 @@ void ParticipantsDialog::onAddButtonClicked()
 
     QModelIndex participantIndex = m_ui->dvParticipants->currentIndex();
     ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(participantIndex);
-    DEBUG_LOG(m_logger) << "current participantId = " << data.id();
-    m_participantVector.push_back(data.id());
+    DEBUG_LOG(m_logger) << "current participantId = " << data.id;
+    m_participantVector.push_back(data.id);
 
     const auto partData = m_participantModel->getParticipantData(participantIndex);
     addDialog(LtsWidgets::initDialog(new ConfigParticipantsDialog(this), m_ppmDtc, m_almDtc, m_almFtc, partData,
                                      m_participantVector, m_equipmentVector),
-              m_menuGroup, QStringLiteral("ConfigAlarms%1").arg(partData.id()));
+              m_menuGroup, QStringLiteral("ConfigAlarms%1").arg(partData.id));
 }
 
 void ParticipantsDialog::onPrint()
@@ -168,12 +168,12 @@ void ParticipantsDialog::setChildrenSelected(const QModelIndex& parent)
         DEBUG_LOG(m_logger) << "Setting row " << childIndex.row() << " selected";
 
         ParticipantManagement::ParticipantData data = m_participantModel->getParticipantData(childIndex);
-        DEBUG_LOG(m_logger) << "append participantId = " << data.id();
-        m_participantVector.push_back(data.id());
-        if (data.equipmentNumber().is_set())
+        DEBUG_LOG(m_logger) << "append participantId = " << data.id;
+        m_participantVector.push_back(data.id);
+        if (data.equipmentNumber.has_value())
         {
-            DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber().get();
-            m_equipmentVector.push_back(data.equipmentNumber().get());
+            DEBUG_LOG(m_logger) << "append equipmentNumber = " << data.equipmentNumber.get();
+            m_equipmentVector.push_back(data.equipmentNumber.get());
         }
 
         m_ui->dvParticipants->selectionModel()->select(m_participantProxyModel->mapFromSource(childIndex),

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_gui_plugin.h

@@ -8,6 +8,7 @@
 
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <AlarmManagement/alm_ftc.h>
 #include <AlarmManagement/alm_dtc.h>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp

@@ -37,10 +37,10 @@ void ParticipantAlarmModel::onParticipantChanged(const ParticipantManagement::Pa
                                                  DataModification modType)
 {
     Q_UNUSED(modType);
-    if (data.partyId() != partyId())
+    if (data.partyId != partyId())
         return;
 
-    INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated();
+    INFO_LOG(m_logger) << "onParticipantChanged isSimulated=" << data.isSimulated;
     onReinitModel(partyId());
     emit newData();
 }
@@ -50,17 +50,17 @@ bool ParticipantAlarmModel::isSelectableByAlarm(const QModelIndex& index, bool*
     bool isSimulatable = false;
     const ParticipantManagement::ParticipantData data(getParticipantData(index));
 
-    if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) ||
-        m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit)
+    if ((data.equipmentNumber.has_value() && data.equipmentNumber.get() > 0) ||
+        m_dtc->type(data.typeId).typeClass == ParticipantManagement::TypeClass::Unit)
         isSimulatable = true;
 
-    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id() << " isSimulated:" << data.isSimulated()
-                        << " equipmentNo:" << data.equipmentNumber() << " typeId=" << data.typeId()
-                        << " modId=" << data.modId() << " typeClass=" << m_dtc->type(data.typeId()).typeClass()
+    DEBUG_LOG(m_logger) << "ParticipantId: " << data.id << " isSimulated:" << data.isSimulated
+                        << " equipmentNo:" << data.equipmentNumber << " typeId=" << data.typeId
+                        << " modId=" << data.modId << " typeClass=" << m_dtc->type(data.typeId).typeClass
                         << " isSimulatable=" << isSimulatable;
 
     if (bIsSimulated)
-        *bIsSimulated = data.isSimulated();
+        *bIsSimulated = data.isSimulated;
 
     return isSimulatable;
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.cpp

@@ -96,28 +96,28 @@ void ParticipantShowConfigView::onShowAlarm()
 void ParticipantShowConfigView::onRemoveAlarm()
 {
     DEBUG_LOG(m_logger) << "onRemoveAlarm"
-                        << " id = " << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id()
+                        << " id = " << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).id
                         << " eventTypeId = "
-                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId()
+                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).eventTypeId
                         << " operatorId = "
-                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId()
+                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).operatorId
                         << " participantId = "
-                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).participantId();
+                        << m_configAlarmModel->getRowData(m_ui->widget->currentIndex().row()).participantId;
 
     const QModelIndex curIdx = m_ui->widget->currentIndex();
     if (!curIdx.isValid())
         return;
     const AlarmManagement::AlarmConfig& rowdata = m_configAlarmModel->getRowData(curIdx.row());
-    int operatorId = rowdata.operatorId();
+    int operatorId = rowdata.operatorId;
     std::vector<int32_t> ddsParticipantIds;
-    ddsParticipantIds.push_back(rowdata.participantId());
+    ddsParticipantIds.push_back(rowdata.participantId);
     bool globalEvent = true;
     bool remove = true;
     std::vector<AlarmManagement::AlarmAction> alarmsDds;
     alarmsDds.resize(1);
-    alarmsDds[0].setMarker(false);
-    alarmsDds[0].messageWindow(false);
-    alarmsDds[0].eventTypeId(rowdata.eventTypeId());
+    alarmsDds[0].setMarker = false;
+    alarmsDds[0].messageWindow = false;
+    alarmsDds[0].eventTypeId = rowdata.eventTypeId;
     AlarmManagement::ConfigureAlarmsRequest request(alarmsDds, operatorId, ddsParticipantIds, globalEvent, remove);
 
     m_requestHelper->startSingleRequest([request, this]() {

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_show_config.h

@@ -6,7 +6,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsWidgets/lts_dialog.h>
 #include <ParticipantManagement/ppm_dtc.h>
-#include <AlarmManagement/Common/alm_config_alarm_model.h>
+#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
 #include <AlarmManagement/alm_dtc.h>
 #include <AlarmManagement/alm_ftc.h>
 
@@ -41,7 +41,6 @@ class ParticipantShowConfigView : public LtsWidgets::LtsDialog,
     void onPrint();
 
   protected:
-    NGL::INGLLogger& m_logger;
     void onConfigureAlarmsReply(const Core::FunctionReplyObject& replyObject) override final;
 
   private:
@@ -57,7 +56,8 @@ class ParticipantShowConfigView : public LtsWidgets::LtsDialog,
     Ui::ParticipantShowConfigView* m_ui;
     LtsUtils::RequestHelper* m_requestHelper;
 
-    AlarmManagement::
+    AlarmManagement::LOGGER_T m_logger;
+
 };
 
 } // namespace ParticipantAlarms

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_dialog.cpp

@@ -2,6 +2,7 @@
 
 #include "alm_emergency_call_dialog.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h"
 #include "ui_alm_emergency_call_dialog.h"
 
@@ -18,7 +19,8 @@ namespace AlarmManagement
 
 EmergencyCallDialog::EmergencyCallDialog(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_dtc(nullptr), m_ftc(nullptr),
-      m_session(nullptr), m_ui(new Ui::EmergencyCallDialog), m_requestHelper(new LtsUtils::RequestHelper(this))
+      m_session(nullptr), m_ui(new Ui::EmergencyCallDialog), m_requestHelper(new LtsUtils::RequestHelper(this)),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 }
@@ -104,10 +106,10 @@ void EmergencyCallDialog::enaDisa()
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, false);
 
     const AlmEmergencyCall& sos = getSelectedSOS();
-    if (sos.id() <= 0)
+    if (sos.id <= 0)
         return;
 
-    if (!sos.expired())
+    if (!sos.expired)
         m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, true);
 
     m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, true);
@@ -158,7 +160,7 @@ void EmergencyCallDialog::onEditBtCliked()
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
     const AlmEmergencyCall& sos = getSelectedSOS();
-    if (sos.id() <= 0)
+    if (sos.id <= 0)
         return;
     setAcknowledgeUi();
 
@@ -181,16 +183,16 @@ void EmergencyCallDialog::onFindEmergencyOnMap()
         return;
 
     const AlmEmergencyCall& sos = getSelectedSOS();
-    if (sos.id() <= 0)
+    if (sos.id <= 0)
         return;
 
-    m_sitMapGuiIfc->setCenterPoint(QPointF(sos.position().lon(), sos.position().lat()));
+    m_sitMapGuiIfc->setCenterPoint(QPointF(sos.position.lon, sos.position.lat));
 }
 
 void EmergencyCallDialog::onEmergencyIndexDoubleClicked(const QModelIndex& index)
 {
     Q_UNUSED(index)
-    emit openInfoDlg(getSelectedSOS().id());
+    emit openInfoDlg(getSelectedSOS().id);
 }
 
 void EmergencyCallDialog::sendAcknowledgeEmergency(const QString& comment)
@@ -198,18 +200,18 @@ void EmergencyCallDialog::sendAcknowledgeEmergency(const QString& comment)
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
 
     const AlmEmergencyCall& sos = getSelectedSOS();
-    if (sos.id() <= 0 || sos.expired())
+    if (sos.id <= 0 || sos.expired)
         return;
 
     EmergencyCallAcknowledgeRequest request;
-    request.id(sos.id());
-    request.issi(sos.issi());
-    request.name(sos.name());
-    request.timestamp(QDateTime::currentMSecsSinceEpoch());
-    request.incomingTime(sos.incomingTime());
-    request.expired(true);
-    request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    request.comment(comment.toStdString());
+    request.id = sos.id;
+    request.issi = sos.issi;
+    request.name = sos.name;
+    request.timestamp = QDateTime::currentMSecsSinceEpoch();
+    request.incomingTime = sos.incomingTime;
+    request.expired = true;
+    request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    request.comment = comment.toStdString();
     m_requestHelper->startSingleRequest(
         [this, request]() { return m_ftc->emergencyCallAcknowledgeRequest(request, this); });
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_gui_plugin.cpp

@@ -82,9 +82,9 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
 
   auto cb = [this](const AlmEmergencyCall &data)
   {
-    if (data.id() <= 0 || data.expired())
+    if (data.id <= 0 || data.expired)
       return;
-    this->showEmergencyCallInfoWindow(data.id());
+    this->showEmergencyCallInfoWindow(data.id);
   };
   m_dtc->almEmergencyCalls(cb);
 
@@ -111,10 +111,10 @@ void InterfaceImpl::onEmergencyCallChanged(const AlmEmergencyCall &data, DataMod
 {
   if (modType != DataModification::eAdded)
     return;
-  if (data.id() <= 0 || data.expired())
+  if (data.id <= 0 || data.expired)
     return;
 
-  this->showEmergencyCallInfoWindow(data.id());
+  this->showEmergencyCallInfoWindow(data.id);
 }
 
 void InterfaceImpl::onOpenInfoDlg(const int &id)

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_info_dialog.cpp

@@ -2,6 +2,7 @@
 
 #include "alm_emergency_call_info_dialog.h"
 
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include "ui_alm_emergency_call_info_dialog.h"
 
 #include <AlarmManagement/alm_operator_rights.h>
@@ -46,10 +47,11 @@ QImage renderEmergencySymbol(bool expired = false)
 
 EmergencyCallInfoDialog::EmergencyCallInfoDialog(int entryId, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_dtc(nullptr), m_ftc(nullptr),
-      m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::EmergencyCallInfoDialog)
+      m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::EmergencyCallInfoDialog),
+      m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
-    m_emergency.id(entryId);
+    m_emergency.id = entryId;
 }
 
 EmergencyCallInfoDialog::~EmergencyCallInfoDialog()
@@ -77,7 +79,7 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc>& ftc,
     m_dtc->enableAlmEmergencyCall();
     m_ftc->enableEmergencyCallAcknowledge();
 
-    m_emergency = m_dtc->almEmergencyCall(m_emergency.id());
+    m_emergency = m_dtc->almEmergencyCall(m_emergency.id);
     setUiValues();
 
     connect(m_dtc.get(), &AlarmManagement::Interface::Dtc::almEmergencyCallChanged, this,
@@ -92,34 +94,34 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc>& ftc,
 
 QString EmergencyCallInfoDialog::emergencyIdentifier() const
 {
-    return QStringLiteral("emergency_") + QString::number(m_emergency.id());
+    return QStringLiteral("emergency_") + QString::number(m_emergency.id);
 }
 
 bool EmergencyCallInfoDialog::setUiValues()
 {
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
-    if (!m_dtc || !m_ftc || m_emergency.id() < 0)
+    if (!m_dtc || !m_ftc || m_emergency.id < 0)
     {
         ERROR_LOG(m_logger) << " >> unabled to init EmergencyCallInfoDialog";
         return false;
     }
 
-    m_ui->lblEquipNr->setText(QString::number(m_emergency.issi()));
-    m_ui->lblIncomingTime->setText(DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.incomingTime())));
-    m_ui->lblStatus->setText(m_emergency.expired()
-                                 ? DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.deleted()))
+    m_ui->lblEquipNr->setText(QString::number(m_emergency.issi));
+    m_ui->lblIncomingTime->setText(DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.incomingTime)));
+    m_ui->lblStatus->setText(m_emergency.expired
+                                 ? DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.deleted))
                                  : QStringLiteral("--"));
-    m_ui->lblComment->setText(QString::fromStdString(m_emergency.comment()));
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_emergency.position().lon(), m_emergency.position().lat());
+    m_ui->lblComment->setText(QString::fromStdString(m_emergency.comment));
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_emergency.position.lon, m_emergency.position.lat);
     m_ui->lblPosition->setText(mgrs);
 
     const bool& hasOperatorRightEmergencyCall =
         LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::EmergencyCall);
     m_ui->pbAckEmergency->setIcon(QIcon(QStringLiteral("icon:edit.svg")));
-    m_ui->pbAckEmergency->setEnabled(m_emergency.expired() ? false : true);
+    m_ui->pbAckEmergency->setEnabled(m_emergency.expired ? false : true);
     m_ui->pbAckEmergency->setVisible(hasOperatorRightEmergencyCall);
 
-    QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired()));
+    QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired));
     m_ui->lblIcon->setPixmap(iconPixmap);
 
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
@@ -129,7 +131,7 @@ bool EmergencyCallInfoDialog::setUiValues()
 void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergencyCall data, DataModification modType)
 {
     TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
-    if (data.id() != m_emergency.id() || data.id() == 0)
+    if (data.id != m_emergency.id || data.id == 0)
         return;
 
     if (modType == DataModification::eRemoved)
@@ -149,9 +151,9 @@ void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergen
 
 void EmergencyCallInfoDialog::onFindEmergencyOnMap()
 {
-    if (!m_sitMapGuiIfc || m_emergency.id() <= 0)
+    if (!m_sitMapGuiIfc || m_emergency.id <= 0)
         return;
-    m_sitMapGuiIfc->setCenterPoint(QPointF(m_emergency.position().lon(), m_emergency.position().lat()));
+    m_sitMapGuiIfc->setCenterPoint(QPointF(m_emergency.position.lon, m_emergency.position.lat));
 }
 
 void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
@@ -191,18 +193,18 @@ void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
 
 void EmergencyCallInfoDialog::sendAcknowledgeEmergencyCallRequest(const QString& comment)
 {
-    if (m_emergency.id() <= 0)
+    if (m_emergency.id <= 0)
         return;
 
     EmergencyCallAcknowledgeRequest request;
-    request.id(m_emergency.id());
-    request.name(m_emergency.name());
-    request.issi(m_emergency.issi());
-    request.timestamp(QDateTime::currentMSecsSinceEpoch());
-    request.incomingTime(m_emergency.incomingTime());
-    request.expired(true);
-    request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
-    request.comment(comment.toStdString());
+    request.id = m_emergency.id;
+    request.name = m_emergency.name;
+    request.issi = m_emergency.issi;
+    request.timestamp = QDateTime::currentMSecsSinceEpoch();
+    request.incomingTime = m_emergency.incomingTime;
+    request.expired = true;
+    request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
+    request.comment = comment.toStdString();
     bool ret = m_requestHelper->startSingleRequest(
         [this, request]() { return m_ftc->emergencyCallAcknowledgeRequest(request, this); });
 
@@ -212,8 +214,8 @@ void EmergencyCallInfoDialog::sendAcknowledgeEmergencyCallRequest(const QString&
 
 void EmergencyCallInfoDialog::retranslate()
 {
-    m_emergency = m_dtc->almEmergencyCall(m_emergency.id());
-    const QString lbName = tr("SOS_%1").arg(m_emergency.issi());
+    m_emergency = m_dtc->almEmergencyCall(m_emergency.id);
+    const QString lbName = tr("SOS_%1").arg(m_emergency.issi);
     translate(m_ui, lbName);
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.cpp

@@ -2,6 +2,7 @@
 
 
 #include "alm_emergency_call_model.h"
+#include <NGLLogger/NGLLoggerBootstrap.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 
 #include <QtCore/QDateTime>
@@ -24,6 +25,7 @@ EmergencyCallModel::EmergencyCallModel(QObject *parent)
       tr("Comment"),
 }, parent)
   , m_dtc(nullptr)
+  , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {}
 
 QVariant EmergencyCallModel::data(const QModelIndex &index, int role) const
@@ -35,35 +37,35 @@ QVariant EmergencyCallModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case Columns::ID:
-    return almEmergency.id();
+    return almEmergency.id;
   case SAMPLE_TIME:
-    return QDateTime::fromMSecsSinceEpoch(almEmergency.sampleTime());
+    return QDateTime::fromMSecsSinceEpoch(almEmergency.sampleTime);
   case INCOMING_TIME:
-    return QDateTime::fromMSecsSinceEpoch(almEmergency.incomingTime());
+    return QDateTime::fromMSecsSinceEpoch(almEmergency.incomingTime);
   case NAME:
-    return QString::fromStdString(almEmergency.name());
+    return QString::fromStdString(almEmergency.name);
   case ISSI:
-    return almEmergency.issi();
+    return almEmergency.issi;
   case POSITION:
   {
-    if (std::isnan(almEmergency.position().lat()))
+    if (std::isnan(almEmergency.position.lat))
       return tr("---");
-    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(almEmergency.position().lon(), almEmergency.position().lat());
+    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(almEmergency.position.lon, almEmergency.position.lat);
     return mgrs;
   }
   case EXPIRED:
-    return almEmergency.expired();
+    return almEmergency.expired;
   case OPERATION_ID:
   {
-    if (almEmergency.operatorId() == 0)
+    if (almEmergency.operatorId == 0)
       return QStringLiteral("-");
 
-    return QString::fromStdString(m_opmDtc.get()->user(almEmergency.operatorId()).name());
+    return QString::fromStdString(m_opmDtc.get()->user(almEmergency.operatorId).name);
   }
   case DELETED_TIMESTAMP:
-    return QDateTime::fromMSecsSinceEpoch(almEmergency.deleted());
+    return QDateTime::fromMSecsSinceEpoch(almEmergency.deleted);
   case COMMENT:
-    return QString::fromStdString(almEmergency.comment());
+    return QString::fromStdString(almEmergency.comment);
   default:
     break;
   } 
@@ -89,7 +91,7 @@ bool EmergencyCallModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
 
 void EmergencyCallModel::onAlarmEmergencyCallChanged(const AlarmManagement::AlmEmergencyCall &data, const DataModification modType)
 {
-  const int id = data.id();
+  const int id = data.id;
   int row = findRowForId(id);
   switch (modType)
   {
@@ -148,7 +150,7 @@ bool EmergencyCallProxyModel::filterAcceptsRow(int source_row, const QModelIndex
 bool EmergencyCallProxyModel::checkFilter(int source_row) const
 {
   const auto sos = m_sourceModel->getRowData(source_row);
-  if ((sos.expired() && !showExpired()) || (exerciseStopped() && !sos.expired()))
+  if ((sos.expired && !showExpired()) || (exerciseStopped() && !sos.expired))
     return false;
 
   return true;

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp

@@ -8,16 +8,16 @@
 #include <ChargeEffect/aes_charge_effect_gui_plugin_interface.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <AreaEffectSimulation/BCContamination/aes_bccontamination_gui_plugin_interface.h>
-#include <AreaEffectSimulation/Borderline/aes_borderline_gui_plugin_interface.h>
-#include <AreaEffectSimulation/DangerArea/aes_danger_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/Explosion/aes_explosion_gui_plugin_interface.h>
-#include <AreaEffectSimulation/FunctionalArea/aes_functional_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/GasPipe/aes_gas_pipe_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineArea/aes_mine_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineCorridor/aes_mine_corridor_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineSingleVirtual/aes_mine_single_virtual_gui_plugin_interface.h>
-#include <AreaEffectSimulation/NContamination/aes_ncontamination_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_mine_single_virtual_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <ngltools/ngltools_dtg.h>
 
@@ -26,7 +26,7 @@ namespace AreaEffectSimulation
 
 AesChargeEffectItemInfo::AesChargeEffectItemInfo(int chargeEffectId, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_session(nullptr),
-      m_ChargeEffectId(chargeEffectId), m_ui(new Ui::AesChargeEffectItemInfo)
+      m_ChargeEffectId(chargeEffectId), m_ui(new Ui::AesChargeEffectItemInfo), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 
@@ -77,8 +77,8 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession* session)
     m_ui->lblOriginatorType->hide();
 #endif
 
-    m_ui->lblOriginatorId->setText(QString::number(data.originatorId()));
-    m_ui->lblOriginatorType->setText(QString::number(data.originatorTypeId().underlying()));
+    m_ui->lblOriginatorId->setText(QString::number(data.originatorId));
+    m_ui->lblOriginatorType->setText(QString::number(static_cast<int>(data.originatorTypeId)));
 
     setOnlineHelpFilename(QStringLiteral("Info_Dialog-Charge_Effect"));
 
@@ -93,7 +93,7 @@ bool AesChargeEffectItemInfo::init(LtsSession::LtsSession* session)
 void AesChargeEffectItemInfo::retranslate()
 {
     const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId);
-    translate(m_ui, tr("ChargeEffect: \"%1\"").arg(QString::fromStdString(item.name()), 1, QLatin1Char('?')));
+    translate(m_ui, tr("ChargeEffect: \"%1\"").arg(QString::fromStdString(item.name), 1, QLatin1Char('?')));
 }
 
 void AesChargeEffectItemInfo::onFindOnMap() const
@@ -111,7 +111,7 @@ template <typename InterfaceType> bool AesChargeEffectItemInfo::tryShowStandardE
     std::shared_ptr<InterfaceType> ifc;
     if (m_session->getForeignGuiInterface<InterfaceType>(ifc))
     {
-        AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(aiv.aesItemId(), this);
+        AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(aiv.aesItemId, this);
         if (dialog)
         {
             addDialog(dialog, dialog->menuGroup(), dialog->dialogIdentifier(), LtsWidgets::LayoutArea::eDialogTab);
@@ -129,11 +129,11 @@ void AesChargeEffectItemInfo::onShowDetails()
 
     const ChargeEffect item = m_aesDtc->chargeEffect(m_ChargeEffectId);
 
-    if (item.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation)
+    if (item.originatorTypeId == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation)
     {
         AesItemView aiv;
-        m_aesDtc->aesItemViewFromEntityId(item.originatorId(), AreaEffectSimulation::AesType::AtUnknown, aiv);
-        DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id() << ", aesType: " << aiv.aesTypeId();
+        m_aesDtc->aesItemViewFromEntityId(item.originatorId, AreaEffectSimulation::AesType::AtUnknown, aiv);
+        DEBUG_LOG(m_logger) << "aiv.id():" << aiv.id << ", aesType: " << aiv.aesTypeId;
 
         auto registerDialog = [this](AreaEffectSimulation::BaseEdit* dialog) {
             if (dialog)
@@ -142,7 +142,7 @@ void AesChargeEffectItemInfo::onShowDetails()
             }
         };
 
-        switch (aiv.aesTypeId().underlying())
+        switch (aiv.aesTypeId)
         {
             case AreaEffectSimulation::AesType::AtNContamination: {
                 tryShowStandardEditDialog<AesNContamination::ForeignGuiInterface>(aiv);
@@ -179,11 +179,11 @@ void AesChargeEffectItemInfo::onShowDetails()
                 std::shared_ptr<AesBCContamination::ForeignGuiInterface> ifc;
                 if (m_session->getForeignGuiInterface<AesBCContamination::ForeignGuiInterface>(ifc))
                 {
-                    const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct().chargeTypeId());
-                    if (gearClass == ProjectDataManagement::GearClass::Biological)
-                        registerDialog(ifc->showEditWindow(aiv.aesItemId(), false, this));
-                    else if (gearClass == ProjectDataManagement::GearClass::Chemical)
-                        registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this));
+                    const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct.chargeTypeId);
+                    if (gearClass == ProjectDataManagement::GearClass::GearClass_Biological)
+                        registerDialog(ifc->showEditWindow(aiv.aesItemId, false, this));
+                    else if (gearClass == ProjectDataManagement::GearClass::GearClass_Chemical)
+                        registerDialog(ifc->showEditWindow(aiv.aesItemId, true, this));
                 }
                 else
                     WARNING_LOG(m_logger)
@@ -194,7 +194,7 @@ void AesChargeEffectItemInfo::onShowDetails()
             case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: {
                 std::shared_ptr<AesMineSingleVirtual::ForeignGuiInterface> ifc;
                 if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
-                    registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId(), this));
+                    registerDialog(ifc->showBoobyTrapEditWindow(aiv.aesItemId, this));
                 else
                     WARNING_LOG(m_logger)
                         << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
@@ -204,7 +204,7 @@ void AesChargeEffectItemInfo::onShowDetails()
             case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: {
                 std::shared_ptr<AesMineSingleVirtual::ForeignGuiInterface> ifc;
                 if (m_session->getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface>(ifc))
-                    registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId(), this));
+                    registerDialog(ifc->showOffRouteMineEditWindow(aiv.aesItemId, this));
                 else
                     WARNING_LOG(m_logger)
                         << Q_FUNC_INFO << " getForeignGuiInterface<AesMineSingleVirtual::ForeignGuiInterface> failed!";
@@ -216,8 +216,8 @@ void AesChargeEffectItemInfo::onShowDetails()
                 if (m_session->getForeignGuiInterface<AesExplosion::ForeignGuiInterface>(ifc))
                 {
                     const bool isExplosionSingle =
-                        (aiv.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtExplosionSingle);
-                    const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct().chargeTypeId());
+                        (aiv.aesTypeId == AreaEffectSimulation::AesType::AtExplosionSingle);
+                    const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct.chargeTypeId);
 
                     for (auto gc :
                          {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar,
@@ -228,7 +228,7 @@ void AesChargeEffectItemInfo::onShowDetails()
 
                         if (gearClass == gc)
                         {
-                            registerDialog(ifc->showEditWindow(aiv.aesItemId(), isExplosionSingle, false, gc, this));
+                            registerDialog(ifc->showEditWindow(aiv.aesItemId, isExplosionSingle, false, gc, this));
                             break;
                         }
                     }
@@ -246,8 +246,8 @@ void AesChargeEffectItemInfo::onShowDetails()
                 {
 
                     AesItem ai;
-                    m_aesDtc->aesItemFromId(aiv.aesItemId(), ai);
-                    registerDialog(ifc->showEditWindow(aiv.aesItemId(), ai.effectSourceId(), this));
+                    m_aesDtc->aesItemFromId(aiv.aesItemId, ai);
+                    registerDialog(ifc->showEditWindow(aiv.aesItemId, ai.effectSourceId, this));
                 }
                 else
                     WARNING_LOG(m_logger)
@@ -274,7 +274,7 @@ void AesChargeEffectItemInfo::onShowDetails()
                 break;
             case AreaEffectSimulation::AesType::AtUnknown:
                 Q_ASSERT(false);
-                WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId();
+                WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId: " << aiv.aesTypeId;
                 break;
             default:
                 DEBUG_LOG(m_logger) << "Couldn't find AesItem to ChargeEffect (any more). Hiding the button";
@@ -298,33 +298,33 @@ void AesChargeEffectItemInfo::onShowDetails()
 
 void AesChargeEffectItemInfo::onChargeEffectChanged(const ChargeEffect& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id();
-    if (data.id() == m_ChargeEffectId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << " [onChargeEffectChanged] id: " << data.id;
+    if (data.id == m_ChargeEffectId && modType != DataModification::eRemoved)
         handleChargeEffect(data);
 }
 
 void AesChargeEffectItemInfo::handleChargeEffect(const ChargeEffect& data)
 {
 
-    m_ui->lblChargeEffectName->setText(QString::fromStdString(data.name()));
+    m_ui->lblChargeEffectName->setText(QString::fromStdString(data.name));
 
-    m_ui->lblEffectStart->setText(DTG::toStringMSec(data.effectStart()));
+    m_ui->lblEffectStart->setText(DTG::toStringMSec(data.effectStart));
 
-    m_ui->lblEffectDuration->setVisible(data.effectDuration() > 0);
-    m_ui->lbxEffectDuration->setVisible(data.effectDuration() > 0);
+    m_ui->lblEffectDuration->setVisible(data.effectDuration > 0);
+    m_ui->lbxEffectDuration->setVisible(data.effectDuration > 0);
 
-    m_ui->lblEffectDuration->setText(LtsWidgets::readableDuration(data.effectDuration()));
+    m_ui->lblEffectDuration->setText(LtsWidgets::readableDuration(data.effectDuration));
 
-    AreaEffectSimulation::AesEffectState st = data.state();
+    AreaEffectSimulation::AesEffectState st = data.state;
     m_ui->lblStatus->setText(AreaEffectSimulation::toString(st));
 
-    m_ui->lblChargeTypeId->setText(QString::number(data.chargeTypeId()));
+    m_ui->lblChargeTypeId->setText(QString::number(data.chargeTypeId));
 
-    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(data.chargeTypeId()));
-    m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(data.chargeTypeId()));
+    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(data.chargeTypeId));
+    m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(data.chargeTypeId));
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.position().lon(), data.position().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.position.lon, data.position.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_danger_area_aes_item_info.cpp

@@ -18,7 +18,7 @@ namespace AreaEffectSimulation
 
 DangerAreaAesItemInfo::DangerAreaAesItemInfo(QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_dtc(nullptr), m_session(nullptr),
-      m_ui(new Ui::DangerAreaAesItemInfo), m_aesItemId(-1)
+      m_ui(new Ui::DangerAreaAesItemInfo), m_aesItemId(-1), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     m_ui->setupUi(this);
 }
@@ -34,35 +34,35 @@ void DangerAreaAesItemInfo::retranslate()
 {
 
     std::unique_ptr<AesItem> item(new BCContamination(m_dtc->bCContamination(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->bCContamination(m_aesItemId), tr("B/C-Contamination"));
         return;
     }
 
     item.reset(new NContamination(m_dtc->nContamination(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->nContamination(m_aesItemId), tr("N-Contamination"));
         return;
     }
 
     item.reset(new ExplosionArea(m_dtc->explosionArea(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->explosionArea(m_aesItemId), tr("Explosion Area"));
         return;
     }
 
     item.reset(new ExplosionSingle(m_dtc->explosionSingle(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->explosionSingle(m_aesItemId), tr("Single Explosion"));
         return;
     }
 
     item.reset(new MineArea(m_dtc->mineArea(m_aesItemId)));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         translate(m_ui, m_dtc->mineArea(m_aesItemId), tr("Mine Area"));
         return;
@@ -114,7 +114,7 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId)
 {
     AesItem* item;
     item = new BCContamination(m_dtc->bCContamination(aesItemId));
-    if (item->id() > 0)
+    if (item->id > 0)
     {
         m_aesItems.insert(aesItemId, AesStruct(AesType::AtBCContamination, item));
         return;
@@ -131,7 +131,7 @@ void DangerAreaAesItemInfo::setText()
 
     for (const AesStruct& aesStruct : std::as_const(m_aesItems))
     {
-        if (aesStruct.item->effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
+        if (aesStruct.item->effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
             aesItemInfo(aesStruct.item);
     }
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp

@@ -11,18 +11,18 @@
 #include <LtsSession/lts_session_data.h>
 #include <LtsUtilsSettings/settings.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
-#include <AreaEffectSimulation/BCContamination/aes_bccontamination_gui_plugin_interface.h>
-#include <AreaEffectSimulation/Base/aes_base_edit.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
-#include <AreaEffectSimulation/Borderline/aes_borderline_gui_plugin_interface.h>
-#include <AreaEffectSimulation/DangerArea/aes_danger_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/Explosion/aes_explosion_gui_plugin_interface.h>
-#include <AreaEffectSimulation/FunctionalArea/aes_functional_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/GasPipe/aes_gas_pipe_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineArea/aes_mine_area_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineCorridor/aes_mine_corridor_gui_plugin_interface.h>
-#include <AreaEffectSimulation/MineSingleVirtual/aes_mine_single_virtual_gui_plugin_interface.h>
-#include <AreaEffectSimulation/NContamination/aes_ncontamination_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_mine_single_virtual_gui_plugin_interface.h>
+#include <Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_gui_plugin_interface.h>
 #include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <ProjectDataManagement/pdm.hpp>
 #include <ProjectDataManagement/pdm_translation.h>
@@ -34,7 +34,7 @@ AesInfoDialog::AesInfoDialog(int aesEntityId, AesType aesType, QWidget* parent)
     : LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_aesEntityId(aesEntityId),
       m_aesType(aesType), m_bcChargeTypeId(-1), m_singleExpChargeTypeId(-1), m_areaExpChargeTypeId(-1),
       m_session(nullptr), m_dtc(nullptr), m_ftc(nullptr), m_pdmDtc(nullptr), m_ui(new Ui::AesInfoDialog),
-      m_requestHelper(new LtsUtils::RequestHelper(this))
+      m_requestHelper(new LtsUtils::RequestHelper(this)), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
 {
     DEBUG_LOG(m_logger) << "ctor AesInfoDialog() ";
     m_ui->setupUi(this);
@@ -64,18 +64,18 @@ void AesInfoDialog::retranslate()
 
 bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView& aesItemView)
 {
-    if (aesItemView.aesItemId() != m_aesEntityId)
+    if (aesItemView.aesItemId != m_aesEntityId)
         return false;
 
     DEBUG_LOG(m_logger) << "AesItemView found for aesEntityId: " << m_aesEntityId
-                        << " AesItemView.aesTypeId(): " << aesItemView.aesTypeId();
+                        << " AesItemView.aesTypeId(): " << aesItemView.aesTypeId;
 
-    if (aesItemView.aesTypeId() != m_aesType)
+    if (aesItemView.aesTypeId != m_aesType)
     {
 
         return false;
     }
-    switch (aesItemView.aesTypeId().underlying())
+    switch (aesItemView.aesTypeId)
     {
         case AreaEffectSimulation::AesType::AtNContamination: {
             handleNContamination(aesItemView);
@@ -245,7 +245,7 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView& aesItemView)
             break;
         case AreaEffectSimulation::AesType::AtUnknown:
             WARNING_LOG(m_logger) << "Unknown AesType found for aesEntityId " << m_aesEntityId << ": "
-                                  << aesItemView.aesTypeId();
+                                  << aesItemView.aesTypeId;
             Q_ASSERT(false);
             break;
     }
@@ -311,7 +311,7 @@ bool AesInfoDialog::init(LtsSession::LtsSession* session, const std::shared_ptr<
 void AesInfoDialog::handleNContamination(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleNContamination(m_dtc->nContamination(m_aesEntityId));
 }
@@ -319,19 +319,19 @@ void AesInfoDialog::handleNContamination(const AesItemView& aesItemView)
 void AesInfoDialog::handleNContamination(const AreaEffectSimulation::NContamination& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::NContamination)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtNContamination);
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleBCContamination(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleBCContamination(m_dtc->bCContamination(m_aesEntityId));
 }
@@ -339,21 +339,21 @@ void AesInfoDialog::handleBCContamination(const AesItemView& aesItemView)
 void AesInfoDialog::handleBCContamination(const AreaEffectSimulation::BCContamination& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BCContamination)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtBCContamination);
 
-    m_bcChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_bcChargeTypeId = data.chargeStruct.chargeTypeId;
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleBoobyTrap(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleBoobyTrap(m_dtc->boobyTrap(m_aesEntityId));
 }
@@ -361,11 +361,11 @@ void AesInfoDialog::handleBoobyTrap(const AesItemView& aesItemView)
 void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtBoobyTrap);
 
-    m_bcChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_bcChargeTypeId = data.chargeStruct.chargeTypeId;
 
     m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_bcChargeTypeId, true));
     m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_bcChargeTypeId, true));
@@ -373,14 +373,14 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap& data)
     m_ui->lblChargeTypeId->setText(QString::number(m_bcChargeTypeId));
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleOffRouteMine(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleOffRouteMine(m_dtc->offRouteMine(m_aesEntityId));
 }
@@ -388,11 +388,11 @@ void AesInfoDialog::handleOffRouteMine(const AesItemView& aesItemView)
 void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtOffRouteMine);
 
-    m_bcChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_bcChargeTypeId = data.chargeStruct.chargeTypeId;
 
     m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_bcChargeTypeId, true));
     m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_bcChargeTypeId, true));
@@ -401,14 +401,14 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine&
 
     m_ui->lblPosition->show();
     QString mgrs =
-        LtsCoordTrans::mgrsFromGeographic(data.area().cornerBottomLeft().lon(), data.area().cornerBottomLeft().lat());
+        LtsCoordTrans::mgrsFromGeographic(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleExplosionArea(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
 
     handleExplosionArea(m_dtc->explosionArea(m_aesEntityId));
 }
@@ -416,19 +416,19 @@ void AesInfoDialog::handleExplosionArea(const AesItemView& aesItemView)
 void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionArea& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtExplosionArea);
 
-    m_areaExpChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_areaExpChargeTypeId = data.chargeStruct.chargeTypeId;
 
-    const Area& area = data.area();
-    if (!qFuzzyCompare(area.cornerBottomLeft().lon(), 0) || !qFuzzyCompare(area.cornerBottomLeft().lat(), 0))
+    const Area& area = data.area;
+    if (!qFuzzyCompare(area.cornerBottomLeft.lon, 0) || !qFuzzyCompare(area.cornerBottomLeft.lat, 0))
     {
         m_ui->lblPosition->show();
-        QPointF bottomLeft(area.cornerBottomLeft().lon(), area.cornerBottomLeft().lat());
+        QPointF bottomLeft(area.cornerBottomLeft.lon, area.cornerBottomLeft.lat);
         const QPointF& center =
-            Polygons::bottomLeft2CenterPoint(bottomLeft, area.width(), area.height(), area.rotation());
+            Polygons::bottomLeft2CenterPoint(bottomLeft, area.width, area.height, area.rotation);
         QString mgrs = LtsCoordTrans::mgrsFromGeographic(center.x(), center.y());
         m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     }
@@ -437,66 +437,66 @@ void AesInfoDialog::handleExplosionArea(const AreaEffectSimulation::ExplosionAre
 void AesInfoDialog::handleExplosionSingle(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleExplosionSingle(m_dtc->explosionSingle(m_aesEntityId));
 }
 
 void AesInfoDialog::handleExplosionSingle(const AreaEffectSimulation::ExplosionSingle& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionSingle)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtExplosionSingle);
 
-    m_singleExpChargeTypeId = data.chargeStruct().chargeTypeId();
+    m_singleExpChargeTypeId = data.chargeStruct.chargeTypeId;
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
 
 void AesInfoDialog::handleMineArea(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleMineArea(m_dtc->mineArea(m_aesEntityId));
 }
 
 void AesInfoDialog::handleMineArea(const AreaEffectSimulation::MineArea& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtMineArea);
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.boundingRectCorner().lon(), data.boundingRectCorner().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.boundingRectCorner.lon, data.boundingRectCorner.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 
     bool bResetVisbile =
-        (data.isDus() || data.isConcrete()) &&
+        (data.isDus || data.isConcrete) &&
 
         LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::MineAreasResetDusMines) &&
         ((m_session->app() == LtsAppDescriptor::App::Situation ||
           m_session->app() == LtsAppDescriptor::App::SituationTablet) &&
          (!m_session->isReplayPartition()));
     m_ui->pbResetDusMines->setVisible(bResetVisbile);
-    m_mineIsReactivatable = data.isReactivatable();
-    m_ui->pbResetDusMines->setToolTip(data.isDus() ? tr("Reset DUS Mines matched to this Minearea")
+    m_mineIsReactivatable = data.isReactivatable;
+    m_ui->pbResetDusMines->setToolTip(data.isDus ? tr("Reset DUS Mines matched to this Minearea")
                                                    : tr("Reset Concrete Mines matched to this Minearea"));
 }
 
 void AesInfoDialog::handleMineCorridor(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleMineCorridor(m_dtc->mineCorridor(m_aesEntityId));
 }
 
 void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::MineArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtMineCorridor);
 
@@ -510,14 +510,14 @@ void AesInfoDialog::handleMineCorridor(const AreaEffectSimulation::MineCorridor&
 void AesInfoDialog::handleGasPipe(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " handleGasPipe: aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleGasPipe(m_dtc->gasPipe(m_aesEntityId));
 }
 
 void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::GasPipe)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtGasPipe);
 
@@ -531,23 +531,23 @@ void AesInfoDialog::handleGasPipe(const AreaEffectSimulation::GasPipe& data)
 void AesInfoDialog::handleDangerArea(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleDangerArea(m_dtc->dangerArea(m_aesEntityId));
 }
 
 void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::DangerArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtDangerArea);
 
-    const auto& qv = data.segments();
+    const auto& qv = data.segments;
     if (qv.size() > 0)
     {
         m_ui->lblPosition->show();
         const Core::GeoPosition2D& pos = qv.at(0);
-        QString mgrs = LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+        QString mgrs = LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
         m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     }
 
@@ -558,23 +558,23 @@ void AesInfoDialog::handleDangerArea(const AreaEffectSimulation::DangerArea& dat
 void AesInfoDialog::handleBorderline(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleBorderline(m_dtc->borderline(m_aesEntityId));
 }
 
 void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::Borderline)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtBorderline);
 
-    const auto& qv = data.segments();
+    const auto& qv = data.segments;
     if (qv.size() > 0)
     {
         m_ui->lblPosition->show();
         const Core::GeoPosition2D& pos = qv.at(0);
-        QString mgrs = LtsCoordTrans::mgrsFromGeographic(pos.lon(), pos.lat());
+        QString mgrs = LtsCoordTrans::mgrsFromGeographic(pos.lon, pos.lat);
         m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     }
 }
@@ -582,30 +582,30 @@ void AesInfoDialog::handleBorderline(const AreaEffectSimulation::Borderline& dat
 void AesInfoDialog::handleFunctionalArea(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleFunctionalArea(m_dtc->functionalArea(m_aesEntityId));
 }
 
 void AesInfoDialog::handleFunctionalArea(const FunctionalArea& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtFunctionalArea);
 
     QStringList chargeTypesNames;
     QStringList chargeTypesShortNames;
-    if (data.medicMode() != AesOperatingMode::OmNotUsed)
+    if (data.medicMode != AesOperatingMode::OmNotUsed)
     {
         chargeTypesNames << m_pdmDtc->trChargeTypeName(411, true);
         chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(411, true);
     }
-    if (data.maintMode() != AesOperatingMode::OmNotUsed)
+    if (data.maintMode != AesOperatingMode::OmNotUsed)
     {
         chargeTypesNames << m_pdmDtc->trChargeTypeName(412, true);
         chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(412, true);
     }
-    if (data.deconMode() != AesOperatingMode::OmNotUsed)
+    if (data.deconMode != AesOperatingMode::OmNotUsed)
     {
         chargeTypesNames << m_pdmDtc->trChargeTypeName(413, true);
         chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(413, true);
@@ -614,9 +614,9 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea& data)
     m_ui->lblChargeType->setToolTip(chargeTypesShortNames.join(QLatin1String(", ")));
 
     m_ui->lblPosition->show();
-    const QPointF bottomLeft(data.area().cornerBottomLeft().lon(), data.area().cornerBottomLeft().lat());
+    const QPointF bottomLeft(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat);
     const QPointF centerpoint =
-        Polygons::bottomLeft2CenterPoint(bottomLeft, data.area().width(), data.area().height(), 0.0);
+        Polygons::bottomLeft2CenterPoint(bottomLeft, data.area.width, data.area.height, 0.0);
     const QString mgrs = LtsCoordTrans::mgrsFromGeographic(centerpoint.x(), centerpoint.y());
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 }
@@ -624,25 +624,25 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea& data)
 void AesInfoDialog::handleAirSupportImpact(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleAirSupportImpact(m_dtc->airSupportImpact(m_aesEntityId));
 }
 
 void AesInfoDialog::handleAirSupportImpact(const AirSupportImpact& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::FunctionalArea)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtAirSupportImpact);
 
     m_ui->lblPosition->show();
-    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition().lon(), data.impactPosition().lat());
+    QString mgrs = LtsCoordTrans::mgrsFromGeographic(data.impactPosition.lon, data.impactPosition.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
 
     m_ui->lbFlightTime->show();
     m_ui->lblFlightTime->show();
 
-    m_ui->lblFlightTime->setText(LtsWidgets::readableDuration(data.flightTime()));
+    m_ui->lblFlightTime->setText(LtsWidgets::readableDuration(data.flightTime));
 }
 
 void AesInfoDialog::handleMineAraeSingleMine()
@@ -651,14 +651,14 @@ void AesInfoDialog::handleMineAraeSingleMine()
     if (!m_dtc->aesItemViewFromEntityId(0, m_aesType, itemView))
         return;
     const DusMineState dms = m_dtc->dusMineState(0);
-    for (size_t i = 0; i < dms.mines().size(); ++i)
+    for (size_t i = 0; i < dms.mines.size(); ++i)
     {
-        const DusMine& mine = dms.mines().at(i);
-        if (mine.eqId() == m_aesEntityId)
+        const DusMine& mine = dms.mines.at(i);
+        if (mine.eqId == m_aesEntityId)
         {
-            if (itemView.form().size() <= i)
+            if (itemView.form.size() <= i)
                 return;
-            handleMineAraeSingleMine(itemView.form().at(i), mine);
+            handleMineAraeSingleMine(itemView.form.at(i), mine);
             return;
         }
     }
@@ -679,12 +679,12 @@ void AesInfoDialog::handleMineAraeSingleMine(const Core::GeoPosition2D& position
     m_ui->lblAesDuration->hide();
     m_ui->pbDetails->hide();
 
-    m_aesEntityName = QString::number(mine.eqId());
+    m_aesEntityName = QString::number(mine.eqId);
 
-    m_ui->lblAesTypeId->setText(QString::number(m_aesType.underlying()));
+    m_ui->lblAesTypeId->setText(QString::number(static_cast<int>(m_aesType)));
     m_ui->lblAesType->setText(toString(m_aesType));
 
-    const int ctId = mine.chargeTypeId();
+    const int ctId = mine.chargeTypeId;
     if (ctId != 0)
     {
         m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(ctId, true));
@@ -699,11 +699,11 @@ void AesInfoDialog::handleMineAraeSingleMine(const Core::GeoPosition2D& position
     else
         m_ui->lbAesId->setText(tr("Mine Id:"));
 
-    m_ui->lblAesId->setText(QString::number(mine.eqId()));
+    m_ui->lblAesId->setText(QString::number(mine.eqId));
 
     bool bResetVisible = false;
 
-    if (mine.triggered() && isDus)
+    if (mine.triggered && isDus)
     {
         m_ui->lblStatus->setText(tr("Inactive"));
         if (LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::MineAreasResetDusMines)
@@ -723,7 +723,7 @@ void AesInfoDialog::handleMineAraeSingleMine(const Core::GeoPosition2D& position
     m_ui->pbResetDusMines->setToolTip(isDus ? tr("Reset DUS Mines matched to this Minearea")
                                             : tr("Reset Concrete Mines matched to this Minearea"));
 
-    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon(), position.lat());
+    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(position.lon, position.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     m_ui->lblPosition->show();
 
@@ -747,21 +747,21 @@ void AesInfoDialog::handleSingleDusMine()
     m_ui->lblAesDuration->hide();
     m_ui->pbDetails->hide();
 
-    m_aesEntityName = QString::number(dsm.id());
+    m_aesEntityName = QString::number(dsm.id);
 
-    m_ui->lblAesTypeId->setText(QString::number(m_aesType.underlying()));
+    m_ui->lblAesTypeId->setText(QString::number(static_cast<int>(m_aesType)));
     m_ui->lblAesType->setText(toString(m_aesType));
 
-    const int ctId = dsm.chargeStruct().chargeTypeId();
+    const int ctId = dsm.chargeStruct.chargeTypeId;
     m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(ctId));
     m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(ctId));
     m_ui->lblChargeType->show();
     m_ui->lblChargeTypeId->setText(QString::number(ctId));
 
     m_ui->lbAesId->setText(tr("DUS Mine Id:"));
-    m_ui->lblAesId->setText(QString::number(dsm.id()));
+    m_ui->lblAesId->setText(QString::number(dsm.id));
 
-    switch (dsm.effectStateId().underlying())
+    switch (dsm.effectStateId)
     {
         case AesEffectState::EsExpired:
             m_ui->lblStatus->setText(tr("Inactive"));
@@ -792,7 +792,7 @@ void AesInfoDialog::handleSingleDusMine()
             break;
     }
 
-    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(dsm.position().lon(), dsm.position().lat());
+    const QString mgrs = LtsCoordTrans::mgrsFromGeographic(dsm.position.lon, dsm.position.lat);
     m_ui->lblPosition->setText(tr("Position: %1").arg(mgrs));
     m_ui->lblPosition->show();
 
@@ -802,18 +802,18 @@ void AesInfoDialog::handleSingleDusMine()
 void AesInfoDialog::handleExplosionCluster(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleExplosionCluster(m_dtc->explosionCluster(m_aesEntityId));
 }
 
 void AesInfoDialog::handleExplosionCluster(const ExplosionCluster& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::ExplosionCluster)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtExplosionCluster);
 
-    const int m_explosionClusterChargeTypeId = data.chargeStruct().chargeTypeId();
+    const int m_explosionClusterChargeTypeId = data.chargeStruct.chargeTypeId;
     m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(m_explosionClusterChargeTypeId, true));
     m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(m_explosionClusterChargeTypeId, true));
     m_ui->lblChargeType->show();
@@ -823,32 +823,32 @@ void AesInfoDialog::handleExplosionCluster(const ExplosionCluster& data)
 void AesInfoDialog::handleEffectCluster(const AesItemView& aesItemView)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AesItemView)"
-                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId();
+                        << " aesItemView.aesItemId(): " << aesItemView.aesItemId;
     handleEffectCluster(m_dtc->effectCluster(m_aesEntityId));
 }
 
 void AesInfoDialog::handleEffectCluster(const EffectCluster& data)
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::EffectCluster)"
-                        << " data.id(): " << data.id();
+                        << " data.id(): " << data.id;
 
     handleAesItem(data, AesType::AtEffectCluster);
 }
 
 void AesInfoDialog::handleAesItem(const AesItem& aesData, AesType aesTypeId)
 {
-    m_aesEntityName = QString::fromStdString(aesData.name());
-    m_aesEffectSource = aesData.effectSourceId();
+    m_aesEntityName = QString::fromStdString(aesData.name);
+    m_aesEffectSource = aesData.effectSourceId;
 
-    m_ui->lblAesItemId->setText(QString::number(aesData.id()));
+    m_ui->lblAesItemId->setText(QString::number(aesData.id));
 
-    m_ui->lblAesTypeId->setText(QString::number(aesTypeId.underlying()));
+    m_ui->lblAesTypeId->setText(QString::number(static_cast<int>(aesTypeId)));
     const ProjectDataManagement::GearClass gearClass =
-        m_pdmDtc->gearClassFromChargeTypeId(aesData.chargeStruct().chargeTypeId());
-    switch (gearClass.underlying())
+        m_pdmDtc->gearClassFromChargeTypeId(aesData.chargeStruct.chargeTypeId);
+    switch (gearClass)
     {
-        case ProjectDataManagement::GearClass::Biological:
-        case ProjectDataManagement::GearClass::Chemical:
+        case ProjectDataManagement::GearClass::GearClass_Biological:
+        case ProjectDataManagement::GearClass::GearClass_Chemical:
             m_ui->lblAesType->setText(ProjectDataManagement::toString(gearClass));
             break;
         default:
@@ -857,28 +857,28 @@ void AesInfoDialog::handleAesItem(const AesItem& aesData, AesType aesTypeId)
 
     m_ui->lblAesName->setText(m_aesEntityName);
 
-    if (aesData.effectStart().is_set())
-        m_ui->lblAesStart->setText(DTG::toStringMSec(aesData.effectStart().get()));
+    if (aesData.effectStart.has_value())
+        m_ui->lblAesStart->setText(DTG::toStringMSec(aesData.effectStart.get()));
     else
         m_ui->lblAesStart->setText(tr("None"));
 
-    if (aesData.effectDuration() == 0)
+    if (aesData.effectDuration == 0)
     {
         m_ui->lbAesDuration->hide();
         m_ui->lblAesDuration->hide();
     }
-    if (aesTypeId == AesType::AtEffectCluster && aesData.effectDuration() == DEFAULT_EFFECT_DURATION)
+    if (aesTypeId == AesType::AtEffectCluster && aesData.effectDuration == DEFAULT_EFFECT_DURATION)
         m_ui->lblAesDuration->setText(QStringLiteral("---"));
     else
-        m_ui->lblAesDuration->setText(LtsWidgets::readableDuration(aesData.effectDuration()));
+        m_ui->lblAesDuration->setText(LtsWidgets::readableDuration(aesData.effectDuration));
 
-    AreaEffectSimulation::AesEffectState st = aesData.effectStateId();
+    AreaEffectSimulation::AesEffectState st = aesData.effectStateId;
     m_ui->lblStatus->setText(toString(st));
 
-    m_ui->lblChargeTypeId->setText(QString::number(aesData.chargeStruct().chargeTypeId()));
+    m_ui->lblChargeTypeId->setText(QString::number(aesData.chargeStruct.chargeTypeId));
 
-    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(aesData.chargeStruct().chargeTypeId()));
-    m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(aesData.chargeStruct().chargeTypeId()));
+    m_ui->lblChargeType->setText(m_pdmDtc->trChargeTypeShortName(aesData.chargeStruct.chargeTypeId));
+    m_ui->lblChargeType->setToolTip(m_pdmDtc->trChargeTypeName(aesData.chargeStruct.chargeTypeId));
 }
 
 void AesInfoDialog::onFindOnMap()
@@ -895,7 +895,7 @@ void AesInfoDialog::onShowDetails()
 {
     DEBUG_LOG(m_logger) << Q_FUNC_INFO;
 
-    switch (m_aesType.underlying())
+    switch (m_aesType)
     {
         case AreaEffectSimulation::AesType::AtNContamination: {
             std::shared_ptr<AesNContamination::ForeignGuiInterface> ifc;
@@ -916,7 +916,7 @@ void AesInfoDialog::onShowDetails()
             if (m_session->getForeignGuiInterface<AesBCContamination::ForeignGuiInterface>(ifc))
             {
                 const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(m_bcChargeTypeId);
-                if (gearClass == ProjectDataManagement::GearClass::Biological)
+                if (gearClass == ProjectDataManagement::GearClass::GearClass_Biological)
                 {
                     AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(m_aesEntityId, false, this);
                     if (dialog)
@@ -925,7 +925,7 @@ void AesInfoDialog::onShowDetails()
                     break;
                 }
 
-                if (gearClass == ProjectDataManagement::GearClass::Chemical)
+                if (gearClass == ProjectDataManagement::GearClass::GearClass_Chemical)
                 {
                     AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(m_aesEntityId, true, this);
                     if (dialog)
@@ -1162,118 +1162,118 @@ bool AesInfoDialog::onResetDusMines()
 
 void AesInfoDialog::onNContaminationChanged(const AreaEffectSimulation::NContamination& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleNContamination(data);
 }
 
 void AesInfoDialog::onBCContaminationChanged(const AreaEffectSimulation::BCContamination& data,
                                              DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleBCContamination(data);
 }
 
 void AesInfoDialog::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleBoobyTrap(data);
 }
 
 void AesInfoDialog::onOffRouteMineChanged(const AreaEffectSimulation::OffRouteMine& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleOffRouteMine(data);
 }
 
 void AesInfoDialog::onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleExplosionArea(data);
 }
 
 void AesInfoDialog::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle& data,
                                              DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleExplosionSingle(data);
 }
 
 void AesInfoDialog::onMineAreaChanged(const AreaEffectSimulation::MineArea& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleMineArea(data);
 }
 
 void AesInfoDialog::onMineCorridorChanged(const MineCorridor& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleMineCorridor(data);
 }
 
 void AesInfoDialog::onGasPipeChanged(const GasPipe& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleGasPipe(data);
 }
 
 void AesInfoDialog::onDangerAreaChanged(const AreaEffectSimulation::DangerArea& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleDangerArea(data);
 }
 
 void AesInfoDialog::onBorderlineChanged(const AreaEffectSimulation::Borderline& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleBorderline(data);
 }
 
 void AesInfoDialog::onFunctionalAreaChanged(const FunctionalArea& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleFunctionalArea(data);
 }
 
 void AesInfoDialog::onAirSupportImpactChanged(const AirSupportImpact& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleAirSupportImpact(data);
 }
 
 void AesInfoDialog::onDusMineStateChanged(const DusMineState& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
 
     if (modType == DataModification::eRemoved)
         return;
-    if (data.id() != 0)
+    if (data.id != 0)
         return;
 
     AesItemView itemView;
     if (!m_dtc->aesItemViewFromEntityId(0, m_aesType, itemView))
         return;
 
-    for (size_t i = 0; i < data.mines().size(); ++i)
+    for (size_t i = 0; i < data.mines.size(); ++i)
     {
-        const DusMine& mine = data.mines().at(i);
-        if (mine.eqId() == m_aesEntityId)
+        const DusMine& mine = data.mines.at(i);
+        if (mine.eqId == m_aesEntityId)
         {
-            if (itemView.form().size() <= i)
+            if (itemView.form.size() <= i)
                 return;
-            handleMineAraeSingleMine(itemView.form().at(i), mine);
+            handleMineAraeSingleMine(itemView.form.at(i), mine);
             return;
         }
     }
@@ -1281,22 +1281,22 @@ void AesInfoDialog::onDusMineStateChanged(const DusMineState& data, DataModifica
 
 void AesInfoDialog::onDusSingleMineChanged(const DusSingleMine& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleSingleDusMine();
 }
 
 void AesInfoDialog::onExplosionClusterChanged(const ExplosionCluster& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleExplosionCluster(data);
 }
 
 void AesInfoDialog::onEffectClusterChanged(const EffectCluster& data, DataModification modType)
 {
-    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id();
-    if (data.id() == m_aesEntityId && modType != DataModification::eRemoved)
+    DEBUG_LOG(m_logger) << Q_FUNC_INFO << " id: " << data.id;
+    if (data.id == m_aesEntityId && modType != DataModification::eRemoved)
         handleEffectCluster(data);
 }
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/CustomView/aes_air_support_impact.cpp

@@ -61,17 +61,17 @@ bool CustomViewAirSupportImpact::init(const QModelIndex &idx)
 bool CustomViewAirSupportImpact::calculateIcon(const AirSupportImpact &asi, const QColor &color)
 {
   Database::AesAirSupportImpact dbAsi;
-  dbAsi.impactPosition = QPointF(asi.impactPosition().lon(), asi.impactPosition().lat());
+  dbAsi.impactPosition = QPointF(asi.impactPosition.lon, asi.impactPosition.lat);
 
   std::shared_ptr<ProjectDataManagement::Interface::Dtc> pdmDtc;
   if (!m_session->getDtc<ProjectDataManagement::DataInterface>(pdmDtc))
     return false;
 
-  double radius = pdmDtc->impactRadius(asi.chargeStruct().chargeTypeId(),
-                                       asi.chargeStruct().igniterTypeId(),
-                                       asi.chargeStruct().igniterFunctionId());
+  double radius = pdmDtc->impactRadius(asi.chargeStruct.chargeTypeId,
+                                       asi.chargeStruct.igniterTypeId,
+                                       asi.chargeStruct.igniterFunctionId);
   QPolygonF poly = AreaEffectSimulation::Polygons::airSupportImpact(dbAsi, radius);
-  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(asi.effectStateId());
+  Qt::BrushStyle bStyle = PixmapLabel::checkForBrushStyle(asi.effectStateId);
   const auto pix = Polygons::pixmapFromPolygon(PixmapLabel::geographic2Utm(poly), color, ICON_RESOLUTION, bStyle);
   m_ui->lblIcon->setPixmap(pix);
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_list.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include "aes_air_support_9liner_model.h"
 
 namespace Ui

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.cpp

@@ -48,36 +48,36 @@ QVariant AirSupport9LinerModel::data(const QModelIndex &index, int role) const
   switch (index.column())
   {
   case ParticipantId:
-    return item.participantId();
+    return item.participantId;
   case Participant:
   {
     if (!m_ppmDtc)
       return QString();
-    return m_ppmDtc->hierarchyFromParticipant(item.participantId());
+    return m_ppmDtc->hierarchyFromParticipant(item.participantId);
   }
   case Timestamp:
-    return QDateTime::fromMSecsSinceEpoch(item.sampleTime());
+    return QDateTime::fromMSecsSinceEpoch(item.sampleTime);
   case AttackHeading:
   {
-    if (item.finalAttackHeading() < 0)
+    if (item.finalAttackHeading < 0)
       return QVariant();
-    if (item.finalAttackHeadingHigh() < 0)
+    if (item.finalAttackHeadingHigh < 0)
       return tr("%1 degree")
-          .arg(item.finalAttackHeading());
+          .arg(item.finalAttackHeading);
     return tr("%1 degree (low: %2 degree, high: %3 degreee)", "degree as symbol!")
-        .arg(item.finalAttackHeading())
-        .arg(item.finalAttackHeadingLow())
-        .arg(item.finalAttackHeadingHigh());
+        .arg(item.finalAttackHeading)
+        .arg(item.finalAttackHeadingLow)
+        .arg(item.finalAttackHeadingHigh);
   }
   case TargetPosition:
   {
-    if (std::isnan(item.targetPosition().lat()))
+    if (std::isnan(item.targetPosition.lat))
       return tr("---");
-    LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(item.targetPosition().lon(),
-                                                                                    item.targetPosition().lat()));
+    LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(item.targetPosition.lon,
+                                                                                    item.targetPosition.lat));
     QString ret = coord.mgrs();
-    if (item.targetPosition().z() > 0)
-      ret += QLatin1Char(' ') + QString::number(qRound(item.targetPosition().z()));
+    if (item.targetPosition.z > 0)
+      ret += QLatin1Char(' ') + QString::number(qRound(item.targetPosition.z));
     return ret;
   }
   }
@@ -131,7 +131,7 @@ bool AirSupport9LinerProxyModel::filterAcceptsRow(int source_row, const QModelIn
     return true;
 
   const qint64 m_offset = 5 * 60 * 1000; 
-  if ((data.sampleTime() + m_offset) > m_session->partitionTime())
+  if ((data.sampleTime + m_offset) > m_session->partitionTime())
     return true;
   return false;
 }
@@ -150,27 +150,27 @@ bool AirSupport9LinerProxyModel::lessThan(const QModelIndex &source_left, const
   switch (source_left.column())
   {
   case AirSupport9LinerModel::ParticipantId:
-    if (left.participantId() != right.participantId())
-      return left.participantId() < right.participantId();
-    return left.sampleTime() < right.sampleTime();
+    if (left.participantId != right.participantId)
+      return left.participantId < right.participantId;
+    return left.sampleTime < right.sampleTime;
   case AirSupport9LinerModel::Participant:
   {
     const auto l = source_left.data();
     const auto r = source_right.data();
     if (l != r)
       return LtsUtils::lessThan(l, r);
-    return left.sampleTime() < right.sampleTime();
+    return left.sampleTime < right.sampleTime;
   }
   case AirSupport9LinerModel::Timestamp:
-    return left.sampleTime() < right.sampleTime();
+    return left.sampleTime < right.sampleTime;
   case AirSupport9LinerModel::AttackHeading:
-    if (left.finalAttackHeading() != right.finalAttackHeading())
-      return left.finalAttackHeading() < right.finalAttackHeading();
-    if (left.finalAttackHeadingLow() != right.finalAttackHeadingLow())
-      return left.finalAttackHeadingLow() < right.finalAttackHeadingLow();
-    if (left.finalAttackHeadingHigh() != right.finalAttackHeadingHigh())
-      return left.finalAttackHeadingHigh() < right.finalAttackHeadingHigh();
-    return left.sampleTime() < right.sampleTime();
+    if (left.finalAttackHeading != right.finalAttackHeading)
+      return left.finalAttackHeading < right.finalAttackHeading;
+    if (left.finalAttackHeadingLow != right.finalAttackHeadingLow)
+      return left.finalAttackHeadingLow < right.finalAttackHeadingLow;
+    if (left.finalAttackHeadingHigh != right.finalAttackHeadingHigh)
+      return left.finalAttackHeadingHigh < right.finalAttackHeadingHigh;
+    return left.sampleTime < right.sampleTime;
   }
   return LtsWidgets::LtsColumnFilterProxyModel::lessThan(source_left, source_right);
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_9liner_model.h

@@ -7,6 +7,7 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
 #include <GuezNasat/gna_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
+#include <ParticipantManagement/ppm_dtc.h>
 #include <LtsSession/lts_session.h>
 #include <QtCore/QSortFilterProxyModel>
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_gui_plugin.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_base_gui_plugin.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_gui_plugin.h>
 #include <GuezNasat/gna_data_plugin_interface.h>
 #include "aes_air_support_gui_plugin_interface.h"
 

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp

@@ -107,7 +107,7 @@ void AirSupportExplosionClusterImpactList::createModel()
 {
   m_model = new AesItemSortFilterProxyModelTmpl<EffectCluster>(m_session, this);
 
-  m_effectClusterModel = new EffectClusterModel({ProjectDataManagement::GearClass::AirSupport}, this);
+  m_effectClusterModel = new EffectClusterModel({ProjectDataManagement::GearClass::GearClass_AirSupport}, this);
   m_effectClusterModel->initModel(m_session);
   m_model->setSourceModel(m_effectClusterModel);
 }

qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <AreaEffectSimulation/Base/aes_itemlist.h>
-#include <AreaEffectSimulation/Base/aes_base_model.h>
-#include <AreaEffectSimulation/Explosion/aes_effect_cluster_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_itemlist.h>
+#include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
+#include <Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.h>
 #include "aes_air_support_impact_model.h"
 
 namespace AreaEffectSimulation